Accepting request 64458 from Virtualization

Accepted submit request 64458 from user mseben

OBS-URL: https://build.opensuse.org/request/show/64458
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=20

virtualbox.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 17 13:17:54 UTC 2011 - mseben@gmail.com
+
+- fix missing permissions handling of VBoxNetDHCP (bnc#679785)
+- fix permissions handling for virtualbox-qt subpackage
+
 -------------------------------------------------------------------
 Wed Mar  9 15:43:08 UTC 2011 - crrodriguez@opensuse.org
 

virtualbox.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package virtualbox
+# spec file for package virtualbox (Version 3.9.80)
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -43,7 +43,7 @@ BuildRequires:  gcc43-32bit libstdc++43-devel-32bit
 #
 ExclusiveArch:  %ix86 x86_64
 Version:        4.0.4
-Release:        2
+Release:        1
 Summary:        VirtualBox is an Emulator
 License:        GPLv2+
 Group:          System/Emulators/PC
@@ -122,6 +122,7 @@ Provides:       %{name}-ose:/usr/lib/virtualbox/VirtualBox.so
 #rename from "ose" version:
 Provides:       %{name}-ose-qt = %version
 Obsoletes:      %{name}-ose-qt < %version
+PreReq:         permissions
 
 %description qt
 Qt GUI part for %{name}.
@@ -175,7 +176,6 @@ VirtualBox guest addition tools.
 ###########################################
 %package -n python-%{name}
 
-
 Summary:        Python bindings for %{name}
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
@@ -442,6 +442,7 @@ popd
 #install wrapper script
 %__install -m 644 %{S:9} 			%{buildroot}%{_bindir}/VirtualBox
 
+
 # modify and install the vboxdrv init script
 # TODO: some of this stuff breaks the fillup macros below? 
 %__sed -i "s|%NOLSB%|yes|g;s|%DEBIAN%||g;s|%PACKAGE%|virtualbox|g" src/VBox/Installer/linux/vboxdrv.sh.in
@@ -456,6 +457,8 @@ popd
 %__install -d -m 755 				%{buildroot}%{_var}/adm/fillup-templates
 install -m 700 %{S:13} 				%{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox
 
+
+
 ######################################################
 echo "entrering python-virtualbox install section"
 ######################################################
@@ -496,10 +499,31 @@ groupadd -r vboxusers 2>/dev/null || :
 /sbin/ldconfig
 %fillup_and_insserv -f -y vboxdrv
 %fillup_only -an vboxes
+%if %suse_version >=1140
+	%set_permissions
+%else	
 	%run_permissions
+%endif	
 
 %post qt
+%if %suse_version >=1140
+	%set_permissions
+%else	
 	%run_permissions
+%endif	
+
+
+%verifyscript
+%if %suse_version >=1140
+	%verify_permissions -e %{_vbox_instdir}/VBoxNetDHCP
+%endif
+%if %suse_version > 1110
+	%verify_permissions -e %{_vbox_instdir}/VBoxNetAdpCtl
+%endif
+%verify_permissions -e %{_vbox_instdir}/VBoxBFE -e %{_vbox_instdir}/VBoxHeadless -e %{_vbox_instdir}/VBoxSDL 
+
+%verifyscript qt
+%verify_permissions -e %{_vbox_instdir}/VirtualBox
 
 %post guest-tools
 %fillup_and_insserv -f -y vboxadd
@@ -520,12 +544,7 @@ exit 0
 %postun guest-tools
 %restart_on_update vboxadd
 %insserv_cleanup
-%verifyscript
+
-%if %suse_version > 1110
-%verify_permissions -e %{_vbox_instdir}/VBoxBFE -e %{_vbox_instdir}/VBoxHeadless -e %{_vbox_instdir}/VBoxSDL -e %{_vbox_instdir}/VirtualBox -e %{_vbox_instdir}/VBoxNetAdpCtl
-%else
-%verify_permissions -e %{_vbox_instdir}/VBoxBFE -e %{_vbox_instdir}/VBoxHeadless -e %{_vbox_instdir}/VBoxSDL -e %{_vbox_instdir}/VirtualBox 
-%endif
 
 %clean
 [ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}"
@@ -587,7 +606,11 @@ exit 0
 %{_var}/adm/fillup-templates/sysconfig.vbox
 %{_sbindir}/rcvboxes
 %{_sbindir}/rcvboxdrv
-#check setuid bit
+%if %suse_version > 1140
+%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP
+%else
+%{_vbox_instdir}/VBoxNetDHCP
+%endif
 %if %suse_version > 1110
 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl
 %else
@@ -596,10 +619,7 @@ exit 0
 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxBFE
 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxHeadless
 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL
-%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP
-#%{_vbox_instdir}/VBoxNetDHCP
 #
-
 %files qt
 %defattr(-, root, root)
 %{_vbox_instdir}/VBoxPermissionMessage