From 6374f221dadbfa0b28ce8ad45f23805298e2edcf33202d5c3b8d2015e99fb793 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@gmail.com>
Date: Sat, 8 Oct 2022 01:19:55 +0000
Subject: [PATCH] Accepting request 1008893 from
 home:lwfinger:branches:Virtualization

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.

OBS-URL: https://build.opensuse.org/request/show/1008893
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=659
---
 fix_error_in_USB_header.patch | 20 ++++++++++++++++++++
 virtualbox.changes            |  2 +-
 virtualbox.spec               |  7 +++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 fix_error_in_USB_header.patch

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/virtualbox.changes b/virtualbox.changes
index 579f8d3..ede8f8a 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -2,7 +2,7 @@
 Sat Oct  8 00:49:59 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>
 
 - 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 affed.
+  File "fix_error_in_USB_header.patch" is added.
 
 -------------------------------------------------------------------
 Wed Oct  5 17:28:00 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>
diff --git a/virtualbox.spec b/virtualbox.spec
index d3aed61..6fe4b0e 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -303,6 +303,7 @@ the terms of the GNU Public License (GPL).
 
 
 ##########################################
+
 %package qt
 Summary:        Qt GUI part for %{name}
 Group:          System/Emulators/PC
@@ -335,6 +336,7 @@ The VirtualBox web server is used to control headless VMs using a browser.
 
 
 ###########################################
+
 %package guest-tools
 Summary:        VirtualBox guest tools
 Group:          System/Emulators/PC
@@ -361,6 +363,7 @@ VirtualBox guest addition tools.
 
 
 ###########################################
+
 %package -n python3-%{name}
 Summary:        Python bindings for %{name}
 Group:          Development/Libraries/Python
@@ -383,6 +386,7 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
 
 
 ###########################################
+
 %package devel
 Summary:        Devel files for %{name}
 Group:          Development/Libraries/Other
@@ -400,6 +404,7 @@ Development file for %{name}
 
 
 ###########################################
+
 %package host-source
 Summary:        Source files for %{name} host kernel modules
 Group:          Development/Sources
@@ -434,6 +439,7 @@ sudo %{_sbindir}/vboxguestconfig
 
 
 ###########################################
+
 %package guest-desktop-icons
 Summary:        Icons for guest desktop files
 Group:          System/Emulators/PC
@@ -449,6 +455,7 @@ This package contains icons for guest desktop files that were created on the des
 
 
 ###########################################
+
 %package vnc
 Summary:        VNC desktop sharing
 Group:          System/Emulators/PC