File project.diff of Package virtualbox

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package virtualbox (Revision ad07b0075971e6a19f58395497e43e16)

Currently displaying revision ad07b0075971e6a19f58395497e43e16 , Show latest

--- virtualbox-rpmlintrc.orig
+++ virtualbox-rpmlintrc
@@ -1,3 +1,4 @@
 addFilter("incoherent-init-script-name vboxdrv")
 addFilter("incoherent-init-script-name vboxadd")
 addFilter("xorg-x11-driver-virtualbox-ose.* shlib-policy-missing-suffix")
+setBadness("permissions-unauthorized-file", 333)
--- virtualbox-wrapper.sh.orig
+++ virtualbox-wrapper.sh
@@ -6,7 +6,7 @@ export QT_NO_KDE_INTEGRATION=1
 # Handle the issue regarding USB passthru
 # The following conditions apply:
 # 1. If ~/.vbox/enable exists, the user accepts the security risk.
-# 2. If ~/.vbox/disable exists, the user does not accept the risk. That file will contain the inode of /etc/udev/rules.d/60-vboxdrv.rules.
+# 2. If ~/.vbox/disable exists, the user does not accept the risk. That file will contain the inode of /usr/lib/udev/rules.d/60-vboxdrv.rules.
 #    When that changes, the VBoxUSB_DevRules will again be displayed as that means that VB has been reloaded. 
 #
 devrules()
@@ -26,8 +26,8 @@ devrules()
 #
 # Ensure that ~/.vbox exists
 mkdir -p ~/.vbox/
-# Get the inode for /etc/udev/rules.d/60-vboxdrv.rules
-INODE=$(stat /etc/udev/rules.d/60-vboxdrv.rules | grep Inode | cut -d' ' -f3)
+# Get the inode for /usr/lib/udev/rules.d/60-vboxdrv.rules
+INODE=$(stat /usr/lib/udev/rules.d/60-vboxdrv.rules | grep Inode | cut -d' ' -f3)
 if [ ! -f ~/.vbox/enable ] && [ ! -f ~/.vbox/disable ] ; then
 	# Neither file exists - find what the user wants
 	devrules
@@ -38,7 +38,7 @@ if [ -f ~/.vbox/disable ] ; then
 else
     LINE=" "
 fi
-# If user originally declined, make certain that /etc/udev/rules.d/60-vboxdrv.rules has not been changed
+# If user originally declined, make certain that /usr/lib/udev/rules.d/60-vboxdrv.rules has not been changed
 if [ -f ~/.vbox/disable ] && [ "$LINE" != "$INODE" ] && [ "$LINE" != "" ] ; then
     # disable is selected and the Inode has changed - ask again
     devrules
--- virtualbox.changes.orig
+++ virtualbox.changes
@@ -1,4 +1,16 @@
 -------------------------------------------------------------------
+Sun Mar 31 21:02:36 UTC 2019 - Hans-Peter Jansen <hpj@urpla.net>
+
+- adjust patch virtualbox-fix-ui-background-color.patch to really
+  fix the background color messing...
+
+-------------------------------------------------------------------
+Sat Mar 30 18:36:47 UTC 2019 - Hans-Peter Jansen <hpj@urpla.net>
+
+- add patch to stop UI messing with Highlight Color for background
+- apply fixes_for_qt5.13.patch for Qt versions >= 5.13.0 only
+
+-------------------------------------------------------------------
 Thu Mar 28 00:20:43 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
 
 - Fix build with the pending Qt 5.13. File "fixes_for_qt5.13.patch" is added. bsc#1130503
@@ -14,6 +26,23 @@ Wed Feb 20 16:31:23 UTC 2019 - Larry Fin
 - Remove requires on libvncserver for virtualbox-vnc. 
 
 -------------------------------------------------------------------
+Tue Feb 12 12:05:48 UTC 2019 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Add setBadness('permissions-unauthorized-file',333) to rpmlintrc
+- Remove suid attributes from all files
+- add libgsoap version dependency >= 2.8.50 (recv_maxlength)
+
+-------------------------------------------------------------------
+Mon Feb 11 12:46:26 UTC 2019 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Fix virtualbox wrapper script virtualbox-wrapper.sh to check
+  60-vboxdrv.rules in /usr/lib/udev/rules.d, not /etc/udev/rules.d
+  Logic is still flawed, until it doesn't take both locations into 
+  account
+- Add custom /etc/permission.d/virtualbox{,.paranoid} definitions
+- Add compatibility symlink to keep old desktop links functional
+
+-------------------------------------------------------------------
 Thu Jan 31 19:31:20 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
 
 - Add changes requested by Security - new file "security_fixes.patch"
--- virtualbox.spec.orig
+++ virtualbox.spec
@@ -16,6 +16,8 @@
 #
 
 
