diff --git a/fix_error_in_USB_header.patch b/fix_error_in_USB_header.patch new file mode 100644 index 0000000..533f42d --- /dev/null +++ b/fix_error_in_USB_header.patch @@ -0,0 +1,20 @@ +Index: a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp +=================================================================== +--- a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp ++++ a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp +@@ -90,7 +90,6 @@ typedef struct USBPROXYURBLNX + # pragma GCC diagnostic push + # pragma GCC diagnostic ignored "-Wpedantic" + #endif +- struct usbdevfs_urb KUrb; + #if RT_GNUC_PREREQ(6, 0) + # pragma GCC diagnostic pop + #endif +@@ -110,6 +109,7 @@ typedef struct USBPROXYURBLNX + bool fDiscarded; + /** Size to transfer in remaining fragments of a split URB */ + uint32_t cbSplitRemaining; ++ struct usbdevfs_urb KUrb; /* This entry MUST be last */ + } USBPROXYURBLNX, *PUSBPROXYURBLNX; + + /** diff --git a/vboxdrv.sh b/vboxdrv.sh index 8745d48..0079acb 100644 --- a/vboxdrv.sh +++ b/vboxdrv.sh @@ -94,7 +94,7 @@ udev_write_vboxdrv() { VBOXDRV_MODE="$2" echo "KERNEL==\"vboxdrv\", NAME=\"vboxdrv\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\"" - echo "KERNEL==\"vboxdrvu\", NAME=\"vboxdrvu\", OWNER=\"root\", GROUP=\"root\", MODE=\"0666\"" + echo "KERNEL==\"vboxdrvu\", NAME=\"vboxdrvu\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"0660\"" echo "KERNEL==\"vboxnetctl\", NAME=\"vboxnetctl\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\"" } diff --git a/virtualbox-60-vboxdrv.rules b/virtualbox-60-vboxdrv.rules index d26b7b4..9c0aa92 100644 --- a/virtualbox-60-vboxdrv.rules +++ b/virtualbox-60-vboxdrv.rules @@ -1,6 +1,6 @@ -KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" -KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0660" -KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0600" +KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660" +KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="vboxusers", MODE="0660" +KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660" SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/lib/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/virtualbox-60-vboxguest.rules b/virtualbox-60-vboxguest.rules index 1eb0b0a..331c61a 100644 --- a/virtualbox-60-vboxguest.rules +++ b/virtualbox-60-vboxguest.rules @@ -1,6 +1,4 @@ KERNEL=="vboxguest", NAME="vboxguest", OWNER="root", MODE="0660" ENV{ID_INPUT}="1", ENV{ID_INPUT_MOUSE}="1" -KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0660" -#KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0660", TAG+="uaccess" - +KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0660", TAG+="uaccess" ACTION=="add|change", SUBSYSTEM=="drm", KERNEL=="card[0-9]", SUBSYSTEMS=="pci", ATTRS{vendor}=="0x15ad", ATTRS{device}=="0x0405", TAG+="systemd", ENV{SYSTEMD_WANTS}="vboxclient.service" diff --git a/virtualbox.changes b/virtualbox.changes index ee07a59..ede8f8a 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Oct 8 00:49:59 UTC 2022 - Larry Finger + +- Fix build breakage with kernel 6.0 due to variable-length array in middle of a struct. boo#1204151 + File "fix_error_in_USB_header.patch" is added. + +------------------------------------------------------------------- +Wed Oct 5 17:28:00 UTC 2022 - Larry Finger + +- Fix boo#1204019 VBoxClient: VbglR3InitUser failed: VERR_ACCESS_DENIED + ------------------------------------------------------------------- Tue Sep 27 17:23:12 UTC 2022 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 49300a9..6fe4b0e 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -173,6 +173,7 @@ Patch137: handle_gsoap_208103.patch Patch142: fixes_for_leap15.3.patch Patch143: vb-6.1.16-modal-dialog-parent.patch Patch144: fixes_for_leap15.4.patch +Patch145: fix_error_in_USB_header.patch Patch999: virtualbox-fix-ui-background-color.patch # # Common BuildRequires for both virtualbox and virtualbox-kmp @@ -531,6 +532,7 @@ This package contains the kernel-modules that VirtualBox uses to create or run v %patch144 -p1 %endif %patch143 -p1 +%patch145 -p1 # make VB UI background colors look sane again %patch999 -p1