diff --git a/fix_usb_rules.sh b/fix_usb_rules.sh index b33950c..32e8e4f 100644 --- a/fix_usb_rules.sh +++ b/fix_usb_rules.sh @@ -1,7 +1,7 @@ #!/bin/bash # script to disable USB passthru in /etc/udev/rules.d/60-vboxdrv.rules # if already disabled, clear the comment character -sed -i 's/#SUBSYSTEM==\"usb/SUBSYSTEM==\"usb/' /etc/udev/rules.d/60-vboxdrv.rules +sed -i 's/#SUBSYSTEM==\"usb/SUBSYSTEM==\"usb/' /usr/lib/udev/rules.d/60-vboxdrv.rules # now comment the usb lines -sed -i 's/SUBSYSTEM==\"usb/#SUBSYSTEM==\"usb/' /etc/udev/rules.d/60-vboxdrv.rules +sed -i 's/SUBSYSTEM==\"usb/#SUBSYSTEM==\"usb/' /usr/lib/udev/rules.d/60-vboxdrv.rules diff --git a/security_fixes.patch b/security_fixes.patch index 9d0dc0f..fc034e0 100644 --- a/security_fixes.patch +++ b/security_fixes.patch @@ -9,7 +9,7 @@ Index: VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== --- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/installer/vboxadd.sh +++ VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd.sh -@@ -869,9 +869,11 @@ dmnstatus() +@@ -890,9 +890,11 @@ dmnstatus() fi } @@ -28,7 +28,7 @@ Index: VirtualBox-7.0.6/src/VBox/Installer/linux/vboxdrv.sh =================================================================== --- VirtualBox-7.0.6.orig/src/VBox/Installer/linux/vboxdrv.sh +++ VirtualBox-7.0.6/src/VBox/Installer/linux/vboxdrv.sh -@@ -48,6 +48,9 @@ DEVICE=/dev/vboxdrv +@@ -47,6 +47,9 @@ DEVICE=/dev/vboxdrv MODPROBE=/sbin/modprobe SCRIPTNAME=vboxdrv.sh diff --git a/virtualbox-wrapper.sh b/virtualbox-wrapper.sh index fe928b8..814f6e2 100644 --- a/virtualbox-wrapper.sh +++ b/virtualbox-wrapper.sh @@ -49,10 +49,10 @@ if [ -f ~/.config/VirtualBox/disable ] ; then echo $INODE > ~/.config/VirtualBox/disable if [ "$LINE" != "$INODE" ] ; then if [ -f /usr/bin/kdesu ] ; then - kdesu /sbin/vbox-fix-usb-rules.sh + kdesu /usr/sbin/vbox-fix-usb-rules.sh fi if [ -f /usr/bin/gnomesu ] ; then - gnomesu /sbin/vbox-fix-usb-rules.sh + gnomesu /usr/sbin/vbox-fix-usb-rules.sh fi fi fi diff --git a/virtualbox.changes b/virtualbox.changes index 46509fd..ba742cc 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 1 21:46:49 UTC 2023 - Larry Finger + +- Fix a few places that did not get updated for the transition from + /sbin => /usr/sbin, and /etc/udev => /usr/lib/udev. boo#1207736. + ldconfig has not been moved in Leap 15.4 - use /sbin for it. + ------------------------------------------------------------------- Tue Jan 24 20:15:06 UTC 2023 - Larry Rainey diff --git a/virtualbox.spec b/virtualbox.spec index bc89c74..fd46170 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -57,6 +57,7 @@ Summary: %{package_summary} # FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" # FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" License: GPL-2.0-or-later +# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: %{package_group} URL: https://www.virtualbox.org/ # @@ -297,28 +298,6 @@ the terms of the GNU Public License (GPL). - - - - - - - - - - - - - - - - - - - - - - ########################################## %package qt @@ -339,28 +318,6 @@ This package contains the code for the GUI used to control VMs. - - - - - - - - - - - - - - - - - - - - - - ######################################### %package websrv @@ -376,29 +333,6 @@ The VirtualBox web server is used to control headless VMs using a browser. - - - - - - - - - - - - - - - - - - - - - - - ########################################### %package guest-tools Summary: VirtualBox guest tools @@ -422,28 +356,6 @@ VirtualBox guest addition tools. - - - - - - - - - - - - - - - - - - - - - - ########################################### %package -n python3-%{name} @@ -465,28 +377,6 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. - - - - - - - - - - - - - - - - - - - - - - ########################################### %package devel @@ -503,28 +393,6 @@ Development file for %{name} - - - - - - - - - - - - - - - - - - - - - - ########################################### %package host-source @@ -558,28 +426,6 @@ sudo %{_sbindir}/vboxguestconfig - - - - - - - - - - - - - - - - - - - - - - ########################################### %package guest-desktop-icons @@ -594,28 +440,6 @@ This package contains icons for guest desktop files that were created on the des - - - - - - - - - - - - - - - - - - - - - - ########################################### %package vnc