diff --git a/Fix_for_server_1.19.patch b/Fix_for_server_1.19.patch index 9b0e3c6..b1b0243 100644 --- a/Fix_for_server_1.19.patch +++ b/Fix_for_server_1.19.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.c +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.c @@ -1236,7 +1236,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc #endif @@ -14,10 +14,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.c /* software cursor */ miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/pointer.c -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/pointer.c ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c @@ -39,6 +39,10 @@ #include "cursorstr.h" #include "servermd.h" @@ -29,10 +29,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c #include "vboxvideo.h" #ifdef XORG_7X -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/edid.c -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/edid.c ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c @@ -35,6 +35,10 @@ * Michael Thayer */ diff --git a/UserManual.pdf b/UserManual.pdf index e323a21..5d3e43f 100644 --- a/UserManual.pdf +++ b/UserManual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e52f4400fb809a78dc1117a190929973c5dd44d24c431cec0de679ce5321bc7 -size 4995165 +oid sha256:09a43b93bc46ca9b77431b957c34b82f5f46323e2bfe1794e63bfa60eee80b1f +size 4997042 diff --git a/VirtualBox-5.2.10-xclient.patch b/VirtualBox-5.2.10-xclient.patch index 2778953..31aa05f 100644 --- a/VirtualBox-5.2.10-xclient.patch +++ b/VirtualBox-5.2.10-xclient.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/Installer/98vboxadd-xclient +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/Installer/98vboxadd-xclient =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/Installer/98vboxadd-xclient +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/Installer/98vboxadd-xclient @@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do test -w $i || rm -f $i done diff --git a/VirtualBox-6.1.38-patched.tar.bz2 b/VirtualBox-6.1.38-patched.tar.bz2 deleted file mode 100644 index 026fe21..0000000 --- a/VirtualBox-6.1.38-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb882289a9b09ba51c203f83b5b251e777db50f7440a60e402743cc55c189345 -size 120745170 diff --git a/VirtualBox-6.1.40-patched.tar.bz2 b/VirtualBox-6.1.40-patched.tar.bz2 new file mode 100644 index 0000000..2ec8ce3 --- /dev/null +++ b/VirtualBox-6.1.40-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2201b32ae66e1d5be66410113e254d321e7d16c81fba7ac59bc14018b38c22a8 +size 120766813 diff --git a/fix-missing-includes-with-qt-5.15.patch b/fix-missing-includes-with-qt-5.15.patch index 793f0cf..8c80b24 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-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp @@ -18,6 +18,7 @@ /* Qt includes: */ #include @@ -10,10 +10,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cp #include #include #include -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h @@ -37,7 +37,6 @@ class QIcon; class QLabel; class QMouseEvent; diff --git a/fix_conflict_between_host_and_guest.patch b/fix_conflict_between_host_and_guest.patch index f31d84e..c0b6c56 100644 --- a/fix_conflict_between_host_and_guest.patch +++ b/fix_conflict_between_host_and_guest.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c +Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c -+++ VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c ++++ VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c @@ -130,7 +130,7 @@ static struct vboxguest_module_info g_VB RTMemAllocExTag, RTMemContAlloc, diff --git a/fix_error_in_USB_header.patch b/fix_error_in_USB_header.patch deleted file mode 100644 index 533f42d..0000000 --- a/fix_error_in_USB_header.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp -=================================================================== ---- a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp -+++ a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp -@@ -90,7 +90,6 @@ typedef struct USBPROXYURBLNX - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wpedantic" - #endif -- struct usbdevfs_urb KUrb; - #if RT_GNUC_PREREQ(6, 0) - # pragma GCC diagnostic pop - #endif -@@ -110,6 +109,7 @@ typedef struct USBPROXYURBLNX - bool fDiscarded; - /** Size to transfer in remaining fragments of a split URB */ - uint32_t cbSplitRemaining; -+ struct usbdevfs_urb KUrb; /* This entry MUST be last */ - } USBPROXYURBLNX, *PUSBPROXYURBLNX; - - /** diff --git a/fix_lib_search.patch b/fix_lib_search.patch index 7b7495a..ea4f47d 100644 --- a/fix_lib_search.patch +++ b/fix_lib_search.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/configure +Index: VirtualBox-6.1.40/configure =================================================================== ---- VirtualBox-6.1.38.orig/configure -+++ VirtualBox-6.1.38/configure +--- VirtualBox-6.1.40.orig/configure ++++ VirtualBox-6.1.40/configure @@ -1591,14 +1591,14 @@ EOF INCQT5="$q/include $q/include/QtCore" FLGQT5="-DQT_SHARED" diff --git a/fixes_for_Leap42.3.patch b/fixes_for_Leap42.3.patch index 0f97dae..5a51eae 100644 --- a/fixes_for_Leap42.3.patch +++ b/fixes_for_Leap42.3.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/sharedfolders/regops.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/sharedfolders/regops.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/sharedfolders/regops.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/sharedfolders/regops.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/sharedfolders/regops.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/sharedfolders/regops.c @@ -1451,7 +1451,7 @@ DECLINLINE(int) vbsf_lock_user_pages(uin # elif RTLNX_VER_MIN(4,6,0) ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, fWrite, 1 /*force*/, papPages); diff --git a/fixes_for_Qt5.11.patch b/fixes_for_Qt5.11.patch index dd6f162..7382fb7 100644 --- a/fixes_for_Qt5.11.patch +++ b/fixes_for_Qt5.11.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h @@ -83,6 +83,7 @@ #include #include @@ -10,10 +10,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h #include #include #include -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp @@ -18,6 +18,7 @@ /* Qt includes: */ #include diff --git a/fixes_for_gcc10.patch b/fixes_for_gcc10.patch index d4a035f..cb8d1ef 100644 --- a/fixes_for_gcc10.patch +++ b/fixes_for_gcc10.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/Config.kmk +Index: VirtualBox-6.1.40/Config.kmk =================================================================== ---- VirtualBox-6.1.38.orig/Config.kmk -+++ VirtualBox-6.1.38/Config.kmk +--- VirtualBox-6.1.40.orig/Config.kmk ++++ VirtualBox-6.1.40/Config.kmk @@ -2642,11 +2642,17 @@ else # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)). # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`. @@ -24,10 +24,10 @@ Index: VirtualBox-6.1.38/Config.kmk ifndef DONT_USE_YASM include $(KBUILD_PATH)/tools/YASM.kmk if1of ($(KBUILD_HOST), win os2) -Index: VirtualBox-6.1.38/src/VBox/Debugger/DBGCDumpImage.cpp +Index: VirtualBox-6.1.40/src/VBox/Debugger/DBGCDumpImage.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Debugger/DBGCDumpImage.cpp -+++ VirtualBox-6.1.38/src/VBox/Debugger/DBGCDumpImage.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Debugger/DBGCDumpImage.cpp ++++ VirtualBox-6.1.40/src/VBox/Debugger/DBGCDumpImage.cpp @@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3 { switch (iType) diff --git a/fixes_for_leap15.2.patch b/fixes_for_leap15.2.patch index b9ad080..3c0e41b 100644 --- a/fixes_for_leap15.2.patch +++ b/fixes_for_leap15.2.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -+++ VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c @@ -76,6 +76,10 @@ #define VBOXNETFLT_OS_SPECFIC 1 #include "../VBoxNetFltInternal.h" @@ -13,10 +13,10 @@ Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux. typedef struct VBOXNETFLTNOTIFIER { struct notifier_block Notifier; PVBOXNETFLTINS pThis; -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c @@ -342,12 +342,15 @@ static void vbox_master_drop(struct drm_ } @@ -36,10 +36,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c #else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */ .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ, #endif /* < 5.4.0 */ -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_main.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_main.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c @@ -659,8 +659,12 @@ static inline u64 vbox_bo_mmap_offset(st #elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0) return bo->bo.addr_space_offset; @@ -53,10 +53,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c } int -Index: VirtualBox-6.1.38/include/iprt/cdefs.h +Index: VirtualBox-6.1.40/include/iprt/cdefs.h =================================================================== ---- VirtualBox-6.1.38.orig/include/iprt/cdefs.h -+++ VirtualBox-6.1.38/include/iprt/cdefs.h +--- VirtualBox-6.1.40.orig/include/iprt/cdefs.h ++++ VirtualBox-6.1.40/include/iprt/cdefs.h @@ -1184,14 +1184,15 @@ * Tell the compiler that we're falling through to the next case in a switch. * @sa RT_FALL_THRU */ @@ -76,10 +76,10 @@ Index: VirtualBox-6.1.38/include/iprt/cdefs.h /** @def RT_IPRT_FORMAT_ATTR -Index: VirtualBox-6.1.38/kBuild/header.kmk +Index: VirtualBox-6.1.40/kBuild/header.kmk =================================================================== ---- VirtualBox-6.1.38.orig/kBuild/header.kmk -+++ VirtualBox-6.1.38/kBuild/header.kmk +--- VirtualBox-6.1.40.orig/kBuild/header.kmk ++++ VirtualBox-6.1.40/kBuild/header.kmk @@ -754,7 +754,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm RMDIR_INT := kmk_builtin_rmdir RMDIR := $(RMDIR_INT) @@ -89,10 +89,10 @@ Index: VirtualBox-6.1.38/kBuild/header.kmk SED_INT := $(SED_EXT) SED := $(SED_EXT) -Index: VirtualBox-6.1.38/configure +Index: VirtualBox-6.1.40/configure =================================================================== ---- VirtualBox-6.1.38.orig/configure -+++ VirtualBox-6.1.38/configure +--- VirtualBox-6.1.40.orig/configure ++++ VirtualBox-6.1.40/configure @@ -1886,7 +1886,7 @@ check_kbuild() fi echo "export PATH" >> $ENV @@ -115,10 +115,10 @@ Index: VirtualBox-6.1.38/configure else fail fi -Index: VirtualBox-6.1.38/tools/bin/backport-commit.sh +Index: VirtualBox-6.1.40/tools/bin/backport-commit.sh =================================================================== ---- VirtualBox-6.1.38.orig/tools/bin/backport-commit.sh -+++ VirtualBox-6.1.38/tools/bin/backport-commit.sh +--- VirtualBox-6.1.40.orig/tools/bin/backport-commit.sh ++++ VirtualBox-6.1.40/tools/bin/backport-commit.sh @@ -19,7 +19,7 @@ # # Determin script dir so we can source the common bits. @@ -128,10 +128,10 @@ Index: VirtualBox-6.1.38/tools/bin/backport-commit.sh MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows. if test "${MY_SCRIPT_DIR}" = "$0"; then MY_SCRIPT_DIR=`pwd -L` -Index: VirtualBox-6.1.38/tools/bin/backport-common.sh +Index: VirtualBox-6.1.40/tools/bin/backport-common.sh =================================================================== ---- VirtualBox-6.1.38.orig/tools/bin/backport-common.sh -+++ VirtualBox-6.1.38/tools/bin/backport-common.sh +--- VirtualBox-6.1.40.orig/tools/bin/backport-common.sh ++++ VirtualBox-6.1.40/tools/bin/backport-common.sh @@ -1,4 +1,4 @@ -# $Id: backport-common.sh $ + $Id: backport-common.sh $ @@ -147,10 +147,10 @@ Index: VirtualBox-6.1.38/tools/bin/backport-common.sh # # Functions. -Index: VirtualBox-6.1.38/tools/bin/backport-merge-and-commit.sh +Index: VirtualBox-6.1.40/tools/bin/backport-merge-and-commit.sh =================================================================== ---- VirtualBox-6.1.38.orig/tools/bin/backport-merge-and-commit.sh -+++ VirtualBox-6.1.38/tools/bin/backport-merge-and-commit.sh +--- VirtualBox-6.1.40.orig/tools/bin/backport-merge-and-commit.sh ++++ VirtualBox-6.1.40/tools/bin/backport-merge-and-commit.sh @@ -19,7 +19,7 @@ # # Determin script dir so we can invoke the two worker scripts. @@ -160,10 +160,10 @@ Index: VirtualBox-6.1.38/tools/bin/backport-merge-and-commit.sh MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows. if test "${MY_SCRIPT_DIR}" = "$0"; then MY_SCRIPT_DIR=`pwd -L` -Index: VirtualBox-6.1.38/tools/bin/backport-merge.sh +Index: VirtualBox-6.1.40/tools/bin/backport-merge.sh =================================================================== ---- VirtualBox-6.1.38.orig/tools/bin/backport-merge.sh -+++ VirtualBox-6.1.38/tools/bin/backport-merge.sh +--- VirtualBox-6.1.40.orig/tools/bin/backport-merge.sh ++++ VirtualBox-6.1.40/tools/bin/backport-merge.sh @@ -19,7 +19,7 @@ # # Determin script dir so we can source the common bits. @@ -173,10 +173,10 @@ Index: VirtualBox-6.1.38/tools/bin/backport-merge.sh MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows. if test "${MY_SCRIPT_DIR}" = "$0"; then MY_SCRIPT_DIR=`pwd -L` -Index: VirtualBox-6.1.38/tools/bin/gen-slickedit-workspace.sh +Index: VirtualBox-6.1.40/tools/bin/gen-slickedit-workspace.sh =================================================================== ---- VirtualBox-6.1.38.orig/tools/bin/gen-slickedit-workspace.sh -+++ VirtualBox-6.1.38/tools/bin/gen-slickedit-workspace.sh +--- VirtualBox-6.1.40.orig/tools/bin/gen-slickedit-workspace.sh ++++ VirtualBox-6.1.40/tools/bin/gen-slickedit-workspace.sh @@ -23,7 +23,7 @@ MY_CAT="kmk_cat" MY_CP="kmk_cp" MY_MKDIR="kmk_mkdir" @@ -186,10 +186,10 @@ Index: VirtualBox-6.1.38/tools/bin/gen-slickedit-workspace.sh MY_RM="kmk_rm" MY_SLEEP="kmk_sleep" MY_EXPR="kmk_expr" -Index: VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Main/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk @@ -235,7 +235,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE | $$(dir $$@) $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) @@ -199,11 +199,11 @@ Index: VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk $(QUIET)$(RM) -- $(VBOX_XIDL_FILE).ts-tmp $(QUIET)$(CP) --changed -fv -- $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE) -Index: VirtualBox-6.1.38/src/VBox/Runtime/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Runtime/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Runtime/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Runtime/Makefile.kmk -@@ -3689,6 +3689,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V +--- VirtualBox-6.1.40.orig/src/VBox/Runtime/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Runtime/Makefile.kmk +@@ -3690,6 +3690,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 48b1321..8075ec2 100644 --- a/fixes_for_leap15.3.patch +++ b/fixes_for_leap15.3.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +Index: VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -+++ VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +--- VirtualBox-6.1.40.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h ++++ VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h @@ -137,9 +137,9 @@ #include #include diff --git a/fixes_for_makefile.patch b/fixes_for_makefile.patch index b90c5e2..03e9441 100644 --- a/fixes_for_makefile.patch +++ b/fixes_for_makefile.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/HostDrivers/linux/Makefile +Index: VirtualBox-6.1.40/src/VBox/HostDrivers/linux/Makefile =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/linux/Makefile -+++ VirtualBox-6.1.38/src/VBox/HostDrivers/linux/Makefile +--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/linux/Makefile ++++ VirtualBox-6.1.40/src/VBox/HostDrivers/linux/Makefile @@ -35,9 +35,6 @@ endif ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),) obj-m += vboxnetadp/ @@ -133,10 +133,10 @@ Index: VirtualBox-6.1.38/src/VBox/HostDrivers/linux/Makefile if test -f $$module.ko; then \ echo "Installing $$module module"; \ /sbin/insmod $$module.ko; \ -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/Makefile +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/Makefile =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/Makefile -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/Makefile +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/Makefile ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/Makefile @@ -24,6 +24,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/ else # ! KERNELRELEASE @@ -177,10 +177,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/Makefile $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \ fi -Index: VirtualBox-6.1.38/include/iprt/x86.h +Index: VirtualBox-6.1.40/include/iprt/x86.h =================================================================== ---- VirtualBox-6.1.38.orig/include/iprt/x86.h -+++ VirtualBox-6.1.38/include/iprt/x86.h +--- VirtualBox-6.1.40.orig/include/iprt/x86.h ++++ VirtualBox-6.1.40/include/iprt/x86.h @@ -860,37 +860,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI * reserved flags. * @{ */ @@ -782,10 +782,10 @@ Index: VirtualBox-6.1.38/include/iprt/x86.h /** SMM MSRs. */ #define MSR_K7_SMBASE UINT32_C(0xc0010111) -Index: VirtualBox-6.1.38/include/VBox/vmm/hm_vmx.h +Index: VirtualBox-6.1.40/include/VBox/vmm/hm_vmx.h =================================================================== ---- VirtualBox-6.1.38.orig/include/VBox/vmm/hm_vmx.h -+++ VirtualBox-6.1.38/include/VBox/vmm/hm_vmx.h +--- VirtualBox-6.1.40.orig/include/VBox/vmm/hm_vmx.h ++++ VirtualBox-6.1.40/include/VBox/vmm/hm_vmx.h @@ -1462,7 +1462,9 @@ AssertCompileSize(VMXABORT, 4); /** VMCS (and related regions) memory type - Uncacheable. */ #define VMX_BASIC_MEM_TYPE_UC 0 @@ -796,10 +796,10 @@ Index: VirtualBox-6.1.38/include/VBox/vmm/hm_vmx.h /** Width of physical addresses used for VMCS and associated memory regions * (1=32-bit, 0=processor's physical address width). */ #define VMX_BASIC_PHYSADDR_WIDTH_32BIT RT_BIT_64(48) -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.h -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-6.1.40/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 b0b62d9..a18c13f 100644 --- a/fixes_for_python.patch +++ b/fixes_for_python.patch @@ -6,10 +6,10 @@ to "#!/usr/bin/python3". Larry Finger -Index: VirtualBox-6.1.38/src/VBox/Frontends/VBoxShell/vboxshell.py +Index: VirtualBox-6.1.40/src/VBox/Frontends/VBoxShell/vboxshell.py =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VBoxShell/vboxshell.py -+++ VirtualBox-6.1.38/src/VBox/Frontends/VBoxShell/vboxshell.py +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VBoxShell/vboxshell.py ++++ VirtualBox-6.1.40/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 0f6712f..3ed3e63 100644 --- a/fixes_for_qt5.13.patch +++ b/fixes_for_qt5.13.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/include/VBox/VBoxGL2D.h +Index: VirtualBox-6.1.40/include/VBox/VBoxGL2D.h =================================================================== ---- VirtualBox-6.1.38.orig/include/VBox/VBoxGL2D.h -+++ VirtualBox-6.1.38/include/VBox/VBoxGL2D.h +--- VirtualBox-6.1.40.orig/include/VBox/VBoxGL2D.h ++++ VirtualBox-6.1.40/include/VBox/VBoxGL2D.h @@ -113,7 +113,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN /* GL_ARB_pixel_buffer_object*/ #ifndef Q_WS_MAC @@ -11,10 +11,10 @@ Index: VirtualBox-6.1.38/include/VBox/VBoxGL2D.h #endif #ifndef GL_READ_ONLY -Index: VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +Index: VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h -+++ VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h ++++ VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h @@ -465,7 +465,12 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 @@ -28,10 +28,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h @@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 @@ -44,10 +44,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcore typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h @@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 @@ -60,10 +60,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext. typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h @@ -3708,7 +3708,11 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ @@ -76,10 +76,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.1.38/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +Index: VirtualBox-6.1.40/src/VBox/Devices/Graphics/vmsvga_glext/glext.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h -+++ VirtualBox-6.1.38/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +--- VirtualBox-6.1.40.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h ++++ VirtualBox-6.1.40/src/VBox/Devices/Graphics/vmsvga_glext/glext.h @@ -6194,7 +6194,11 @@ typedef char GLchar; #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ diff --git a/fixes_for_sle12.patch b/fixes_for_sle12.patch index 817d105..013cc44 100644 --- a/fixes_for_sle12.patch +++ b/fixes_for_sle12.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.c @@ -362,7 +362,9 @@ static struct drm_driver driver = { .master_drop = vbox_master_drop, #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2) @@ -12,10 +12,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c # endif #endif -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_main.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_main.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_main.c @@ -622,11 +622,13 @@ int vbox_dumb_destroy(struct drm_file *f #endif @@ -30,10 +30,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c void vbox_gem_free_object(struct drm_gem_object *obj) { -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_ttm.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_ttm.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_ttm.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_ttm.c @@ -297,7 +297,7 @@ static struct ttm_backend_func vbox_tt_b }; #endif @@ -133,10 +133,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_ttm.c ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); # else ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.h -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_drv.h @@ -87,6 +87,9 @@ #else # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) @@ -147,10 +147,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h /** @def RTLNX_RHEL_RANGE * Check that it's a RedHat kernel in the given version range. -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_mode.c +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_mode.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_mode.c -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_mode.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/drm/vbox_mode.c ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/drm/vbox_mode.c @@ -552,7 +552,8 @@ static void vbox_set_edid(struct drm_con for (i = 0; i < EDID_SIZE - 1; ++i) sum += edid[i]; diff --git a/gcc5-real-support.patch b/gcc5-real-support.patch index 53f7e37..c884a40 100644 --- a/gcc5-real-support.patch +++ b/gcc5-real-support.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/configure +Index: VirtualBox-6.1.40/configure =================================================================== ---- VirtualBox-6.1.38.orig/configure -+++ VirtualBox-6.1.38/configure +--- VirtualBox-6.1.40.orig/configure ++++ VirtualBox-6.1.40/configure @@ -442,8 +442,13 @@ check_gcc() log_failure "cannot execute '$CXX -dumpversion'" fail really diff --git a/handle_gsoap_208103.patch b/handle_gsoap_208103.patch index 75ff2be..854a3e4 100644 --- a/handle_gsoap_208103.patch +++ b/handle_gsoap_208103.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Main/webservice/vboxweb.cpp +Index: VirtualBox-6.1.40/src/VBox/Main/webservice/vboxweb.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/webservice/vboxweb.cpp -+++ VirtualBox-6.1.38/src/VBox/Main/webservice/vboxweb.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Main/webservice/vboxweb.cpp ++++ VirtualBox-6.1.40/src/VBox/Main/webservice/vboxweb.cpp @@ -945,9 +945,9 @@ static void doQueuesLoop() continue; // timeout, not necessary to bother gsoap // r < 0, errno diff --git a/internal-headers.patch b/internal-headers.patch index a1c46b7..34aa1da 100644 --- a/internal-headers.patch +++ b/internal-headers.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -23,6 +23,9 @@ vboxvideo_70_DEFS := \ ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here. vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this? @@ -12,10 +12,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 vboxvideo_15_DEFS := \ $(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_ -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/edid.c -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/edid.c ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c @@ -35,10 +35,6 @@ * Michael Thayer */ @@ -27,10 +27,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c #include "misc.h" #include "xf86DDC.h" #include "xf86Crtc.h" -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/pointer.c -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/pointer.c ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c @@ -39,10 +39,6 @@ #include "cursorstr.h" #include "servermd.h" @@ -42,10 +42,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c #include "vboxvideo.h" #ifdef XORG_7X -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.h +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.h =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.h +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.h @@ -42,8 +42,8 @@ # pragma once #endif diff --git a/modify_for_4_8_bo_move.patch b/modify_for_4_8_bo_move.patch index 1bcaad7..42b4f76 100644 --- a/modify_for_4_8_bo_move.patch +++ b/modify_for_4_8_bo_move.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +Index: VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c -+++ VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +--- VirtualBox-6.1.40.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c ++++ VirtualBox-6.1.40/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c @@ -35,7 +35,7 @@ #include #include @@ -11,7 +11,7 @@ Index: VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP) # if RTLNX_VER_MIN(2,6,23) && RTLNX_VER_MAX(5,8,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) -@@ -296,6 +296,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb +@@ -301,6 +301,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb fFlags &= ~RTMEMHDR_FLAG_KMALLOC; pHdr = vmalloc(cb + sizeof(*pHdr)); } diff --git a/remove_vbox_video_build.patch b/remove_vbox_video_build.patch index 6b3432a..3ca1909 100644 --- a/remove_vbox_video_build.patch +++ b/remove_vbox_video_build.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/Makefile.kmk +Index: VirtualBox-6.1.40/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/Makefile.kmk -+++ VirtualBox-6.1.38/Makefile.kmk +--- VirtualBox-6.1.40.orig/Makefile.kmk ++++ VirtualBox-6.1.40/Makefile.kmk @@ -724,7 +724,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \ src/VBox/Additions/x11/vboxmouse \ src/VBox/Additions/x11/vboxmouse/xorg70 \ @@ -10,10 +10,10 @@ Index: VirtualBox-6.1.38/Makefile.kmk src/VBox/NetworkServices \ src/VBox/NetworkServices/Dhcpd \ src/VBox/NetworkServices/NAT \ -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -398,7 +398,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-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk # Build using local X.Org headers. We assume X.Org Server 1.7 or later. DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/Makefile.kmk @@ -22,7 +22,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 3d8d3ee..78bd44b 100644 --- a/security_fixes.patch +++ b/security_fixes.patch @@ -5,11 +5,11 @@ # # January 31, 2019 - Larry Finger # -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh -@@ -611,9 +611,11 @@ dmnstatus() +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh +@@ -838,9 +838,11 @@ dmnstatus() fi } @@ -24,10 +24,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh case "$1" in # Does setup without clean-up first and marks all kernels currently found on the # system so that we can see later if any were added. -Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh +Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxdrv.sh -+++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh +--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxdrv.sh ++++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh @@ -38,6 +38,9 @@ DEVICE=/dev/vboxdrv MODPROBE=/sbin/modprobe SCRIPTNAME=vboxdrv.sh diff --git a/smap.diff b/smap.diff index cbb880d..2e60e0c 100644 --- a/smap.diff +++ b/smap.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +Index: VirtualBox-6.1.40/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -+++ VirtualBox-6.1.38/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c ++++ VirtualBox-6.1.40/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c @@ -51,6 +51,12 @@ # include # define VBOX_WITH_SUSPEND_NOTIFICATION diff --git a/turn_off_cloud_net.patch b/turn_off_cloud_net.patch index fe2c1b1..4090988 100644 --- a/turn_off_cloud_net.patch +++ b/turn_off_cloud_net.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/Config.kmk +Index: VirtualBox-6.1.40/Config.kmk =================================================================== ---- VirtualBox-6.1.38.orig/Config.kmk -+++ VirtualBox-6.1.38/Config.kmk +--- VirtualBox-6.1.40.orig/Config.kmk ++++ VirtualBox-6.1.40/Config.kmk @@ -806,7 +806,7 @@ endif # Use new VBoxNetDhcpd instead of old VBoxNetDHCP VBOX_WITH_DHCPD = 1 diff --git a/vb-6.1.16-modal-dialog-parent.patch b/vb-6.1.16-modal-dialog-parent.patch index b26e57d..314c41d 100644 --- a/vb-6.1.16-modal-dialog-parent.patch +++ b/vb-6.1.16-modal-dialog-parent.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp @@ -16,6 +16,7 @@ */ @@ -19,10 +19,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlo QString strFilePath; if (!fileNames.isEmpty()) -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp @@ -397,10 +397,10 @@ void UIFilePathSelector::selectPath() switch (m_enmMode) { @@ -45,10 +45,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSel } /* Do nothing if nothing chosen: */ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp @@ -232,16 +232,16 @@ void UIEmptyFilePathSelector::choose() switch (mMode) { @@ -69,10 +69,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePa } if (path.isEmpty()) return; -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp @@ -441,7 +441,7 @@ void UIMediumSelector::sltButtonLeaveEmp void UIMediumSelector::sltAddMedium() @@ -82,10 +82,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelect if (uMediumID.isNull()) return; repopulateTreeWidget(); -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp @@ -3197,7 +3197,7 @@ void UICommon::updateMachineStorage(cons } else if (target.type == UIMediumTarget::UIMediumTargetType_WithFileDialog) @@ -95,10 +95,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp strMachineFolder, false /* fUseLastFolder */); } else if(target.type == UIMediumTarget::UIMediumTargetType_CreateAdHocVISO) -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp @@ -486,7 +486,7 @@ void UIMediumManagerWidget::sltHandleMac void UIMediumManagerWidget::sltAddMedium() { @@ -108,10 +108,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManage strDefaultMachineFolder, true /* use most recent medium folder */); } -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp @@ -1176,7 +1176,7 @@ void UIExtraDataManagerWindow::sltSave() /* Compose initial file-name: */ const QString strInitialFileName = QDir(uiCommon().homeFolder()).absoluteFilePath(QString("%1_ExtraData.xml").arg(currentChooserName())); @@ -130,10 +130,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraData "Choose file to load extra-data from.."); /* Make sure file-name was chosen: */ if (strFileName.isEmpty()) -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp @@ -78,7 +78,7 @@ void UITextEditor::retranslateUi() void UITextEditor::open() diff --git a/vbox-default-os-type.diff b/vbox-default-os-type.diff index c93567c..9a0b3c7 100644 --- a/vbox-default-os-type.diff +++ b/vbox-default-os-type.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp @@ -306,15 +306,15 @@ void UINameAndSystemEditor::sltFamilyCha if (iIndexWin7 != -1) m_pComboType->setCurrentIndex(iIndexWin7); diff --git a/vbox-deprec-gsoap-service-proxies.diff b/vbox-deprec-gsoap-service-proxies.diff index 37115b3..eb626e0 100644 --- a/vbox-deprec-gsoap-service-proxies.diff +++ b/vbox-deprec-gsoap-service-proxies.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/webservice/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Main/webservice/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk @@ -772,7 +772,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts $(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 281f428..623a879 100644 --- a/vbox-disable-updates.diff +++ b/vbox-disable-updates.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp @@ -104,8 +104,8 @@ void UIGlobalSettingsUpdate::getFromCach /* Get old update data from the cache: */ const UIDataSettingsGlobalUpdate &oldUpdateData = m_pCache->base(); @@ -13,10 +13,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlo if (m_pCheckBoxUpdate->isChecked()) { m_pComboBoxUpdatePeriod->setCurrentIndex(oldUpdateData.m_periodIndex); -Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp @@ -86,8 +86,6 @@ void UISettingsDialogGlobal::retranslate m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input")); diff --git a/vbox-fpie.diff b/vbox-fpie.diff index aaa0d00..e26bfd3 100644 --- a/vbox-fpie.diff +++ b/vbox-fpie.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/Config.kmk +Index: VirtualBox-6.1.40/Config.kmk =================================================================== ---- VirtualBox-6.1.38.orig/Config.kmk -+++ VirtualBox-6.1.38/Config.kmk +--- VirtualBox-6.1.40.orig/Config.kmk ++++ VirtualBox-6.1.40/Config.kmk @@ -5663,6 +5663,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi ifeq ($(KBUILD_TARGET),linux) # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp diff --git a/vbox-gsoapssl-deps.diff b/vbox-gsoapssl-deps.diff index 75260e7..c297888 100644 --- a/vbox-gsoapssl-deps.diff +++ b/vbox-gsoapssl-deps.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/webservice/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Main/webservice/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk @@ -355,6 +355,7 @@ ifdef VBOX_GSOAP_INSTALLED vboxwebsrv_LIBS += \ $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \ diff --git a/vbox-no-build-dates.diff b/vbox-no-build-dates.diff index d01d5c9..979e52c 100644 --- a/vbox-no-build-dates.diff +++ b/vbox-no-build-dates.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +Index: VirtualBox-6.1.40/src/VBox/Frontends/VBoxFB/VBoxFB.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp -+++ VirtualBox-6.1.38/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp ++++ VirtualBox-6.1.40/src/VBox/Frontends/VBoxFB/VBoxFB.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) printf("VirtualBox DirectFB GUI built %s %s\n" @@ -11,10 +11,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VBoxFB/VBoxFB.cpp for (;;) { -Index: VirtualBox-6.1.38/src/VBox/Runtime/common/string/uniread.cpp +Index: VirtualBox-6.1.40/src/VBox/Runtime/common/string/uniread.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Runtime/common/string/uniread.cpp -+++ VirtualBox-6.1.38/src/VBox/Runtime/common/string/uniread.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Runtime/common/string/uniread.cpp ++++ VirtualBox-6.1.40/src/VBox/Runtime/common/string/uniread.cpp @@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const " * IPRT - Unicode Tables.\n" " *\n" @@ -24,10 +24,10 @@ Index: VirtualBox-6.1.38/src/VBox/Runtime/common/string/uniread.cpp " */\n" "\n" "/*\n" -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -50,10 +50,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c @@ -44,16 +44,10 @@ #ifndef XP_MAC #include "_pr_bld.h" @@ -73,10 +73,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -99,10 +99,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -125,10 +125,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: VirtualBox-6.1.38/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +Index: VirtualBox-6.1.40/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp -+++ VirtualBox-6.1.38/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp ++++ VirtualBox-6.1.40/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp @@ -308,7 +308,7 @@ static int vboxInitLogging(const char *p #endif "Log opened %s\n", @@ -138,10 +138,10 @@ Index: VirtualBox-6.1.38/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp. vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-6.1.38/src/VBox/Devices/PC/BIOS/bios.c +Index: VirtualBox-6.1.40/src/VBox/Devices/PC/BIOS/bios.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Devices/PC/BIOS/bios.c -+++ VirtualBox-6.1.38/src/VBox/Devices/PC/BIOS/bios.c +--- VirtualBox-6.1.40.orig/src/VBox/Devices/PC/BIOS/bios.c ++++ VirtualBox-6.1.40/src/VBox/Devices/PC/BIOS/bios.c @@ -143,7 +143,7 @@ void set_mode(uint8_t mode); #define BX_PCIBIOS 1 @@ -151,10 +151,10 @@ Index: VirtualBox-6.1.38/src/VBox/Devices/PC/BIOS/bios.c //-------------------------------------------------------------------------- // print_bios_banner // displays a the bios version -Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxService/VBoxService.cpp +Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxService/VBoxService.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp -+++ VirtualBox-6.1.38/src/VBox/Additions/common/VBoxService/VBoxService.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp ++++ VirtualBox-6.1.40/src/VBox/Additions/common/VBoxService/VBoxService.cpp @@ -245,7 +245,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-6.1.38/src/VBox/Additions/common/VBoxService/VBoxService.cpp int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-6.1.38/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk @@ -187,7 +187,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-6.1.38/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk # Clean up $(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.1.38/src/VBox/ExtPacks/Skeleton/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/ExtPacks/Skeleton/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/ExtPacks/Skeleton/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk ++++ VirtualBox-6.1.40/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-6.1.38/src/VBox/ExtPacks/Skeleton/Makefile.kmk # Clean up $(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk @@ -343,7 +343,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-6.1.38/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk # Clean up $(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VNC/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VNC/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/VNC/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/ExtPacks/VNC/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/VNC/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/ExtPacks/VNC/Makefile.kmk @@ -154,7 +154,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-6.1.38/src/VBox/ExtPacks/VNC/Makefile.kmk # Clean up $(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/ -Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp -+++ VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp ++++ VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp @@ -319,7 +319,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv } VGDrvCommonInitLoggers(); @@ -229,10 +229,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp /* * Check if the NT version is supported and initialize g_enmVGDrvNtVer. -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp @@ -872,7 +872,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-6.1.38/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.c int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: VirtualBox-6.1.38/src/VBox/Additions/solaris/Mouse/vboxms.c +Index: VirtualBox-6.1.40/src/VBox/Additions/solaris/Mouse/vboxms.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/solaris/Mouse/vboxms.c -+++ VirtualBox-6.1.38/src/VBox/Additions/solaris/Mouse/vboxms.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/solaris/Mouse/vboxms.c ++++ VirtualBox-6.1.40/src/VBox/Additions/solaris/Mouse/vboxms.c @@ -256,7 +256,7 @@ static VBMSSTATE g_OpenNodeSt int _init(void) { @@ -255,10 +255,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/solaris/Mouse/vboxms.c mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL); /* * Prevent module autounloading. -Index: VirtualBox-6.1.38/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c +Index: VirtualBox-6.1.40/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c -+++ VirtualBox-6.1.38/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c +--- VirtualBox-6.1.40.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c ++++ VirtualBox-6.1.40/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c @@ -247,10 +247,10 @@ Returns: UTILITY_NAME, UTILITY_MAJOR_VERSION, @@ -272,10 +272,10 @@ Index: VirtualBox-6.1.38/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInf Usage (); return -1; } -Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp -+++ VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp ++++ VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp @@ -118,7 +118,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject) { @@ -294,10 +294,10 @@ Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp NTSTATUS Status = vboxUsbRtGlobalsInit(); Assert(Status == STATUS_SUCCESS); -Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp -+++ VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp ++++ VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp @@ -1516,7 +1516,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB RTLogDestinations(0, "debugger"); #endif @@ -307,10 +307,10 @@ Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals)); -Index: VirtualBox-6.1.38/src/VBox/Main/glue/VBoxLogRelCreate.cpp +Index: VirtualBox-6.1.40/src/VBox/Main/glue/VBoxLogRelCreate.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp -+++ VirtualBox-6.1.38/src/VBox/Main/glue/VBoxLogRelCreate.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp ++++ VirtualBox-6.1.40/src/VBox/Main/glue/VBoxLogRelCreate.cpp @@ -61,7 +61,7 @@ static DECLCALLBACK(void) vboxHeaderFoot #endif "Log opened %s\n", @@ -320,10 +320,10 @@ Index: VirtualBox-6.1.38/src/VBox/Main/glue/VBoxLogRelCreate.cpp pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE); int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c @@ -141,7 +141,7 @@ int main(int argc, char **argv) { PRIntn tab = 0; @@ -333,10 +333,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c printf("Depend.c build time is %s %s\n", buildDate, buildTime); -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp @@ -458,7 +458,7 @@ int main() { @@ -346,10 +346,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/pro #ifdef TEST_STD_STRING cout << "Testing std::string." << endl; #else -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp @@ -425,7 +425,7 @@ int main() { @@ -359,10 +359,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/tes #if 0 { -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp @@ -102,7 +102,7 @@ class test_message public: test_message() @@ -372,10 +372,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp } ~test_message() -Index: VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c +Index: VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c -+++ VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c +--- VirtualBox-6.1.40.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c ++++ VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c @@ -29,9 +29,8 @@ #include "build_id.h" @@ -387,10 +387,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_i #ifndef ElfW #define ElfW(type) Elf_##type -Index: VirtualBox-6.1.38/src/libs/zlib-1.2.11/os400/make.sh +Index: VirtualBox-6.1.40/src/libs/zlib-1.2.11/os400/make.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/zlib-1.2.11/os400/make.sh -+++ VirtualBox-6.1.38/src/libs/zlib-1.2.11/os400/make.sh +--- VirtualBox-6.1.40.orig/src/libs/zlib-1.2.11/os400/make.sh ++++ VirtualBox-6.1.40/src/libs/zlib-1.2.11/os400/make.sh @@ -258,8 +258,8 @@ fi # Create and compile the identification source file. @@ -402,10 +402,10 @@ Index: VirtualBox-6.1.38/src/libs/zlib-1.2.11/os400/make.sh echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c make_module OS400 os400.c LINK= # No need to rebuild service program yet. -Index: VirtualBox-6.1.38/src/VBox/Additions/x11/VBoxClient/logging.cpp +Index: VirtualBox-6.1.40/src/VBox/Additions/x11/VBoxClient/logging.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp -+++ VirtualBox-6.1.38/src/VBox/Additions/x11/VBoxClient/logging.cpp +--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp ++++ VirtualBox-6.1.40/src/VBox/Additions/x11/VBoxClient/logging.cpp @@ -162,10 +162,10 @@ static DECLCALLBACK(void) vbClLogHeaderF case RTLOGPHASE_BEGIN: { diff --git a/vbox-permissions_warning.diff b/vbox-permissions_warning.diff index 30f4cd2..e3f97e1 100644 --- a/vbox-permissions_warning.diff +++ b/vbox-permissions_warning.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/apps/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/apps/Makefile.kmk -+++ VirtualBox-6.1.38/src/apps/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/apps/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/Makefile.kmk @@ -31,5 +31,7 @@ if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUP endif endif @@ -10,10 +10,10 @@ Index: VirtualBox-6.1.38/src/apps/Makefile.kmk + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/Makefile.kmk @@ -0,0 +1,32 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file @@ -47,10 +47,10 @@ Index: VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/Makefile.kmk + +include $(KBUILD_PATH)/subfooter.kmk + -Index: VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp +Index: VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp ++++ VirtualBox-6.1.40/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp @@ -0,0 +1,12 @@ +#include +#include diff --git a/vbox-python-py310.patch b/vbox-python-py310.patch index e5c7c6b..ec1b9c6 100644 --- a/vbox-python-py310.patch +++ b/vbox-python-py310.patch @@ -1,9 +1,9 @@ # https://www.virtualbox.org/changeset/90537/vbox -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/Makefile.kmk +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/Makefile.kmk -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/Makefile.kmk ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/Makefile.kmk @@ -625,6 +625,52 @@ VBoxPython3_10m_x86_LIBS = $(VBOX_ endif endif @@ -57,10 +57,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/Makefile.kmk ifdef VBOX_PYTHONDEF_INC # # Python without versioning -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyXPCOM.h +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyXPCOM.h =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyXPCOM.h +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyXPCOM.h @@ -137,7 +137,7 @@ inline PyObject *PyBool_FromLong(long ok # define PyInt_Check(o) PyLong_Check(o) # define PyInt_AsLong(o) PyLong_AsLong(o) diff --git a/vbox-python-selection.patch b/vbox-python-selection.patch index 4e07301..9dc4c73 100644 --- a/vbox-python-selection.patch +++ b/vbox-python-selection.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/bldprogs/scm.cpp +Index: VirtualBox-6.1.40/src/bldprogs/scm.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/bldprogs/scm.cpp -+++ VirtualBox-6.1.38/src/bldprogs/scm.cpp +--- VirtualBox-6.1.40.orig/src/bldprogs/scm.cpp ++++ VirtualBox-6.1.40/src/bldprogs/scm.cpp @@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA pszTreatAs = "shell"; else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0) @@ -11,10 +11,10 @@ Index: VirtualBox-6.1.38/src/bldprogs/scm.cpp else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0) || (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) ) pszTreatAs = "perl"; -Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/configure +Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/configure =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/configure -+++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/configure +--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/configure ++++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/configure @@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES= PYTHON_TESTS= pythondir= @@ -39,10 +39,10 @@ Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PYTHON+:} false; then : -Index: VirtualBox-6.1.38/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +Index: VirtualBox-6.1.40/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec -+++ VirtualBox-6.1.38/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec ++++ VirtualBox-6.1.40/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec @@ -22,6 +22,9 @@ %define VBOXDOCDIR %{_defaultdocdir}/%NAME% %global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$ @@ -53,10 +53,10 @@ Index: VirtualBox-6.1.38/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec Summary: Oracle VM VirtualBox Name: %NAME% -Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in +Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/libxml.spec.in -+++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in +--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml.spec.in ++++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in @@ -1,3 +1,4 @@ +%global with_python2 0 %global with_python3 1 @@ -121,10 +121,10 @@ Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in %if 0%{?with_python3} %files python3 -Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec +Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/libxml2.spec -+++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec +--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml2.spec ++++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec @@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot} %if 0%{?with_python3} @@ -134,10 +134,10 @@ Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec make install DESTDIR=%{buildroot} %endif # with_python3 -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/ErrorUtils.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/ErrorUtils.cpp @@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc { // a temp scope so I can use temp locals. #if PY_MAJOR_VERSION <= 2 @@ -147,10 +147,10 @@ Index: VirtualBox-6.1.38/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-6.1.38/src/libs/xpcom18a4/python/src/PyGBase.cpp +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyGBase.cpp =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyGBase.cpp +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/src/PyGBase.cpp @@ -183,7 +183,11 @@ PyG_Base::~PyG_Base() // Get the correct interface pointer for this object given the IID. void *PyG_Base::ThisAsIID( const nsIID &iid ) @@ -164,10 +164,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyGBase.cpp if (iid.Equals(NS_GET_IID(nsISupports))) return (nsISupports *)(nsIInternalPython *)this; if (iid.Equals(NS_GET_IID(nsISupportsWeakReference))) -Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/gen_python_deps.py +Index: VirtualBox-6.1.40/src/libs/xpcom18a4/python/gen_python_deps.py =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/gen_python_deps.py -+++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/gen_python_deps.py +--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/python/gen_python_deps.py ++++ VirtualBox-6.1.40/src/libs/xpcom18a4/python/gen_python_deps.py @@ -86,7 +86,7 @@ def main(argv): else: multi = 1 diff --git a/vbox-smc-napa.diff b/vbox-smc-napa.diff index 5c33c3f..7195d0d 100644 --- a/vbox-smc-napa.diff +++ b/vbox-smc-napa.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Devices/PC/vbox.dsl +Index: VirtualBox-6.1.40/src/VBox/Devices/PC/vbox.dsl =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Devices/PC/vbox.dsl -+++ VirtualBox-6.1.38/src/VBox/Devices/PC/vbox.dsl +--- VirtualBox-6.1.40.orig/src/VBox/Devices/PC/vbox.dsl ++++ VirtualBox-6.1.40/src/VBox/Devices/PC/vbox.dsl @@ -1197,7 +1197,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, Device (SMC) { diff --git a/vbox-suid-warning.diff b/vbox-suid-warning.diff index e93a905..f503282 100644 --- a/vbox-suid-warning.diff +++ b/vbox-suid-warning.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/apps/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/apps/Makefile.kmk -+++ VirtualBox-6.1.38/src/apps/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/apps/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/Makefile.kmk @@ -35,5 +35,7 @@ include $(PATH_SUB_CURRENT)/VBoxPermissi include $(PATH_SUB_CURRENT)/VBoxUSB_DevRules/Makefile.kmk @@ -10,10 +10,10 @@ Index: VirtualBox-6.1.38/src/apps/Makefile.kmk + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/Makefile.kmk @@ -0,0 +1,33 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file @@ -48,10 +48,10 @@ Index: VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/Makefile.kmk +include $(KBUILD_PATH)/subfooter.kmk + + -Index: VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp +Index: VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp ++++ VirtualBox-6.1.40/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp @@ -0,0 +1,15 @@ +#include +#include diff --git a/vbox-usb-warning.diff b/vbox-usb-warning.diff index 3f37a49..cd18973 100644 --- a/vbox-usb-warning.diff +++ b/vbox-usb-warning.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/apps/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/apps/Makefile.kmk -+++ VirtualBox-6.1.38/src/apps/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/apps/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/Makefile.kmk @@ -33,5 +33,7 @@ endif include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk @@ -10,10 +10,10 @@ Index: VirtualBox-6.1.38/src/apps/Makefile.kmk + include $(FILE_KBUILD_SUB_FOOTER) -Index: VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/Makefile.kmk +Index: VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/Makefile.kmk =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/Makefile.kmk ++++ VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/Makefile.kmk @@ -0,0 +1,30 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file @@ -45,10 +45,10 @@ Index: VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/Makefile.kmk +include $(KBUILD_PATH)/subfooter.kmk + + -Index: VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp +Index: VirtualBox-6.1.40/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp =================================================================== --- /dev/null -+++ VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp ++++ VirtualBox-6.1.40/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 d604189..c04e0b5 100644 --- a/vbox-vboxadd-init-script.diff +++ b/vbox-vboxadd-init-script.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd.sh @@ -26,11 +26,14 @@ # Provides: vboxadd # Required-Start: @@ -74,7 +74,7 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh fi done for i in ${OLDMODULES}; do -@@ -376,9 +358,9 @@ create_udev_rule() +@@ -528,9 +510,9 @@ create_udev_rule() udevcontrol reload_rules >/dev/null 2>&1 || true fi } @@ -87,42 +87,7 @@ Index: VirtualBox-6.1.38/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 -@@ -497,25 +479,18 @@ setup() - chcon -t bin_t "$BUILDINTMP" 2>/dev/null - - if test -z "$INSTALL_NO_MODULE_BUILDS"; then -- # Check whether modules setup is already complete for currently running kernel. -- # Prevent unnecessary rebuilding in order to speed up booting process. -- if test "$(setup_complete)" = "1"; then -- info "VirtualBox Guest Additions kernel modules $VBOX_VERSION $VBOX_REVISION are" -- info "already available for kernel $TARGET_VER and do not require to be rebuilt." -+ info "Building the VirtualBox Guest Additions kernel modules. This may take a while." -+ info "To build modules for other installed kernels, run" -+ info " /sbin/rcvboxadd quicksetup " -+ info "or" -+ info " /sbin/rcvboxadd quicksetup all" -+ if test -d /lib/modules/"$TARGET_VER"/build; then -+ setup_modules "$TARGET_VER" -+ depmod - else -- info "Building the VirtualBox Guest Additions kernel modules. This may take a while." -- info "To build modules for other installed kernels, run" -- info " /sbin/rcvboxadd quicksetup " -- info "or" -- info " /sbin/rcvboxadd quicksetup all" -- if test -d /lib/modules/"$TARGET_VER"/build; then -- setup_modules "$TARGET_VER" -- depmod -- else -- info "Kernel headers not found for target kernel $TARGET_VER. \ -+ info "Kernel headers not found for target kernel $TARGET_VER. \ - Please install them and execute - /sbin/rcvboxadd setup" -- fi - fi - fi - create_vbox_user -@@ -529,17 +504,14 @@ Please install them and execute +@@ -736,17 +718,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` @@ -143,7 +108,7 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh depmod # Remove old module sources -@@ -549,12 +521,13 @@ cleanup() +@@ -756,12 +735,13 @@ cleanup() fi # Clean-up X11-related bits @@ -161,7 +126,7 @@ Index: VirtualBox-6.1.38/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 -@@ -587,7 +560,7 @@ start() +@@ -807,7 +787,7 @@ for your Linux distribution." rm -f $userdev || { fail "Cannot remove $userdev" } @@ -170,10 +135,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh fail "modprobe vboxguest failed" case "$no_udev" in 1) sleep .5;; -Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd-service.sh +Index: VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd-service.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh -+++ VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd-service.sh +--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh ++++ VirtualBox-6.1.40/src/VBox/Additions/linux/installer/vboxadd-service.sh @@ -26,7 +26,7 @@ # Provides: vboxadd-service # Required-Start: vboxadd @@ -183,10 +148,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd-service.sh # Default-Stop: 0 1 6 # X-Conflicts-With: systemd-timesyncd.service # Description: VirtualBox Additions Service -Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxautostart-service.sh +Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxautostart-service.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxautostart-service.sh -+++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxautostart-service.sh +--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxautostart-service.sh ++++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxautostart-service.sh @@ -23,7 +23,7 @@ # Provides: vboxautostart-service # Required-Start: vboxdrv @@ -196,10 +161,10 @@ Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxautostart-service.sh # Default-Stop: 0 1 6 # Description: VirtualBox autostart service ### END INIT INFO -Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxballoonctrl-service.sh +Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxballoonctrl-service.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh -+++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxballoonctrl-service.sh +--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh ++++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxballoonctrl-service.sh @@ -23,7 +23,7 @@ # Provides: vboxballoonctrl-service # Required-Start: vboxdrv @@ -209,10 +174,10 @@ Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxballoonctrl-service.sh # Default-Stop: 0 1 6 # Description: VirtualBox watchdog daemon ### END INIT INFO -Index: VirtualBox-6.1.38/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +Index: VirtualBox-6.1.40/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh -+++ VirtualBox-6.1.38/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +--- VirtualBox-6.1.40.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh ++++ VirtualBox-6.1.40/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh @@ -31,7 +31,7 @@ # Provides: testboxscript-service # Required-Start: $network @@ -222,10 +187,10 @@ Index: VirtualBox-6.1.38/src/VBox/ValidationKit/testboxscript/linux/testboxscrip # Default-Stop: 0 1 6 # Description: TestBoxScript service ### END INIT INFO -Index: VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +Index: VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh -+++ VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +--- VirtualBox-6.1.40.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh ++++ VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh @@ -31,7 +31,7 @@ # Provides: vboxtxs # Required-Start: $network @@ -235,10 +200,10 @@ Index: VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs # Default-Stop: 0 1 6 # Description: VirtualBox Test Execution Service ### END INIT INFO -Index: VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +Index: VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh -+++ VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +--- VirtualBox-6.1.40.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh ++++ VirtualBox-6.1.40/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh @@ -31,7 +31,7 @@ # Provides: vboxtxs # Required-Start: $network diff --git a/vbox-vboxdrv-init-script.diff b/vbox-vboxdrv-init-script.diff index 9c0fbdf..b716063 100644 --- a/vbox-vboxdrv-init-script.diff +++ b/vbox-vboxdrv-init-script.diff @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh +Index: VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxdrv.sh -+++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh +--- VirtualBox-6.1.40.orig/src/VBox/Installer/linux/vboxdrv.sh ++++ VirtualBox-6.1.40/src/VBox/Installer/linux/vboxdrv.sh @@ -19,11 +19,12 @@ # ### BEGIN INIT INFO @@ -19,7 +19,7 @@ Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh ### END INIT INFO ## @todo This file duplicates a lot of script with vboxadd.sh. When making -@@ -393,13 +394,6 @@ See the documentation for your Linux dis +@@ -510,13 +511,6 @@ See the documentation for your Linux dis fi fi # ensure permissions @@ -33,54 +33,3 @@ Index: VirtualBox-6.1.38/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 -@@ -531,17 +525,6 @@ setup() - { - begin_msg "Building VirtualBox kernel modules" console - log "Building the main VirtualBox module." -- -- # Detect if kernel was built with clang. -- unset LLVM -- vbox_cc_is_clang=$(/lib/modules/"$KERN_VER"/build/scripts/config \ -- --file /lib/modules/"$KERN_VER"/build/.config \ -- --state CONFIG_CC_IS_CLANG 2>/dev/null) -- if test "${vbox_cc_is_clang}" = "y"; then -- log "Using clang compiler." -- export LLVM=1 -- fi -- - if ! myerr=`$BUILDINTMP \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ - --module-source "$MODULE_SRC/vboxdrv" \ -@@ -559,31 +542,7 @@ setup() - log "Error building the module:" - module_build_log "$myerr" - failure "Look at $LOG to find out what went wrong" -- fi -- log "Building the net adaptor module." -- if ! myerr=`$BUILDINTMP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxnetadp" \ -- --no-print-directory install 2>&1`; then -- log "Error building the module:" -- module_build_log "$myerr" -- failure "Look at $LOG to find out what went wrong" -- fi -- if test -e "$MODULE_SRC/vboxpci"; then -- log "Building the PCI pass-through module." -- if ! myerr=`$BUILDINTMP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxpci" \ -- --no-print-directory install 2>&1`; then -- log "Error building the module:" -- module_build_log "$myerr" -- failure "Look at $LOG to find out what went wrong" -- fi -- fi -- rm -f /etc/vbox/module_not_compiled -- depmod -a -- sync -- succ_msg "VirtualBox kernel modules built" -+ /sbin/vboxconfig - # Secure boot on Ubuntu and Debian. - if test -n "$HAVE_SEC_BOOT" && - type update-secureboot-policy >/dev/null 2>&1; then diff --git a/vbox_remove_smp_mflags.patch b/vbox_remove_smp_mflags.patch index 1842c7b..6c5afef 100644 --- a/vbox_remove_smp_mflags.patch +++ b/vbox_remove_smp_mflags.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in +Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/libxml.spec.in -+++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in +--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml.spec.in ++++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml.spec.in @@ -94,7 +94,7 @@ at parse time or later once the document %build @@ -11,10 +11,10 @@ Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in %install rm -fr %{buildroot} -Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec +Index: VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec =================================================================== ---- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/libxml2.spec -+++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec +--- VirtualBox-6.1.40.orig/src/libs/libxml2-2.9.4/libxml2.spec ++++ VirtualBox-6.1.40/src/libs/libxml2-2.9.4/libxml2.spec @@ -94,7 +94,7 @@ at parse time or later once the document %build diff --git a/virtualbox-sed-params.patch b/virtualbox-sed-params.patch index 887ec03..cce5d6c 100644 --- a/virtualbox-sed-params.patch +++ b/virtualbox-sed-params.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Main/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Main/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Main/Makefile.kmk @@ -1648,7 +1648,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \ $(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \ --stringparam generating "dtrace-probes" \ @@ -11,10 +11,10 @@ Index: VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d" \ "$@" \ "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d" -Index: VirtualBox-6.1.38/src/VBox/Devices/Makefile.kmk +Index: VirtualBox-6.1.40/src/VBox/Devices/Makefile.kmk =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/Devices/Makefile.kmk -+++ VirtualBox-6.1.38/src/VBox/Devices/Makefile.kmk +--- VirtualBox-6.1.40.orig/src/VBox/Devices/Makefile.kmk ++++ VirtualBox-6.1.40/src/VBox/Devices/Makefile.kmk @@ -880,8 +880,7 @@ endif $(call MSG_TOOL,iasl,VBoxDD,$<,$@) $(QUIET)$(RM) -f $@ $@.tmp $@.pre diff --git a/virtualbox-snpritnf-buffer-overflow.patch b/virtualbox-snpritnf-buffer-overflow.patch index 1ad7a37..f0649d4 100644 --- a/virtualbox-snpritnf-buffer-overflow.patch +++ b/virtualbox-snpritnf-buffer-overflow.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c +Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c =================================================================== ---- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c -+++ VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c +--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c ++++ VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c @@ -833,6 +833,7 @@ dt_gmatch(const char *s, const char *p) #else return (p == NULL || *p == '\0' || RTStrSimplePatternMatch(p, s)); /** @todo implement gmatch. */ diff --git a/virtualbox.changes b/virtualbox.changes index ede8f8a..7b69f51 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Oct 18 15:42:42 UTC 2022 - Larry Rainey + +This is a maintenance release. The following items were fixed and/or added: + + GUI: Fixed missed machine-items state translation on language change + USB: Fixed possible crash when the device got detached while the controller is resetting the port + Main: Provide guest's absolute pointing mouse device with buttons state when mouse integration is ON + Linux Host and Guest Additions: Prevented build failure on 5.8+ 32-bit kernels + Linux Host and Guest Additions: Introduced additional fixes for kernel 6.0 + Linux Host and Guest Additions: Introduced additional fixes for Debian specific kernels + Solaris and Linux Guest Additions: Added better handling of negative screen sizes which some X11 desktop environments are reporting + Windows Guest Additions: Added fixes related to VBoxTray IPC + +- Fix boo#1204233 boo#1204331 boo#1202851 + +- Remove file fix_error_in_USB_header.patch - fixed upstream + ------------------------------------------------------------------- Sat Oct 8 00:49:59 UTC 2022 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 6fe4b0e..d506ae0 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -52,7 +52,7 @@ %endif # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!! Name: virtualbox%{?dash}%{?name_suffix} -Version: 6.1.38 +Version: 6.1.40 Release: 0 Summary: %{package_summary} # FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" @@ -173,7 +173,7 @@ Patch137: handle_gsoap_208103.patch Patch142: fixes_for_leap15.3.patch Patch143: vb-6.1.16-modal-dialog-parent.patch Patch144: fixes_for_leap15.4.patch -Patch145: fix_error_in_USB_header.patch + Patch999: virtualbox-fix-ui-background-color.patch # # Common BuildRequires for both virtualbox and virtualbox-kmp @@ -299,9 +299,6 @@ hardware. VirtualBox is freely available as Open Source Software under the terms of the GNU Public License (GPL). - - - ########################################## %package qt @@ -332,9 +329,6 @@ Obsoletes: %{name}-vboxwebsrv < %{version} The VirtualBox web server is used to control headless VMs using a browser. - - - ########################################### %package guest-tools @@ -359,10 +353,7 @@ Requires(pre): net-tools-deprecated VirtualBox guest addition tools. - - - -########################################### +########################################## %package -n python3-%{name} Summary: Python bindings for %{name} @@ -382,10 +373,7 @@ Obsoletes: python3-%{name}-ose < %{version} Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. - - - -########################################### +########################################## %package devel Summary: Devel files for %{name} @@ -400,10 +388,7 @@ Obsoletes: %{name}-ose-devel < %{version} Development file for %{name} - - - -########################################### +########################################## %package host-source Summary: Source files for %{name} host kernel modules @@ -435,10 +420,7 @@ These can be built for custom kernels using sudo %{_sbindir}/vboxguestconfig - - - -########################################### +########################################## %package guest-desktop-icons Summary: Icons for guest desktop files @@ -451,10 +433,7 @@ BuildArch: noarch This package contains icons for guest desktop files that were created on the desktop. - - - -########################################### +########################################## %package vnc Summary: VNC desktop sharing @@ -532,7 +511,6 @@ This package contains the kernel-modules that VirtualBox uses to create or run v %patch144 -p1 %endif %patch143 -p1 -%patch145 -p1 # make VB UI background colors look sane again %patch999 -p1 @@ -648,7 +626,7 @@ install -m 755 out/linux.*/release/bin/additions/mount.vboxsf %{buildroot}%{_sbi install -m 744 src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}%{_vbox_instdir}/vboxadd-service install -d %{buildroot}%{_userunitdir} # udev rule for guest (virtualbox-guest-tools) -install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules +install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/90-vboxguest.rules install -p -m 0644 -D %{SOURCE12} %{buildroot}%{_unitdir}/vboxclient.service install -p -m 0644 -D %{SOURCE13} %{buildroot}%{_unitdir}/vboxservice.service # /media is used for auto-mounting of shared folders @@ -1076,7 +1054,7 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_sbindir}/VBoxService %{_sbindir}/vboxguestconfig %{_sbindir}/mount.vboxsf -%{_udevrulesdir}/60-vboxguest.rules +%{_udevrulesdir}/90-vboxguest.rules %{_vbox_instdir}/vboxadd-service %{_unitdir}/vboxadd-service.service %{_unitdir}/multi-user.target.wants/vboxadd-service.service