From c3b92b1f7d7a5d9dfba6bdebecd8cc68283ae0901fca0e97478e1850a581d991 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 20 Jul 2023 17:04:46 +0000 Subject: [PATCH] Accepting request 1099771 from home:larryr:branches:Virtualization Thu July 19 15:24:39 UTC 2023 - Larry Rainey - VirtualBox 7.0.10 (released July 18 2023) This is a maintenance release. The following items were fixed and/or added: OCI: Introduced general improvements VMM: Fixed a bug while walking page tables while executing nested VMs causing flooding of the release log as a consequence (Intel hosts only, bug #21551) GUI: Added general improvements TPM: Fixed a crash when a VM has a TPM version 1.2 configured (bug #21622) 3D: Initial support for OpenGL 4.1 3D: Fixed various graphics issues with Windows 11 guests (bugs #21136, #21515) Guest Control/VBoxManage: Fixed parameter "--ignore-orphaned-processes" Guest Control/VBoxManage: Fixed behavior of how handling argument 0 for a started guest process works: One can now explicitly specify it with the newly added option "--arg0". This will effectively restore the behavior of former VirtualBox versions Audio: Also use the PulseAudio backend when pipewire-pulse is running instead of falling back to ALSA (bug #21575) NAT: Adjusted UDP proxy timeout from 18-21 to 21-24 range to respect intended 20 second timeout (bug #21560) Linux Host: Added initial support for Indirect Branch Tracking (bug #21435) Linux Host: Added initial support for kernel 6.5 (NOTE: Guest Additions do not support kernel 6.5 yet) Linux Host and Guest: Improved condition check when kernel modules need to be signed Linux Host and Guest: Added initial support for RHEL 8.8 (bug #21692), 8.9 (bug #21690) and 9.3 (bugs #21598 and #21671) kernels Linux Guest Additions: Fixed issue when kernel modules were rebuilt on each boot when guest system has no X11 installed Linux Guest Additions: Added initial support for kernel 6.4 Linux Guest Additions: Fixed issue when vboxvideo module reloading caused kernel panic in some guests (bug #21740) Linux Guest Additions: Introduced general improvements in the installer area Windows Guest Additions: Introduced general improvements in graphics drivers area removed "fixes_for_kernel_6.4.patch" as this is fixed upstream Fix issue with kernel on newer CPU (boo#1212209) OBS-URL: https://build.opensuse.org/request/show/1099771 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=702 --- UserManual.pdf | 4 +- VirtualBox-5.2.10-xclient.patch | 6 +- VirtualBox-7.0.10-patched.tar.bz2 | 3 + VirtualBox-7.0.8-patched.tar.bz2 | 3 - fix-missing-includes-with-qt-5.15.patch | 12 +- fix_7.0.6_locking_problems.patch | 6 +- fix_conflict_between_host_and_guest.patch | 6 +- fix_sdl_build.patch | 20 +-- fixes_for_gcc13.patch | 12 +- fixes_for_kernel_6.4.patch | 47 ------- fixes_for_leap15.2.patch | 82 ++++++------ fixes_for_leap15.3.patch | 36 ++--- fixes_for_leap15.4.patch | 6 +- fixes_for_leap15.5.patch | 72 ++++------ fixes_for_makefile.patch | 30 ++--- fixes_for_python.patch | 6 +- fixes_for_qt5.13.patch | 18 +-- fixes_for_sle12.patch | 30 ++--- gcc5-real-support.patch | 8 +- handle_gsoap_208103.patch | 6 +- modify_for_4_8_bo_move.patch | 6 +- python311.patch | 31 ++--- remove_vbox_video_build.patch | 18 +-- security_fixes.patch | 14 +- smap.diff | 6 +- turn_off_cloud_net.patch | 8 +- vbox-default-os-type.diff | 6 +- vbox-deprec-gsoap-service-proxies.diff | 6 +- vbox-disable-updates.diff | 6 +- vbox-fpie.diff | 10 +- vbox-gsoapssl-deps.diff | 6 +- vbox-no-build-dates.diff | 156 +++++++++++----------- vbox-permissions_warning.diff | 14 +- vbox-python-py310.patch | 10 +- vbox-python-selection.patch | 36 ++--- vbox-smc-napa.diff | 6 +- vbox-suid-warning.diff | 14 +- vbox-usb-warning.diff | 14 +- vbox-vboxadd-init-script.diff | 56 ++++---- vbox-vboxdrv-init-script.diff | 30 ++--- virtualbox-sed-params.patch | 14 +- virtualbox.changes | 43 +++++- virtualbox.spec | 6 +- 43 files changed, 445 insertions(+), 484 deletions(-) create mode 100644 VirtualBox-7.0.10-patched.tar.bz2 delete mode 100644 VirtualBox-7.0.8-patched.tar.bz2 delete mode 100644 fixes_for_kernel_6.4.patch diff --git a/UserManual.pdf b/UserManual.pdf index 8bc420e..1eee024 100644 --- a/UserManual.pdf +++ b/UserManual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b0049dd2580ee9b3a74ee8d5b5c83d65583391683c821bddd8f75e15cdb791e -size 4586462 +oid sha256:c0b39f7d5cb1f94327c1d260a08668ec11427ca5be3536945de897a866c4c32b +size 4591275 diff --git a/VirtualBox-5.2.10-xclient.patch b/VirtualBox-5.2.10-xclient.patch index d094424..9fafdc3 100644 --- a/VirtualBox-5.2.10-xclient.patch +++ b/VirtualBox-5.2.10-xclient.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Additions/x11/Installer/98vboxadd-xclient +Index: VirtualBox-7.0.10/src/VBox/Additions/x11/Installer/98vboxadd-xclient =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient -+++ VirtualBox-7.0.8/src/VBox/Additions/x11/Installer/98vboxadd-xclient +--- VirtualBox-7.0.10.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient ++++ VirtualBox-7.0.10/src/VBox/Additions/x11/Installer/98vboxadd-xclient @@ -31,15 +31,9 @@ for i in $HOME/.vboxclient-*.pid; do test -w $i || rm -f $i done diff --git a/VirtualBox-7.0.10-patched.tar.bz2 b/VirtualBox-7.0.10-patched.tar.bz2 new file mode 100644 index 0000000..d56bca7 --- /dev/null +++ b/VirtualBox-7.0.10-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0609ba229ba6ca0cc893977d4c84f3fb6613aa5ed567532536e8f3c8407347d0 +size 153272438 diff --git a/VirtualBox-7.0.8-patched.tar.bz2 b/VirtualBox-7.0.8-patched.tar.bz2 deleted file mode 100644 index 1c11109..0000000 --- a/VirtualBox-7.0.8-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef92b020bd595ac22462d5d6af79f9735cb65234c99b7d5fc048fcea13ee2f30 -size 153315882 diff --git a/fix-missing-includes-with-qt-5.15.patch b/fix-missing-includes-with-qt-5.15.patch index d7607f9..b734b1e 100644 --- a/fix-missing-includes-with-qt-5.15.patch +++ b/fix-missing-includes-with-qt-5.15.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +Index: VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp -+++ VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp ++++ VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp @@ -28,6 +28,7 @@ /* Qt includes: */ #include @@ -10,10 +10,10 @@ Index: VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp #include #include #include -Index: VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +Index: VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h -+++ VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h ++++ VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h @@ -47,7 +47,6 @@ class QIcon; class QLabel; class QMouseEvent; diff --git a/fix_7.0.6_locking_problems.patch b/fix_7.0.6_locking_problems.patch index 0830a3e..e81387a 100644 --- a/fix_7.0.6_locking_problems.patch +++ b/fix_7.0.6_locking_problems.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/HostDrivers/Support/SUPDrvGip.cpp +Index: VirtualBox-7.0.10/src/VBox/HostDrivers/Support/SUPDrvGip.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp -+++ VirtualBox-7.0.8/src/VBox/HostDrivers/Support/SUPDrvGip.cpp +--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp ++++ VirtualBox-7.0.10/src/VBox/HostDrivers/Support/SUPDrvGip.cpp @@ -4537,9 +4537,11 @@ static int supdrvTscDeltaThreadWait(PSUP */ static void supdrvTscDeltaThreadStartMeasurement(PSUPDRVDEVEXT pDevExt, bool fForceAll) diff --git a/fix_conflict_between_host_and_guest.patch b/fix_conflict_between_host_and_guest.patch index 4811363..975d5a6 100644 --- a/fix_conflict_between_host_and_guest.patch +++ b/fix_conflict_between_host_and_guest.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c +Index: VirtualBox-7.0.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c -+++ VirtualBox-7.0.8/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c ++++ VirtualBox-7.0.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c @@ -140,7 +140,7 @@ static struct vboxguest_module_info g_VB RTMemAllocExTag, RTMemContAlloc, diff --git a/fix_sdl_build.patch b/fix_sdl_build.patch index 38e66d8..a3505cb 100644 --- a/fix_sdl_build.patch +++ b/fix_sdl_build.patch @@ -1,8 +1,8 @@ -Index: VirtualBox-7.0.8/configure +Index: VirtualBox-7.0.10/configure =================================================================== ---- VirtualBox-7.0.8.orig/configure -+++ VirtualBox-7.0.8/configure -@@ -1189,21 +1189,19 @@ check_sdl() +--- VirtualBox-7.0.10.orig/configure ++++ VirtualBox-7.0.10/configure +@@ -1191,21 +1191,19 @@ check_sdl() fail fi else @@ -27,7 +27,7 @@ Index: VirtualBox-7.0.8/configure #undef main extern "C" int main(int argc, char** argv) { -@@ -1219,7 +1217,7 @@ extern "C" int main(int argc, char** arg +@@ -1221,7 +1219,7 @@ extern "C" int main(int argc, char** arg } EOF [ -n "$INCSDL" ] && I_INCSDL=`prefix_I "$INCSDL"` @@ -36,8 +36,8 @@ Index: VirtualBox-7.0.8/configure if test_execute; then cnf_append "LIB_SDK_LIBSDL_SDL" "`strip_l "$LIBSDL"`" cnf_append "SDK_LIBSDL_LIBPATH" "`strip_L "$LIBSDL"`" -@@ -2961,11 +2959,8 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then - [ $WITH_LIBTPMS -eq 1 ] && check_libtpms +@@ -3015,11 +3013,8 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then + [ $WITH_LIBLZMA -eq 1 ] && check_liblzma [ "$OS" != "darwin" ] && check_png [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam - if [ $WITH_SDL -eq 1 ]; then @@ -50,10 +50,10 @@ Index: VirtualBox-7.0.8/configure [ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf [ $WITH_X11 -eq 1 ] && check_x # TODO check for xcomposite-dev (X11/extensions/Xcomposite.h, additions only) -Index: VirtualBox-7.0.8/src/VBox/Frontends/VBoxSDL/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/Frontends/VBoxSDL/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/Frontends/VBoxSDL/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/Frontends/VBoxSDL/Makefile.kmk @@ -51,7 +51,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K PROGRAMS += VBoxSDL endif diff --git a/fixes_for_gcc13.patch b/fixes_for_gcc13.patch index e7bc788..0722578 100644 --- a/fixes_for_gcc13.patch +++ b/fixes_for_gcc13.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h +Index: VirtualBox-7.0.10/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h -+++ VirtualBox-7.0.8/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h +--- VirtualBox-7.0.10.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h ++++ VirtualBox-7.0.10/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h @@ -13,6 +13,7 @@ #include #endif @@ -10,10 +10,10 @@ Index: VirtualBox-7.0.8/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h #include "util_likely.h" #include "util_math.h" -Index: VirtualBox-7.0.8/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h +Index: VirtualBox-7.0.10/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h -+++ VirtualBox-7.0.8/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h +--- VirtualBox-7.0.10.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h ++++ VirtualBox-7.0.10/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h @@ -66,6 +66,9 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CO OF THIS SOFTWARE. diff --git a/fixes_for_kernel_6.4.patch b/fixes_for_kernel_6.4.patch deleted file mode 100644 index 507fdf5..0000000 --- a/fixes_for_kernel_6.4.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/sharedfolders/regops.c -=================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/sharedfolders/regops.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -179,7 +179,11 @@ static size_t vbsf_iov_iter_count(struct - { - size_t cbRet = 0; - size_t cLeft = iter->nr_segs; -+#if RTLNX_VER_MIN(6, 4, 0) -+ struct iovec const *iov = iter_iov(iter); -+#else - struct iovec const *iov = iter->iov; -+#endif - while (cLeft-- > 0) { - cbRet += iov->iov_len; - iov++; -@@ -295,8 +299,12 @@ void vbsf_iov_iter_revert(struct vbsf_io - } - - while (cbRewind > 0) { -- struct iovec const *pIov = --iter->iov; -- size_t const cbSeg = pIov->iov_len; -+#if RTLNX_VER_MIN(6, 4, 0) -+ struct iovec const *pIov = --iter_iov(iter); -+#else -+ struct iovec const *pIov = --iter->iov; -+#endif -+ size_t const cbSeg = pIov->iov_len; - iter->nr_segs++; - - Assert((uintptr_t)pIov >= (uintptr_t)iter->iov_org); -@@ -2399,9 +2407,13 @@ static size_t vbsf_iter_max_span_of_page - # if RTLNX_VER_MIN(3,16,0) - if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) { - # endif -+#if RTLNX_VER_MIN(6, 4, 0) -+ const struct iovec *pCurIov = iter_iov(iter); -+#else - const struct iovec *pCurIov = iter->iov; -- size_t cLeft = iter->nr_segs; -- size_t cPagesSpan = 0; -+#endif -+ size_t cLeft = iter->nr_segs; -+ size_t cPagesSpan = 0; - - /* iovect and kvec are identical, except for the __user tagging of iov_base. */ - AssertCompileMembersSameSizeAndOffset(struct iovec, iov_base, struct kvec, iov_base); diff --git a/fixes_for_leap15.2.patch b/fixes_for_leap15.2.patch index 55a2361..d20c0b0 100644 --- a/fixes_for_leap15.2.patch +++ b/fixes_for_leap15.2.patch @@ -1,8 +1,8 @@ -Index: VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +Index: VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -+++ VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -@@ -86,6 +86,10 @@ +--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +@@ -89,6 +89,10 @@ #define VBOXNETFLT_OS_SPECFIC 1 #include "../VBoxNetFltInternal.h" @@ -13,10 +13,10 @@ Index: VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c typedef struct VBOXNETFLTNOTIFIER { struct notifier_block Notifier; PVBOXNETFLTINS pThis; -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-7.0.10/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-7.0.8/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-7.0.8/src/VBox/Additions/linux/drm/vbox_main.c +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_main.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_main.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_main.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_main.c ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_main.c @@ -663,8 +663,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,10 +53,10 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_main.c } int -Index: VirtualBox-7.0.8/include/iprt/cdefs.h +Index: VirtualBox-7.0.10/include/iprt/cdefs.h =================================================================== ---- VirtualBox-7.0.8.orig/include/iprt/cdefs.h -+++ VirtualBox-7.0.8/include/iprt/cdefs.h +--- VirtualBox-7.0.10.orig/include/iprt/cdefs.h ++++ VirtualBox-7.0.10/include/iprt/cdefs.h @@ -1399,14 +1399,15 @@ #if RT_CLANG_PREREQ(4, 0) && RT_CPLUSPLUS_PREREQ(201100) # define RT_FALL_THROUGH() [[clang::fallthrough]] @@ -76,10 +76,10 @@ Index: VirtualBox-7.0.8/include/iprt/cdefs.h /** @def RT_IPRT_FORMAT_ATTR -Index: VirtualBox-7.0.8/kBuild/header.kmk +Index: VirtualBox-7.0.10/kBuild/header.kmk =================================================================== ---- VirtualBox-7.0.8.orig/kBuild/header.kmk -+++ VirtualBox-7.0.8/kBuild/header.kmk +--- VirtualBox-7.0.10.orig/kBuild/header.kmk ++++ VirtualBox-7.0.10/kBuild/header.kmk @@ -764,7 +764,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm RMDIR_INT := kmk_builtin_rmdir RMDIR := $(RMDIR_INT) @@ -89,11 +89,11 @@ Index: VirtualBox-7.0.8/kBuild/header.kmk SED_INT := $(SED_EXT) SED := $(SED_EXT) -Index: VirtualBox-7.0.8/configure +Index: VirtualBox-7.0.10/configure =================================================================== ---- VirtualBox-7.0.8.orig/configure -+++ VirtualBox-7.0.8/configure -@@ -2000,7 +2000,7 @@ check_kbuild() +--- VirtualBox-7.0.10.orig/configure ++++ VirtualBox-7.0.10/configure +@@ -2041,7 +2041,7 @@ check_kbuild() fi echo "export KBUILD_PATH KBUILD_DEVTOOLS PATH" >> $ENV echo "unset path_kbuild_bin path_tools_bin" >> $ENV @@ -102,7 +102,7 @@ Index: VirtualBox-7.0.8/configure echo '' >> $ENV echo "# Legacy - do not use:" >> $ENV -@@ -2010,7 +2010,7 @@ check_kbuild() +@@ -2051,7 +2051,7 @@ check_kbuild() echo '' >> $ENV elif check_avail "kmk" KBUILDDIR really; then # check for installed kBuild @@ -111,10 +111,10 @@ Index: VirtualBox-7.0.8/configure else fail fi -Index: VirtualBox-7.0.8/tools/bin/backport-commit.sh +Index: VirtualBox-7.0.10/tools/bin/backport-commit.sh =================================================================== ---- VirtualBox-7.0.8.orig/tools/bin/backport-commit.sh -+++ VirtualBox-7.0.8/tools/bin/backport-commit.sh +--- VirtualBox-7.0.10.orig/tools/bin/backport-commit.sh ++++ VirtualBox-7.0.10/tools/bin/backport-commit.sh @@ -29,7 +29,7 @@ # # Determin script dir so we can source the common bits. @@ -124,10 +124,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/tools/bin/backport-common.sh +Index: VirtualBox-7.0.10/tools/bin/backport-common.sh =================================================================== ---- VirtualBox-7.0.8.orig/tools/bin/backport-common.sh -+++ VirtualBox-7.0.8/tools/bin/backport-common.sh +--- VirtualBox-7.0.10.orig/tools/bin/backport-common.sh ++++ VirtualBox-7.0.10/tools/bin/backport-common.sh @@ -1,4 +1,4 @@ -# $Id: backport-common.sh $ + $Id: backport-common.sh $ @@ -143,10 +143,10 @@ Index: VirtualBox-7.0.8/tools/bin/backport-common.sh # # Functions. -Index: VirtualBox-7.0.8/tools/bin/backport-merge-and-commit.sh +Index: VirtualBox-7.0.10/tools/bin/backport-merge-and-commit.sh =================================================================== ---- VirtualBox-7.0.8.orig/tools/bin/backport-merge-and-commit.sh -+++ VirtualBox-7.0.8/tools/bin/backport-merge-and-commit.sh +--- VirtualBox-7.0.10.orig/tools/bin/backport-merge-and-commit.sh ++++ VirtualBox-7.0.10/tools/bin/backport-merge-and-commit.sh @@ -29,7 +29,7 @@ # # Determin script dir so we can invoke the two worker scripts. @@ -156,10 +156,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/tools/bin/backport-merge.sh +Index: VirtualBox-7.0.10/tools/bin/backport-merge.sh =================================================================== ---- VirtualBox-7.0.8.orig/tools/bin/backport-merge.sh -+++ VirtualBox-7.0.8/tools/bin/backport-merge.sh +--- VirtualBox-7.0.10.orig/tools/bin/backport-merge.sh ++++ VirtualBox-7.0.10/tools/bin/backport-merge.sh @@ -29,7 +29,7 @@ # # Determin script dir so we can source the common bits. @@ -169,11 +169,11 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/VBox/Main/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/Main/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Main/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/Main/Makefile.kmk -@@ -267,7 +267,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE +--- VirtualBox-7.0.10.orig/src/VBox/Main/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/Main/Makefile.kmk +@@ -264,7 +264,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) @@ -182,11 +182,11 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/VBox/Runtime/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/Runtime/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Runtime/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/Runtime/Makefile.kmk -@@ -4411,6 +4411,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V +--- VirtualBox-7.0.10.orig/src/VBox/Runtime/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/Runtime/Makefile.kmk +@@ -4421,6 +4421,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V # # Generate the status code data. # diff --git a/fixes_for_leap15.3.patch b/fixes_for_leap15.3.patch index b831405..cbaa689 100644 --- a/fixes_for_leap15.3.patch +++ b/fixes_for_leap15.3.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +Index: VirtualBox-7.0.10/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -+++ VirtualBox-7.0.8/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +--- VirtualBox-7.0.10.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h ++++ VirtualBox-7.0.10/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h @@ -147,9 +147,9 @@ #include #include @@ -14,10 +14,10 @@ Index: VirtualBox-7.0.8/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h #if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38) # include #endif -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyXPCOM.h +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyXPCOM.h =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyXPCOM.h +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyXPCOM.h @@ -191,7 +191,7 @@ extern "C" PyAPI_FUNC(const char *) PyUn # endif @@ -27,10 +27,10 @@ Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyXPCOM.h DECLINLINE(int) PyRun_SimpleString(const char *pszCode) { -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/ErrorUtils.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp ++++ VirtualBox-7.0.10/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); @@ -58,10 +58,10 @@ Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/ErrorUtils.cpp #endif Py_DECREF(temp); } else -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyGBase.cpp +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyGBase.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyGBase.cpp +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp ++++ VirtualBox-7.0.10/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); @@ -71,10 +71,10 @@ Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyGBase.cpp #endif if (szRepr==NULL) szRepr = ""; int reprOffset = *szRepr=='<' ? 1 : 0; -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyIID.cpp +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyIID.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/PyIID.cpp -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyIID.cpp +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/PyIID.cpp ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyIID.cpp @@ -137,7 +137,7 @@ Py_nsIID::IIDFromPyObject(PyObject *ob, ok = iid.Parse(PyString_AsString(ob)); #else @@ -84,10 +84,10 @@ Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyIID.cpp #endif if (!ok) { PyXPCOM_BuildPyException(NS_ERROR_ILLEGAL_VALUE); -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/VariantUtils.cpp +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/VariantUtils.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/VariantUtils.cpp +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp ++++ VirtualBox-7.0.10/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); diff --git a/fixes_for_leap15.4.patch b/fixes_for_leap15.4.patch index 58dda2d..9ea47a1 100644 --- a/fixes_for_leap15.4.patch +++ b/fixes_for_leap15.4.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp +Index: VirtualBox-7.0.10/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp -+++ VirtualBox-7.0.8/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp ++++ VirtualBox-7.0.10/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp @@ -710,7 +710,7 @@ static const char *keyModToStr(unsigned RT_CASE_RET_STR(KMOD_NUM); RT_CASE_RET_STR(KMOD_CAPS); diff --git a/fixes_for_leap15.5.patch b/fixes_for_leap15.5.patch index 829d1f8..5a168e7 100644 --- a/fixes_for_leap15.5.patch +++ b/fixes_for_leap15.5.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.h -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h @@ -166,9 +166,9 @@ # include # include @@ -15,20 +15,18 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h # include #else /* < 5.5.0 || RHEL < 8.3 || SLES < 15-SP3 */ # include -@@ -198,9 +198,7 @@ - # include - #endif +@@ -200,7 +200,6 @@ --#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2) + #if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2) # include -#endif #include "vboxvideo_guest.h" #include "vboxvideo_vbe.h" -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.c @@ -52,7 +52,7 @@ /** Detect whether kernel mode setting is OFF. */ @@ -47,10 +45,10 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c .irq_handler = vbox_irq_handler, #endif .name = DRIVER_NAME, -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_irq.c +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_irq.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_irq.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_irq.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_irq.c ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_irq.c @@ -205,21 +205,11 @@ int vbox_irq_init(struct vbox_private *v { INIT_WORK(&vbox->hotplug_work, vbox_hotplug_worker); @@ -73,15 +71,13 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_irq.c -#endif flush_work(&vbox->hotplug_work); } -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_ttm.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c -@@ -321,16 +321,7 @@ static struct ttm_tt *vbox_ttm_tt_create - #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_RANGE(8,5, 8,99) - tt->func = &vbox_tt_backend_func; +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c +@@ -323,14 +323,6 @@ static struct ttm_tt *vbox_ttm_tt_create #endif --#if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_MAJ_PREREQ(9,2) + #if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2) if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) { -#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) - if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) { @@ -94,7 +90,7 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c kfree(tt); return NULL; } -@@ -628,11 +619,7 @@ int vbox_bo_create(struct drm_device *de +@@ -628,11 +620,7 @@ int vbox_bo_create(struct drm_device *de drm_vma_node_reset(&vboxbo->bo.base.vma_node); #endif @@ -106,24 +102,10 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c 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) && !defined(SUSE_SLE12) align >> PAGE_SHIFT, false, NULL, acc_size, -Index: VirtualBox-7.0.8/src/libs/openssl-3.0.7/Config.kmk +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_fb.c =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/openssl-3.0.7/Config.kmk -+++ VirtualBox-7.0.8/src/libs/openssl-3.0.7/Config.kmk -@@ -247,9 +247,6 @@ ifneq ($(KBUILD_TARGET),win) - TEMPLATE_LibCrypto_ASFLAGS.amd64 = -m64 - TEMPLATE_LibCrypto_ASDEFS = $(NO_SUCH_VARIABLE) - TEMPLATE_LibCrypto_ASDEFS.darwin = OPENSSL_MANGLE_ASM -- if "$(VBOX_AS_VERSION)" != "" && "$(VBOX_AS_VERSION)" vlt "GNU assembler version 2.20" -- TEMPLATE_LibCrypto_ASFLAGS.solaris = -include $(VBOX_PATH_OPENSSL)/crypto/old-solaris-asm-trick.h -- endif - endif - - TEMPLATE_LibCrypto_DEFS = \ -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_fb.c -=================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_fb.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_fb.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_fb.c ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_fb.c @@ -47,6 +47,7 @@ #include #include @@ -132,10 +114,10 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_fb.c #include -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_mode.c +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_mode.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_mode.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_mode.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_mode.c ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_mode.c @@ -39,10 +39,8 @@ #include "vbox_drv.h" #include @@ -148,17 +130,17 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_mode.c # include #endif @@ -53,6 +51,7 @@ - #if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2) + #if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2) # include #endif +#include #include "VBoxVideo.h" -Index: VirtualBox-7.0.8/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp +Index: VirtualBox-7.0.10/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp -+++ VirtualBox-7.0.8/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp ++++ VirtualBox-7.0.10/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp @@ -710,7 +710,7 @@ static const char *keyModToStr(unsigned RT_CASE_RET_STR(KMOD_NUM); RT_CASE_RET_STR(KMOD_CAPS); diff --git a/fixes_for_makefile.patch b/fixes_for_makefile.patch index 68c7a44..4fe58f3 100644 --- a/fixes_for_makefile.patch +++ b/fixes_for_makefile.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/HostDrivers/linux/Makefile +Index: VirtualBox-7.0.10/src/VBox/HostDrivers/linux/Makefile =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/linux/Makefile -+++ VirtualBox-7.0.8/src/VBox/HostDrivers/linux/Makefile +--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/linux/Makefile ++++ VirtualBox-7.0.10/src/VBox/HostDrivers/linux/Makefile @@ -43,11 +43,8 @@ obj-m = vboxdrv/ obj-m += vboxnetflt/ endif @@ -140,10 +140,10 @@ Index: VirtualBox-7.0.8/src/VBox/HostDrivers/linux/Makefile if test -f $$module.ko; then \ echo "Installing $$module module"; \ $(SUDO) /sbin/insmod $$module.ko; \ -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/Makefile +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/Makefile =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/Makefile -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/Makefile +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/Makefile ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/Makefile @@ -34,6 +34,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/ else # ! KERNELRELEASE @@ -184,10 +184,10 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/Makefile $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \ fi -Index: VirtualBox-7.0.8/include/iprt/x86.h +Index: VirtualBox-7.0.10/include/iprt/x86.h =================================================================== ---- VirtualBox-7.0.8.orig/include/iprt/x86.h -+++ VirtualBox-7.0.8/include/iprt/x86.h +--- VirtualBox-7.0.10.orig/include/iprt/x86.h ++++ VirtualBox-7.0.10/include/iprt/x86.h @@ -894,37 +894,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI * reserved flags. * @{ */ @@ -793,10 +793,10 @@ Index: VirtualBox-7.0.8/include/iprt/x86.h /** SMM MSRs. */ #define MSR_K7_SMBASE UINT32_C(0xc0010111) -Index: VirtualBox-7.0.8/include/VBox/vmm/hm_vmx.h +Index: VirtualBox-7.0.10/include/VBox/vmm/hm_vmx.h =================================================================== ---- VirtualBox-7.0.8.orig/include/VBox/vmm/hm_vmx.h -+++ VirtualBox-7.0.8/include/VBox/vmm/hm_vmx.h +--- VirtualBox-7.0.10.orig/include/VBox/vmm/hm_vmx.h ++++ VirtualBox-7.0.10/include/VBox/vmm/hm_vmx.h @@ -1633,7 +1633,9 @@ AssertCompileSize(VMXABORT, 4); /** VMCS (and related regions) memory type - Uncacheable. */ #define VMX_BASIC_MEM_TYPE_UC 0 @@ -807,10 +807,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.h -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h @@ -87,6 +87,12 @@ #else # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) diff --git a/fixes_for_python.patch b/fixes_for_python.patch index 29f6704..5735b7e 100644 --- a/fixes_for_python.patch +++ b/fixes_for_python.patch @@ -6,10 +6,10 @@ to "#!/usr/bin/python3". Larry Finger -Index: VirtualBox-7.0.8/src/VBox/Frontends/VBoxShell/vboxshell.py +Index: VirtualBox-7.0.10/src/VBox/Frontends/VBoxShell/vboxshell.py =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Frontends/VBoxShell/vboxshell.py -+++ VirtualBox-7.0.8/src/VBox/Frontends/VBoxShell/vboxshell.py +--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VBoxShell/vboxshell.py ++++ VirtualBox-7.0.10/src/VBox/Frontends/VBoxShell/vboxshell.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 diff --git a/fixes_for_qt5.13.patch b/fixes_for_qt5.13.patch index f6468b6..6d40bff 100644 --- a/fixes_for_qt5.13.patch +++ b/fixes_for_qt5.13.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/include/VBox/VBoxGL2D.h +Index: VirtualBox-7.0.10/include/VBox/VBoxGL2D.h =================================================================== ---- VirtualBox-7.0.8.orig/include/VBox/VBoxGL2D.h -+++ VirtualBox-7.0.8/include/VBox/VBoxGL2D.h +--- VirtualBox-7.0.10.orig/include/VBox/VBoxGL2D.h ++++ VirtualBox-7.0.10/include/VBox/VBoxGL2D.h @@ -123,7 +123,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN /* GL_ARB_pixel_buffer_object*/ #ifndef Q_WS_MAC @@ -11,10 +11,10 @@ Index: VirtualBox-7.0.8/include/VBox/VBoxGL2D.h #endif #ifndef GL_READ_ONLY -Index: VirtualBox-7.0.8/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h +Index: VirtualBox-7.0.10/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h -+++ VirtualBox-7.0.8/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h +--- VirtualBox-7.0.10.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h ++++ VirtualBox-7.0.10/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h @@ -466,7 +466,12 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 @@ -28,10 +28,10 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext. typedef khronos_intptr_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-7.0.8/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +Index: VirtualBox-7.0.10/src/VBox/Devices/Graphics/vmsvga_glext/glext.h =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h -+++ VirtualBox-7.0.8/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +--- VirtualBox-7.0.10.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h ++++ VirtualBox-7.0.10/src/VBox/Devices/Graphics/vmsvga_glext/glext.h @@ -4680,6 +4680,14 @@ GLAPI void APIENTRY glWeightuivARB (GLin GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer); GLAPI void APIENTRY glVertexBlendARB (GLint count); diff --git a/fixes_for_sle12.patch b/fixes_for_sle12.patch index 8f07862..68d0300 100644 --- a/fixes_for_sle12.patch +++ b/fixes_for_sle12.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-7.0.10/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-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c # endif #endif -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_main.c +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_main.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_main.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_main.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_main.c ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_main.c @@ -626,11 +626,13 @@ int vbox_dumb_destroy(struct drm_file *f #endif @@ -30,10 +30,10 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_main.c void vbox_gem_free_object(struct drm_gem_object *obj) { -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_ttm.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_ttm.c @@ -302,7 +302,7 @@ static struct ttm_backend_func vbox_tt_b }; #endif @@ -124,10 +124,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.h -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_drv.h @@ -87,6 +87,9 @@ #else # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) @@ -138,10 +138,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/VBox/Additions/linux/drm/vbox_mode.c +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_mode.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_mode.c -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_mode.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/drm/vbox_mode.c ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/drm/vbox_mode.c @@ -556,7 +556,8 @@ static void vbox_set_edid(struct drm_con for (i = 0; i < EDID_SIZE - 1; ++i) sum += edid[i]; diff --git a/gcc5-real-support.patch b/gcc5-real-support.patch index 4983bca..629109f 100644 --- a/gcc5-real-support.patch +++ b/gcc5-real-support.patch @@ -1,8 +1,8 @@ -Index: VirtualBox-7.0.8/configure +Index: VirtualBox-7.0.10/configure =================================================================== ---- VirtualBox-7.0.8.orig/configure -+++ VirtualBox-7.0.8/configure -@@ -473,8 +473,13 @@ check_gcc() +--- VirtualBox-7.0.10.orig/configure ++++ VirtualBox-7.0.10/configure +@@ -475,8 +475,13 @@ check_gcc() log_failure "cannot execute '$CXX -dumpversion'" fail really fi diff --git a/handle_gsoap_208103.patch b/handle_gsoap_208103.patch index dd1b77b..85a8085 100644 --- a/handle_gsoap_208103.patch +++ b/handle_gsoap_208103.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Main/webservice/vboxweb.cpp +Index: VirtualBox-7.0.10/src/VBox/Main/webservice/vboxweb.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Main/webservice/vboxweb.cpp -+++ VirtualBox-7.0.8/src/VBox/Main/webservice/vboxweb.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Main/webservice/vboxweb.cpp ++++ VirtualBox-7.0.10/src/VBox/Main/webservice/vboxweb.cpp @@ -955,9 +955,9 @@ static void doQueuesLoop() continue; // timeout, not necessary to bother gsoap // r < 0, errno diff --git a/modify_for_4_8_bo_move.patch b/modify_for_4_8_bo_move.patch index bbe21b6..d9bdb96 100644 --- a/modify_for_4_8_bo_move.patch +++ b/modify_for_4_8_bo_move.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +Index: VirtualBox-7.0.10/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c -+++ VirtualBox-7.0.8/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +--- VirtualBox-7.0.10.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c ++++ VirtualBox-7.0.10/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c @@ -45,7 +45,7 @@ #include #include diff --git a/python311.patch b/python311.patch index 4c187a7..627531e 100644 --- a/python311.patch +++ b/python311.patch @@ -1,20 +1,20 @@ -Index: VirtualBox-7.0.8/configure +Index: VirtualBox-7.0.10/configure =================================================================== ---- VirtualBox-7.0.8.orig/configure -+++ VirtualBox-7.0.8/configure -@@ -2137,7 +2137,7 @@ extern "C" int main(void) +--- VirtualBox-7.0.10.orig/configure ++++ VirtualBox-7.0.10/configure +@@ -2178,7 +2178,7 @@ extern "C" int main(void) } EOF found= -- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m" -+ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m python3.11 python3.11m" +- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.9 python3.10 python3.11 python3.12" ++ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.9 python3.10 python3.11 python3.12 python3.11 python3.11m" for p in $PYTHONDIR; do for d in $SUPPYTHONLIBS; do for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do -Index: VirtualBox-7.0.8/src/VBox/Installer/linux/routines.sh +Index: VirtualBox-7.0.10/src/VBox/Installer/linux/routines.sh =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Installer/linux/routines.sh -+++ VirtualBox-7.0.8/src/VBox/Installer/linux/routines.sh +--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/routines.sh ++++ VirtualBox-7.0.10/src/VBox/Installer/linux/routines.sh @@ -444,7 +444,7 @@ maybe_run_python_bindings_installer() { # the VirtualBox API bindings. Needs to prevent double installs which waste # quite a bit of time. @@ -24,16 +24,3 @@ Index: VirtualBox-7.0.8/src/VBox/Installer/linux/routines.sh if [ "`$p -c 'import sys if sys.version_info >= (2, 6) and (sys.version_info < (3, 0) or sys.version_info >= (3, 3)): print(\"test\")' 2> /dev/null`" != "test" ]; then -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/Makefile.kmk -=================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/Makefile.kmk -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/Makefile.kmk -@@ -753,7 +753,7 @@ ifdef VBOX_PYTHONDEF_INC - # TODO: ASSUMING that we don't need a different headers for pymalloc - # ('m' builds < 3.8) and CRT malloc. - # -- VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 34 33 \ -+ VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 311 34 33 \ - ,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,))) - ifneq ($(VBOX_PYTHON_LIMITED_API_VER),) - DLLS += VBoxPython3 diff --git a/remove_vbox_video_build.patch b/remove_vbox_video_build.patch index 54af899..196ba7c 100644 --- a/remove_vbox_video_build.patch +++ b/remove_vbox_video_build.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/Makefile.kmk +Index: VirtualBox-7.0.10/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/Makefile.kmk -+++ VirtualBox-7.0.8/Makefile.kmk +--- VirtualBox-7.0.10.orig/Makefile.kmk ++++ VirtualBox-7.0.10/Makefile.kmk @@ -824,7 +824,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \ src/VBox/Additions/x11/vboxmouse \ src/VBox/Additions/x11/vboxmouse/xorg70 \ @@ -10,10 +10,10 @@ Index: VirtualBox-7.0.8/Makefile.kmk src/VBox/NetworkServices \ src/VBox/NetworkServices/Dhcpd \ src/VBox/NetworkServices/NAT \ -Index: VirtualBox-7.0.8/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -404,7 +404,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,10 +24,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/VBox/Additions/x11/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/Additions/x11/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/x11/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/Additions/x11/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/VBox/Additions/x11/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/Additions/x11/Makefile.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 diff --git a/security_fixes.patch b/security_fixes.patch index 2b6d877..cf54b70 100644 --- a/security_fixes.patch +++ b/security_fixes.patch @@ -5,11 +5,11 @@ # # January 31, 2019 - Larry Finger # -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh -@@ -1109,9 +1109,11 @@ dmnstatus() +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd.sh +@@ -1228,9 +1228,11 @@ dmnstatus() fi } @@ -24,10 +24,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/VBox/Installer/linux/vboxdrv.sh +Index: VirtualBox-7.0.10/src/VBox/Installer/linux/vboxdrv.sh =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Installer/linux/vboxdrv.sh -+++ VirtualBox-7.0.8/src/VBox/Installer/linux/vboxdrv.sh +--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/vboxdrv.sh ++++ VirtualBox-7.0.10/src/VBox/Installer/linux/vboxdrv.sh @@ -48,6 +48,9 @@ DEVICE=/dev/vboxdrv MODPROBE=/sbin/modprobe SCRIPTNAME=vboxdrv.sh diff --git a/smap.diff b/smap.diff index 2827f9d..207958b 100644 --- a/smap.diff +++ b/smap.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +Index: VirtualBox-7.0.10/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -+++ VirtualBox-7.0.8/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c ++++ VirtualBox-7.0.10/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c @@ -61,6 +61,12 @@ # include # define VBOX_WITH_SUSPEND_NOTIFICATION diff --git a/turn_off_cloud_net.patch b/turn_off_cloud_net.patch index e5a6e67..c21b7a4 100644 --- a/turn_off_cloud_net.patch +++ b/turn_off_cloud_net.patch @@ -1,8 +1,8 @@ -Index: VirtualBox-7.0.8/Config.kmk +Index: VirtualBox-7.0.10/Config.kmk =================================================================== ---- VirtualBox-7.0.8.orig/Config.kmk -+++ VirtualBox-7.0.8/Config.kmk -@@ -972,11 +972,9 @@ if1of ($(KBUILD_TARGET), freebsd linux) +--- VirtualBox-7.0.10.orig/Config.kmk ++++ VirtualBox-7.0.10/Config.kmk +@@ -981,11 +981,9 @@ if1of ($(KBUILD_TARGET), freebsd linux) endif # Use new VBoxNetDhcpd instead of old VBoxNetDHCP VBOX_WITH_DHCPD = 1 diff --git a/vbox-default-os-type.diff b/vbox-default-os-type.diff index fab7c00..4b93bbe 100644 --- a/vbox-default-os-type.diff +++ b/vbox-default-os-type.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp +Index: VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp -+++ VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp ++++ VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp @@ -397,15 +397,15 @@ void UINameAndSystemEditor::sltFamilyCha if (iIndexWin10 != -1) m_pComboType->setCurrentIndex(iIndexWin10); diff --git a/vbox-deprec-gsoap-service-proxies.diff b/vbox-deprec-gsoap-service-proxies.diff index 288290f..556ddd6 100644 --- a/vbox-deprec-gsoap-service-proxies.diff +++ b/vbox-deprec-gsoap-service-proxies.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Main/webservice/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/Main/webservice/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Main/webservice/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/Main/webservice/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/VBox/Main/webservice/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/Main/webservice/Makefile.kmk @@ -848,7 +848,7 @@ ifdef VBOX_GSOAP_INSTALLED $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT)) diff --git a/vbox-disable-updates.diff b/vbox-disable-updates.diff index 13d6003..f259ea2 100644 --- a/vbox-disable-updates.diff +++ b/vbox-disable-updates.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +Index: VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -+++ VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp ++++ VirtualBox-7.0.10/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp @@ -98,8 +98,6 @@ void UISettingsDialogGlobal::retranslate m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input")); diff --git a/vbox-fpie.diff b/vbox-fpie.diff index eba64f3..79bc461 100644 --- a/vbox-fpie.diff +++ b/vbox-fpie.diff @@ -1,8 +1,8 @@ -Index: VirtualBox-7.0.8/Config.kmk +Index: VirtualBox-7.0.10/Config.kmk =================================================================== ---- VirtualBox-7.0.8.orig/Config.kmk -+++ VirtualBox-7.0.8/Config.kmk -@@ -6749,6 +6749,9 @@ TEMPLATE_VBoxR3HardenedExe_LDFLAGS.darwi +--- VirtualBox-7.0.10.orig/Config.kmk ++++ VirtualBox-7.0.10/Config.kmk +@@ -6778,6 +6778,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,7 +12,7 @@ Index: VirtualBox-7.0.8/Config.kmk endif ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBoxR3HardenedExe_SDKS = VBoxNtDll $(TEMPLATE_VBoxR3Exe_SDKS) -@@ -6781,8 +6784,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! +@@ -6810,8 +6813,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBoxR3HardenedExe_VBOX_IMPORT_CHECKER.win = noimports else ifn1of ($(KBUILD_TARGET), os2) ifneq ($(KBUILD_TYPE),asan) # Keep RPATH in asan builds so we can find libasan.so.X and libubsan.so.Y. diff --git a/vbox-gsoapssl-deps.diff b/vbox-gsoapssl-deps.diff index aa03434..f6d6ef1 100644 --- a/vbox-gsoapssl-deps.diff +++ b/vbox-gsoapssl-deps.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Main/webservice/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/Main/webservice/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Main/webservice/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/Main/webservice/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/VBox/Main/webservice/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/Main/webservice/Makefile.kmk @@ -412,11 +412,12 @@ ifdef VBOX_GSOAP_INSTALLED endif endif diff --git a/vbox-no-build-dates.diff b/vbox-no-build-dates.diff index 332bf21..9b98f02 100644 --- a/vbox-no-build-dates.diff +++ b/vbox-no-build-dates.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +Index: VirtualBox-7.0.10/src/VBox/Frontends/VBoxFB/VBoxFB.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp -+++ VirtualBox-7.0.8/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp ++++ VirtualBox-7.0.10/src/VBox/Frontends/VBoxFB/VBoxFB.cpp @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) printf("VirtualBox DirectFB GUI built %s %s\n" @@ -11,10 +11,10 @@ Index: VirtualBox-7.0.8/src/VBox/Frontends/VBoxFB/VBoxFB.cpp fputs("\nWARNING! Unmaintained code.\nWARNING! Needs fixing & debugging!\n\n", stdout); -Index: VirtualBox-7.0.8/src/VBox/Runtime/common/string/uniread.cpp +Index: VirtualBox-7.0.10/src/VBox/Runtime/common/string/uniread.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Runtime/common/string/uniread.cpp -+++ VirtualBox-7.0.8/src/VBox/Runtime/common/string/uniread.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Runtime/common/string/uniread.cpp ++++ VirtualBox-7.0.10/src/VBox/Runtime/common/string/uniread.cpp @@ -1049,7 +1049,7 @@ int PrintHeader(const char *argv0, const " * IPRT - Unicode Tables.\n" " *\n" @@ -24,10 +24,10 @@ Index: VirtualBox-7.0.8/src/VBox/Runtime/common/string/uniread.cpp " */\n" "\n" "/*\n" -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -50,10 +50,10 @@ Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c ++++ VirtualBox-7.0.10/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-7.0.8/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -99,10 +99,10 @@ Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -125,10 +125,10 @@ Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-7.0.8/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +Index: VirtualBox-7.0.10/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp -+++ VirtualBox-7.0.8/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp ++++ VirtualBox-7.0.10/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp @@ -327,7 +327,7 @@ static int vboxInitLogging(const char *p #endif "Log opened %s\n", @@ -138,10 +138,10 @@ Index: VirtualBox-7.0.8/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.c vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-7.0.8/src/VBox/Devices/PC/BIOS/bios.c +Index: VirtualBox-7.0.10/src/VBox/Devices/PC/BIOS/bios.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Devices/PC/BIOS/bios.c -+++ VirtualBox-7.0.8/src/VBox/Devices/PC/BIOS/bios.c +--- VirtualBox-7.0.10.orig/src/VBox/Devices/PC/BIOS/bios.c ++++ VirtualBox-7.0.10/src/VBox/Devices/PC/BIOS/bios.c @@ -164,7 +164,7 @@ void set_mode(uint8_t mode); #define BX_PCIBIOS 1 @@ -151,10 +151,10 @@ Index: VirtualBox-7.0.8/src/VBox/Devices/PC/BIOS/bios.c //-------------------------------------------------------------------------- // print_bios_banner // displays a the bios version -Index: VirtualBox-7.0.8/src/VBox/Additions/common/VBoxService/VBoxService.cpp +Index: VirtualBox-7.0.10/src/VBox/Additions/common/VBoxService/VBoxService.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp -+++ VirtualBox-7.0.8/src/VBox/Additions/common/VBoxService/VBoxService.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp ++++ VirtualBox-7.0.10/src/VBox/Additions/common/VBoxService/VBoxService.cpp @@ -255,7 +255,7 @@ static DECLCALLBACK(void) vgsvcLogHeader "VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n" "Log opened %s\n", @@ -164,10 +164,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk @@ -193,7 +193,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature @@ -177,10 +177,10 @@ Index: VirtualBox-7.0.8/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk # Clean up $(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/ -Index: VirtualBox-7.0.8/src/VBox/ExtPacks/Skeleton/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/ExtPacks/Skeleton/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/ExtPacks/Skeleton/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk ++++ VirtualBox-7.0.10/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,10 +190,10 @@ Index: VirtualBox-7.0.8/src/VBox/ExtPacks/Skeleton/Makefile.kmk # Clean up $(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/ -Index: VirtualBox-7.0.8/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk @@ -354,7 +354,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature @@ -203,10 +203,10 @@ Index: VirtualBox-7.0.8/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk # Clean up $(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/ -Index: VirtualBox-7.0.8/src/VBox/ExtPacks/VNC/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/ExtPacks/VNC/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/ExtPacks/VNC/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/ExtPacks/VNC/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/VBox/ExtPacks/VNC/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/ExtPacks/VNC/Makefile.kmk @@ -164,7 +164,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature @@ -216,10 +216,10 @@ Index: VirtualBox-7.0.8/src/VBox/ExtPacks/VNC/Makefile.kmk # Clean up $(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/ -Index: VirtualBox-7.0.8/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +Index: VirtualBox-7.0.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp -+++ VirtualBox-7.0.8/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp ++++ VirtualBox-7.0.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp @@ -329,7 +329,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv } VGDrvCommonInitLoggers(); @@ -229,10 +229,10 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp /* * Check if the NT version is supported and initialize g_enmVGDrvNtVer. -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp @@ -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", @@ -242,10 +242,10 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cp int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-7.0.8/src/VBox/Additions/solaris/Mouse/vboxms.c +Index: VirtualBox-7.0.10/src/VBox/Additions/solaris/Mouse/vboxms.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/solaris/Mouse/vboxms.c -+++ VirtualBox-7.0.8/src/VBox/Additions/solaris/Mouse/vboxms.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/solaris/Mouse/vboxms.c ++++ VirtualBox-7.0.10/src/VBox/Additions/solaris/Mouse/vboxms.c @@ -266,7 +266,7 @@ static VBMSSTATE g_OpenNodeSt int _init(void) { @@ -255,10 +255,10 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/solaris/Mouse/vboxms.c mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL); /* * Prevent module autounloading. -Index: VirtualBox-7.0.8/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c +Index: VirtualBox-7.0.10/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c -+++ VirtualBox-7.0.8/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c +--- VirtualBox-7.0.10.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c ++++ VirtualBox-7.0.10/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c @@ -251,10 +251,10 @@ Returns: UTILITY_NAME, UTILITY_MAJOR_VERSION, @@ -272,10 +272,10 @@ Index: VirtualBox-7.0.8/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo Usage (); return -1; } -Index: VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +Index: VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp -+++ VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp ++++ VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp @@ -128,7 +128,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject) { @@ -294,10 +294,10 @@ Index: VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp NTSTATUS Status = vboxUsbRtGlobalsInit(); Assert(Status == STATUS_SUCCESS); -Index: VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +Index: VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp -+++ VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +--- VirtualBox-7.0.10.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp ++++ VirtualBox-7.0.10/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp @@ -1518,7 +1518,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB RTLogDestinations(0, "debugger"); #endif @@ -307,10 +307,10 @@ Index: VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals)); -Index: VirtualBox-7.0.8/src/VBox/Main/glue/VBoxLogRelCreate.cpp +Index: VirtualBox-7.0.10/src/VBox/Main/glue/VBoxLogRelCreate.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp -+++ VirtualBox-7.0.8/src/VBox/Main/glue/VBoxLogRelCreate.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp ++++ VirtualBox-7.0.10/src/VBox/Main/glue/VBoxLogRelCreate.cpp @@ -71,7 +71,7 @@ static DECLCALLBACK(void) vboxHeaderFoot #endif "Log opened %s\n", @@ -320,10 +320,10 @@ Index: VirtualBox-7.0.8/src/VBox/Main/glue/VBoxLogRelCreate.cpp pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE); int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c ++++ VirtualBox-7.0.10/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-7.0.8/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c printf("Depend.c build time is %s %s\n", buildDate, buildTime); -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp @@ -458,7 +458,7 @@ int main() { @@ -346,10 +346,10 @@ Index: VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/prof #ifdef TEST_STD_STRING cout << "Testing std::string." << endl; #else -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp @@ -425,7 +425,7 @@ int main() { @@ -359,10 +359,10 @@ Index: VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test #if 0 { -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp @@ -102,7 +102,7 @@ class test_message public: test_message() @@ -372,10 +372,10 @@ Index: VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp } ~test_message() -Index: VirtualBox-7.0.8/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c +Index: VirtualBox-7.0.10/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c -+++ VirtualBox-7.0.8/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c +--- VirtualBox-7.0.10.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c ++++ VirtualBox-7.0.10/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c @@ -30,9 +30,8 @@ #include "build_id.h" #include "macros.h" @@ -387,10 +387,10 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id #ifndef ElfW #define ElfW(type) Elf_##type -Index: VirtualBox-7.0.8/src/VBox/Additions/x11/VBoxClient/logging.cpp +Index: VirtualBox-7.0.10/src/VBox/Additions/x11/VBoxClient/logging.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp -+++ VirtualBox-7.0.8/src/VBox/Additions/x11/VBoxClient/logging.cpp +--- VirtualBox-7.0.10.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp ++++ VirtualBox-7.0.10/src/VBox/Additions/x11/VBoxClient/logging.cpp @@ -328,10 +328,10 @@ static DECLCALLBACK(void) vbClLogHeaderF case RTLOGPHASE_BEGIN: { diff --git a/vbox-permissions_warning.diff b/vbox-permissions_warning.diff index 2fb0693..5f74a0e 100644 --- a/vbox-permissions_warning.diff +++ b/vbox-permissions_warning.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/apps/Makefile.kmk +Index: VirtualBox-7.0.10/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/apps/Makefile.kmk -+++ VirtualBox-7.0.8/src/apps/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/apps/Makefile.kmk ++++ VirtualBox-7.0.10/src/apps/Makefile.kmk @@ -28,5 +28,7 @@ SUB_DEPTH = ../.. include $(KBUILD_PATH)/subheader.kmk @@ -10,10 +10,10 @@ Index: VirtualBox-7.0.8/src/apps/Makefile.kmk + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-7.0.8/src/apps/VBoxPermissionMessage/Makefile.kmk +Index: VirtualBox-7.0.10/src/apps/VBoxPermissionMessage/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-7.0.8/src/apps/VBoxPermissionMessage/Makefile.kmk ++++ VirtualBox-7.0.10/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-7.0.8/src/apps/VBoxPermissionMessage/Makefile.kmk + +include $(KBUILD_PATH)/subfooter.kmk + -Index: VirtualBox-7.0.8/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp +Index: VirtualBox-7.0.10/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp =================================================================== --- /dev/null -+++ VirtualBox-7.0.8/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp ++++ VirtualBox-7.0.10/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp @@ -0,0 +1,12 @@ +#include +#include diff --git a/vbox-python-py310.patch b/vbox-python-py310.patch index ef467ba..df91bf9 100644 --- a/vbox-python-py310.patch +++ b/vbox-python-py310.patch @@ -1,11 +1,11 @@ # https://www.virtualbox.org/changeset/90537/vbox -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/Makefile.kmk +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/Makefile.kmk -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/Makefile.kmk -@@ -663,11 +663,57 @@ ifndef VBOX_ONLY_SDK - VBoxPython3_10m_x86_LIBS = $(VBOX_PYTHON310M_LIB_X86) +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/Makefile.kmk ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/Makefile.kmk +@@ -642,11 +642,57 @@ ifndef VBOX_ONLY_SDK + VBoxPython3_12_x86_LIBS = $(VBOX_PYTHON312_LIB_X86) endif endif +endif diff --git a/vbox-python-selection.patch b/vbox-python-selection.patch index 1155222..d8a2e03 100644 --- a/vbox-python-selection.patch +++ b/vbox-python-selection.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/bldprogs/scm.cpp +Index: VirtualBox-7.0.10/src/bldprogs/scm.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/bldprogs/scm.cpp -+++ VirtualBox-7.0.8/src/bldprogs/scm.cpp +--- VirtualBox-7.0.10.orig/src/bldprogs/scm.cpp ++++ VirtualBox-7.0.10/src/bldprogs/scm.cpp @@ -2367,7 +2367,7 @@ static int scmProcessFileInner(PSCMRWSTA pszTreatAs = "shell"; else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0) @@ -11,10 +11,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +Index: VirtualBox-7.0.10/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec -+++ VirtualBox-7.0.8/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec ++++ VirtualBox-7.0.10/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec @@ -32,6 +32,9 @@ %define VBOXDOCDIR %{_defaultdocdir}/%NAME% %global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$ @@ -25,10 +25,10 @@ Index: VirtualBox-7.0.8/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec Summary: Oracle VM VirtualBox Name: %NAME% -Index: VirtualBox-7.0.8/src/libs/libxml2-2.9.14/libxml.spec.in +Index: VirtualBox-7.0.10/src/libs/libxml2-2.9.14/libxml.spec.in =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/libxml2-2.9.14/libxml.spec.in -+++ VirtualBox-7.0.8/src/libs/libxml2-2.9.14/libxml.spec.in +--- VirtualBox-7.0.10.orig/src/libs/libxml2-2.9.14/libxml.spec.in ++++ VirtualBox-7.0.10/src/libs/libxml2-2.9.14/libxml.spec.in @@ -1,3 +1,4 @@ +%global with_python2 0 %global with_python3 1 @@ -93,10 +93,10 @@ Index: VirtualBox-7.0.8/src/libs/libxml2-2.9.14/libxml.spec.in %if 0%{?with_python3} %files -n python3-%{name} -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/ErrorUtils.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/ErrorUtils.cpp @@ -438,7 +438,9 @@ char *PyTraceback_AsString(PyObject *exc { // a temp scope so I can use temp locals. @@ -108,10 +108,10 @@ Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/ErrorUtils.cpp #else /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */ const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult); -Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyGBase.cpp +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/src/PyGBase.cpp =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyGBase.cpp +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp ++++ VirtualBox-7.0.10/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 ) @@ -125,10 +125,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/libs/xpcom18a4/python/gen_python_deps.py +Index: VirtualBox-7.0.10/src/libs/xpcom18a4/python/gen_python_deps.py =================================================================== ---- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/gen_python_deps.py -+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/gen_python_deps.py +--- VirtualBox-7.0.10.orig/src/libs/xpcom18a4/python/gen_python_deps.py ++++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/gen_python_deps.py @@ -96,7 +96,7 @@ def main(argv): else: multi = 1 diff --git a/vbox-smc-napa.diff b/vbox-smc-napa.diff index 53cc4e8..a97bb34 100644 --- a/vbox-smc-napa.diff +++ b/vbox-smc-napa.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Devices/PC/vbox.dsl +Index: VirtualBox-7.0.10/src/VBox/Devices/PC/vbox.dsl =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Devices/PC/vbox.dsl -+++ VirtualBox-7.0.8/src/VBox/Devices/PC/vbox.dsl +--- VirtualBox-7.0.10.orig/src/VBox/Devices/PC/vbox.dsl ++++ VirtualBox-7.0.10/src/VBox/Devices/PC/vbox.dsl @@ -1225,7 +1225,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, Device (SMC) { diff --git a/vbox-suid-warning.diff b/vbox-suid-warning.diff index a1b9d4f..6cd5828 100644 --- a/vbox-suid-warning.diff +++ b/vbox-suid-warning.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/apps/Makefile.kmk +Index: VirtualBox-7.0.10/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/apps/Makefile.kmk -+++ VirtualBox-7.0.8/src/apps/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/apps/Makefile.kmk ++++ VirtualBox-7.0.10/src/apps/Makefile.kmk @@ -32,5 +32,7 @@ include $(PATH_SUB_CURRENT)/VBoxPermissi include $(PATH_SUB_CURRENT)/VBoxUSB_DevRules/Makefile.kmk @@ -10,10 +10,10 @@ Index: VirtualBox-7.0.8/src/apps/Makefile.kmk + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-7.0.8/src/apps/VBoxSUIDMessage/Makefile.kmk +Index: VirtualBox-7.0.10/src/apps/VBoxSUIDMessage/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-7.0.8/src/apps/VBoxSUIDMessage/Makefile.kmk ++++ VirtualBox-7.0.10/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-7.0.8/src/apps/VBoxSUIDMessage/Makefile.kmk +include $(KBUILD_PATH)/subfooter.kmk + + -Index: VirtualBox-7.0.8/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp +Index: VirtualBox-7.0.10/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp =================================================================== --- /dev/null -+++ VirtualBox-7.0.8/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp ++++ VirtualBox-7.0.10/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp @@ -0,0 +1,15 @@ +#include +#include diff --git a/vbox-usb-warning.diff b/vbox-usb-warning.diff index 117087f..97dd83b 100644 --- a/vbox-usb-warning.diff +++ b/vbox-usb-warning.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/apps/Makefile.kmk +Index: VirtualBox-7.0.10/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/apps/Makefile.kmk -+++ VirtualBox-7.0.8/src/apps/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/apps/Makefile.kmk ++++ VirtualBox-7.0.10/src/apps/Makefile.kmk @@ -30,5 +30,7 @@ include $(KBUILD_PATH)/subheader.kmk include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk @@ -10,10 +10,10 @@ Index: VirtualBox-7.0.8/src/apps/Makefile.kmk + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-7.0.8/src/apps/VBoxUSB_DevRules/Makefile.kmk +Index: VirtualBox-7.0.10/src/apps/VBoxUSB_DevRules/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-7.0.8/src/apps/VBoxUSB_DevRules/Makefile.kmk ++++ VirtualBox-7.0.10/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-7.0.8/src/apps/VBoxUSB_DevRules/Makefile.kmk +include $(KBUILD_PATH)/subfooter.kmk + + -Index: VirtualBox-7.0.8/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp +Index: VirtualBox-7.0.10/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp =================================================================== --- /dev/null -+++ VirtualBox-7.0.8/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp ++++ VirtualBox-7.0.10/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp @@ -0,0 +1,25 @@ +#include +#include diff --git a/vbox-vboxadd-init-script.diff b/vbox-vboxadd-init-script.diff index 5347eec..88eed54 100644 --- a/vbox-vboxadd-init-script.diff +++ b/vbox-vboxadd-init-script.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd.sh @@ -36,11 +36,14 @@ # Provides: vboxadd # Required-Start: @@ -18,7 +18,7 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh ### END INIT INFO ## @todo This file duplicates a lot of script with vboxdrv.sh. When making -@@ -261,12 +264,6 @@ do_vboxguest_non_udev() +@@ -266,12 +269,6 @@ do_vboxguest_non_udev() fail "Cannot create device $dev with major $maj and minor $min" } fi @@ -31,7 +31,7 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh if [ ! -c $userdev ]; then maj=10 -@@ -277,12 +274,6 @@ do_vboxguest_non_udev() +@@ -282,12 +279,6 @@ do_vboxguest_non_udev() rmmod vboxguest 2>/dev/null fail "Cannot create device $userdev with major $maj and minor $min" } @@ -44,7 +44,7 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh fi fi } -@@ -346,7 +337,7 @@ cleanup_modules() +@@ -351,7 +342,7 @@ cleanup_modules() done if test -z "${keep}"; then rm -rf /lib/modules/"${KERN_VER}" @@ -53,7 +53,7 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh fi done for i in ${OLDMODULES}; do -@@ -612,9 +603,9 @@ create_udev_rule() +@@ -660,9 +651,9 @@ create_udev_rule() udevcontrol reload_rules >/dev/null 2>&1 || true fi } @@ -66,7 +66,7 @@ Index: VirtualBox-7.0.8/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 -@@ -804,18 +795,17 @@ setup() +@@ -875,18 +866,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." @@ -94,7 +94,7 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh fi fi create_vbox_user -@@ -833,17 +823,14 @@ Please install them and execute +@@ -904,17 +894,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` @@ -115,7 +115,7 @@ Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh depmod # Remove old module sources -@@ -853,12 +840,13 @@ cleanup() +@@ -924,12 +911,13 @@ cleanup() fi # Clean-up X11-related bits @@ -133,10 +133,10 @@ Index: VirtualBox-7.0.8/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 -Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd-service.sh +Index: VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd-service.sh =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh -+++ VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd-service.sh +--- VirtualBox-7.0.10.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh ++++ VirtualBox-7.0.10/src/VBox/Additions/linux/installer/vboxadd-service.sh @@ -36,7 +36,7 @@ # Provides: vboxadd-service # Required-Start: vboxadd @@ -146,10 +146,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/VBox/Installer/linux/vboxautostart-service.sh +Index: VirtualBox-7.0.10/src/VBox/Installer/linux/vboxautostart-service.sh =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Installer/linux/vboxautostart-service.sh -+++ VirtualBox-7.0.8/src/VBox/Installer/linux/vboxautostart-service.sh +--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/vboxautostart-service.sh ++++ VirtualBox-7.0.10/src/VBox/Installer/linux/vboxautostart-service.sh @@ -33,7 +33,7 @@ # Provides: vboxautostart-service # Required-Start: vboxdrv @@ -159,10 +159,10 @@ Index: VirtualBox-7.0.8/src/VBox/Installer/linux/vboxautostart-service.sh # Default-Stop: 0 1 6 # Description: VirtualBox autostart service ### END INIT INFO -Index: VirtualBox-7.0.8/src/VBox/Installer/linux/vboxballoonctrl-service.sh +Index: VirtualBox-7.0.10/src/VBox/Installer/linux/vboxballoonctrl-service.sh =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh -+++ VirtualBox-7.0.8/src/VBox/Installer/linux/vboxballoonctrl-service.sh +--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh ++++ VirtualBox-7.0.10/src/VBox/Installer/linux/vboxballoonctrl-service.sh @@ -33,7 +33,7 @@ # Provides: vboxballoonctrl-service # Required-Start: vboxdrv @@ -172,10 +172,10 @@ Index: VirtualBox-7.0.8/src/VBox/Installer/linux/vboxballoonctrl-service.sh # Default-Stop: 0 1 6 # Description: VirtualBox watchdog daemon ### END INIT INFO -Index: VirtualBox-7.0.8/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +Index: VirtualBox-7.0.10/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh -+++ VirtualBox-7.0.8/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +--- VirtualBox-7.0.10.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh ++++ VirtualBox-7.0.10/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh @@ -41,7 +41,7 @@ # Provides: testboxscript-service # Required-Start: $network @@ -185,10 +185,10 @@ Index: VirtualBox-7.0.8/src/VBox/ValidationKit/testboxscript/linux/testboxscript # Default-Stop: 0 1 6 # Description: TestBoxScript service ### END INIT INFO -Index: VirtualBox-7.0.8/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +Index: VirtualBox-7.0.10/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh -+++ VirtualBox-7.0.8/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +--- VirtualBox-7.0.10.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh ++++ VirtualBox-7.0.10/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh @@ -41,7 +41,7 @@ # Provides: vboxtxs # Required-Start: $network @@ -198,10 +198,10 @@ Index: VirtualBox-7.0.8/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs- # Default-Stop: 0 1 6 # Description: VirtualBox Test Execution Service ### END INIT INFO -Index: VirtualBox-7.0.8/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +Index: VirtualBox-7.0.10/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh -+++ VirtualBox-7.0.8/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +--- VirtualBox-7.0.10.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh ++++ VirtualBox-7.0.10/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh @@ -41,7 +41,7 @@ # Provides: vboxtxs # Required-Start: $network diff --git a/vbox-vboxdrv-init-script.diff b/vbox-vboxdrv-init-script.diff index 8998897..64cc4d6 100644 --- a/vbox-vboxdrv-init-script.diff +++ b/vbox-vboxdrv-init-script.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-7.0.8/src/VBox/Installer/linux/vboxdrv.sh +Index: VirtualBox-7.0.10/src/VBox/Installer/linux/vboxdrv.sh =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Installer/linux/vboxdrv.sh -+++ VirtualBox-7.0.8/src/VBox/Installer/linux/vboxdrv.sh +--- VirtualBox-7.0.10.orig/src/VBox/Installer/linux/vboxdrv.sh ++++ VirtualBox-7.0.10/src/VBox/Installer/linux/vboxdrv.sh @@ -29,11 +29,12 @@ # ### BEGIN INIT INFO @@ -19,7 +19,7 @@ Index: VirtualBox-7.0.8/src/VBox/Installer/linux/vboxdrv.sh ### END INIT INFO ## @todo This file duplicates a lot of script with vboxadd.sh. When making -@@ -535,13 +536,6 @@ See the documentation for your Linux dis +@@ -569,13 +570,6 @@ See the documentation for your Linux dis fi fi # ensure permissions @@ -33,12 +33,11 @@ Index: VirtualBox-7.0.8/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 -@@ -699,31 +693,7 @@ setup() - log "Error building the module:" +@@ -734,30 +728,8 @@ setup() module_build_log "$myerr" failure "Look at $LOG to find out what went wrong" -- fi -- log "Building the net adaptor module." + fi +- log "Building the net adapter module." - if ! myerr=`$BUILDINTMP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --module-source "$MODULE_SRC/vboxnetadp" \ @@ -62,15 +61,16 @@ Index: VirtualBox-7.0.8/src/VBox/Installer/linux/vboxdrv.sh - depmod -a - sync - succ_msg "VirtualBox kernel modules built" -+ /sbin/vboxconfig ++ ++ /usr/sbin/vboxconfig - # Secure boot on Ubuntu, Debian and Oracle Linux. - if test -n "$HAVE_SEC_BOOT"; then -Index: VirtualBox-7.0.8/Config.kmk + # Sign kernel modules if kernel configuration requires it. + if test "$(kernel_requires_module_signature)" = "1"; then +Index: VirtualBox-7.0.10/Config.kmk =================================================================== ---- VirtualBox-7.0.8.orig/Config.kmk -+++ VirtualBox-7.0.8/Config.kmk -@@ -3070,6 +3070,9 @@ else +--- VirtualBox-7.0.10.orig/Config.kmk ++++ VirtualBox-7.0.10/Config.kmk +@@ -3084,6 +3084,9 @@ else endif VBOX_MACOSX_ICON_FILE ?= $(PATH_ROOT)/src/VBox/Artwork/darwin/NonOSE/VirtualBox.icns endif diff --git a/virtualbox-sed-params.patch b/virtualbox-sed-params.patch index 29850b3..7933876 100644 --- a/virtualbox-sed-params.patch +++ b/virtualbox-sed-params.patch @@ -1,8 +1,8 @@ -Index: VirtualBox-7.0.8/src/VBox/Main/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/Main/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Main/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/Main/Makefile.kmk -@@ -1876,7 +1876,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \ +--- VirtualBox-7.0.10.orig/src/VBox/Main/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/Main/Makefile.kmk +@@ -1895,7 +1895,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,10 +11,10 @@ Index: VirtualBox-7.0.8/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-7.0.8/src/VBox/Devices/Makefile.kmk +Index: VirtualBox-7.0.10/src/VBox/Devices/Makefile.kmk =================================================================== ---- VirtualBox-7.0.8.orig/src/VBox/Devices/Makefile.kmk -+++ VirtualBox-7.0.8/src/VBox/Devices/Makefile.kmk +--- VirtualBox-7.0.10.orig/src/VBox/Devices/Makefile.kmk ++++ VirtualBox-7.0.10/src/VBox/Devices/Makefile.kmk @@ -989,8 +989,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(in $(call MSG_TOOL,iasl,VBoxDD,$<,$@) $(QUIET)$(RM) -f $@ $@.tmp $@.pre diff --git a/virtualbox.changes b/virtualbox.changes index fb36dd0..692e45c 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,8 +1,49 @@ +------------------------------------------------------------------- +Thu July 19 15:24:39 UTC 2023 - Larry Rainey + +- VirtualBox 7.0.10 (released July 18 2023) + +This is a maintenance release. The following items were fixed and/or added: + + OCI: Introduced general improvements + VMM: Fixed a bug while walking page tables while executing nested VMs causing flooding of the release log as a consequence (Intel hosts only, bug #21551) + GUI: Added general improvements + TPM: Fixed a crash when a VM has a TPM version 1.2 configured (bug #21622) + 3D: Initial support for OpenGL 4.1 + 3D: Fixed various graphics issues with Windows 11 guests (bugs #21136, #21515) + Guest Control/VBoxManage: Fixed parameter "--ignore-orphaned-processes" + Guest Control/VBoxManage: Fixed behavior of how handling argument 0 for a started guest process works: One can now explicitly specify it with the newly added option "--arg0". This will effectively restore the behavior of former VirtualBox versions + Audio: Also use the PulseAudio backend when pipewire-pulse is running instead of falling back to ALSA (bug #21575) + NAT: Adjusted UDP proxy timeout from 18-21 to 21-24 range to respect intended 20 second timeout (bug #21560) + Linux Host: Added initial support for Indirect Branch Tracking (bug #21435) + Linux Host: Added initial support for kernel 6.5 (NOTE: Guest Additions do not support kernel 6.5 yet) + Linux Host and Guest: Improved condition check when kernel modules need to be signed + Linux Host and Guest: Added initial support for RHEL 8.8 (bug #21692), 8.9 (bug #21690) and 9.3 (bugs #21598 and #21671) kernels + Linux Guest Additions: Fixed issue when kernel modules were rebuilt on each boot when guest system has no X11 installed + Linux Guest Additions: Added initial support for kernel 6.4 + Linux Guest Additions: Fixed issue when vboxvideo module reloading caused kernel panic in some guests (bug #21740) + Linux Guest Additions: Introduced general improvements in the installer area + Windows Guest Additions: Introduced general improvements in graphics drivers area + + removed "fixes_for_kernel_6.4.patch" as this is fixed upstream + + Fix issue with kernel on newer CPU (boo#1212209) + ------------------------------------------------------------------- Tue Jun 27 19:08:03 UTC 2023 - Larry Finger - Fix builds on kernel 6.4 (boo#1212761) - File "fixes_for_kernel_6.4.patch" added. + +bash ./virtualbox-patch-source.sh VirtualBox-7.0.10.tar.bz2 +tar xjf VirtualBox-7.0.10.tar.bz2 +cd VirtualBox-7.0.10 +mkdir patches +mkpatch +cd .. +osc status +osc add VirtualBox-7.0.10-patched.tar.bz2 +osc status +cd -File "fixes_for_kernel_6.4.patch" added. ------------------------------------------------------------------- Wed Jun 14 02:18:18 UTC 2023 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 3b3adb1..406ad28 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -49,7 +49,7 @@ %endif # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!! Name: virtualbox%{?dash}%{?name_suffix} -Version: 7.0.8 +Version: 7.0.10 Release: 0 Summary: %{package_summary} License: GPL-2.0-or-later @@ -165,8 +165,6 @@ Patch37: fix_7.0.6_locking_problems.patch # Support python 3.11 Patch38: python311.patch Patch39: fix_sdl_build.patch -# Fix build on kernel 6.4 -Patch40: fixes_for_kernel_6.4.patch # # Common BuildRequires for both virtualbox and virtualbox-kmp BuildRequires: %{kernel_module_package_buildreqs} @@ -220,6 +218,7 @@ BuildRequires: lzfse-devel BuildRequires: pulseaudio-devel BuildRequires: python-rpm-macros BuildRequires: python3-devel +BuildRequires: rpm BuildRequires: sed BuildRequires: systemd-rpm-macros BuildRequires: update-desktop-files @@ -488,7 +487,6 @@ This package contains the kernel-modules that VirtualBox uses to create or run v %patch37 -p1 %patch38 -p1 %patch39 -p1 -%patch40 -p1 ### Documents for virtualbox main package ### %if %{main_package}