Accepting request 1036720 from home:lwfinger:branches:Virtualization

added file "set_noexec_stack.patch" to remove executable stack in yasm-compiled routines addwd file "fix_v7_build.patch" added file "VBoxDDR0.r0" deleted file "/vb-6.1.16-modal-dialog-parent.patch" VirtualBox 7.0.2 (released October 20 2022) This is a maintenance release. The following items were fixed and/or added: Known issue: VMs having more than one vCPU configured will not work properly on macOS Catalina due to an unknown memory corruption issue. Either lower the number of vCPUs to 1 or upgrade to BigSur or later where the issue does not occur Main: Fixed issue when VBoxSVC could become unresponsive if Extension Pack was not installed (bug #21167) Linux Guest Additions: Introduced initial support for kernel 6.1 Linux Guest Additions: Fixed issue when VBoxClient seamless service caused a crash of some X11 applications (bug #21132) GUI: Fixed a glitch in the log viewer which was causing wrong log file to be saved (bug #21156) VirtualBox 7.0.0 (released October 10 2022) This is a major update. The following major new features were added: Virtual machines can be fully encrypted now, including the VM config logs and saved states (CLI only for now) OCI: Cloud virtual machines can be added to Virtual Machine Manager and controlled as local VMs OCI: Cloud networks can now be configured via Network Manager tool same way as it is done for Host-only and NAT networks GUI: Added a new utility similar to "top" or "resource monitor" which lists peformance statistics (CPU usage, RAM usage, disk I/O rate, etc.) of running guests GUI: Reworked the new vm wizard to integrate the unattended guest OS installation and to have a more streamlined work flow GUI: Added a new help viewer widget which enables the user manual to be navigated and searched GUI: Adding new notification center unifying most of running progresses and error reporting around the GUI GUI: Improved theme support on all platforms. Linux and macOS use native engine while for Windows host it is separately implemented. GUI: Large icon update. Audio recording: Now using Vorbis as the default audio format for WebM containers. Opus is no longer being used. Audio: Added "default" host driver type to make it possible to move VMs (appliances) between different platforms without the need of changing the audio driver explicitly. When the "default" driver is selected, the best audio backend option for a platform will be used. This is the default for newly created VMs. Guest Control: Implemented initial support for automatic updating of Guest Additions for Linux guests Guest Control: Implemented ability to wait for and/or reboot the guest when updating Guest Additions via VBoxManage VBoxManage: Added Guest Control "waitrunlevel" sub-command to make it possible to wait for a guest to reach a certain run level Linux Guest Additions: Reworked guest screen re-size functionality, added basic integration with some of guest Desktop Environments Devices: Implemented new 3D support based on DirectX 11 (and DXVK on non Windows hosts) Devices: Added virtual IOMMU devices (Intel and AMD variant) OBS-URL: https://build.opensuse.org/request/show/1036720 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=663
2022-11-18 21:49:33 +00:00 · 2022-11-18 21:49:33 +00:00 · a4bb9742dd
commit a4bb9742dd
parent fb62e748b1
50 changed files with 4390 additions and 857 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -21,3 +21,5 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 ## Specific LFS patterns
 VBoxDDR0.r0 filter=lfs diff=lfs merge=lfs -text
--- a/Fix_for_server_1.19.patch
+++ b/Fix_for_server_1.19.patch
@ -1,7 +1,7 @@
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
@@ -1236,7 +1236,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
 #endif
@ -14,10 +14,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
     /* software cursor */
     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
@@ -39,6 +39,10 @@
 #include "cursorstr.h"
 #include "servermd.h"
@ -29,10 +29,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c
 #include "vboxvideo.h"
 #ifdef XORG_7X
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/edid.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/edid.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/vboxvideo/edid.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/edid.c
@@ -35,6 +35,10 @@
  *    Michael Thayer <michael.thayer@oracle.com>
  */
--- a/UserManual.pdf
+++ b/UserManual.pdf
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09a43b93bc46ca9b77431b957c34b82f5f46323e2bfe1794e63bfa60eee80b1f
+oid sha256:925793ac0429b9b7c881811fdf2c3cfe5502713cf195db2de385a864370aeffa
-size 4997042
+size 4577633
--- a/VBoxDDR0.r0
+++ b/VBoxDDR0.r0
@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:8e19d03fd8bcd84f30876e1e60c9bf928d4c7e28587877d5589858037a07e135
 size 306128
--- a/VirtualBox-5.2.10-xclient.patch
+++ b/VirtualBox-5.2.10-xclient.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/Installer/98vboxadd-xclient
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-@@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do
+@@ -31,15 +31,9 @@ for i in $HOME/.vboxclient-*.pid; do
     test -w $i || rm -f $i
 done
@ -21,6 +21,3 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/x11/Installer/98vboxadd-xclient
   /usr/bin/VBoxClient --clipboard
   /usr/bin/VBoxClient --checkhostversion
   /usr/bin/VBoxClient --seamless
   /usr/bin/VBoxClient --draganddrop
 -  /usr/bin/VBoxClient --vmsvga  # In case VMSVGA emulation is enabled
 fi
--- a/VirtualBox-6.1.40-patched.tar.bz2
+++ b/VirtualBox-6.1.40-patched.tar.bz2
@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:2201b32ae66e1d5be66410113e254d321e7d16c81fba7ac59bc14018b38c22a8
 size 120766813
--- a/VirtualBox-7.0.2-patched.tar.bz2
+++ b/VirtualBox-7.0.2-patched.tar.bz2
@ -0,0 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:3d64c39a1a96aebf295c0974037b2e82a991ac5de3ac4c96cad54ea2d3aafc73
 size 153430697
--- a/fix-missing-includes-with-qt-5.15.patch
+++ b/fix-missing-includes-with-qt-5.15.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
+Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
-+++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
+++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
-@@ -18,6 +18,7 @@
+@@ -28,6 +28,7 @@
 /* Qt includes: */
 #include <QApplication>
 #include <QLabel>
@ -10,11 +10,11 @@ Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cp
 #include <QPaintEvent>
 #include <QStyle>
 #include <QVBoxLayout>
-Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
+Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
-+++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
+++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
-@@ -37,7 +37,6 @@ class QIcon;
+@@ -47,7 +47,6 @@ class QIcon;
 class QLabel;
 class QMouseEvent;
 class QObject;
--- a/fix_conflict_between_host_and_guest.patch
+++ b/fix_conflict_between_host_and_guest.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
+++ VirtualBox-7.0.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
-@@ -130,7 +130,7 @@ static struct vboxguest_module_info g_VB
+@@ -140,7 +140,7 @@ static struct vboxguest_module_info g_VB
     RTMemAllocExTag,
     RTMemContAlloc,
     RTMemContFree,
--- a/fix_kmp_build.patch
+++ b/fix_kmp_build.patch
@ -0,0 +1,92 @@
 Index: VirtualBox-7.0.2/Config.kmk
 ===================================================================
 --- VirtualBox-7.0.2.orig/Config.kmk
 +++ VirtualBox-7.0.2/Config.kmk
@@ -780,6 +780,7 @@ if1of ($(KBUILD_TARGET), linux solaris)
  VBOX_WITH_XPCOM_NAMESPACE_CLEANUP = 1
 endif
 # The webservices api.
 +# disabled for now due to pending license clarification
 VBOX_WITH_WEBSERVICES = 1
 VBOX_WITH_WEBSERVICES_SSL = 1
 # The Qt GUI.
@@ -1406,7 +1407,7 @@ endif
 VBOX_ONLY_BUILD_NEW := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK VALIDATIONKIT\
 	, $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
 ifneq ($(VBOX_ONLY_BUILD),$(VBOX_ONLY_BUILD_NEW))
 - $(error VBox: LocalConfig.kmk changed the VBOX_ONLY_ build status, VBOX_ONLY_* must be on the kmk command line or in the environment: $(VBOX_ONLY_BUILD) -> $(VBOX_ONLY_BUILD_NEW))
 +# $(error VBox: LocalConfig.kmk changed the VBOX_ONLY_ build status, VBOX_ONLY_* must be on the kmk command line or in the environment: $(VBOX_ONLY_BUILD) -> $(VBOX_ONLY_BUILD_NEW))
 endif
 #
@@ -1576,7 +1577,7 @@ endif
 #
 ifdef VBOX_HEADLESS
  VBOX_WITH_QTGUI=
 - VBOX_WITH_VBOXSDL=
 +# VBOX_WITH_VBOXSDL=
  VBOX_WITH_VRDP_RDESKTOP=
 endif
 Index: VirtualBox-7.0.2/configure
 ===================================================================
 --- VirtualBox-7.0.2.orig/configure
 +++ VirtualBox-7.0.2/configure
@@ -1201,8 +1201,8 @@ check_sdl()
   if [ -n "$foundsdl" ]; then
     cat > $ODIR.tmp_src.cc << EOF
 #include <cstdio>
 -#include <SDL.h>
 -#include <SDL_main.h>
 +#include <SDL/SDL.h>
 +#include <SDL/SDL_main.h>
 #undef main
 extern "C" int main(int argc, char** argv)
 {
 Index: VirtualBox-7.0.2/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
 +++ VirtualBox-7.0.2/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
@@ -45,7 +45,7 @@
 # pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
 # pragma warning(disable: 4668) /* warning C4668: '__GNUC__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
 #endif
 -#include <SDL.h>
 +#include <SDL/SDL.h>
 #ifdef _MSC_VER
 # pragma warning(pop)
 #endif
 Index: VirtualBox-7.0.2/src/VBox/Frontends/Makefile.kmk
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/VBox/Frontends/Makefile.kmk
 +++ VirtualBox-7.0.2/src/VBox/Frontends/Makefile.kmk
@@ -44,9 +44,9 @@ ifndef VBOX_ONLY_DOCS
    include $(PATH_SUB_CURRENT)/VBoxBugReport/Makefile.kmk
   endif
  endif
 - ifdef VBOX_WITH_VBOXSDL
 +# ifdef VBOX_WITH_VBOXSDL
   include $(PATH_SUB_CURRENT)/VBoxSDL/Makefile.kmk
 - endif
 +# endif
  ifdef VBOX_WITH_VBOXFB
   include $(PATH_SUB_CURRENT)/VBoxFB/Makefile.kmk
  endif
 Index: VirtualBox-7.0.2/src/libs/Makefile.kmk
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/libs/Makefile.kmk
 +++ VirtualBox-7.0.2/src/libs/Makefile.kmk
@@ -104,13 +104,7 @@ endif
 # SoftFloat is used by the VMM for FPU emulation.
 -if  (!defined(VBOX_ONLY_BUILD) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != "") \
 - || (   defined(VBOX_WITH_NOCRT_STATIC) \
 -     && "$(KBUILD_TARGET)" == "win" \
 -     && (   defined(VBOX_ONLY_ADDITIONS) \
 -         || (!defined(VBOX_ONLY_BUILD) && defined(VBOX_WITH_ADDITIONS))))
  include $(PATH_SUB_CURRENT)/softfloat-3e/Makefile.kmk
 -endif
 # zlib is used by the IPRT compression code, libpng and others.
--- a/fix_lib_search.patch
+++ b/fix_lib_search.patch
@ -1,10 +1,10 @@
-Index: VirtualBox-6.1.40/configure
+Index: VirtualBox-7.0.2/configure
 ===================================================================
--- VirtualBox-6.1.40.orig/configure
+--- VirtualBox-7.0.2.orig/configure
-+++ VirtualBox-6.1.40/configure
+++ VirtualBox-7.0.2/configure
-@@ -1591,14 +1591,14 @@ EOF
+@@ -1629,14 +1629,14 @@ EOF
         INCQT5="$q/include $q/include/QtCore"
-         FLGQT5="-DQT_SHARED"
+         FLGQT5="-DQT_SHARED -std=c++11"
         I_INCQT5=`prefix_I "$INCQT5"`
 -        LIBQT5="-L$q/lib -lQt5CoreVBox -lQt5GuiVBox"
 +        LIBQT5="-L$q/lib -L$q/usr/lib64 -lQt5CoreVBox -lQt5GuiVBox"
--- a/fix_v7_build.patch
+++ b/fix_v7_build.patch
@ -0,0 +1,87 @@
 Index: VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
 +++ VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
@@ -28,7 +28,7 @@ BEGINCODE
 extern NAME(dtrace_probe)
 GLOBALNAME dtrace_probe6
 -    jmp     NAME(dtrace_probe)
 +    jmp     [rel dtrace_probe wrt ..got]
 %ifidn __OUTPUT_FORMAT__,elf
 section .note.GNU-stack noalloc noexec nowrite progbits
 Index: VirtualBox-7.0.2/src/VBox/VMM/Config.kmk
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/VBox/VMM/Config.kmk
 +++ VirtualBox-7.0.2/src/VBox/VMM/Config.kmk
@@ -58,9 +58,7 @@ else
   VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
  endif
 endif
 -ifdef IEM_WITHOUT_ASSEMBLY
  VMM_COMMON_DEFS += IEM_WITHOUT_ASSEMBLY
 -endif
 # part of global DEFS
 ifdef VBOX_WITH_MULTI_CORE
  VMM_COMMON_DEFS += VBOX_WITH_MULTI_CORE
 Index: VirtualBox-7.0.2/src/VBox/VMM/testcase/Makefile.kmk
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/VBox/VMM/testcase/Makefile.kmk
 +++ VirtualBox-7.0.2/src/VBox/VMM/testcase/Makefile.kmk
@@ -358,7 +358,6 @@ tstIEMAImplAsm_ASFLAGS.x86   := -Werror
 tstIEMAImplAsm_INCS          := ../include .
 tstIEMAImplAsm_SOURCES        = \
 	tstIEMAImpl.cpp \
 -	../VMMAll/IEMAllAImpl.asm \
 	../VMMAll/IEMAllAImplC.cpp \
 	$(tstIEMAImpl_CLEAN)
 tstIEMAImplAsm_SOURCES.x86   += tstIEMAImplDataSseBinary.asm
 Index: VirtualBox-7.0.2/src/VBox/VMM/Makefile.kmk
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/VBox/VMM/Makefile.kmk
 +++ VirtualBox-7.0.2/src/VBox/VMM/Makefile.kmk
@@ -226,7 +226,6 @@ VBoxVMM_SOURCES  = \
 	VMMAll/VMMAll.cpp
 VBoxVMM_SOURCES.amd64 += \
 	VMMR3/PGMR3DbgA.asm \
 -	$(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/IEMAllAImpl.asm,) \
 	VMMAll/VMMAllA.asm
 ifdef VBOX_WITH_VUSB
 VBoxVMM_SOURCES += VMMR3/PDMUsb.cpp
@@ -545,7 +544,6 @@ if defined(VBOX_WITH_R0_MODULES) && !def
  	VMMAll/HMVMXAll.cpp \
  	VMMAll/IEMAll.cpp \
  	VMMAll/IEMAllInstructionsInterpretOnly.cpp \
 -	$(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/IEMAllAImpl.asm,) \
  	VMMAll/IEMAllAImplC.cpp \
  	VMMAll/IEMAllCImpl.cpp \
  	VMMAll/IEMAllCImplSvmInstr.cpp \
 Index: VirtualBox-7.0.2/src/VBox/Devices/Makefile.kmk
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/VBox/Devices/Makefile.kmk
 +++ VirtualBox-7.0.2/src/VBox/Devices/Makefile.kmk
@@ -1234,6 +1234,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
  else
   VBoxDDR0_TEMPLATE       = VBoxR0
  endif
 + VBoxDDR0_MEMSET = "y"
  VBoxDDR0_DEFS           = \
  	$(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
  	$(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,) \
 Index: VirtualBox-7.0.2/src/VBox/Devices/Network/DevE1000.cpp
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/VBox/Devices/Network/DevE1000.cpp
 +++ VirtualBox-7.0.2/src/VBox/Devices/Network/DevE1000.cpp
@@ -44,7 +44,11 @@
 #include <iprt/ctype.h>
 #include <iprt/net.h>
 #include <iprt/semaphore.h>
 +#ifdef VBoxDDR0_MEMSET
 +#include <iprt/nocrt/string.h>
 +#else
 #include <iprt/string.h>
 +#endif
 #include <iprt/time.h>
 #include <iprt/uuid.h>
 #include <VBox/vmm/pdmdev.h>
--- a/fixes_for_Leap42.3.patch
+++ b/fixes_for_Leap42.3.patch
@ -1,7 +1,7 @@
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/sharedfolders/regops.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/sharedfolders/regops.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/sharedfolders/regops.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/sharedfolders/regops.c
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/sharedfolders/regops.c
@@ -1451,7 +1451,7 @@ DECLINLINE(int) vbsf_lock_user_pages(uin
 # elif RTLNX_VER_MIN(4,6,0)
     ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, fWrite, 1 /*force*/, papPages);
--- a/fixes_for_Qt5.11.patch
+++ b/fixes_for_Qt5.11.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
-+++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
-@@ -83,6 +83,7 @@
+@@ -97,6 +97,7 @@
 #include <QtWidgets/qgraphicsitem.h>
 #include <QtWidgets/qgraphicslayoutitem.h>
 #include <QtWidgets/qgraphicswidget.h>
@ -10,15 +10,15 @@ Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
 #include <QtCore/QMetaType>
 #include <QtGui/qevent.h>
 #include <QtGui/qtouchdevice.h>
-Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
-+++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
-@@ -18,6 +18,7 @@
+@@ -27,6 +27,7 @@
 /* Qt includes: */
- #include <QButtonGroup>
+ #include <QVBoxLayout>
 #include <QRegExpValidator>
 +#include <QButtonGroup>
 /* GUI includes: */
- #include "QIWidgetValidator.h"
+ #include "UIGlobalSettingsProxy.h"
--- a/fixes_for_gcc10.patch
+++ b/fixes_for_gcc10.patch
@ -1,13 +1,12 @@
-Index: VirtualBox-6.1.40/Config.kmk
+Index: VirtualBox-7.0.2/Config.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/Config.kmk
+--- VirtualBox-7.0.2.orig/Config.kmk
-+++ VirtualBox-6.1.40/Config.kmk
+++ VirtualBox-7.0.2/Config.kmk
-@@ -2642,11 +2642,17 @@ else
+@@ -3100,15 +3100,17 @@ else
  # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
  # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
  # gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
 - VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \
 -    $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
 + #
 + # Check to make sure that the compiler has either  -dumpfullversion or -dumpversion. gcc-10 has neither
 + RC = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) ; echo $$?)
@ -16,19 +15,22 @@ Index: VirtualBox-6.1.40/Config.kmk
 +    VBOX_GCC_VERSION = 100201
 + else
 +    VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) | \
-+    $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|' )
+     $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|' )
-+ endif
+- ifeq ($(KBUILD_TARGET), darwin)
 -  VBOX_CLANG_VERSION = $(shell $(1) --version | \
 -    $(SED_EXT) -n 's|.*version \([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|p' )
  endif
 endif
 -
 -# YASM macros
 ifndef DONT_USE_YASM
  include $(KBUILD_PATH)/tools/YASM.kmk
  if1of ($(KBUILD_HOST), win os2)