+%define qt5ver %(rpm -q --queryformat %%{version} libQt5Core5|perl -ne '/(\\d+)\\.(\\d+)\\.(\\d+)?/&&printf "%%d%%02d%%02d\\n",$1,$2,$3')
+
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
   %define _fillupdir /var/adm/fillup-templates
@@ -62,6 +64,8 @@ Source8:        %{name}-guest-preamble
 Source9:        %{name}-wrapper.sh
 Source10:       %{name}-LocalConfig.kmk
 Source11:       %{name}-60-vboxdrv.rules
+Source12:       %{name}.permissions
+Source13:       %{name}.permissions.paranoid
 Source14:       vboxdrv.service
 Source15:       vboxadd-service.service
 Source16:       vboxconfig.sh
@@ -138,6 +142,7 @@ Patch130:       fixes_for_5.1.patch
 # Fixes for Qt5.13
 Patch131:       fixes_for_qt5.13.patch
 #endif
+Patch999:       virtualbox-fix-ui-background-color.patch
 #
 BuildRequires:  LibVNCServer-devel
 BuildRequires:  SDL-devel
@@ -160,7 +165,7 @@ BuildRequires:  fdupes
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  glibc-devel-static
-BuildRequires:  gsoap-devel
+BuildRequires:  gsoap-devel >= 2.8.50
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  kbuild >= 0.1.9998svn3101
 #BuildRequires:  kernel-syms
@@ -440,7 +445,11 @@ as an "extpack" for VirtualBox. The impl
 %patch128 -p1
 %patch129 -p1
 %patch130 -p1
+
+%if %{qt5ver} >= 51300
 %patch131 -p1
+%endif
+%patch999 -p1
 
 #copy user manual
 cp %{SOURCE1} UserManual.pdf
@@ -569,6 +578,8 @@ install -d -m 755 %{buildroot}%{_libdir}
 install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/drivers
 install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/input
 install -d -m 755 %{buildroot}%{_sysconfdir}/default
+install -d -m 755 %{buildroot}%{_sysconfdir}/init.d
+install -d -m 755 %{buildroot}%{_sysconfdir}/permissions.d
 install -d %{buildroot}%{_unitdir}
 install -d %{buildroot}%{_unitdir}/multi-user.target.wants
 install -d -m 755 %{buildroot}%{_sysconfdir}/vbox
@@ -655,6 +666,8 @@ install -m 755 VBoxNetDHCP			%{buildroot
 install -m 755 VBoxNetAdpCtl			%{buildroot}%{_vbox_instdir}
 install -m 755 VirtualBox			%{buildroot}%{_vbox_instdir}/VirtualBox6
 install -m 755 VirtualBoxVM			%{buildroot}%{_vbox_instdir}
+# compatibility symlink in order to keep old desktop links functional
+ln -s %{_vbox_instdir}/VirtualBoxVM		%{buildroot}%{_vbox_instdir}/VirtualBox
 install -m 755 VBoxEFI*.fd			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxSysInfo.sh			%{buildroot}%{_vbox_instdir}
 install -m 644 *.so		 		%{buildroot}%{_vbox_instdir}
@@ -682,6 +695,10 @@ install -m 644 %{SOURCE4}			%{buildroot}
 #install wrapper script
 install -m 644 %{SOURCE9}			%{buildroot}%{_bindir}/VirtualBox
 
+# permissions
+install -m 644 %{SOURCE12}                      %{buildroot}%{_sysconfdir}/permissions.d/virtualbox
+install -m 644 %{SOURCE13}                      %{buildroot}%{_sysconfdir}/permissions.d/virtualbox.paranoid
+
 # Service files to load kernel modules on boot
 install -m 0644 %{SOURCE14}			%{buildroot}%{_unitdir}/vboxdrv.service
 ln -s -f %{_sbindir}/service			%{buildroot}%{_sbindir}/rcvboxdrv
@@ -934,10 +951,13 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %{_sbindir}/rcvboxdrv
 /sbin/vboxconfig
 %{_vbox_instdir}/VBoxCreateUSBNode.sh
-%verify(not mode) %attr(4755,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT
-%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP
-%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl
-%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxHeadless
+%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT
+%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP
+%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl
+%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxHeadless
+# not %config tagged for security reasons
+%{_sysconfdir}/permissions.d/virtualbox
+%{_sysconfdir}/permissions.d/virtualbox.paranoid
 %dir %{_sysconfdir}/vbox
 %attr(1775,root,vboxusers) %{_sysconfdir}/vbox
 %config %attr(644,root,vboxusers) %{_sysconfdir}/vbox/vbox.cfg
@@ -948,8 +968,9 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxPermissionMessage
 %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxUSB_DevRules
 %attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBox6
-%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM
-%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxSDL
+%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM
+%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxSDL
+%{_vbox_instdir}/VirtualBox
 #wrapper script is in bindir
 %attr(0755,root,root) %{_bindir}/VirtualBox
 #rules fixing script is in /sbin

Places

File project.diff of Package virtualbox (Revision ad07b0075971e6a19f58395497e43e16)

Places