From b9790b4fa1d6b5ab8d692fde44be4d3aff61e5d17f11011fec9c2554db34c21e Mon Sep 17 00:00:00 2001
From: Michal Seben <mseben@gmail.com>
Date: Thu, 17 Mar 2011 13:20:12 +0000
Subject: [PATCH] - fix missing permissions handling of VBoxNetDHCP
 (bnc#679785) - fix permissions handling for virtualbox-qt subpackage

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=35
---
 virtualbox.changes |  6 ++++++
 virtualbox.spec    | 40 +++++++++++++++++++++++++++++-----------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/virtualbox.changes b/virtualbox.changes
index 7992b9a..1497672 100644
--- a/virtualbox.changes
+++ b/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
 
diff --git a/virtualbox.spec b/virtualbox.spec
index bbb6978..8fcb31b 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -131,6 +131,7 @@ Qt GUI part for %{name}.
 License:        GPLv2+
 Summary:        Host kernel module for VirtualBox
 Group:          System/Emulators/PC
+PreReq:         permissions
 # SUSE specify macro to define host kmp package
 %{?suse_kernel_module_package:%suse_kernel_module_package -p %{S:7} -n %{name}-host -f %{S:5} kdump um xen xenpae}
 
@@ -499,10 +500,31 @@ groupadd -r vboxusers 2>/dev/null || :
 /sbin/ldconfig
 %fillup_and_insserv -f -y vboxdrv
 %fillup_only -an vboxes
-%run_permissions
+%if %suse_version >=1140
+	%set_permissions
+%else	
+	%run_permissions
+%endif	
 
 %post qt
-%run_permissions
+%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
@@ -523,12 +545,6 @@ 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
@@ -591,7 +607,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
@@ -600,8 +620,6 @@ 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)