-Index: VirtualBox-6.1.40/src/VBox/Debugger/DBGCDumpImage.cpp
+Index: VirtualBox-7.0.2/src/VBox/Debugger/DBGCDumpImage.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Debugger/DBGCDumpImage.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Debugger/DBGCDumpImage.cpp
-+++ VirtualBox-6.1.40/src/VBox/Debugger/DBGCDumpImage.cpp
+++ VirtualBox-7.0.2/src/VBox/Debugger/DBGCDumpImage.cpp
-@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3
+@@ -478,7 +478,7 @@ static const char *dbgcMachoCpuType(int3
 {
     switch (iType)
     {
--- a/fixes_for_leap15.2.patch
+++ b/fixes_for_leap15.2.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+Index: VirtualBox-7.0.2/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+--- VirtualBox-7.0.2.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++ VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-7.0.2/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-@@ -76,6 +76,10 @@
+@@ -86,6 +86,10 @@
 #define VBOXNETFLT_OS_SPECFIC 1
 #include "../VBoxNetFltInternal.h"
@ -13,10 +13,10 @@ Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
 typedef struct VBOXNETFLTNOTIFIER {
     struct notifier_block Notifier;
     PVBOXNETFLTINS pThis;
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_drv.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -342,12 +342,15 @@ static void vbox_master_drop(struct drm_
 }
@ -36,10 +36,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c
 #else  /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */
 		.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
 #endif /* <  5.4.0 */
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_main.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_main.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_main.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_main.c
@@ -659,8 +659,12 @@ static inline u64 vbox_bo_mmap_offset(st
 #elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0)
 	return bo->bo.addr_space_offset;
@ -53,14 +53,14 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c
 }
 int
-Index: VirtualBox-6.1.40/include/iprt/cdefs.h
+Index: VirtualBox-7.0.2/include/iprt/cdefs.h
 ===================================================================
--- VirtualBox-6.1.40.orig/include/iprt/cdefs.h
+--- VirtualBox-7.0.2.orig/include/iprt/cdefs.h
-+++ VirtualBox-6.1.40/include/iprt/cdefs.h
+++ VirtualBox-7.0.2/include/iprt/cdefs.h
-@@ -1184,14 +1184,15 @@
+@@ -1399,14 +1399,15 @@
-  * Tell the compiler that we're falling through to the next case in a switch.
+ #if RT_CLANG_PREREQ(4, 0) && RT_CPLUSPLUS_PREREQ(201100)
-  * @sa RT_FALL_THRU  */
+ # define RT_FALL_THROUGH()      [[clang::fallthrough]]
- #if RT_GNUC_PREREQ(7, 0)
+ #elif RT_CLANG_PREREQ(12, 0) || RT_GNUC_PREREQ(7, 0)
 -# define RT_FALL_THROUGH()      __attribute__((__fallthrough__))
 +# define FALL_THROUGH		__attribute__((__fallthrough__))
 #else
@ -76,11 +76,11 @@ Index: VirtualBox-6.1.40/include/iprt/cdefs.h
 /** @def RT_IPRT_FORMAT_ATTR
-Index: VirtualBox-6.1.40/kBuild/header.kmk
+Index: VirtualBox-7.0.2/kBuild/header.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/kBuild/header.kmk
+--- VirtualBox-7.0.2.orig/kBuild/header.kmk
-+++ VirtualBox-6.1.40/kBuild/header.kmk
+++ VirtualBox-7.0.2/kBuild/header.kmk
-@@ -754,7 +754,7 @@ RMDIR_EXT   := $(KBUILD_BIN_PATH)/kmk_rm
+@@ -764,7 +764,7 @@ RMDIR_EXT   := $(KBUILD_BIN_PATH)/kmk_rm
 RMDIR_INT   := kmk_builtin_rmdir
 RMDIR       := $(RMDIR_INT)
@ -89,25 +89,21 @@ Index: VirtualBox-6.1.40/kBuild/header.kmk
 SED_INT     := $(SED_EXT)
 SED         := $(SED_EXT)
-Index: VirtualBox-6.1.40/configure
+Index: VirtualBox-7.0.2/configure
 ===================================================================
--- VirtualBox-6.1.40.orig/configure
+--- VirtualBox-7.0.2.orig/configure
-+++ VirtualBox-6.1.40/configure
+++ VirtualBox-7.0.2/configure
-@@ -1886,7 +1886,7 @@ check_kbuild()
+@@ -1960,7 +1960,7 @@ check_kbuild()
     fi
-     echo "export PATH" >> $ENV
+     echo "export KBUILD_PATH KBUILD_DEVTOOLS PATH" >> $ENV
-     echo "unset path_kbuild_bin path_dev_bin" >> $ENV
+     echo "unset path_kbuild_bin path_tools_bin" >> $ENV
 -    KBUILD_SED="$KBUILDDIR_BIN/kmk_sed"
 +    KBUILD_SED="/usr/bin/kmk_sed"
   elif [ "$OS.$BUILD_MACHINE" = "darwin.amd64" ]; then
     # Currently there are no amd64 kBuild bins. So use the x86 variant in any case.
     KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.x86"
@@ -1902,10 +1902,10 @@ check_kbuild()
     echo "echo \"\$PATH\" | grep -q \"\$path_dev_bin\" || PATH=\"\$path_dev_bin:\$PATH\"" >> $ENV
     echo "export PATH" >> $ENV
     echo "unset path_kbuild_bin path_dev_bin" >> $ENV
 -    KBUILD_SED="$KBUILDDIR_BIN/kmk_sed"
 +    KBUILD_SED="/usr/bin/kmk_sed"
     echo '' >> $ENV
     echo "# Legacy - do not use:" >> $ENV
@@ -1970,7 +1970,7 @@ check_kbuild()
     echo '' >> $ENV
   elif check_avail "kmk" KBUILDDIR really; then
     # check for installed kBuild
 -    KBUILD_SED="`which_wrapper kmk_sed`"
@ -115,11 +111,11 @@ Index: VirtualBox-6.1.40/configure
   else
     fail
   fi
-Index: VirtualBox-6.1.40/tools/bin/backport-commit.sh
+Index: VirtualBox-7.0.2/tools/bin/backport-commit.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/tools/bin/backport-commit.sh
+--- VirtualBox-7.0.2.orig/tools/bin/backport-commit.sh
-+++ VirtualBox-6.1.40/tools/bin/backport-commit.sh
+++ VirtualBox-7.0.2/tools/bin/backport-commit.sh
-@@ -19,7 +19,7 @@
+@@ -29,7 +29,7 @@
 #
 # Determin script dir so we can source the common bits.
 #
@ -128,17 +124,17 @@ Index: VirtualBox-6.1.40/tools/bin/backport-commit.sh
 MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
 if test "${MY_SCRIPT_DIR}" = "$0"; then
     MY_SCRIPT_DIR=`pwd -L`
-Index: VirtualBox-6.1.40/tools/bin/backport-common.sh
+Index: VirtualBox-7.0.2/tools/bin/backport-common.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/tools/bin/backport-common.sh
+--- VirtualBox-7.0.2.orig/tools/bin/backport-common.sh
-+++ VirtualBox-6.1.40/tools/bin/backport-common.sh
+++ VirtualBox-7.0.2/tools/bin/backport-common.sh
@@ -1,4 +1,4 @@
 -# $Id: backport-common.sh $
 + $Id: backport-common.sh $
 ## @file
 # Common backport script bits.
 #
-@@ -23,7 +23,7 @@
+@@ -33,7 +33,7 @@
 MY_PRINTF=kmk_printf
     MY_RM=kmk_rm
    MY_SVN=svn
@ -147,11 +143,11 @@ Index: VirtualBox-6.1.40/tools/bin/backport-common.sh
 #
 # Functions.
-Index: VirtualBox-6.1.40/tools/bin/backport-merge-and-commit.sh
+Index: VirtualBox-7.0.2/tools/bin/backport-merge-and-commit.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/tools/bin/backport-merge-and-commit.sh
+--- VirtualBox-7.0.2.orig/tools/bin/backport-merge-and-commit.sh
-+++ VirtualBox-6.1.40/tools/bin/backport-merge-and-commit.sh
+++ VirtualBox-7.0.2/tools/bin/backport-merge-and-commit.sh
-@@ -19,7 +19,7 @@
+@@ -29,7 +29,7 @@
 #
 # Determin script dir so we can invoke the two worker scripts.
 #
@ -160,11 +156,11 @@ Index: VirtualBox-6.1.40/tools/bin/backport-merge-and-commit.sh
 MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
 if test "${MY_SCRIPT_DIR}" = "$0"; then
     MY_SCRIPT_DIR=`pwd -L`
-Index: VirtualBox-6.1.40/tools/bin/backport-merge.sh
+Index: VirtualBox-7.0.2/tools/bin/backport-merge.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/tools/bin/backport-merge.sh
+--- VirtualBox-7.0.2.orig/tools/bin/backport-merge.sh
-+++ VirtualBox-6.1.40/tools/bin/backport-merge.sh
+++ VirtualBox-7.0.2/tools/bin/backport-merge.sh
-@@ -19,7 +19,7 @@
+@@ -29,7 +29,7 @@
 #
 # Determin script dir so we can source the common bits.
 #
@ -173,24 +169,11 @@ Index: VirtualBox-6.1.40/tools/bin/backport-merge.sh
 MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
 if test "${MY_SCRIPT_DIR}" = "$0"; then
     MY_SCRIPT_DIR=`pwd -L`
-Index: VirtualBox-6.1.40/tools/bin/gen-slickedit-workspace.sh
+Index: VirtualBox-7.0.2/src/VBox/Main/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/tools/bin/gen-slickedit-workspace.sh
+--- VirtualBox-7.0.2.orig/src/VBox/Main/Makefile.kmk
-+++ VirtualBox-6.1.40/tools/bin/gen-slickedit-workspace.sh
+++ VirtualBox-7.0.2/src/VBox/Main/Makefile.kmk
-@@ -23,7 +23,7 @@ MY_CAT="kmk_cat"
+@@ -267,7 +267,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE
 MY_CP="kmk_cp"
 MY_MKDIR="kmk_mkdir"
 MY_MV="kmk_mv"
 -MY_SED="kmk_sed"
 +MY_SED="/usr/bin/kmk_sed"
 MY_RM="kmk_rm"
 MY_SLEEP="kmk_sleep"
 MY_EXPR="kmk_expr"
 Index: VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Main/Makefile.kmk
 +++ VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk
@@ -235,7 +235,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE
 		| $$(dir $$@)
 	$(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
 	$(QUIET)$(VBOX_XSLTPROC) -o $(VBOX_XIDL_FILE).ts-tmp $(VBOX_PATH_MAIN_SRC)/idl/docstrip.xsl $(VBOX_XIDL_FILE_SRC)
@ -199,11 +182,11 @@ Index: VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk
 	$(QUIET)$(RM) -- $(VBOX_XIDL_FILE).ts-tmp
 	$(QUIET)$(CP) --changed -fv -- $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE)
-Index: VirtualBox-6.1.40/src/VBox/Runtime/Makefile.kmk
+Index: VirtualBox-7.0.2/src/VBox/Runtime/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Runtime/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/VBox/Runtime/Makefile.kmk
-+++ VirtualBox-6.1.40/src/VBox/Runtime/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/Runtime/Makefile.kmk
-@@ -3690,6 +3690,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V
+@@ -4476,6 +4476,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V
 #
 # Generate the status code data.
 #
--- a/fixes_for_leap15.3.patch
+++ b/fixes_for_leap15.3.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+Index: VirtualBox-7.0.2/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+--- VirtualBox-7.0.2.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-+++ VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-7.0.2/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-@@ -137,9 +137,9 @@
+@@ -147,9 +147,9 @@
 #include <linux/interrupt.h>
 #include <linux/completion.h>
 #include <linux/compiler.h>
@ -14,3 +14,137 @@ Index: VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
 #if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38)
 # include <linux/smp_lock.h>
 #endif
 Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyXPCOM.h
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
 +++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyXPCOM.h
@@ -191,7 +191,7 @@ extern "C" PyAPI_FUNC(const char *) PyUn
 # endif
 /* PyUnicode_AsUTF8 is just PyUnicode_AsUTF8AndSize without returning a size. */
 -# define PyUnicode_AsUTF8(o) PyUnicode_AsUTF8AndSize(o, NULL)
 +// # define PyUnicode_AsUTF8(o) (const char *)PyUnicode_AsUTF8AndSize(o, NULL)
 DECLINLINE(int) PyRun_SimpleString(const char *pszCode)
 {
 Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
 +++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -121,7 +121,7 @@ void DoLogMessage(const char *methodName
 #if PY_MAJOR_VERSION <= 2
 			c += PyString_AsString(repr);
 #else
 -			c += PyUnicode_AsUTF8(repr);
 +			c += PyUnicode_AsUTF8AndSize(repr, NULL);
 #endif
 			Py_DECREF(repr);
 		}
@@ -203,7 +203,7 @@ PRBool PyXPCOM_FormatGivenException(nsCS
 #if PY_MAJOR_VERSION <= 2
 		streamout += PyString_AsString(temp);
 #else
 -		streamout += PyUnicode_AsUTF8(temp);
 +		streamout += PyUnicode_AsUTF8AndSize(temp, NULL);
 #endif
 		Py_DECREF(temp);
 	} else
@@ -215,7 +215,7 @@ PRBool PyXPCOM_FormatGivenException(nsCS
 #if PY_MAJOR_VERSION <= 2
 			streamout += PyString_AsString(temp);
 #else
 -			streamout += PyUnicode_AsUTF8(temp);
 +			streamout += PyUnicode_AsUTF8AndSize(temp, NULL);
 #endif
 			Py_DECREF(temp);
 		} else
@@ -440,10 +440,11 @@ char *PyTraceback_AsString(PyObject *exc
 #if PY_MAJOR_VERSION <= 2
 	char *tempResult = (char *)PyString_AsString(obResult);
 #elif PY_MINOR_VERSION <= 6
 -	char *tempResult = (char *)PyUnicode_AsUTF8(obResult);
 +	char *tempResult = (char *)PyBytes_AsString(obResult);
 +#elif PY_MINOR_VERSION <= 6
 +	const char *tempResult = PyUnicode_AsUTF8AndSize(obResult, NULL);
 #else
 -    /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
 -	const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
 +	const char *tempResult = (const char *)PyUnicode_AsUTF8AndSize(obResult, NULL);
 #endif
 	result = (char *)PyMem_Malloc(strlen(tempResult)+1);
 	if (result==NULL)
 Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
 +++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -117,7 +117,7 @@ PyG_Base::PyG_Base(PyObject *instance, c
 #if PY_MAJOR_VERSION <= 2
 		szRepr = PyString_AsString(r);
 #else
 -		szRepr = PyUnicode_AsUTF8(r);
 +		szRepr = PyUnicode_AsUTF8AndSize(r, NULL);
 #endif
 	if (szRepr==NULL) szRepr = "";
 	int reprOffset = *szRepr=='<' ? 1 : 0;
 Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyIID.cpp
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
 +++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyIID.cpp
@@ -137,7 +137,7 @@ Py_nsIID::IIDFromPyObject(PyObject *ob,
 		ok = iid.Parse(PyString_AsString(ob));
 #else
 	if (PyUnicode_Check(ob)) {
 -		ok = iid.Parse(PyUnicode_AsUTF8(ob));
 +		ok = iid.Parse(PyUnicode_AsUTF8AndSize(ob, NULL));
 #endif
 		if (!ok) {
 			PyXPCOM_BuildPyException(NS_ERROR_ILLEGAL_VALUE);
 Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/VariantUtils.cpp
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
 +++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/VariantUtils.cpp
@@ -141,7 +141,7 @@ PyObject *PyObject_FromNSString( const n
 #if PY_MAJOR_VERSION <= 2
 			char* dest = (char *)PyString_AS_STRING(ret);
 #else
 -			char* dest = (char *)PyUnicode_AsUTF8(ret);
 +			char* dest = (char *)PyUnicode_AsUTF8AndSize(ret, NULL);
 #endif
 			copy_string(s.BeginReading(fromBegin), s.EndReading(fromEnd), dest);
 		}
@@ -393,7 +393,7 @@ PRBool FillSingleArray(void *array_ptr,
 #if PY_MAJOR_VERSION <= 2
 			sequence_ob = PyObject_Str(sequence_ob);
 #else
 -			sequence_ob = PyUnicode_AsUTF8String(sequence_ob);
 +			sequence_ob = (PyObject *)PyUnicode_AsUTF8AndSize(sequence_ob, NULL);
 #endif
 		} else
 			release_seq = PR_FALSE;
@@ -402,7 +402,7 @@ PRBool FillSingleArray(void *array_ptr,
 #if PY_MAJOR_VERSION <= 2
 		memcpy(pthis, PyString_AS_STRING(sequence_ob), sequence_size);
 #else
 -		memcpy(pthis, PyUnicode_AsUTF8(sequence_ob), sequence_size);
 +		memcpy(pthis, PyUnicode_AsUTF8AndSize(sequence_ob, NULL), sequence_size);
 #endif
 		if (release_seq)
                 {
@@ -477,7 +477,7 @@ PRBool FillSingleArray(void *array_ptr,
 					PyErr_SetString(PyExc_TypeError, "This parameter must be a unicode object");
 					BREAK_FALSE;
 				}
 -				FILL_SIMPLE_POINTER( char, *PyUnicode_AsUTF8(val) );
 +				FILL_SIMPLE_POINTER( char, *PyUnicode_AsUTF8AndSize(val, NULL) );
 #endif
 				break;
@@ -549,7 +549,7 @@ PRBool FillSingleArray(void *array_ptr,
 					PyErr_SetString(PyExc_TypeError, "This parameter must be a unicode object");
 					BREAK_FALSE;
 				}
 -				if ((val_use = PyUnicode_AsUTF8String(val))==NULL)
 +				if ((val_use = (PyObject *)PyUnicode_AsUTF8AndSize(val, NULL))==NULL)
 					BREAK_FALSE;
 				const char *sz = PyBytes_AS_STRING(val_use);
--- a/fixes_for_leap15.4.patch
+++ b/fixes_for_leap15.4.patch
@ -0,0 +1,136 @@
 Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyXPCOM.h
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
 +++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyXPCOM.h
@@ -191,7 +191,7 @@ extern "C" PyAPI_FUNC(const char *) PyUn
 # endif
 /* PyUnicode_AsUTF8 is just PyUnicode_AsUTF8AndSize without returning a size. */
 -# define PyUnicode_AsUTF8(o) PyUnicode_AsUTF8AndSize(o, NULL)
 +// # define PyUnicode_AsUTF8(o) (const char *)PyUnicode_AsUTF8AndSize(o, NULL)
 DECLINLINE(int) PyRun_SimpleString(const char *pszCode)
 {
 Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
 +++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -121,7 +121,7 @@ void DoLogMessage(const char *methodName
 #if PY_MAJOR_VERSION <= 2
 			c += PyString_AsString(repr);
 #else
 -			c += PyUnicode_AsUTF8(repr);
 +			c += PyUnicode_AsUTF8AndSize(repr, NULL);
 #endif
 			Py_DECREF(repr);
 		}
@@ -203,7 +203,7 @@ PRBool PyXPCOM_FormatGivenException(nsCS
 #if PY_MAJOR_VERSION <= 2
 		streamout += PyString_AsString(temp);
 #else
 -		streamout += PyUnicode_AsUTF8(temp);
 +		streamout += PyUnicode_AsUTF8AndSize(temp, NULL);
 #endif
 		Py_DECREF(temp);
 	} else
@@ -215,7 +215,7 @@ PRBool PyXPCOM_FormatGivenException(nsCS
 #if PY_MAJOR_VERSION <= 2
 			streamout += PyString_AsString(temp);
 #else
 -			streamout += PyUnicode_AsUTF8(temp);
 +			streamout += PyUnicode_AsUTF8AndSize(temp, NULL);
 #endif
 			Py_DECREF(temp);
 		} else
@@ -438,12 +438,11 @@ char *PyTraceback_AsString(PyObject *exc
 	{ // a temp scope so I can use temp locals.
 #if PY_MAJOR_VERSION <= 2
 -	char *tempResult = (char *)PyString_AsString(obResult);
 +	char *tempResult = PyString_AsString(obResult);
 #elif PY_MINOR_VERSION <= 6
 -	char *tempResult = (char *)PyUnicode_AsUTF8(obResult);
 +	const char *tempResult = PyUnicode_AsUTF8AndSize(obResult, NULL);
 #else
 -    /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
 -	const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
 +	const char *tempResult = (const char *)PyUnicode_AsUTF8AndSize(obResult, NULL);
 #endif
 	result = (char *)PyMem_Malloc(strlen(tempResult)+1);
 	if (result==NULL)
 Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
 +++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -117,7 +117,7 @@ PyG_Base::PyG_Base(PyObject *instance, c
 #if PY_MAJOR_VERSION <= 2
 		szRepr = PyString_AsString(r);
 #else
 -		szRepr = PyUnicode_AsUTF8(r);
 +		szRepr = PyUnicode_AsUTF8AndSize(r, NULL);
 #endif
 	if (szRepr==NULL) szRepr = "";
 	int reprOffset = *szRepr=='<' ? 1 : 0;
 Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyIID.cpp
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
 +++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyIID.cpp
@@ -137,7 +137,7 @@ Py_nsIID::IIDFromPyObject(PyObject *ob,
 		ok = iid.Parse(PyString_AsString(ob));
 #else
 	if (PyUnicode_Check(ob)) {
 -		ok = iid.Parse(PyUnicode_AsUTF8(ob));
 +		ok = iid.Parse(PyUnicode_AsUTF8AndSize(ob, NULL));
 #endif
 		if (!ok) {
 			PyXPCOM_BuildPyException(NS_ERROR_ILLEGAL_VALUE);
 Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/VariantUtils.cpp
 ===================================================================
 --- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
 +++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/VariantUtils.cpp
@@ -141,7 +141,7 @@ PyObject *PyObject_FromNSString( const n
 #if PY_MAJOR_VERSION <= 2
 			char* dest = (char *)PyString_AS_STRING(ret);
 #else
 -			char* dest = (char *)PyUnicode_AsUTF8(ret);
 +			char* dest = (char *)PyUnicode_AsUTF8AndSize(ret, NULL);
 #endif
 			copy_string(s.BeginReading(fromBegin), s.EndReading(fromEnd), dest);
 		}
@@ -393,7 +393,7 @@ PRBool FillSingleArray(void *array_ptr,
 #if PY_MAJOR_VERSION <= 2
 			sequence_ob = PyObject_Str(sequence_ob);
 #else
 -			sequence_ob = PyUnicode_AsUTF8String(sequence_ob);
 +			sequence_ob = (PyObject *)PyUnicode_AsUTF8AndSize(sequence_ob, NULL);
 #endif
 		} else
 			release_seq = PR_FALSE;
@@ -402,7 +402,7 @@ PRBool FillSingleArray(void *array_ptr,
 #if PY_MAJOR_VERSION <= 2
 		memcpy(pthis, PyString_AS_STRING(sequence_ob), sequence_size);
 #else
 -		memcpy(pthis, PyUnicode_AsUTF8(sequence_ob), sequence_size);
 +		memcpy(pthis, PyUnicode_AsUTF8AndSize(sequence_ob, NULL), sequence_size);
 #endif
 		if (release_seq)
                 {
@@ -477,7 +477,7 @@ PRBool FillSingleArray(void *array_ptr,
 					PyErr_SetString(PyExc_TypeError, "This parameter must be a unicode object");
 					BREAK_FALSE;
 				}
 -				FILL_SIMPLE_POINTER( char, *PyUnicode_AsUTF8(val) );
 +				FILL_SIMPLE_POINTER( char, *PyUnicode_AsUTF8AndSize(val, NULL) );
 #endif
 				break;
@@ -549,7 +549,7 @@ PRBool FillSingleArray(void *array_ptr,
 					PyErr_SetString(PyExc_TypeError, "This parameter must be a unicode object");
 					BREAK_FALSE;
 				}
 -				if ((val_use = PyUnicode_AsUTF8String(val))==NULL)
 +				if ((val_use = (PyObject *)PyUnicode_AsUTF8AndSize(val, NULL))==NULL)
 					BREAK_FALSE;
 				const char *sz = PyBytes_AS_STRING(val_use);
--- a/fixes_for_makefile.patch
+++ b/fixes_for_makefile.patch
@ -1,21 +1,25 @@
-Index: VirtualBox-6.1.40/src/VBox/HostDrivers/linux/Makefile
+Index: VirtualBox-7.0.2/src/VBox/HostDrivers/linux/Makefile
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/linux/Makefile
+--- VirtualBox-7.0.2.orig/src/VBox/HostDrivers/linux/Makefile
-+++ VirtualBox-6.1.40/src/VBox/HostDrivers/linux/Makefile
+++ VirtualBox-7.0.2/src/VBox/HostDrivers/linux/Makefile
-@@ -35,9 +35,6 @@ endif
+@@ -43,11 +43,8 @@ obj-m = vboxdrv/
- ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
+ obj-m += vboxnetflt/
  obj-m += vboxnetadp/
  endif
-ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
+  ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
- obj-m += vboxpci/
+-obj-m += vboxnetadp/
-endif
+- endif
 - ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
 -obj-m += vboxpci/
 - endif
 + obj-m += vboxnetadp/
 +endif
 else # ! KERNELRELEASE
-@@ -45,12 +42,14 @@ else # ! KERNELRELEASE
+@@ -62,12 +59,14 @@ SUDO :=
 endif
 KBUILD_VERBOSE ?=
 KERN_VER ?= $(shell uname -r)
 +PWD ?= $(shell pwd)
 +
 .PHONY: all install clean check unload load \
@ -30,8 +34,8 @@ Index: VirtualBox-6.1.40/src/VBox/HostDrivers/linux/Makefile
 +all: vboxdrv vboxnetflt vboxnetadp
 # We want to build on Linux 2.6.18 and later kernels.
- ifneq ($(filter-out 1.% 2.0.% 2.1.% 2.2.% 2.3.% 2.4.% 2.5.%,$(KERN_VER)),)
+ KERN_VER ?= $(shell uname -r)
-@@ -63,63 +62,44 @@ vboxdrv:
+@@ -81,56 +80,38 @@ vboxdrv:
 vboxnetflt: vboxdrv
 	+@if [ -d vboxnetflt ]; then \
@ -93,16 +97,19 @@ Index: VirtualBox-6.1.40/src/VBox/HostDrivers/linux/Makefile
 -install: install-vboxdrv install-vboxnetflt install-vboxnetadp install-vboxpci
 +install: install-vboxdrv install-vboxnetflt install-vboxnetadp
- else
+ # Look for wrapper modules, sorting them so vmmr0 is first.
 VBOX_WRAPPER_DIRS := $(notdir $(wildcard $(CURDIR)/vbox_*))
@@ -140,6 +121,9 @@ VBOX_WRAPPER_DIRS := $(filter vbox_vmmr0
   define wrapper_template
 $(wrapper): $(subst $(wrapper),,vbox_vmmr0)
 	+$$(MAKE) KBUILD_VERBOSE=$$(KBUILD_VERBOSE) -C $(wrapper)/
 +vboxnetflt:
 +vboxnetadp:
 +install:
- vboxdrv:
+ load-$(wrapper): $(subst load-$(wrapper),,load-vbox_vmmr0)
- vboxnetflt:
+ 	@if ! grep -q "^$(wrapper) " /proc/modules; then \
- vboxnetadp:
+@@ -217,19 +201,13 @@ clean-vboxnetadp:
 -vboxpci:
 install:
 endif
@@ -140,19 +120,13 @@ clean-vboxnetadp:
 	fi
 	rm -rf vboxnetadp.ko
@ -123,8 +130,8 @@ Index: VirtualBox-6.1.40/src/VBox/HostDrivers/linux/Makefile
 +	@for module in vboxnetadp vboxnetflt vboxdrv; do \
 		if grep "^$$module " /proc/modules >/dev/null; then \
 			echo "Removing previously installed $$module module"; \
- 			/sbin/rmmod $$module; \
+ 			$(SUDO) /sbin/rmmod $$module; \
-@@ -160,7 +134,7 @@ unload:
+@@ -237,7 +215,7 @@ unload:
 	done
 load: unload
@ -132,12 +139,12 @@ Index: VirtualBox-6.1.40/src/VBox/HostDrivers/linux/Makefile
 +	@for module in vboxdrv vboxnetflt vboxnetadp; do \
 		if test -f $$module.ko; then \
 			echo "Installing $$module module"; \
- 			/sbin/insmod $$module.ko; \
+ 			$(SUDO) /sbin/insmod $$module.ko; \
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/Makefile
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/Makefile
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/Makefile
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/Makefile
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/Makefile
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/Makefile
-@@ -24,6 +24,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/
+@@ -34,6 +34,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/
 else # ! KERNELRELEASE
 KBUILD_VERBOSE =
@ -145,7 +152,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/Makefile
  ifeq ($(KBUILD_VERBOSE),)
 VBOX_QUIET    := @
 VBOX_QUIET_SH := @
-@@ -49,6 +50,7 @@ vboxsf: vboxguest
+@@ -59,6 +60,7 @@ vboxsf: vboxguest
 	    if [ -f vboxguest/Module.symvers ]; then \
 	        cp vboxguest/Module.symvers vboxsf; \
 	    fi; \
@ -153,7 +160,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/Makefile
 	    echo "=== Building 'vboxsf' module ==="; \
 	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxsf/Module.symvers) -C vboxsf || exit 1; \
 	    if [ -f vboxsf/vboxsf.ko ]; then \
-@@ -61,6 +63,9 @@ vboxsf: vboxguest
+@@ -71,6 +73,9 @@ vboxsf: vboxguest
 vboxvideo:
 	+ $(VBOX_QUIET_SH)if [ -d vboxvideo ]; then \
@ -163,7 +170,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/Makefile
 	    echo "=== Building 'vboxvideo' module ==="; \
 	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo || exit 1; \
 	    if [ -f vboxvideo/vboxvideo.ko ]; then \
-@@ -76,11 +81,13 @@ install-vboxguest:
+@@ -86,11 +91,13 @@ install-vboxguest:
 install-vboxsf:
 	+ $(VBOX_QUIET_SH)if [ -d vboxsf ]; then \
@ -177,11 +184,11 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/Makefile
 	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \
 	fi
-Index: VirtualBox-6.1.40/include/iprt/x86.h
+Index: VirtualBox-7.0.2/include/iprt/x86.h
 ===================================================================
--- VirtualBox-6.1.40.orig/include/iprt/x86.h
+--- VirtualBox-7.0.2.orig/include/iprt/x86.h
-+++ VirtualBox-6.1.40/include/iprt/x86.h
+++ VirtualBox-7.0.2/include/iprt/x86.h
-@@ -860,37 +860,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
+@@ -894,37 +894,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
  *          reserved flags.
  * @{ */
 /** Bit 0 - PE - Protection Enabled */
@ -241,7 +248,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 #define X86_CR0_PAGING                      RT_BIT_32(31)
 #define X86_CR0_BIT_PG                      31 /**< Bit number of X86_CR0_PG */
 /** @} */
-@@ -899,9 +921,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
+@@ -933,9 +955,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
 /** @name CR3
  * @{ */
 /** Bit 3 - PWT - Page-level Writes Transparent. */
@ -255,7 +262,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** Bits 12-31 - - Page directory page number. */
 #define X86_CR3_PAGE_MASK                   (0xfffff000)
 /** Bits  5-31 - - PAE Page directory page number. */
-@@ -914,46 +940,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
+@@ -954,46 +980,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
 /** @name CR4
  * @{ */
 /** Bit 0 - VME - Virtual-8086 Mode Extensions. */
@ -340,7 +347,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** Bit 23 - CET - Control-flow Enhancement Technology enabled. */
 #define X86_CR4_CET                         RT_BIT_32(23)
 /** @} */
-@@ -1167,12 +1231,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1207,12 +1271,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 /** Machine check type register (P5). */
 #define MSR_P5_MC_TYPE                      UINT32_C(0x00000001)
 /** Time Stamp Counter. */
@ -357,7 +364,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 #ifndef MSR_IA32_APICBASE /* qemu cpu.h kludge */
 # define MSR_IA32_APICBASE                  0x1b
-@@ -1198,7 +1266,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1238,7 +1306,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_CORE_THREAD_COUNT               0x35
 /** CPU Feature control. */
@ -367,7 +374,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** Feature control - Lock MSR from writes (R/W0). */
 #define MSR_IA32_FEATURE_CONTROL_LOCK                 RT_BIT_64(0)
 /** Feature control - Enable VMX inside SMX operation (R/WL). */
-@@ -1223,11 +1293,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1263,11 +1333,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_FEATURE_CONTROL_LMCE                 RT_BIT_64(20)
 /** Per-processor TSC adjust MSR. */
@ -383,7 +390,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** IBRS - Indirect branch restricted speculation. */
 #define MSR_IA32_SPEC_CTRL_F_IBRS           RT_BIT_32(0)
 /** STIBP - Single thread indirect branch predictors. */
-@@ -1237,7 +1311,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1277,7 +1351,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 /** Prediction command register.
  * Write only, logical processor scope, no state since write only. */
@ -393,7 +400,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** IBPB - Indirect branch prediction barrie when written as 1. */
 #define MSR_IA32_PRED_CMD_F_IBPB            RT_BIT_32(0)
-@@ -1248,7 +1324,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1288,7 +1364,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_BIOS_SIGN_ID               0x8B
 /** SMM monitor control. */
@ -403,7 +410,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** SMM control - Valid. */
 #define MSR_IA32_SMM_MONITOR_VALID                  RT_BIT_64(0)
 /** SMM control - VMXOFF unblocks SMI. */
-@@ -1257,10 +1335,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1297,10 +1375,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_SMM_MONITOR_MSGEG_PHYSADDR(a)      (((a) >> 12) & UINT64_C(0xfffff))
 /** SMBASE - Base address of SMRANGE image (Read-only, SMM only). */
@ -418,7 +425,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** General performance counter no. 1. */
 #define MSR_IA32_PMC1                       0xC2
 /** General performance counter no. 2. */
-@@ -1283,18 +1365,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1323,18 +1405,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_FSB_CLOCK_STS              0xCD
 /** C-State configuration control. Intel specific: Nehalem, Sandy Bridge. */
@ -445,7 +452,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** CPU is no subject to meltdown problems. */
 #define MSR_IA32_ARCH_CAP_F_RDCL_NO         RT_BIT_32(0)
 /** CPU has better IBRS and you can leave it on all the time. */
-@@ -1308,7 +1398,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1348,7 +1438,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_ARCH_CAP_F_MDS_NO          RT_BIT_32(4)
 /** Flush command register. */
@ -455,7 +462,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** Flush the level 1 data cache when this bit is written. */
 #define MSR_IA32_FLUSH_CMD_F_L1D            RT_BIT_32(0)
-@@ -1329,14 +1421,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1369,14 +1461,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #endif
 /** Machine Check Global Capabilities Register. */
@ -476,7 +483,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** Default PAT MSR value on processor powerup / reset (see Intel spec. 11.12.4
  *  "Programming the PAT", AMD spec. 7.8.2 "PAT Indexing") */
 #define MSR_IA32_CR_PAT_INIT_VAL            UINT64_C(0x0007040600070406)
-@@ -1355,36 +1453,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1395,36 +1493,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_FLEX_RATIO                      0x194
 /** Performance state value and starting with Intel core more.
  * Apple uses the >=core features to determine TSC granularity on older CPUs. */
@ -535,7 +542,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** Trace/Profile Resource Control (R/W) */
 #define MSR_IA32_DEBUGCTL                   UINT32_C(0x000001d9)
-@@ -1522,7 +1642,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1605,7 +1725,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 /** @} */
 /** Intel TSX (Transactional Synchronization Extensions) control MSR. */
@ -545,7 +552,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** Variable range MTRRs.
  * @{ */
-@@ -1572,89 +1694,167 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1655,91 +1777,169 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_IA32_PERF_GLOBAL_OVF_CTRL       0x390
 /** Precise Event Based sampling (Intel only). */
@ -604,7 +611,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 +#ifndef MSR_IA32_VMX_VMCS_ENUM
 #define MSR_IA32_VMX_VMCS_ENUM              0x48A
 +#endif
- /** Allowed settings for secondary proc-based VM execution controls */
+ /** Allowed settings for secondary processor-based VM-execution controls. */
 +#ifndef MSR_IA32_VMX_PROCBASED_CTLS2
 #define MSR_IA32_VMX_PROCBASED_CTLS2        0x48B
 +#endif
@ -631,6 +638,8 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** Allowed settings for the VM-function controls. */
 +#ifndef MSR_IA32_VMX_VMFUNC
 #define MSR_IA32_VMX_VMFUNC                 0x491
 /** Tertiary processor-based VM execution controls. */
 #define MSR_IA32_VMX_PROCBASED_CTLS3        0x492
 +#endif
 /** Intel PT - Enable and control for trace packet generation. */
@ -713,7 +722,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** X2APIC MSR range start. */
 #define MSR_IA32_X2APIC_START               0x800
-@@ -1789,23 +1989,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1874,23 +2074,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 /** The mask which give the SYSCALL EIP. */
 #define  MSR_K6_STAR_SYSCALL_EIP_MASK       UINT32_C(0xffffffff)
 /** K6 WHCR - Write Handling Control Register. */
@ -761,7 +770,7 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** K8 LSTAR - Long mode SYSCALL target (RIP). */
 #define MSR_K8_LSTAR                        UINT32_C(0xc0000082)
-@@ -1821,14 +2045,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
+@@ -1906,14 +2130,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
 #define MSR_K8_KERNEL_GS_BASE               UINT32_C(0xc0000102)
 /** K8 TSC_AUX - Used with RDTSCP. */
 #define MSR_K8_TSC_AUX                      UINT32_C(0xc0000103)
@ -782,11 +791,11 @@ Index: VirtualBox-6.1.40/include/iprt/x86.h
 /** SMM MSRs. */
 #define MSR_K7_SMBASE                       UINT32_C(0xc0010111)
-Index: VirtualBox-6.1.40/include/VBox/vmm/hm_vmx.h
+Index: VirtualBox-7.0.2/include/VBox/vmm/hm_vmx.h
 ===================================================================
--- VirtualBox-6.1.40.orig/include/VBox/vmm/hm_vmx.h
+--- VirtualBox-7.0.2.orig/include/VBox/vmm/hm_vmx.h
-+++ VirtualBox-6.1.40/include/VBox/vmm/hm_vmx.h
+++ VirtualBox-7.0.2/include/VBox/vmm/hm_vmx.h
-@@ -1462,7 +1462,9 @@ AssertCompileSize(VMXABORT, 4);
+@@ -1631,7 +1631,9 @@ AssertCompileSize(VMXABORT, 4);
 /** VMCS (and related regions) memory type - Uncacheable. */
 #define VMX_BASIC_MEM_TYPE_UC                                   0
 /** VMCS (and related regions) memory type - Write back. */
@ -796,10 +805,10 @@ Index: VirtualBox-6.1.40/include/VBox/vmm/hm_vmx.h
 /** Width of physical addresses used for VMCS and associated memory regions
  *  (1=32-bit, 0=processor's physical address width). */
 #define VMX_BASIC_PHYSADDR_WIDTH_32BIT                          RT_BIT_64(48)
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_drv.h
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -87,6 +87,12 @@
 #else
 # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
--- a/fixes_for_python.patch
+++ b/fixes_for_python.patch
@ -6,10 +6,10 @@ to "#!/usr/bin/python3".
 Larry Finger
-Index: VirtualBox-6.1.40/src/VBox/Frontends/VBoxShell/vboxshell.py
+Index: VirtualBox-7.0.2/src/VBox/Frontends/VBoxShell/vboxshell.py
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
-+++ VirtualBox-6.1.40/src/VBox/Frontends/VBoxShell/vboxshell.py
+++ VirtualBox-7.0.2/src/VBox/Frontends/VBoxShell/vboxshell.py
@@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python3
--- a/fixes_for_qt5.13.patch
+++ b/fixes_for_qt5.13.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/include/VBox/VBoxGL2D.h
+Index: VirtualBox-7.0.2/include/VBox/VBoxGL2D.h
 ===================================================================
--- VirtualBox-6.1.40.orig/include/VBox/VBoxGL2D.h
+--- VirtualBox-7.0.2.orig/include/VBox/VBoxGL2D.h
-+++ VirtualBox-6.1.40/include/VBox/VBoxGL2D.h
+++ VirtualBox-7.0.2/include/VBox/VBoxGL2D.h
-@@ -113,7 +113,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN
+@@ -123,7 +123,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN
 /* GL_ARB_pixel_buffer_object*/
 #ifndef Q_WS_MAC
 /* apears to be defined on mac */
@ -11,27 +11,27 @@ Index: VirtualBox-6.1.40/include/VBox/VBoxGL2D.h
 #endif
 #ifndef GL_READ_ONLY
-Index: VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h
+Index: VirtualBox-7.0.2/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
-+++ VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h
+++ VirtualBox-7.0.2/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
-@@ -465,7 +465,12 @@ GLAPI void APIENTRY glBlendEquation (GLe
+@@ -466,7 +466,12 @@ GLAPI void APIENTRY glBlendEquation (GLe
 #ifndef GL_VERSION_1_5
 #define GL_VERSION_1_5 1
 #include <stddef.h>
 +#include <QtCore/qglobal.h>
 +#if __BITS_PER_LONG != 64
- typedef ptrdiff_t GLsizeiptr;
+ typedef khronos_ssize_t GLsizeiptr;
 +#else
 +typedef long int GLsizeiptr;
 +#endif
- typedef ptrdiff_t GLintptr;
+ typedef khronos_intptr_t GLintptr;
 #define GL_BUFFER_SIZE                    0x8764
 #define GL_BUFFER_USAGE                   0x8765
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
@@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe
 #ifndef GL_VERSION_1_5
 #define GL_VERSION_1_5 1
@ -44,10 +44,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcore
 typedef ptrdiff_t GLintptr;
 #define GL_BUFFER_SIZE                    0x8764
 #define GL_BUFFER_USAGE                   0x8765
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
@@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe
 #ifndef GL_VERSION_1_5
 #define GL_VERSION_1_5 1
@ -60,10 +60,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.
 typedef ptrdiff_t GLintptr;
 #define GL_BUFFER_SIZE                    0x8764
 #define GL_BUFFER_USAGE                   0x8765
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
@@ -3708,7 +3708,11 @@ typedef char GLchar;			/* native charact
 #ifndef GL_VERSION_1_5
 /* GL types for handling large vertex buffer objects */
@ -76,19 +76,22 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
 #endif
 #ifndef GL_ARB_vertex_buffer_object
-Index: VirtualBox-6.1.40/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
+Index: VirtualBox-7.0.2/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
+--- VirtualBox-7.0.2.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
-+++ VirtualBox-6.1.40/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
+++ VirtualBox-7.0.2/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
-@@ -6194,7 +6194,11 @@ typedef char GLchar;
+@@ -4680,6 +4680,14 @@ GLAPI void APIENTRY glWeightuivARB (GLin
- #ifndef GL_VERSION_1_5
+ GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
- /* GL types for handling large vertex buffer objects */
+ GLAPI void APIENTRY glVertexBlendARB (GLint count);
- typedef ptrdiff_t GLintptr;
+ #endif
 +#ifndef GL_VERSION_1_5
 +/* GL types for handling large vertex buffer objects */
 +typedef ptrdiff_t GLintptr;
 +#if __BITS_PER_LONG != 64
- typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLsizeiptr;
 +#else
 +typedef long int GLsizeiptr;
 +#endif
- #endif
+ #endif /* GL_ARB_vertex_blend */
 #ifndef GL_ARB_vertex_buffer_object
--- a/fixes_for_sle12.patch
+++ b/fixes_for_sle12.patch
@ -1,7 +1,7 @@
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_drv.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -362,7 +362,9 @@ static struct drm_driver driver = {
 	.master_drop = vbox_master_drop,
 #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
@ -12,10 +12,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c
 # endif
 #endif
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_main.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_main.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_main.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_main.c
@@ -622,11 +622,13 @@ int vbox_dumb_destroy(struct drm_file *f
 #endif
@ -30,10 +30,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c
 void vbox_gem_free_object(struct drm_gem_object *obj)
 {
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_ttm.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -297,7 +297,7 @@ static struct ttm_backend_func vbox_tt_b
 };
 #endif
@ -70,16 +70,16 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c
 	.io_mem_pfn = ttm_bo_default_io_mem_pfn,
 # endif
 #endif
-@@ -624,7 +624,7 @@ int vbox_bo_create(struct drm_device *de
+@@ -628,7 +628,7 @@ int vbox_bo_create(struct drm_device *de
 	ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
 #endif /* < 6.1.0 */
 			  ttm_bo_type_device, &vboxbo->placement,
 -#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
 +#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) && !defined(SUSE_SLE12)
 			  align >> PAGE_SHIFT, false, NULL, acc_size,
 #elif RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_RANGE(8,6, 8,99) /* < 5.13.0, < RHEL(8.6, 8.99) */
 			  align >> PAGE_SHIFT, false, acc_size,
-@@ -666,7 +666,7 @@ static inline u64 vbox_bo_gpu_offset(str
+@@ -670,7 +670,7 @@ static inline u64 vbox_bo_gpu_offset(str
 int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr)
 {
@ -88,7 +88,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c
 	struct ttm_operation_ctx ctx = { false, false };
 #endif
 	int ret;
-@@ -689,7 +689,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
+@@ -693,7 +693,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
 		PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
 #endif
@ -97,7 +97,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c
 	ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else
 	ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-@@ -711,7 +711,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
+@@ -715,7 +715,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
 int vbox_bo_unpin(struct vbox_bo *bo)
 {
@ -106,7 +106,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c
 # if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
 	struct ttm_operation_ctx ctx = { false, false };
 # endif
-@@ -734,7 +734,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
+@@ -738,7 +738,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
 		PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
 #endif
@ -115,7 +115,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c
 	ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
 	ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-@@ -757,7 +757,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
+@@ -761,7 +761,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
  */
 int vbox_bo_push_sysram(struct vbox_bo *bo)
 {
@ -124,7 +124,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c
 	struct ttm_operation_ctx ctx = { false, false };
 # endif
 	int i, ret;
-@@ -778,7 +778,7 @@ int vbox_bo_push_sysram(struct vbox_bo *
+@@ -782,7 +782,7 @@ int vbox_bo_push_sysram(struct vbox_bo *
 	for (i = 0; i < bo->placement.num_placement; i++)
 		PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
@ -133,10 +133,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c
 	ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 # else
 	ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_drv.h
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -87,6 +87,9 @@
 #else
 # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
@ -147,10 +147,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h
 /** @def RTLNX_RHEL_RANGE
  * Check that it's a RedHat kernel in the given version range.
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_mode.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_mode.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -552,7 +552,8 @@ static void vbox_set_edid(struct drm_con
 	for (i = 0; i < EDID_SIZE - 1; ++i)
 		sum += edid[i];
--- a/gcc5-real-support.patch
+++ b/gcc5-real-support.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/configure
+Index: VirtualBox-7.0.2/configure
 ===================================================================
--- VirtualBox-6.1.40.orig/configure
+--- VirtualBox-7.0.2.orig/configure
-+++ VirtualBox-6.1.40/configure
+++ VirtualBox-7.0.2/configure
-@@ -442,8 +442,13 @@ check_gcc()
+@@ -472,8 +472,13 @@ check_gcc()
         log_failure "cannot execute '$CXX -dumpversion'"
         fail really
       fi
--- a/handle_gsoap_208103.patch
+++ b/handle_gsoap_208103.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Main/webservice/vboxweb.cpp
+Index: VirtualBox-7.0.2/src/VBox/Main/webservice/vboxweb.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Main/webservice/vboxweb.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Main/webservice/vboxweb.cpp
-+++ VirtualBox-6.1.40/src/VBox/Main/webservice/vboxweb.cpp
+++ VirtualBox-7.0.2/src/VBox/Main/webservice/vboxweb.cpp
-@@ -945,9 +945,9 @@ static void doQueuesLoop()
+@@ -955,9 +955,9 @@ static void doQueuesLoop()
                     continue; // timeout, not necessary to bother gsoap
                 // r < 0, errno
 #if GSOAP_VERSION >= 208103
--- a/internal-headers.patch
+++ b/internal-headers.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -23,6 +23,9 @@ vboxvideo_70_DEFS := \
+@@ -33,6 +33,9 @@ vboxvideo_70_DEFS := \
 ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
  vboxvideo_70_DEFS += __EXTENSIONS__  ## @todo Why this?
 endif
@ -12,10 +12,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
 vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
 vboxvideo_15_DEFS := \
 	$(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/edid.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/edid.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/vboxvideo/edid.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/edid.c
@@ -35,10 +35,6 @@
  *    Michael Thayer <michael.thayer@oracle.com>
  */
@ -27,10 +27,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c
 #include "misc.h"
 #include "xf86DDC.h"
 #include "xf86Crtc.h"
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
@@ -39,10 +39,6 @@
 #include "cursorstr.h"
 #include "servermd.h"
@ -42,10 +42,10 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c
 #include "vboxvideo.h"
 #ifdef XORG_7X
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
@@ -42,8 +42,8 @@
 # pragma once
 #endif
--- a/modify_for_4_8_bo_move.patch
+++ b/modify_for_4_8_bo_move.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+Index: VirtualBox-7.0.2/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+--- VirtualBox-7.0.2.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
-+++ VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+++ VirtualBox-7.0.2/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
-@@ -35,7 +35,7 @@
+@@ -45,7 +45,7 @@
 #include <iprt/assert.h>
 #include <iprt/errcore.h>
 #include "r0drv/alloc-r0drv.h"
@ -11,7 +11,7 @@ Index: VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
 #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP)
 # if RTLNX_VER_MIN(2,6,23) && RTLNX_VER_MAX(5,8,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
-@@ -301,6 +301,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb
+@@ -311,6 +311,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb
                 fFlags &= ~RTMEMHDR_FLAG_KMALLOC;
                 pHdr = vmalloc(cb + sizeof(*pHdr));
             }
--- a/remove_vbox_video_build.patch
+++ b/remove_vbox_video_build.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/Makefile.kmk
+Index: VirtualBox-7.0.2/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/Makefile.kmk
+--- VirtualBox-7.0.2.orig/Makefile.kmk
-+++ VirtualBox-6.1.40/Makefile.kmk
+++ VirtualBox-7.0.2/Makefile.kmk
-@@ -724,7 +724,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \
+@@ -823,7 +823,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \
 	src/VBox/Additions/x11/vboxmouse \
 	src/VBox/Additions/x11/vboxmouse/xorg70 \
 	src/VBox/Additions/x11/vboxmouse/xorg71 \
@ -10,11 +10,11 @@ Index: VirtualBox-6.1.40/Makefile.kmk
 	src/VBox/NetworkServices \
 	src/VBox/NetworkServices/Dhcpd \
 	src/VBox/NetworkServices/NAT \
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -398,7 +398,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s
+@@ -407,7 +407,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s
 vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES)
 vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS)
@ -24,11 +24,11 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
  DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
  SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
-Index: VirtualBox-6.1.40/src/VBox/Additions/x11/Makefile.kmk
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/Makefile.kmk
-+++ VirtualBox-6.1.40/src/VBox/Additions/x11/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/Makefile.kmk
-@@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk
+@@ -32,7 +32,7 @@ include $(KBUILD_PATH)/subheader.kmk
 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
  ifndef VBOX_NO_LEGACY_XORG_X11
--- a/security_fixes.patch
+++ b/security_fixes.patch
@ -5,11 +5,11 @@
 #
 # January 31, 2019 - Larry Finger
 #
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/installer/vboxadd.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/installer/vboxadd.sh
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/installer/vboxadd.sh
-@@ -838,9 +838,11 @@ dmnstatus()
+@@ -871,9 +871,11 @@ dmnstatus()
     fi
 }
@ -24,11 +24,11 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
 case "$1" in
 # Does setup without clean-up first and marks all kernels currently found on the
 # system so that we can see later if any were added.
-Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh
+Index: VirtualBox-7.0.2/src/VBox/Installer/linux/vboxdrv.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxdrv.sh
+--- VirtualBox-7.0.2.orig/src/VBox/Installer/linux/vboxdrv.sh
-+++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-7.0.2/src/VBox/Installer/linux/vboxdrv.sh
-@@ -38,6 +38,9 @@ DEVICE=/dev/vboxdrv
+@@ -48,6 +48,9 @@ DEVICE=/dev/vboxdrv
 MODPROBE=/sbin/modprobe
 SCRIPTNAME=vboxdrv.sh
--- a/set_noexec_stack.patch
+++ b/set_noexec_stack.patch
--- a/smap.diff
+++ b/smap.diff
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+Index: VirtualBox-7.0.2/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+--- VirtualBox-7.0.2.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-+++ VirtualBox-6.1.40/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ VirtualBox-7.0.2/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-@@ -51,6 +51,12 @@
+@@ -61,6 +61,12 @@
 # include <iprt/power.h>
 # define VBOX_WITH_SUSPEND_NOTIFICATION
 #endif
--- a/turn_off_cloud_net.patch
+++ b/turn_off_cloud_net.patch
@ -1,13 +1,18 @@
-Index: VirtualBox-6.1.40/Config.kmk
+Index: VirtualBox-7.0.2/Config.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/Config.kmk
+--- VirtualBox-7.0.2.orig/Config.kmk
-+++ VirtualBox-6.1.40/Config.kmk
+++ VirtualBox-7.0.2/Config.kmk
-@@ -806,7 +806,7 @@ endif
+@@ -970,11 +970,9 @@ if1of ($(KBUILD_TARGET), freebsd linux)
 endif
 # Use new VBoxNetDhcpd instead of old VBoxNetDHCP
 VBOX_WITH_DHCPD = 1
- # Experimental suport for cloud network integration
+-# Experimental suport for cloud network integration (depends on libssh)
-VBOX_WITH_CLOUD_NET = 1
+-ifdef VBOX_WITH_LIBSSH
 - VBOX_WITH_CLOUD_NET = 1
 -endif
 # Use Mac OS X VMNET API instead of network kernel extensions
 +# Experimental suport for cloud network integration
 +#VBOX_WITH_CLOUD_NET = 1
 VBOX_WITH_VMNET = 1
 ## @}
--- a/vb-6.1.16-modal-dialog-parent.patch
+++ b/vb-6.1.16-modal-dialog-parent.patch
@ -1,145 +0,0 @@
 Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp
 +++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp
@@ -16,6 +16,7 @@
  */
 /* Qt includes: */
 +#include <QApplication>
 #include <QHeaderView>
 #include <QMenu>
 #ifdef VBOX_WS_WIN
@@ -295,7 +296,7 @@ void UIGlobalSettingsExtension::sltAddPa
         extensions << QString("*.%1").arg(VBoxExtPackFileExts[i]);
     const QString strFilter = tr("Extension package files (%1)").arg(extensions.join(" "));
 -    const QStringList fileNames = QIFileDialog::getOpenFileNames(strBaseFolder, strFilter, this, strTitle, 0, true, true);
 +    const QStringList fileNames = QIFileDialog::getOpenFileNames(strBaseFolder, strFilter, QApplication::activeWindow(), strTitle, 0, true, true);
     QString strFilePath;
     if (!fileNames.isEmpty())
 Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp
 +++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp
@@ -397,10 +397,10 @@ void UIFilePathSelector::selectPath()
     switch (m_enmMode)
     {
         case Mode_File_Open:
 -            strSelPath = QIFileDialog::getOpenFileName(strInitDir, m_strFileDialogFilters, parentWidget(), m_strFileDialogTitle); break;
 +            strSelPath = QIFileDialog::getOpenFileName(strInitDir, m_strFileDialogFilters, QApplication::activeWindow(), m_strFileDialogTitle); break;
         case Mode_File_Save:
         {
 -            strSelPath = QIFileDialog::getSaveFileName(strInitDir, m_strFileDialogFilters, parentWidget(), m_strFileDialogTitle);
 +            strSelPath = QIFileDialog::getSaveFileName(strInitDir, m_strFileDialogFilters, QApplication::activeWindow(), m_strFileDialogTitle);
             if (!strSelPath.isEmpty() && QFileInfo(strSelPath).suffix().isEmpty())
             {
                 if (m_strFileDialogDefaultSaveExtension.isEmpty())
@@ -411,7 +411,7 @@ void UIFilePathSelector::selectPath()
             break;
         }
         case Mode_Folder:
 -            strSelPath = QIFileDialog::getExistingDirectory(strInitDir, parentWidget(), m_strFileDialogTitle); break;
 +            strSelPath = QIFileDialog::getExistingDirectory(strInitDir, QApplication::activeWindow(), m_strFileDialogTitle); break;
     }
     /* Do nothing if nothing chosen: */
 Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp
 +++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp
@@ -232,16 +232,16 @@ void UIEmptyFilePathSelector::choose()
     switch (mMode)
     {
         case UIEmptyFilePathSelector::Mode_File_Open:
 -            path = QIFileDialog::getOpenFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle); break;
 +            path = QIFileDialog::getOpenFileName (initDir, mFileFilters, QApplication::activeWindow(), mFileDialogTitle); break;
         case UIEmptyFilePathSelector::Mode_File_Save:
         {
 -            path = QIFileDialog::getSaveFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle);
 +            path = QIFileDialog::getSaveFileName (initDir, mFileFilters, QApplication::activeWindow(), mFileDialogTitle);
             if (!path.isEmpty() && QFileInfo (path).suffix().isEmpty())
                 path = QString ("%1.%2").arg (path).arg (mDefaultSaveExt);
             break;
         }
         case UIEmptyFilePathSelector::Mode_Folder:
 -            path = QIFileDialog::getExistingDirectory (initDir, parentWidget(), mFileDialogTitle); break;
 +            path = QIFileDialog::getExistingDirectory (initDir, QApplication::activeWindow(), mFileDialogTitle); break;
     }
     if (path.isEmpty())
         return;
 Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp
 +++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp
@@ -441,7 +441,7 @@ void UIMediumSelector::sltButtonLeaveEmp
 void UIMediumSelector::sltAddMedium()
 {
 -    QUuid uMediumID = uiCommon().openMediumWithFileOpenDialog(m_enmMediumType, this, m_strMachineFolder);
 +    QUuid uMediumID = uiCommon().openMediumWithFileOpenDialog(m_enmMediumType, QApplication::activeWindow(), m_strMachineFolder);
     if (uMediumID.isNull())
         return;
     repopulateTreeWidget();
 Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp
 +++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp
@@ -3197,7 +3197,7 @@ void UICommon::updateMachineStorage(cons
                 }
                 else if (target.type == UIMediumTarget::UIMediumTargetType_WithFileDialog)
                 {
 -                    uMediumID = openMediumWithFileOpenDialog(target.mediumType, windowManager().mainWindowShown(),
 +                    uMediumID = openMediumWithFileOpenDialog(target.mediumType, QApplication::activeWindow(),
                                                              strMachineFolder, false /* fUseLastFolder */);
                 }
                 else if(target.type == UIMediumTarget::UIMediumTargetType_CreateAdHocVISO)
 Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
 +++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
@@ -486,7 +486,7 @@ void UIMediumManagerWidget::sltHandleMac
 void UIMediumManagerWidget::sltAddMedium()
 {
     QString strDefaultMachineFolder = uiCommon().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
 -    uiCommon().openMediumWithFileOpenDialog(currentMediumType(), this,
 +    uiCommon().openMediumWithFileOpenDialog(currentMediumType(), QApplication::activeWindow(),
                                               strDefaultMachineFolder, true /* use most recent medium folder */);
 }
 Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
 +++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -1176,7 +1176,7 @@ void UIExtraDataManagerWindow::sltSave()
     /* Compose initial file-name: */
     const QString strInitialFileName = QDir(uiCommon().homeFolder()).absoluteFilePath(QString("%1_ExtraData.xml").arg(currentChooserName()));
     /* Open file-save dialog to choose file to save extra-data into: */
 -    const QString strFileName = QIFileDialog::getSaveFileName(strInitialFileName, "XML files (*.xml)", this,
 +    const QString strFileName = QIFileDialog::getSaveFileName(strInitialFileName, "XML files (*.xml)", QApplication::activeWindow(),
                                                               "Choose file to save extra-data into..", 0, true, true);
     /* Make sure file-name was chosen: */
     if (strFileName.isEmpty())
@@ -1263,7 +1263,7 @@ void UIExtraDataManagerWindow::sltLoad()
     /* Compose initial file-name: */
     const QString strInitialFileName = QDir(uiCommon().homeFolder()).absoluteFilePath(QString("%1_ExtraData.xml").arg(currentChooserName()));
     /* Open file-open dialog to choose file to open extra-data into: */
 -    const QString strFileName = QIFileDialog::getOpenFileName(strInitialFileName, "XML files (*.xml)", this,
 +    const QString strFileName = QIFileDialog::getOpenFileName(strInitialFileName, "XML files (*.xml)", QApplication::activeWindow(),
                                                               "Choose file to load extra-data from..");
     /* Make sure file-name was chosen: */
     if (strFileName.isEmpty())
 Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp
 +++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp
@@ -78,7 +78,7 @@ void UITextEditor::retranslateUi()
 void UITextEditor::open()
 {
 -    QString fileName = QIFileDialog::getOpenFileName(uiCommon().documentsPath(), tr("Text (*.txt);;All (*.*)"), this, tr("Select a file to open..."));
 +    QString fileName = QIFileDialog::getOpenFileName(uiCommon().documentsPath(), tr("Text (*.txt);;All (*.*)"), QApplication::activeWindow(), tr("Select a file to open..."));
     if (!fileName.isEmpty())
     {
         QFile file(fileName);
--- a/vbox-default-os-type.diff
+++ b/vbox-default-os-type.diff
@ -1,10 +1,10 @@
-Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
-+++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
-@@ -306,15 +306,15 @@ void UINameAndSystemEditor::sltFamilyCha
+@@ -397,15 +397,15 @@ void UINameAndSystemEditor::sltFamilyCha
-         if (iIndexWin7 != -1)
+         if (iIndexWin10 != -1)
-             m_pComboType->setCurrentIndex(iIndexWin7);
+             m_pComboType->setCurrentIndex(iIndexWin10);
     }
 -    /* Or select Oracle Linux item for Linux family as default: */
 +    /* Or select openSUSE item for Linux family as default: */
@ -12,7 +12,7 @@ Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSyst
     {
 -        QString strDefaultID = "Oracle";
 +        QString strDefaultID = "openSUSE";
-         if (ARCH_BITS == 64 && m_fSupportsHWVirtEx && m_fSupportsLongMode)
+         if (ARCH_BITS == 64)
             strDefaultID += "_64";
 -        const int iIndexUbuntu = m_pComboType->findData(strDefaultID, TypeID);
 -        if (iIndexUbuntu != -1)
--- a/vbox-disable-updates.diff
+++ b/vbox-disable-updates.diff
@ -1,23 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
+Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
+++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -104,8 +104,8 @@ void UIGlobalSettingsUpdate::getFromCach
+@@ -101,8 +101,6 @@ void UISettingsDialogGlobal::retranslate
     /* Get old update data from the cache: */
     const UIDataSettingsGlobalUpdate &oldUpdateData = m_pCache->base();
 -    /* Load old update data from the cache: */
 -    m_pCheckBoxUpdate->setChecked(oldUpdateData.m_fCheckEnabled);
 +    /* Disable old update data from the cache: */
 +    m_pCheckBoxUpdate->setChecked(false);
     if (m_pCheckBoxUpdate->isChecked())
     {
         m_pComboBoxUpdatePeriod->setCurrentIndex(oldUpdateData.m_periodIndex);
 Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
 +++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -86,8 +86,6 @@ void UISettingsDialogGlobal::retranslate
     m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@ -26,8 +11,8 @@ Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDi
 #endif
     /* Language page: */
-@@ -203,16 +201,6 @@ void UISettingsDialogGlobal::prepare()
+@@ -227,17 +225,7 @@ void UISettingsDialogGlobal::prepare()
-                             iPageIndex, "#input", pSettingsPage);
+                     addPageHelpKeyword(iPageIndex, "preferences");
                     break;
                 }
 -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@ -37,6 +22,7 @@ Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDi
 -                    pSettingsPage = new UIGlobalSettingsUpdate;
 -                    addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png",
 -                            iPageIndex, "#update", pSettingsPage);
                     addPageHelpKeyword(iPageIndex, "preferences");
 -                    break;
 -                }
 -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
--- a/vbox-fpie.diff
+++ b/vbox-fpie.diff
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/Config.kmk
+Index: VirtualBox-7.0.2/Config.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/Config.kmk
+--- VirtualBox-7.0.2.orig/Config.kmk
-+++ VirtualBox-6.1.40/Config.kmk
+++ VirtualBox-7.0.2/Config.kmk
-@@ -5663,6 +5663,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
+@@ -6620,6 +6620,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
 ifeq ($(KBUILD_TARGET),linux)
 # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
 # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
@ -12,14 +12,14 @@ Index: VirtualBox-6.1.40/Config.kmk
 endif
 ifeq ($(KBUILD_TARGET),win) # No CRT!
  TEMPLATE_VBOXR3HARDENEDEXE_SDKS          = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS)
-@@ -5684,8 +5687,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
+@@ -6652,8 +6655,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
-  TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64     = $(NOT_SUCH_VARIABLE)
+  TEMPLATE_VBOXR3HARDENEDEXE_VBOX_IMPORT_CHECKER.win = noimports
- else ifn1of ($(KBUILD_TARGET), os2 solaris)
+ else ifn1of ($(KBUILD_TARGET), os2)
-  # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
+  ifneq ($(KBUILD_TYPE),asan) # Keep RPATH in asan builds so we can find libasan.so.X and libubsan.so.Y.
 -  TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
 -  TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
 +  TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) -pie
 +  TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) -pie
  endif
 endif
 #
--- a/vbox-gsoapssl-deps.diff
+++ b/vbox-gsoapssl-deps.diff
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk
+Index: VirtualBox-7.0.0_BETA1/src/VBox/Main/webservice/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Main/webservice/Makefile.kmk
+--- VirtualBox-7.0.0_BETA1.orig/src/VBox/Main/webservice/Makefile.kmk
-+++ VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-7.0.0_BETA1/src/VBox/Main/webservice/Makefile.kmk
-@@ -355,6 +355,7 @@ ifdef VBOX_GSOAP_INSTALLED
+@@ -410,6 +410,7 @@ ifdef VBOX_GSOAP_INSTALLED
  vboxwebsrv_LIBS += \
 	$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
 	$(VBOX_GSOAP_CXX_LIBS) \
@ -10,7 +10,7 @@ Index: VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk
 	$(LIB_RUNTIME)
  vboxwebsrv_LIBS.solaris += socket nsl
  ifdef VBOX_WITH_WEBSERVICES_SSL
-@@ -534,6 +535,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) |
+@@ -586,6 +587,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) |
  webtest_LIBS += \
 	$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
 	$(VBOX_GSOAP_CXX_LIBS) \
--- a/vbox-no-build-dates.diff
+++ b/vbox-no-build-dates.diff
@ -1,21 +1,21 @@
-Index: VirtualBox-6.1.40/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+Index: VirtualBox-7.0.2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
-+++ VirtualBox-6.1.40/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+++ VirtualBox-7.0.2/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
-@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
+@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
     printf("VirtualBox DirectFB GUI built %s %s\n"
-            "(C) 2004-" VBOX_C_YEAR " " VBOX_VENDOR "\n"
+            "Copyright (C) 2004-" VBOX_C_YEAR " " VBOX_VENDOR "\n"
-           "(C) 2004-2005 secunet Security Networks AG\n", __DATE__, __TIME__);
+-           "Copyright (C) 2004-2005 secunet Security Networks AG\n", __DATE__, __TIME__);
-+           "(C) 2004-2005 secunet Security Networks AG\n");
+           "Copyright (C) 2004-2005 secunet Security Networks AG\n");
     for (;;)
     {
-Index: VirtualBox-6.1.40/src/VBox/Runtime/common/string/uniread.cpp
+Index: VirtualBox-7.0.2/src/VBox/Runtime/common/string/uniread.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Runtime/common/string/uniread.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Runtime/common/string/uniread.cpp
-+++ VirtualBox-6.1.40/src/VBox/Runtime/common/string/uniread.cpp
+++ VirtualBox-7.0.2/src/VBox/Runtime/common/string/uniread.cpp
-@@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const
+@@ -1046,7 +1046,7 @@ int PrintHeader(const char *argv0, const
                   " * IPRT - Unicode Tables.\n"
                   " *\n"
                   " * Automatically Generated from %s\n"
@ -24,10 +24,10 @@ Index: VirtualBox-6.1.40/src/VBox/Runtime/common/string/uniread.cpp
                   " */\n"
                   "\n"
                   "/*\n"
-Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
-+++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
@@ -42,16 +42,13 @@
 /**************************IDENTITY AND VERSIONING***********************/
 /************************************************************************/
@ -50,10 +50,10 @@ Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
 #if !defined(_PRODUCTION)
 #define _PRODUCTION ""
 #endif
-Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
-+++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
@@ -44,16 +44,10 @@
 #ifndef XP_MAC
 #include "_pr_bld.h"
@ -73,10 +73,10 @@ Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
 #if !defined(_PRODUCTION)
 #define _PRODUCTION ""
 #endif
-Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
-+++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
@@ -42,16 +42,13 @@
 /**************************IDENTITY AND VERSIONING***********************/
 /************************************************************************/
@ -99,10 +99,10 @@ Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
 #if !defined(_PRODUCTION)
 #define _PRODUCTION ""
 #endif
-Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
-+++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
@@ -42,16 +42,13 @@
 /**************************IDENTITY AND VERSIONING***********************/
 /************************************************************************/
@ -125,11 +125,11 @@ Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
 #if !defined(_PRODUCTION)
 #define _PRODUCTION ""
 #endif
-Index: VirtualBox-6.1.40/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+Index: VirtualBox-7.0.2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
-+++ VirtualBox-6.1.40/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+++ VirtualBox-7.0.2/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
-@@ -308,7 +308,7 @@ static int vboxInitLogging(const char *p
+@@ -327,7 +327,7 @@ static int vboxInitLogging(const char *p
 #endif
                        "Log opened %s\n",
                        VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
@ -138,11 +138,11 @@ Index: VirtualBox-6.1.40/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.
         vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
         if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
-Index: VirtualBox-6.1.40/src/VBox/Devices/PC/BIOS/bios.c
+Index: VirtualBox-7.0.2/src/VBox/Devices/PC/BIOS/bios.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Devices/PC/BIOS/bios.c
+--- VirtualBox-7.0.2.orig/src/VBox/Devices/PC/BIOS/bios.c
-+++ VirtualBox-6.1.40/src/VBox/Devices/PC/BIOS/bios.c
+++ VirtualBox-7.0.2/src/VBox/Devices/PC/BIOS/bios.c
-@@ -143,7 +143,7 @@ void set_mode(uint8_t mode);
+@@ -164,7 +164,7 @@ void set_mode(uint8_t mode);
 #define BX_PCIBIOS  1
 #define BX_APPNAME          "VirtualBox"
@ -151,11 +151,11 @@ Index: VirtualBox-6.1.40/src/VBox/Devices/PC/BIOS/bios.c
 //--------------------------------------------------------------------------
 // print_bios_banner
 //   displays a the bios version
-Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+Index: VirtualBox-7.0.2/src/VBox/Additions/common/VBoxService/VBoxService.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
-+++ VirtualBox-6.1.40/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ VirtualBox-7.0.2/src/VBox/Additions/common/VBoxService/VBoxService.cpp
-@@ -245,7 +245,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
+@@ -255,7 +255,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
                    "VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
                    "Log opened %s\n",
                    RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET,
@ -164,11 +164,11 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxService/VBoxService.cpp
             int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
             if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
-Index: VirtualBox-6.1.40/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+Index: VirtualBox-7.0.2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
-+++ VirtualBox-6.1.40/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
-@@ -187,7 +187,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA
+@@ -193,7 +193,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA
 		$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \
 		$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature
 # Tar it up.
@ -177,10 +177,10 @@ Index: VirtualBox-6.1.40/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
 # Clean up
 	$(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/
-Index: VirtualBox-6.1.40/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+Index: VirtualBox-7.0.2/src/VBox/ExtPacks/Skeleton/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
-+++ VirtualBox-6.1.40/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/ExtPacks/Skeleton/Makefile.kmk
@@ -161,7 +161,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_SKELETON_MA
 		$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.manifest \
 		$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.signature
@ -190,11 +190,11 @@ Index: VirtualBox-6.1.40/src/VBox/ExtPacks/Skeleton/Makefile.kmk
 # Clean up
 	$(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/
-Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+Index: VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
-+++ VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
-@@ -343,7 +343,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
+@@ -354,7 +354,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
 		$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \
 		$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature
  # Tar it up.
@ -203,11 +203,11 @@ Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
  # Clean up
 	$(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/
-Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VNC/Makefile.kmk
+Index: VirtualBox-7.0.2/src/VBox/ExtPacks/VNC/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
-+++ VirtualBox-6.1.40/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/ExtPacks/VNC/Makefile.kmk
-@@ -154,7 +154,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED
+@@ -164,7 +164,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED
 		$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \
 		$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature
 # Tar it up.
@ -216,11 +216,11 @@ Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VNC/Makefile.kmk
 # Clean up
 	$(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/
-Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+Index: VirtualBox-7.0.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
-+++ VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ VirtualBox-7.0.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
-@@ -319,7 +319,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv
+@@ -329,7 +329,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv
     }
     VGDrvCommonInitLoggers();
@ -229,11 +229,11 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
     /*
      * Check if the NT version is supported and initialize g_enmVGDrvNtVer.
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+Index: VirtualBox-7.0.2/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
-@@ -872,7 +872,7 @@ static DECLCALLBACK(void) vboxGreeterLog
+@@ -882,7 +882,7 @@ static DECLCALLBACK(void) vboxGreeterLog
                    "vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release log\n"
                    "Log opened %s\n",
                    RTBldCfgVersion(), RTBldCfgRevisionStr(), g_iVerbosity, VBOX_BUILD_TARGET,
@ -242,11 +242,11 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.c
             int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
             if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
-Index: VirtualBox-6.1.40/src/VBox/Additions/solaris/Mouse/vboxms.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/solaris/Mouse/vboxms.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/solaris/Mouse/vboxms.c
+++ VirtualBox-7.0.2/src/VBox/Additions/solaris/Mouse/vboxms.c
-@@ -256,7 +256,7 @@ static VBMSSTATE            g_OpenNodeSt
+@@ -266,7 +266,7 @@ static VBMSSTATE            g_OpenNodeSt
 int _init(void)
 {
     int rc;
@ -255,11 +255,11 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/solaris/Mouse/vboxms.c
     mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL);
     /*
      * Prevent module autounloading.
-Index: VirtualBox-6.1.40/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+Index: VirtualBox-7.0.2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+--- VirtualBox-7.0.2.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
-+++ VirtualBox-6.1.40/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+++ VirtualBox-7.0.2/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
-@@ -247,10 +247,10 @@ Returns:
+@@ -251,10 +251,10 @@ Returns:
     UTILITY_NAME,
     UTILITY_MAJOR_VERSION,
     UTILITY_MINOR_VERSION,
@ -272,11 +272,11 @@ Index: VirtualBox-6.1.40/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInf
     Usage ();
     return -1;
   }
-Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+Index: VirtualBox-7.0.2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
-+++ VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ VirtualBox-7.0.2/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
-@@ -118,7 +118,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI
+@@ -128,7 +128,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI
 static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject)
 {
     RT_NOREF1(pDriverObject);
@ -285,7 +285,7 @@ Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
     VBoxDrvToolStrFree(&g_VBoxUsbGlobals.RegPath);
     vboxUsbRtGlobalsTerm();
-@@ -274,7 +274,7 @@ RT_C_DECLS_END
+@@ -284,7 +284,7 @@ RT_C_DECLS_END
 NTSTATUS DriverEntry(IN PDRIVER_OBJECT pDriverObject, IN PUNICODE_STRING pRegistryPath)
 {
@ -294,11 +294,11 @@ Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
     NTSTATUS Status = vboxUsbRtGlobalsInit();
     Assert(Status == STATUS_SUCCESS);
-Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+Index: VirtualBox-7.0.2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
-+++ VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ VirtualBox-7.0.2/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
-@@ -1516,7 +1516,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB
+@@ -1518,7 +1518,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB
     RTLogDestinations(0, "debugger");
 #endif
@ -307,11 +307,11 @@ Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
     memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals));
-Index: VirtualBox-6.1.40/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+Index: VirtualBox-7.0.2/src/VBox/Main/glue/VBoxLogRelCreate.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
-+++ VirtualBox-6.1.40/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+++ VirtualBox-7.0.2/src/VBox/Main/glue/VBoxLogRelCreate.cpp
-@@ -61,7 +61,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
+@@ -71,7 +71,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
 #endif
                    "Log opened %s\n",
                    g_pszLogEntity, VBOX_VERSION_STRING, RTBldCfgRevision(),
@ -320,10 +320,10 @@ Index: VirtualBox-6.1.40/src/VBox/Main/glue/VBoxLogRelCreate.cpp
             pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
             int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
-Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
-+++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
 {
     PRIntn tab = 0;
@ -333,10 +333,10 @@ Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
     printf("Depend.c build time is %s %s\n", buildDate, buildTime);
-Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
-+++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
@@ -458,7 +458,7 @@ int
 main()
   {
@ -346,10 +346,10 @@ Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/pro
 #ifdef TEST_STD_STRING
     cout << "Testing std::string." << endl;
 #else
-Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
-+++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
@@ -425,7 +425,7 @@ int
 main()
   {	
@ -359,10 +359,10 @@ Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/tes
 #if 0
     {
-Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
-+++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
@@ -102,7 +102,7 @@ class test_message
     public:
       test_message()
@ -372,13 +372,13 @@ Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
         }
      ~test_message()
-Index: VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
+Index: VirtualBox-7.0.2/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
-+++ VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
+++ VirtualBox-7.0.2/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
-@@ -29,9 +29,8 @@
+@@ -30,9 +30,8 @@
 #include "build_id.h"
 #include "macros.h"
 -#ifndef NT_GNU_BUILD_ID
 +#undef NT_GNU_BUILD_ID
@ -387,26 +387,11 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_i
 #ifndef ElfW
 #define ElfW(type) Elf_##type
-Index: VirtualBox-6.1.40/src/libs/zlib-1.2.11/os400/make.sh
+Index: VirtualBox-7.0.2/src/VBox/Additions/x11/VBoxClient/logging.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/zlib-1.2.11/os400/make.sh
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
-+++ VirtualBox-6.1.40/src/libs/zlib-1.2.11/os400/make.sh
+++ VirtualBox-7.0.2/src/VBox/Additions/x11/VBoxClient/logging.cpp
-@@ -258,8 +258,8 @@ fi
+@@ -203,10 +203,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
 #      Create and compile the identification source file.
 echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
 -echo '#pragma comment(user, __DATE__)' >> os400.c
 -echo '#pragma comment(user, __TIME__)' >> os400.c
 +#echo '#pragma comment(user, __DATE__)' >> os400.c
 +#echo '#pragma comment(user, __TIME__)' >> os400.c
 echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
 make_module     OS400           os400.c
 LINK=                           # No need to rebuild service program yet.
 Index: VirtualBox-6.1.40/src/VBox/Additions/x11/VBoxClient/logging.cpp
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
 +++ VirtualBox-6.1.40/src/VBox/Additions/x11/VBoxClient/logging.cpp
@@ -162,10 +162,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
         case RTLOGPHASE_BEGIN:
         {
             pfnLog(pLoggerRelease,
--- a/vbox-permissions_warning.diff
+++ b/vbox-permissions_warning.diff
@ -1,19 +1,19 @@
-Index: VirtualBox-6.1.40/src/apps/Makefile.kmk
+Index: VirtualBox-7.0.2/src/apps/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/apps/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/apps/Makefile.kmk
-+++ VirtualBox-6.1.40/src/apps/Makefile.kmk
+++ VirtualBox-7.0.2/src/apps/Makefile.kmk
-@@ -31,5 +31,7 @@ if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUP
+@@ -28,5 +28,7 @@
-  endif
+ SUB_DEPTH = ../..
- endif
+ include $(KBUILD_PATH)/subheader.kmk
 +include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk
 +
 include $(FILE_KBUILD_SUB_FOOTER)
-Index: VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/Makefile.kmk
+Index: VirtualBox-7.0.2/src/apps/VBoxPermissionMessage/Makefile.kmk
 ===================================================================
 --- /dev/null
-+++ VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/Makefile.kmk
+++ VirtualBox-7.0.2/src/apps/VBoxPermissionMessage/Makefile.kmk
@@ -0,0 +1,32 @@
 +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
 +## @file
@ -47,10 +47,10 @@ Index: VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/Makefile.kmk
 +
 +include $(KBUILD_PATH)/subfooter.kmk
 +
-Index: VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
+Index: VirtualBox-7.0.2/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
 ===================================================================
 --- /dev/null
-+++ VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
+++ VirtualBox-7.0.2/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
@@ -0,0 +1,12 @@
 +#include <QtWidgets/QApplication>
 +#include <QtWidgets/QMessageBox>
--- a/vbox-python-py310.patch
+++ b/vbox-python-py310.patch
@ -1,10 +1,10 @@
 # https://www.virtualbox.org/changeset/90537/vbox
-Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/Makefile.kmk
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/Makefile.kmk
-+++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/Makefile.kmk
-@@ -625,6 +625,52 @@ VBoxPython3_10m_x86_LIBS       = $(VBOX_
+@@ -702,6 +702,52 @@ VBoxPython3_10m_x86_LIBS       = $(VBOX_
  endif
 endif
@ -57,16 +57,3 @@ Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/Makefile.kmk
 ifdef VBOX_PYTHONDEF_INC
 #
 # Python without versioning
 Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyXPCOM.h
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
 +++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyXPCOM.h
@@ -137,7 +137,7 @@ inline PyObject *PyBool_FromLong(long ok
 #  define PyInt_Check(o) PyLong_Check(o)
 #  define PyInt_AsLong(o) PyLong_AsLong(o)
 #  define PyNumber_Int(o) PyNumber_Long(o)
 -#  if PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */
 +#  if !defined(Py_LIMITED_API) && PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */
 #   ifndef PyUnicode_AsUTF8
 #    define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o)
 #   endif
--- a/vbox-python-selection.patch
+++ b/vbox-python-selection.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/bldprogs/scm.cpp
+Index: VirtualBox-7.0.2/src/bldprogs/scm.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/bldprogs/scm.cpp
+--- VirtualBox-7.0.2.orig/src/bldprogs/scm.cpp
-+++ VirtualBox-6.1.40/src/bldprogs/scm.cpp
+++ VirtualBox-7.0.2/src/bldprogs/scm.cpp
-@@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA
+@@ -2335,7 +2335,7 @@ static int scmProcessFileInner(PSCMRWSTA
                             pszTreatAs = "shell";
                         else if (   (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0)
                                  || (cchFirst >= 19 && strncmp(pchFirst, "/usr/bin/env python", 19) == 0) )
@ -11,39 +11,11 @@ Index: VirtualBox-6.1.40/src/bldprogs/scm.cpp
                         else if (   (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0)
                                  || (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) )
                             pszTreatAs = "perl";
-Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/configure
+Index: VirtualBox-7.0.2/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/configure
+--- VirtualBox-7.0.2.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
-+++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/configure
+++ VirtualBox-7.0.2/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
-@@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES=
+@@ -32,6 +32,9 @@
 PYTHON_TESTS=
 pythondir=
 if test "$with_python" != "no" ; then
 -    if test -x "$with_python/bin/python"
 +    if test -x "$with_python/bin/python3"
     then
 -        echo Found python in $with_python/bin/python
 -        PYTHON="$with_python/bin/python"
 +        echo Found python in $with_python/bin/python3
 +        PYTHON="$with_python/bin/python3"
     else
         if test -x "$with_python/python.exe"
         then
@@ -15174,7 +15174,8 @@ if test "$with_python" != "no" ; then
                     with_python=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
                 else
                     # Extract the first word of "python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5", so it can be a program name with args.
 -set dummy python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5; ac_word=$2
 +PYTHON=python3
 +set dummy python3 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_PYTHON+:} false; then :
 Index: VirtualBox-6.1.40/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
 +++ VirtualBox-6.1.40/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
@@ -22,6 +22,9 @@
 %define VBOXDOCDIR %{_defaultdocdir}/%NAME%
 %global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
@ -53,10 +25,10 @@ Index: VirtualBox-6.1.40/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
 Summary:   Oracle VM VirtualBox
 Name:      %NAME%
-Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in
+Index: VirtualBox-7.0.2/src/libs/libxml2-2.9.14/libxml.spec.in
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml.spec.in
+--- VirtualBox-7.0.2.orig/src/libs/libxml2-2.9.14/libxml.spec.in
-+++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in
+++ VirtualBox-7.0.2/src/libs/libxml2-2.9.14/libxml.spec.in
@@ -1,3 +1,4 @@
 +%global with_python2 0
 %global with_python3 1
@ -64,7 +36,7 @@ Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in
 Summary: Library providing XML and HTML support
@@ -8,7 +9,9 @@ License: MIT
 Group: Development/Libraries
- Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
+ Source: https://download.gnome.org/sources/libxml2/@LIBXML_MAJOR_VERSION@.@LIBXML_MINOR_VERSION@/libxml2-%{version}.tar.xz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 +%if 0%{?with_python2}
 BuildRequires: python-devel
@ -72,15 +44,15 @@ Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in
 %if 0%{?with_python3}
 BuildRequires: python3-devel
 %endif # with_python3
-@@ -72,7 +75,6 @@ to read, modify and write XML and HTML f
+@@ -75,7 +78,6 @@ to read, modify and write XML and HTML f
 this includes parsing and validation even with complex DTDs, either
 at parse time or later once the document has been modified.
 -%if 0%{?with_python3}
- %package python3
+ %package -n python3-%{name}
 Summary: Python 3 bindings for the libxml2 library
 Group: Development/Libraries
-@@ -87,7 +89,6 @@ This library allows to manipulate XML fi
+@@ -92,7 +94,6 @@ This library allows to manipulate XML fi
 to read, modify and write XML and HTML files. There is DTDs support
 this includes parsing and validation even with complex DTDs, either
 at parse time or later once the document has been modified.
@ -88,7 +60,7 @@ Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in
 %prep
 %setup -q
-@@ -99,11 +100,14 @@ make
+@@ -110,11 +111,14 @@ find doc -type f -exec chmod 0644 \{\} \
 %install
 rm -fr %{buildroot}
@ -105,52 +77,41 @@ Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in
 make install DESTDIR=%{buildroot}
 %endif # with_python3
-@@ -165,6 +169,7 @@ rm -fr %{buildroot}
+@@ -177,6 +181,7 @@ rm -fr %{buildroot}
 %{_libdir}/*a
 +%if 0%{?with_python2}
- %files python
+ %files -n python-%{name}
 %defattr(-, root, root)
-@@ -176,6 +181,7 @@ rm -fr %{buildroot}
+@@ -188,6 +193,7 @@ rm -fr %{buildroot}
 %doc python/tests/*.py
 %doc doc/*.py
 %doc doc/python.html
 +%endif
 %if 0%{?with_python3}
- %files python3
+ %files -n python3-%{name}
-Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml2.spec
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-+++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-@@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot}
+@@ -438,7 +438,9 @@ char *PyTraceback_AsString(PyObject *exc
 %if 0%{?with_python3}
 make clean
 -%configure --with-python=%{__python3}
 +%configure --with-python=python3
 make install DESTDIR=%{buildroot}
 %endif # with_python3
 Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
 +++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc
 	{ // a temp scope so I can use temp locals.
 #if PY_MAJOR_VERSION <= 2
- 	char *tempResult = PyString_AsString(obResult);
+-	char *tempResult = PyString_AsString(obResult);
 +	char *tempResult = (char *)PyString_AsString(obResult);
 +#elif PY_MINOR_VERSION <= 6
-+	char *tempResult = PyUnicode_AsUTF8(obResult);
+	char *tempResult = (char *)PyUnicode_AsUTF8(obResult);
 #else
     /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
 	const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
-Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyGBase.cpp
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
-+++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -183,7 +183,11 @@ PyG_Base::~PyG_Base()
 // Get the correct interface pointer for this object given the IID.
 void *PyG_Base::ThisAsIID( const nsIID &iid )
@ -164,11 +125,11 @@ Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyGBase.cpp
 	if (iid.Equals(NS_GET_IID(nsISupports)))
 		return (nsISupports *)(nsIInternalPython *)this;
 	if (iid.Equals(NS_GET_IID(nsISupportsWeakReference)))
-Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/gen_python_deps.py
+Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/gen_python_deps.py
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/gen_python_deps.py
-+++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/gen_python_deps.py
-@@ -86,7 +86,7 @@ def main(argv):
+@@ -96,7 +96,7 @@ def main(argv):
     else:
         multi = 1
@ -177,7 +138,7 @@ Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/gen_python_deps.py
         prefixes = ["/usr"]
         versions = [str(sys.version_info[0])+'.'+str(sys.version_info[1]),
                     str(sys.version_info[0])+'.'+str(sys.version_info[1])+'m']
-@@ -114,24 +114,25 @@ def main(argv):
+@@ -124,24 +124,25 @@ def main(argv):
             continue
         for p in prefixes:
             c = checkPair(p, v, dllpre, dllsuff, bitness_magic)
--- a/vbox-smc-napa.diff
+++ b/vbox-smc-napa.diff
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Devices/PC/vbox.dsl
+Index: VirtualBox-7.0.2/src/VBox/Devices/PC/vbox.dsl
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Devices/PC/vbox.dsl
+--- VirtualBox-7.0.2.orig/src/VBox/Devices/PC/vbox.dsl
-+++ VirtualBox-6.1.40/src/VBox/Devices/PC/vbox.dsl
+++ VirtualBox-7.0.2/src/VBox/Devices/PC/vbox.dsl
-@@ -1197,7 +1197,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
+@@ -1225,7 +1225,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
                 Device (SMC)
                 {
                     Name (_HID, EisaId ("APP0001"))
--- a/vbox-suid-warning.diff
+++ b/vbox-suid-warning.diff
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/apps/Makefile.kmk
+Index: VirtualBox-7.0.2/src/apps/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/apps/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/apps/Makefile.kmk
-+++ VirtualBox-6.1.40/src/apps/Makefile.kmk
+++ VirtualBox-7.0.2/src/apps/Makefile.kmk
-@@ -35,5 +35,7 @@ include $(PATH_SUB_CURRENT)/VBoxPermissi
+@@ -32,5 +32,7 @@ include $(PATH_SUB_CURRENT)/VBoxPermissi
 include $(PATH_SUB_CURRENT)/VBoxUSB_DevRules/Makefile.kmk
@ -10,10 +10,10 @@ Index: VirtualBox-6.1.40/src/apps/Makefile.kmk
 +
 include $(FILE_KBUILD_SUB_FOOTER)
-Index: VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/Makefile.kmk
+Index: VirtualBox-7.0.2/src/apps/VBoxSUIDMessage/Makefile.kmk
 ===================================================================
 --- /dev/null
-+++ VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/Makefile.kmk
+++ VirtualBox-7.0.2/src/apps/VBoxSUIDMessage/Makefile.kmk
@@ -0,0 +1,33 @@
 +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
 +## @file
@ -48,10 +48,10 @@ Index: VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/Makefile.kmk
 +include $(KBUILD_PATH)/subfooter.kmk
 +
 +
-Index: VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
+Index: VirtualBox-7.0.2/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
 ===================================================================
 --- /dev/null
-+++ VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
+++ VirtualBox-7.0.2/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
@@ -0,0 +1,15 @@
 +#include <QtWidgets/QApplication>
 +#include <QtWidgets/QMessageBox>
--- a/vbox-usb-warning.diff
+++ b/vbox-usb-warning.diff
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/apps/Makefile.kmk
+Index: VirtualBox-7.0.2/src/apps/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/apps/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/apps/Makefile.kmk
-+++ VirtualBox-6.1.40/src/apps/Makefile.kmk
+++ VirtualBox-7.0.2/src/apps/Makefile.kmk
-@@ -33,5 +33,7 @@ endif
+@@ -30,5 +30,7 @@ include $(KBUILD_PATH)/subheader.kmk
 include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk
@ -10,10 +10,10 @@ Index: VirtualBox-6.1.40/src/apps/Makefile.kmk
 +
 include $(FILE_KBUILD_SUB_FOOTER)
-Index: VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/Makefile.kmk
+Index: VirtualBox-7.0.2/src/apps/VBoxUSB_DevRules/Makefile.kmk
 ===================================================================
 --- /dev/null
-+++ VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/Makefile.kmk
+++ VirtualBox-7.0.2/src/apps/VBoxUSB_DevRules/Makefile.kmk
@@ -0,0 +1,30 @@
 +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
 +## @file
@ -45,10 +45,10 @@ Index: VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/Makefile.kmk
 +include $(KBUILD_PATH)/subfooter.kmk
 +
 +
-Index: VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
+Index: VirtualBox-7.0.2/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
 ===================================================================
 --- /dev/null
-+++ VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
+++ VirtualBox-7.0.2/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
@@ -0,0 +1,25 @@
 +#include <QtWidgets/QApplication>
 +#include <QtWidgets/QMessageBox>
--- a/vbox-vboxadd-init-script.diff
+++ b/vbox-vboxadd-init-script.diff
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
+Index: VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+--- VirtualBox-7.0.0_BETA2.orig/src/VBox/Additions/linux/installer/vboxadd.sh
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd.sh
-@@ -26,11 +26,14 @@
+@@ -36,11 +36,14 @@
 # Provides:       vboxadd
 # Required-Start:
 # Required-Stop:
@ -18,7 +18,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
 ### END INIT INFO
 ## @todo This file duplicates a lot of script with vboxdrv.sh.  When making
-@@ -121,20 +124,11 @@ module_build_log()
+@@ -131,20 +134,11 @@ module_build_log()
 dev=/dev/vboxguest
 userdev=/dev/vboxuser
@ -39,7 +39,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
 # Attempt to detect VirtualBox Guest Additions version and revision information.
 VBOXCLIENT="${INSTALL_DIR}/bin/VBoxClient"
 VBOX_VERSION="`"$VBOXCLIENT" --version | cut -d r -f1`"
-@@ -184,12 +178,6 @@ do_vboxguest_non_udev()
+@@ -194,12 +188,6 @@ do_vboxguest_non_udev()
             fail "Cannot create device $dev with major $maj and minor $min"
         }
     fi
@ -52,7 +52,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
     if [ ! -c $userdev ]; then
         maj=10
-@@ -200,12 +188,6 @@ do_vboxguest_non_udev()
+@@ -210,12 +198,6 @@ do_vboxguest_non_udev()
                 rmmod vboxguest 2>/dev/null
                 fail "Cannot create device $userdev with major $maj and minor $min"
             }
@ -65,7 +65,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
         fi
     fi
 }
-@@ -267,7 +249,7 @@ cleanup_modules()
+@@ -277,7 +259,7 @@ cleanup_modules()
         done
         if test -z "${keep}"; then
             rm -rf /lib/modules/"${KERN_VER}"
@ -74,7 +74,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
         fi
     done
     for i in ${OLDMODULES}; do
-@@ -528,9 +510,9 @@ create_udev_rule()
+@@ -509,9 +491,9 @@ create_udev_rule()
         udevcontrol reload_rules >/dev/null 2>&1 || true
     fi
 }
@ -87,7 +87,35 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
     # And a post-installation script for rebuilding modules when a new kernel
     # is installed.
     mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d
-@@ -736,17 +718,14 @@ Please install them and execute
+@@ -692,18 +674,17 @@ setup()
 already available for kernel $TARGET_VER and do not require to be rebuilt."
         else
             info "Building the VirtualBox Guest Additions kernel modules.  This may take a while."
 -            info "To build modules for other installed kernels, run"
 -            info "  /sbin/rcvboxadd quicksetup <version>"
 -            info "or"
 -            info "  /sbin/rcvboxadd quicksetup all"
 -            if test -d /lib/modules/"$TARGET_VER"/build; then
 -                setup_modules "$TARGET_VER"
 -                depmod
 -            else
 -                info "Kernel headers not found for target kernel $TARGET_VER. \
 +        info "To build modules for other installed kernels, run"
 +        info "  /sbin/rcvboxadd quicksetup <version>"
 +        info "or"
 +        info "  /sbin/rcvboxadd quicksetup all"
 +        if test -d /lib/modules/"$TARGET_VER"/build; then
 +            setup_modules "$TARGET_VER"
 +            depmod
 +        else
 +            info "Kernel headers not found for target kernel $TARGET_VER. \
 Please install them and execute
   /sbin/rcvboxadd setup"
 -            fi
         fi
     fi
     create_vbox_user
@@ -720,17 +701,14 @@ Please install them and execute
     # Put the X.Org driver in place.  This is harmless if it is not needed.
     # Also set up the OpenGL library.
     myerr=`"${INSTALL_DIR}/init/vboxadd-x11" setup 2>&1`
@ -108,7 +136,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
         depmod
         # Remove old module sources
-@@ -756,12 +735,13 @@ cleanup()
+@@ -740,12 +718,13 @@ cleanup()
     fi
     # Clean-up X11-related bits
@ -126,7 +154,7 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
     fi
     rm -f /sbin/mount.vboxsf 2>/dev/null
     rm -f /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
-@@ -807,7 +787,7 @@ for your Linux distribution."
+@@ -791,7 +770,7 @@ for your Linux distribution."
             rm -f $userdev || {
                 fail "Cannot remove $userdev"
             }
@ -135,11 +163,11 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh
                 fail "modprobe vboxguest failed"
             case "$no_udev" in 1)
                 sleep .5;;
-Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd-service.sh
+Index: VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd-service.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
+--- VirtualBox-7.0.0_BETA2.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
-+++ VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd-service.sh
+++ VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd-service.sh
-@@ -26,7 +26,7 @@
+@@ -36,7 +36,7 @@
 # Provides:       vboxadd-service
 # Required-Start: vboxadd
 # Required-Stop:  vboxadd
@ -148,11 +176,11 @@ Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd-service.sh
 # Default-Stop:   0 1 6
 # X-Conflicts-With: systemd-timesyncd.service
 # Description:    VirtualBox Additions Service
-Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxautostart-service.sh
+Index: VirtualBox-7.0.0_BETA2/src/VBox/Installer/linux/vboxautostart-service.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxautostart-service.sh
+--- VirtualBox-7.0.0_BETA2.orig/src/VBox/Installer/linux/vboxautostart-service.sh
-+++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxautostart-service.sh
+++ VirtualBox-7.0.0_BETA2/src/VBox/Installer/linux/vboxautostart-service.sh
-@@ -23,7 +23,7 @@
+@@ -33,7 +33,7 @@
 # Provides:       vboxautostart-service
 # Required-Start: vboxdrv
 # Required-Stop:  vboxdrv
@ -161,11 +189,11 @@ Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxautostart-service.sh
 # Default-Stop:   0 1 6
 # Description:    VirtualBox autostart service
 ### END INIT INFO
-Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+Index: VirtualBox-7.0.0_BETA2/src/VBox/Installer/linux/vboxballoonctrl-service.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+--- VirtualBox-7.0.0_BETA2.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
-+++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+++ VirtualBox-7.0.0_BETA2/src/VBox/Installer/linux/vboxballoonctrl-service.sh
-@@ -23,7 +23,7 @@
+@@ -33,7 +33,7 @@
 # Provides:       vboxballoonctrl-service
 # Required-Start: vboxdrv
 # Required-Stop:  vboxdrv
@ -174,11 +202,11 @@ Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxballoonctrl-service.sh
 # Default-Stop:   0 1 6
 # Description:    VirtualBox watchdog daemon
 ### END INIT INFO
-Index: VirtualBox-6.1.40/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+Index: VirtualBox-7.0.0_BETA2/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+--- VirtualBox-7.0.0_BETA2.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
-+++ VirtualBox-6.1.40/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+++ VirtualBox-7.0.0_BETA2/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
-@@ -31,7 +31,7 @@
+@@ -41,7 +41,7 @@
 # Provides:       testboxscript-service
 # Required-Start: $network
 # Required-Stop:
@ -187,11 +215,11 @@ Index: VirtualBox-6.1.40/src/VBox/ValidationKit/testboxscript/linux/testboxscrip
 # Default-Stop:   0 1 6
 # Description:    TestBoxScript service
 ### END INIT INFO
-Index: VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+Index: VirtualBox-7.0.0_BETA2/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+--- VirtualBox-7.0.0_BETA2.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
-+++ VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+++ VirtualBox-7.0.0_BETA2/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
-@@ -31,7 +31,7 @@
+@@ -41,7 +41,7 @@
 # Provides:       vboxtxs
 # Required-Start: $network
 # Required-Stop:
@ -200,11 +228,11 @@ Index: VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs
 # Default-Stop:   0 1 6
 # Description:    VirtualBox Test Execution Service
 ### END INIT INFO
-Index: VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+Index: VirtualBox-7.0.0_BETA2/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+--- VirtualBox-7.0.0_BETA2.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
-+++ VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+++ VirtualBox-7.0.0_BETA2/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
-@@ -31,7 +31,7 @@
+@@ -41,7 +41,7 @@
 # Provides:       vboxtxs
 # Required-Start: $network
 # Required-Stop:
--- a/vbox-vboxdrv-init-script.diff
+++ b/vbox-vboxdrv-init-script.diff
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh
+Index: VirtualBox-7.0.2/src/VBox/Installer/linux/vboxdrv.sh
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxdrv.sh
+--- VirtualBox-7.0.2.orig/src/VBox/Installer/linux/vboxdrv.sh
-+++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-7.0.2/src/VBox/Installer/linux/vboxdrv.sh
-@@ -19,11 +19,12 @@
+@@ -29,11 +29,12 @@
 #
 ### BEGIN INIT INFO
 # Provides:       vboxdrv
@ -19,7 +19,7 @@ Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh
 ### END INIT INFO
 ## @todo This file duplicates a lot of script with vboxadd.sh.  When making
-@@ -510,13 +511,6 @@ See the documentation for your Linux dis
+@@ -520,13 +521,6 @@ See the documentation for your Linux dis
         fi
     fi
     # ensure permissions
@ -33,3 +33,139 @@ Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh
     if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
         failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
     fi
@@ -658,15 +652,9 @@ setup()
 {
     begin_msg "Building VirtualBox kernel modules" console
     log "Building the main VirtualBox module."
 -
 -    # Detect if kernel was built with clang.
 -    unset LLVM
 -    vbox_cc_is_clang=$(kernel_get_config_opt "CONFIG_MODULE_SIG_HASH")
 -    if test "${vbox_cc_is_clang}" = "y"; then
 -        log "Using clang compiler."
 -        export LLVM=1
 -    fi
 -
 +    vbox_cc_is_clang=$(/lib/modules/"$KERN_VER"/build/scripts/config \
 +        --file /lib/modules/"$KERN_VER"/build/.config \
 +        --state CONFIG_CC_IS_CLANG 2>/dev/null)
     if ! myerr=`$BUILDINTMP \
         --save-module-symvers /tmp/vboxdrv-Module.symvers \
         --module-source "$MODULE_SRC/vboxdrv" \
@@ -684,31 +672,7 @@ setup()
         log "Error building the module:"
         module_build_log "$myerr"
         failure "Look at $LOG to find out what went wrong"
 -    fi
 -    log "Building the net adaptor module."
 -    if ! myerr=`$BUILDINTMP \
 -        --use-module-symvers /tmp/vboxdrv-Module.symvers \
 -        --module-source "$MODULE_SRC/vboxnetadp" \
 -        --no-print-directory install 2>&1`; then
 -        log "Error building the module:"
 -        module_build_log "$myerr"
 -        failure "Look at $LOG to find out what went wrong"
 -    fi
 -    if test -e "$MODULE_SRC/vboxpci"; then
 -        log "Building the PCI pass-through module."
 -        if ! myerr=`$BUILDINTMP \
 -            --use-module-symvers /tmp/vboxdrv-Module.symvers \
 -            --module-source "$MODULE_SRC/vboxpci" \
 -            --no-print-directory install 2>&1`; then
 -            log "Error building the module:"
 -            module_build_log "$myerr"
 -            failure "Look at $LOG to find out what went wrong"
 -        fi
 -    fi
 -    rm -f /etc/vbox/module_not_compiled
 -    depmod -a
 -    sync
 -    succ_msg "VirtualBox kernel modules built"
 +    /sbin/vboxconfig
     # Secure boot on Ubuntu, Debian and Oracle Linux.
     if test -n "$HAVE_SEC_BOOT"; then
 Index: VirtualBox-7.0.2/Makefile.kmk
 ===================================================================
 --- VirtualBox-7.0.2.orig/Makefile.kmk
 +++ VirtualBox-7.0.2/Makefile.kmk
@@ -69,8 +69,7 @@ OTHER_CLEAN += \
 	$(VBOX_VERSION_STAMP) \
 	$(wildcard $(PATH_OUT)/version-stamp-*.*.*) \
 	$(VBOX_SVN_REV_KMK).ts \
 -	$(VBOX_SVN_REV_KMK) \
 -	$(PATH_OUT)/DynamicConfig.kmk
 +	$(VBOX_SVN_REV_KMK)
 if  !defined(VBOX_ONLY_ADDITIONS) \
 Index: VirtualBox-7.0.2/Config.kmk
 ===================================================================
 --- VirtualBox-7.0.2.orig/Config.kmk
 +++ VirtualBox-7.0.2/Config.kmk
@@ -3223,34 +3223,6 @@ $(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/
 	$(QUIET)$(APPEND) -tn "$@" "int foobar(void)" "{" "    return 42;" "}" ""
 # No $(QUIET) here as it's interesting to see what goes into the file.
 -$(PATH_OUT)/DynamicConfig.kmk: \
 -		$(PATH_ROOT)/Config.kmk \
 -		$(LOCALCFG) \
 -		$(AUTOCFG) \
 -		$(VBOX_GCC_PATH_CC) \
 -		$(VBOX_GCC_PATH_CXX) \
 -		$(VBOX_GCC_LIBGCC) \
 -		$(VBOX_GCC32_PATH_CC) \
 -		$(VBOX_GCC32_PATH_CXX) \
 -		$(VBOX_GCC32_LIBGCC) \
 -		$(if-expr "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "solaris.amd64" && $(KBUILD_HOST_VERSION_MINOR) >= 11 \
 -			, /platform/i86pc/kernel/$(KBUILD_HOST_ARCH)/unix,) \
 -        	| $(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/DynamicConfig.cpp
 -	$(call MSG_GENERATE,,$@,)
 -	$(QUIET)$(RM) -f '$@'
 -	$(QUIET)$(MKDIR) -p $(@D)
 -	$(QUIET)$(APPEND) '$@' '# Host version: $(KBUILD_HOST_VERSION_MAJOR).$(KBUILD_HOST_VERSION_MINOR).$(KBUILD_HOST_VERSION_PATCH); full: $(KBUILD_HOST_VERSION)'
 -ifneq ($(KBUILD_TARGET),win)
 -	$(QUIET)$(APPEND) '$@' '# $(KBUILD_HOST_UNAME_SYSNAME) - $(KBUILD_HOST_UNAME_RELEASE) - $(KBUILD_HOST_UNAME_VERSION)'
 -endif
 -ifeq ($(KBUILD_TARGET),darwin)
 -	$(QUIET)$(APPEND) '$@' '#              VBOX_XCODE_VERSION: $(VBOX_XCODE_VERSION)'
 -	$(QUIET)$(APPEND) '$@' '# VBOX_PATH_MACOSX_TOOLCHAIN_ROOT: $(VBOX_PATH_MACOSX_TOOLCHAIN_ROOT)'
 -	$(QUIET)$(APPEND) '$@' '#       VBOX_PATH_MACOSX_SDK_ROOT: $(VBOX_PATH_MACOSX_SDK_ROOT)'
 -	$(QUIET)$(APPEND) '$@' '#     VBOX_PATH_MACOSX_DEVEL_ROOT: $(VBOX_PATH_MACOSX_DEVEL_ROOT)'
 -	$(QUIET)$(APPEND) '$@' 'VBOX_CLANG_VERSION_CC          ?= $(call VBOX_CLANG_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC))'
 -	$(QUIET)$(APPEND) '$@' 'VBOX_CLANG_VERSION_CXX         ?= $(call VBOX_CLANG_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CXX))'
 -endif
 # HC compiler switch detection.
 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_VERSION_CC            ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC))'
 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_VERSION_CXX           ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CXX))'
@@ -3449,30 +3421,9 @@ endif
 	$(QUIET)$(CAT) $@
 	$(QUIET)$(ECHO) '=========== END OF $@ ========='
 -include $(PATH_OUT)/DynamicConfig.kmk
 endif # !VBOX_NOINC_DYNAMIC_CONFIG_KMK
 -#
 -# C++ language level
 -# See https://en.cppreference.com/w/cpp/compiler_support and compiler docs.
 -#
 -## @todo consider maxing this out.
 -ifndef VBOX_GCC_std
 - if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.arm64) # Go straight for c++17 here.
 -VBOX_GCC_std := -std=c++17
 -# else if "$(VBOX_CLANG_VERSION_CXX)" vge 60000 # Most language features complete by v6. Lib stuff was less complete in v6, but hopefully acceptable for out purposes.
 -#VBOX_GCC_std := -std=c++17
 - else if "$(VBOX_CLANG_VERSION_CXX)" vge 50000 # darwin Xcode 5 allegedly knows what C++11 is
 -VBOX_GCC_std := -std=c++11
 -# else if "$(VBOX_GCC_VERSION_CXX)" vge 70000 # Language feature P0512R0 was v8, rest v7 or earlier. Most lib stuff present in 7, complete in v12.
 -#VBOX_GCC_std := -std=gnu++17
 - else if "$(VBOX_GCC_VERSION_CXX)" vge 40800
 -VBOX_GCC_std := -std=c++11
 - else if "$(VBOX_GCC_VERSION_CXX)" vge 40600
 -VBOX_GCC_std := -std=c++0x
 - endif
 -endif
 ifndef VBOX_VCC_std
  if $(VBOX_VCC_TOOL_STEM) >= VCC141 # since 2017 15.3
   VBOX_VCC_std := -std:c++17 -Zc:__cplusplus
--- a/vbox_remove_smp_mflags.patch
+++ b/vbox_remove_smp_mflags.patch
@ -1,26 +1,13 @@
-Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in
+Index: VirtualBox-7.0.2/src/libs/libxml2-2.9.14/libxml.spec.in
 ===================================================================
--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml.spec.in
+--- VirtualBox-7.0.2.orig/src/libs/libxml2-2.9.14/libxml.spec.in
-+++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in
+++ VirtualBox-7.0.2/src/libs/libxml2-2.9.14/libxml.spec.in
-@@ -94,7 +94,7 @@ at parse time or later once the document
+@@ -103,7 +103,7 @@ sed -i 's|#!/usr/bin/python |#!%{__pytho
 %build
 %configure
 -make %{_smp_mflags}
 +make
- %install
+ find doc -type f -exec chmod 0644 \{\} \;
 rm -fr %{buildroot}
 Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec
 ===================================================================
 --- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml2.spec
 +++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec
@@ -94,7 +94,7 @@ at parse time or later once the document
 %build
 %configure
 -make %{_smp_mflags}
 +make
 %install
 rm -fr %{buildroot}
--- a/virtualbox-sed-params.patch
+++ b/virtualbox-sed-params.patch
@ -1,8 +1,8 @@
-Index: VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk
+Index: VirtualBox-7.0.2/src/VBox/Main/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Main/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/VBox/Main/Makefile.kmk
-+++ VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/Main/Makefile.kmk
-@@ -1648,7 +1648,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \
+@@ -1876,7 +1876,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \
 	$(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
 		--stringparam generating "dtrace-probes" \
 		-o "$@" $(VBoxAPIWrap_VBOX_XSLT) $(VBOX_XIDL_FILE)
@ -11,11 +11,11 @@ Index: VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk
 		"$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d" \
 		"$@" \
 		"$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d"
-Index: VirtualBox-6.1.40/src/VBox/Devices/Makefile.kmk
+Index: VirtualBox-7.0.2/src/VBox/Devices/Makefile.kmk
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Devices/Makefile.kmk
+--- VirtualBox-7.0.2.orig/src/VBox/Devices/Makefile.kmk
-+++ VirtualBox-6.1.40/src/VBox/Devices/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/Devices/Makefile.kmk
-@@ -880,8 +880,7 @@ endif
+@@ -989,8 +989,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
 	$(call MSG_TOOL,iasl,VBoxDD,$<,$@)
 	$(QUIET)$(RM) -f $@ $@.tmp $@.pre
 	$(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -x c -o $@.pre $<
--- a/virtualbox-snpritnf-buffer-overflow.patch
+++ b/virtualbox-snpritnf-buffer-overflow.patch
@ -1,7 +1,7 @@
-Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
+Index: VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
 ===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
+--- VirtualBox-7.0.2.orig/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
-+++ VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
+++ VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
@@ -833,6 +833,7 @@ dt_gmatch(const char *s, const char *p)
 #else
 	return (p == NULL || *p == '\0' || RTStrSimplePatternMatch(p, s)); /** @todo implement gmatch. */
--- a/virtualbox.changes
+++ b/virtualbox.changes
@ -1,3 +1,58 @@
 -------------------------------------------------------------------
 Tue Nov 15 20:59:55 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>
 added file "set_noexec_stack.patch" to remove executable stack in yasm-compiled routines
 addwd file "fix_v7_build.patch"
 added file "VBoxDDR0.r0"
 deleted file "/vb-6.1.16-modal-dialog-parent.patch"
 VirtualBox 7.0.2 (released October 20 2022)
 This is a maintenance release. The following items were fixed and/or added:
 Known issue: VMs having more than one vCPU configured will not work properly on macOS Catalina due to an unknown memory corruption issue. Either lower the number of vCPUs to 1 or upgrade to BigSur or later where the issue does not occur
 Main: Fixed issue when VBoxSVC could become unresponsive if Extension Pack was not installed (bug #21167)
 Linux Guest Additions: Introduced initial support for kernel 6.1
 Linux Guest Additions: Fixed issue when VBoxClient seamless service caused a crash of some X11 applications (bug #21132)
 GUI: Fixed a glitch in the log viewer which was causing wrong log file to be saved (bug #21156)
 VirtualBox 7.0.0 (released October 10 2022)
 This is a major update. The following major new features were added:
 Virtual machines can be fully encrypted now, including the VM config logs and saved states (CLI only for now)
 OCI: Cloud virtual machines can be added to Virtual Machine Manager and controlled as local VMs
 OCI: Cloud networks can now be configured via Network Manager tool same way as it is done for Host-only and NAT networks
 GUI: Added a new utility similar to "top" or "resource monitor" which lists peformance statistics (CPU usage, RAM usage, disk I/O rate, etc.) of running guests
 GUI: Reworked the new vm wizard to integrate the unattended guest OS installation and to have a more streamlined work flow
 GUI: Added a new help viewer widget which enables the user manual to be navigated and searched
 GUI: Adding new notification center unifying most of running progresses and error reporting around the GUI
 GUI: Improved theme support on all platforms. Linux and macOS use native engine while for Windows host it is separately implemented.
 GUI: Large icon update.
 Audio recording: Now using Vorbis as the default audio format for WebM containers. Opus is no longer being used.
 Audio: Added "default" host driver type to make it possible to move VMs (appliances) between different platforms without the need of changing the audio driver explicitly. When the "default" driver is selected, the best audio backend option for a platform will be used. This is the default for newly created VMs.
 Guest Control: Implemented initial support for automatic updating of Guest Additions for Linux guests
 Guest Control: Implemented ability to wait for and/or reboot the guest when updating Guest Additions via VBoxManage
 VBoxManage: Added Guest Control "waitrunlevel" sub-command to make it possible to wait for a guest to reach a certain run level
 Linux Guest Additions: Reworked guest screen re-size functionality, added basic integration with some of guest Desktop Environments
 Devices: Implemented new 3D support based on DirectX 11 (and DXVK on non Windows hosts)
 Devices: Added virtual IOMMU devices (Intel and AMD variant)
 Devices: Added virtual TPM 1.2 and 2.0 devices
 Devices: The EHCI and XHCI USB controller devices are now part of the open source base package
 EFI: Added support for Secure Boot
 Debugging: Added experimental support for guest debugging through GDB and highly experimental support for guest debugging through KD/WinDbg
 In addition, the following items were fixed and/or added:
 OCI: Cloud networking functionality is enhanced for local VMs, now local VMs could be connected to cloud networking
 GUI: Improved behavior of the virtual machine list and various VM related tools in case multiple items are selected
 GUI: On available platforms, added a new option to disable the host's screensaver
 GUI: Reworked global preferences, machine settings and the wizards to improve stability and usability
 GUI: Improving mouse handling in multi-monitor case on X11 platform
 GUI: Medium enumeration engine was reworked to improve permormance
 GUI: NAT Network stuff was moved from global preferences to global Network Manager tool
 GUI: Extension Pack Manager was moved from global preferences to global tools
 GUI: Improved overall accessibility
 GUI: Migrating to recent Qt versions.
 -------------------------------------------------------------------
 Tue Oct 18 15:42:42 UTC 2022 - Larry Rainey <llrainey15@gmail.com>
--- a/virtualbox.spec
+++ b/virtualbox.spec
@ -46,13 +46,12 @@
 # With 32-bit builds, the job limit cannot be larger than 2, otherwise the build runs out of memory.
 # For 64-bit builds, no memory limit is reached when more jobs are run, but the builds crash with strange errors.
 # For the above reasons, limit the number of jobs to 2.
 #%define _smp_mflags -j2
 %define _vbox_instdir %{_prefix}/lib/virtualbox
 %define _udevrulesdir %{_prefix}/lib/udev/rules.d
 %endif
 # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
 Name:           virtualbox%{?dash}%{?name_suffix}
-Version:        6.1.40
+Version:        7.0.2
 Release:        0
 Summary:        %{package_summary}
 # FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
@ -89,6 +88,7 @@ Source22:       vboxweb-service.sh
 Source23:       vboxautostart-service.service
 Source24:       vboxautostart-service.sh
 Source25:       vboxclient.desktop
 Source26:       VBoxDDR0.r0
 Source97:       README.build
 Source98:       virtualbox-rpmlintrc
 Source99:       virtualbox-patch-source.sh
@ -171,13 +171,18 @@ Patch136:       fixes_for_gcc10.patch
 Patch137:       handle_gsoap_208103.patch
 # Fix for struct file_operations backport in 15.3
 Patch142:       fixes_for_leap15.3.patch
-Patch143:       vb-6.1.16-modal-dialog-parent.patch
+Patch143:       fix_kmp_build.patch
-Patch144:       fixes_for_leap15.4.patch
+#Fix for yasm defaulting to executable stack
-
+Patch144:       set_noexec_stack.patch
 #Fix to make C++ generate PIC code, and fixes to make yasm have relocatable references to external globals
 Patch145:       fix_v7_build.patch
 Patch999:       virtualbox-fix-ui-background-color.patch
 #
 # Common BuildRequires for both virtualbox and virtualbox-kmp
 BuildRequires:  %{kernel_module_package_buildreqs}
 BuildRequires:  acpica
 BuildRequires:  cmake-full
 BuildRequires:  dwarves
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  kbuild >= 0.1.9998svn3101
@ -195,38 +200,46 @@ Source2:        VirtualBox.appdata.xml
 ### Requirements for virtualbox main package ###
 %if %{main_package}
 BuildRequires:  LibVNCServer-devel
-BuildRequires:  acpica
+BuildRequires:  SDL-devel
 BuildRequires:  alsa-devel
-BuildRequires:  bin86
+#BuildRequires:  bin86
-BuildRequires:  dev86
+#BuildRequires:  dev86
 BuildRequires:  device-mapper-devel
 BuildRequires:  dmidecode
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
 BuildRequires:  glslang-devel
 BuildRequires:  gsoap-devel >= 2.8.50
-BuildRequires:  infinipath-psm
+#BuildRequires:  infinipath-psm
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  libelf-devel
 BuildRequires:  libidl-devel
 BuildRequires:  libopenssl-1_1-devel
 BuildRequires:  libopus-devel
 BuildRequires:  libqt5-linguist
 BuildRequires:  libqt5-linguist-devel
 BuildRequires:  libqt5-qtbase-devel
 BuildRequires:  libqt5-qttools-devel
 BuildRequires:  libqt5-qtx11extras-devel
 BuildRequires:  libtpms-devel
 BuildRequires:  libvpx-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libzio-devel
 BuildRequires:  lzfse
 BuildRequires:  lzfse-devel
 BuildRequires:  pulseaudio-devel
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-devel
 #BuildRequires:  sdl12_compat-devel
 BuildRequires:  sed
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  update-desktop-files
 BuildRequires:  which
-BuildRequires:  xorg-x11
+#BuildRequires:  xorg-x11
 BuildRequires:  xorg-x11-server
-BuildRequires:  xorg-x11-server-sdk
+#BuildRequires:  xorg-x11-server-sdk
-BuildRequires:  zlib-devel-static
+#BuildRequires:  zlib-devel-static
 BuildRequires:  pkgconfig(fontsproto)
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(glx)
@ -283,7 +296,11 @@ Requires(pre):  net-tools-deprecated
 %endif
 ### Requirements for virtualbox-kmp ###
 %if %{kmp_package}
 BuildRequires:  alsa-devel
 BuildRequires:  libiptc-devel
 BuildRequires:  libpulse-devel
 BuildRequires:  libxml2-devel
 Requires:       ca-certificates
 Requires:       openSUSE-signkey-cert
 %kernel_module_package -p %{SOURCE7} -n virtualbox -f %{SOURCE5} -x kdump um xen pae xenpae pv
 # end of kmp_package
@ -300,7 +317,6 @@ the terms of the GNU Public License (GPL).
 ##########################################
 %package qt
 Summary:        Qt GUI part for %{name}
 Group:          System/Emulators/PC
@ -317,6 +333,8 @@ Obsoletes:      %{name}-ose-qt < %{version}
 %description qt
 This package contains the code for the GUI used to control VMs.
 #########################################
 %package websrv
 Summary:        WebService GUI part for %{name}
 Group:          System/Emulators/PC
@ -328,7 +346,6 @@ Obsoletes:      %{name}-vboxwebsrv < %{version}
 %description websrv
 The VirtualBox web server is used to control headless VMs using a browser.
 ###########################################
 %package guest-tools
@ -342,9 +359,8 @@ Supplements:    modalias(pci:v000080EEd0000CAFEsv*sd*bc*sc*i*)
 #rename from "ose" version:
 Provides:       %{name}-ose-guest-tools = %{version}
 Obsoletes:      %{name}-ose-guest-tools < %{version}
-Obsoletes:      virtualbox-guest-x11
+Obsoletes:      virtualbox-guest-x11 < %{version}
-Provides:       virtualbox-guest-x11
+Obsoletes:      xorg-x11-driver-virtualbox-ose < %{version}
 Obsoletes:      xorg-x11-driver-virtualbox-ose
 %if ! 0%{?suse_version} > 1325
 Requires(pre):  net-tools-deprecated
 %endif
@ -353,8 +369,7 @@ Requires(pre):  net-tools-deprecated
 VirtualBox guest addition tools.
-##########################################
+###########################################
 %package -n python3-%{name}
 Summary:        Python bindings for %{name}
 Group:          Development/Libraries/Python
@ -373,8 +388,7 @@ Obsoletes:      python3-%{name}-ose < %{version}
 Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
-##########################################
+###########################################
 %package devel
 Summary:        Devel files for %{name}
 Group:          Development/Libraries/Other
@ -388,8 +402,7 @@ Obsoletes:      %{name}-ose-devel < %{version}
 Development file for %{name}
-##########################################
+###########################################
 %package host-source
 Summary:        Source files for %{name} host kernel modules
 Group:          Development/Sources
@ -420,8 +433,7 @@ These can be built for custom kernels using
 sudo %{_sbindir}/vboxguestconfig
-##########################################
+###########################################
 %package guest-desktop-icons
 Summary:        Icons for guest desktop files
 Group:          System/Emulators/PC
@ -433,8 +445,7 @@ BuildArch:      noarch
 This package contains icons for guest desktop files that were created on the desktop.
-##########################################
+###########################################
 %package vnc
 Summary:        VNC desktop sharing
 Group:          System/Emulators/PC
@ -506,13 +517,11 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
 # Patch for Leap 15.3
 %patch142 -p1
 %endif
 %if 0%{?sle_version} == 1504 && 0%{?is_opensuse}
 # Patch for Leap 15.4
 %patch144 -p1
 %endif
 %patch143 -p1
 %patch144 -p1
 %patch145 -p1
 # make VB UI background colors look sane again
-%patch999 -p1
+##%patch999 -p1
 ### Documents for virtualbox main package ###
 %if %{main_package}
@ -579,7 +588,6 @@ source ./env.sh
 echo "build basic parts"
    %{_bindir}/kmk %{?_smp_mflags} \
    VBOX_GCC_WERR= \
    KBUILD_VERBOSE=2 \
    VBOX_USE_SYSTEM_XORG_HEADERS=1 \
    VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
    TOOL_YASM_AS=yasm \
@ -657,7 +665,7 @@ pushd out/linux.*/release/bin
 install -m 755 VBoxManage 			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxHeadless 			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxSDL 				%{buildroot}%{_vbox_instdir}
-install -m 755 VBoxTunctl 			%{buildroot}%{_vbox_instdir}
+#install -m 755 VBoxTunctl 			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxNetNAT			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxAutostart			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxVolInfo			%{buildroot}%{_vbox_instdir}
@ -667,13 +675,14 @@ install -m 755 webtest				%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxDTrace			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxDbg.so			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxDbg.so			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxDxVk.so			%{buildroot}%{_vbox_instdir}
 install -m 755 UICommon.so			%{buildroot}%{_vbox_instdir}
 install -m 755 vboximg-mount			%{buildroot}%{_vbox_instdir}
 # create links to vbox tools in PATH - they could be usefull for controlling vbox from command line
 ln -s %{_vbox_instdir}/VBoxManage		%{buildroot}%{_bindir}/VBoxManage
 ln -s %{_vbox_instdir}/VBoxHeadless 		%{buildroot}%{_bindir}/VBoxHeadless
 ln -s %{_vbox_instdir}/VBoxSDL			%{buildroot}%{_bindir}/VBoxSDL
-ln -s %{_vbox_instdir}/VBoxTunctl		%{buildroot}%{_bindir}/VBoxTunctl
+#ln -s %{_vbox_instdir}/VBoxTunctl		%{buildroot}%{_bindir}/VBoxTunctl
 ln -s %{_vbox_instdir}/vboximg-mount		%{buildroot}%{_bindir}/vboximg-mount
 install -m 755 VBoxSVC 				%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxXPCOMIPCD 			%{buildroot}%{_vbox_instdir}
@ -692,6 +701,7 @@ install -m 755 VBoxEFI*.fd			%{buildroot}%{_vbox_instdir}
 install -m 755 VBoxSysInfo.sh			%{buildroot}%{_vbox_instdir}
 install -m 644 *.so		 		%{buildroot}%{_vbox_instdir}
 install -m 644 *.r0 				%{buildroot}%{_vbox_instdir}
 install -m 644 %{SOURCE26}				%{buildroot}%{_vbox_instdir}
 install -m 644 components/*			%{buildroot}%{_vbox_instdir}/components/
 # install languages
 install -m 644 nls/*				%{buildroot}%{_datadir}/virtualbox/nls/
@ -948,7 +958,8 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %doc README.autostart UserManual.pdf README.build
 %{_bindir}/VBoxManage
 %{_bindir}/VBoxHeadless
-%{_bindir}/VBoxTunctl
+%{_bindir}/VBoxSDL
 #%{_bindir}/VBoxTunctl
 %{_bindir}/vboximg-mount
 %dir %{_vbox_instdir}
 %{_vbox_instdir}/VBoxAutostart
@ -976,7 +987,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %{_vbox_instdir}/VBoxEFI*.fd
 %{_vbox_instdir}/VBoxManage
 %{_vbox_instdir}/VBoxSVC
-%{_vbox_instdir}/VBoxTunctl
+#%{_vbox_instdir}/VBoxTunctl
 %{_vbox_instdir}/VBoxXPCOMIPCD
 %{_vbox_instdir}/VBoxExtPackHelperApp
 %{_vbox_instdir}/vboximg-mount
@ -986,6 +997,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %{_vbox_instdir}/VBoxDragAndDropSvc.so
 %{_vbox_instdir}/VBoxVMMPreload.so
 #todo:double check - if this file should be assigned to the host side
 %{_vbox_instdir}/VBoxDxVk.so
 %{_vbox_instdir}/UICommon.so
 %{_vbox_instdir}/VBoxHostChannel.so
 %dir %{_vbox_instdir}/components
@ -1000,9 +1012,9 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %{_prefix}/lib/virtualbox/vboxautostart-service.sh
 %{_unitdir}/vboxdrv.service
 %{_unitdir}/vboxautostart-service.service
 %{_unitdir}/multi-user.target.wants/vboxweb-service.service
 %{_unitdir}/multi-user.target.wants/vboxdrv.service
 %{_unitdir}/multi-user.target.wants/vboxautostart-service.service
 %{_unitdir}/multi-user.target.wants/vboxweb-service.service
 %{_sbindir}/rcvboxdrv
 %{_sbindir}/rcvboxautostart
 %{_sbindir}/vboxconfig
@ -1155,14 +1167,6 @@ COMMON_KMK_FLAGS="
 	KBUILD_TARGET=linux \
 	BUILD_TARGET=linux \
 "
 # Architecture specific flags
 %ifarch x86_64
 COMMON_KMK_FLAGS+="
 	KBUILD_TARGET_ARCH=amd64 \
 	BUILD_TARGET_ARCH=amd64
 "
 %endif
 # Build additions to export the source code of vbox{guest,sf,video} to
 # out/linux.*/release/bin/additions/src/
 %{_bindir}/kmk %{?_smp_mflags} \
@ -1235,7 +1239,7 @@ for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp} \
 	    SYMBOLS="$PWD/modules_build_dir/$flavor/vboxguest/Module.symvers"
 	fi
 	# build the module for the specific flavor
-	%make_build -j2 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor %{?linux_make_arch} modules \
+	%make_build -j4 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor %{?linux_make_arch} modules \
 		M=$PWD/modules_build_dir/$flavor/$module_name KBUILD_EXTRA_SYMBOLS="$SYMBOLS" V=1
    done
 done