jengelh/virtualbox
SHA256
1
0
Fork 1
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 1004166 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1004166
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=242
This commit is contained in:
Dominique Leuenberger 2022-09-18 15:32:05 +00:00 committed by Git OBS Bridge
commit b59b1d61e6
46 changed files with 545 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Fix_for_server_1.19.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.c Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
=================================================================== ===================================================================
--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.c +++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
@@ -1236,7 +1236,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc @@ -1236,7 +1236,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
#endif #endif
@ -14,10 +14,10 @@ Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
/* software cursor */ /* software cursor */
miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c
=================================================================== ===================================================================
--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/pointer.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
+++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c +++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c
@@ -39,6 +39,10 @@ @@ -39,6 +39,10 @@
#include "cursorstr.h" #include "cursorstr.h"
#include "servermd.h" #include "servermd.h"
@ -29,10 +29,10 @@ Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
#include "vboxvideo.h" #include "vboxvideo.h"
#ifdef XORG_7X #ifdef XORG_7X
Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/edid.c Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c
=================================================================== ===================================================================
--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/edid.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/edid.c
+++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/edid.c +++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c
@@ -35,6 +35,10 @@ @@ -35,6 +35,10 @@
* Michael Thayer <michael.thayer@oracle.com> * Michael Thayer <michael.thayer@oracle.com>
*/ */

6
VirtualBox-5.2.10-xclient.patch
View File

@ -1,5 +1,7 @@
--- ./src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2020-06-06 06:20:12.079227656 +0100 Index: VirtualBox-6.1.38/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+++ ./src/VBox/Additions/x11/Installer/98vboxadd-xclient 2020-06-06 06:26:55.886940895 +0100 ===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+++ VirtualBox-6.1.38/src/VBox/Additions/x11/Installer/98vboxadd-xclient
@@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do @@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do
test -w $i || rm -f $i test -w $i || rm -f $i
done done

3
VirtualBox-6.1.36-patched.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e8bc02a9cf08f6be753a3100a39731217e76e46ae04d6cbfae05eb011aae7c8
size 120679036

3
VirtualBox-6.1.38-patched.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eb882289a9b09ba51c203f83b5b251e777db50f7440a60e402743cc55c189345
size 120745170

12
fix-missing-includes-with-qt-5.15.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
+++ VirtualBox-6.1.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
/* Qt includes: */ /* Qt includes: */
#include <QApplication> #include <QApplication>
@ -10,10 +10,10 @@ Index: VirtualBox-6.1.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cp
#include <QPaintEvent> #include <QPaintEvent>
#include <QStyle> #include <QStyle>
#include <QVBoxLayout> #include <QVBoxLayout>
Index: VirtualBox-6.1.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
=================================================================== ===================================================================
--- VirtualBox-6.1.12.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
+++ VirtualBox-6.1.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
@@ -37,7 +37,6 @@ class QIcon; @@ -37,7 +37,6 @@ class QIcon;
class QLabel; class QLabel;
class QMouseEvent; class QMouseEvent;

6
fix_conflict_between_host_and_guest.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.0.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
=================================================================== ===================================================================
--- VirtualBox-6.0.10.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
+++ VirtualBox-6.0.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c +++ VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
@@ -130,7 +130,7 @@ static struct vboxguest_module_info g_VB @@ -130,7 +130,7 @@ static struct vboxguest_module_info g_VB
RTMemAllocExTag, RTMemAllocExTag,
RTMemContAlloc, RTMemContAlloc,

8
fix_lib_search.patch
View File

@ -1,8 +1,8 @@
Index: VirtualBox-6.1.26/configure Index: VirtualBox-6.1.38/configure
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/configure --- VirtualBox-6.1.38.orig/configure
+++ VirtualBox-6.1.26/configure +++ VirtualBox-6.1.38/configure
@@ -1586,14 +1586,14 @@ EOF @@ -1591,14 +1591,14 @@ EOF
INCQT5="$q/include $q/include/QtCore" INCQT5="$q/include $q/include/QtCore"
FLGQT5="-DQT_SHARED" FLGQT5="-DQT_SHARED"
I_INCQT5=`prefix_I "$INCQT5"` I_INCQT5=`prefix_I "$INCQT5"`

8
fixes_for_Leap42.3.patch
View File

@ -1,8 +1,8 @@
Index: VirtualBox-6.1.13/src/VBox/Additions/linux/sharedfolders/regops.c Index: VirtualBox-6.1.38/src/VBox/Additions/linux/sharedfolders/regops.c
=================================================================== ===================================================================
--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/sharedfolders/regops.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/sharedfolders/regops.c
+++ VirtualBox-6.1.13/src/VBox/Additions/linux/sharedfolders/regops.c +++ VirtualBox-6.1.38/src/VBox/Additions/linux/sharedfolders/regops.c
@@ -1432,7 +1432,7 @@ DECLINLINE(int) vbsf_lock_user_pages(uin @@ -1451,7 +1451,7 @@ DECLINLINE(int) vbsf_lock_user_pages(uin
# elif RTLNX_VER_MIN(4,6,0) # elif RTLNX_VER_MIN(4,6,0)
ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, fWrite, 1 /*force*/, papPages); ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, fWrite, 1 /*force*/, papPages);
# elif RTLNX_VER_RANGE(4,4,168, 4,5,0) # elif RTLNX_VER_RANGE(4,4,168, 4,5,0)

12
fixes_for_Qt5.11.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
@@ -83,6 +83,7 @@ @@ -83,6 +83,7 @@
#include <QtWidgets/qgraphicsitem.h> #include <QtWidgets/qgraphicsitem.h>
#include <QtWidgets/qgraphicslayoutitem.h> #include <QtWidgets/qgraphicslayoutitem.h>
@ -10,10 +10,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
#include <QtCore/QMetaType> #include <QtCore/QMetaType>
#include <QtGui/qevent.h> #include <QtGui/qevent.h>
#include <QtGui/qtouchdevice.h> #include <QtGui/qtouchdevice.h>
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/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.14/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
/* Qt includes: */ /* Qt includes: */
#include <QButtonGroup> #include <QButtonGroup>

14
fixes_for_gcc10.patch
View File

@ -1,8 +1,8 @@
Index: VirtualBox-6.1.16/Config.kmk Index: VirtualBox-6.1.38/Config.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.16.orig/Config.kmk --- VirtualBox-6.1.38.orig/Config.kmk
+++ VirtualBox-6.1.16/Config.kmk +++ VirtualBox-6.1.38/Config.kmk
@@ -2630,11 +2630,17 @@ else @@ -2642,11 +2642,17 @@ else
# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)). # 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`. # Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
# gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`! # gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
@ -24,10 +24,10 @@ Index: VirtualBox-6.1.16/Config.kmk
ifndef DONT_USE_YASM ifndef DONT_USE_YASM
include $(KBUILD_PATH)/tools/YASM.kmk include $(KBUILD_PATH)/tools/YASM.kmk
if1of ($(KBUILD_HOST), win os2) if1of ($(KBUILD_HOST), win os2)
Index: VirtualBox-6.1.16/src/VBox/Debugger/DBGCDumpImage.cpp Index: VirtualBox-6.1.38/src/VBox/Debugger/DBGCDumpImage.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.16.orig/src/VBox/Debugger/DBGCDumpImage.cpp --- VirtualBox-6.1.38.orig/src/VBox/Debugger/DBGCDumpImage.cpp
+++ VirtualBox-6.1.16/src/VBox/Debugger/DBGCDumpImage.cpp +++ VirtualBox-6.1.38/src/VBox/Debugger/DBGCDumpImage.cpp
@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3 @@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3
{ {
switch (iType) switch (iType)

88
fixes_for_leap15.2.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.26/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c --- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-6.1.26/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -76,6 +76,10 @@ @@ -76,6 +76,10 @@
#define VBOXNETFLT_OS_SPECFIC 1 #define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h" #include "../VBoxNetFltInternal.h"
@ -13,11 +13,11 @@ Index: VirtualBox-6.1.26/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
typedef struct VBOXNETFLTNOTIFIER { typedef struct VBOXNETFLTNOTIFIER {
struct notifier_block Notifier; struct notifier_block Notifier;
PVBOXNETFLTINS pThis; PVBOXNETFLTINS pThis;
Index: VirtualBox-6.1.26/src/VBox/Additions/linux/drm/vbox_drv.c Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/src/VBox/Additions/linux/drm/vbox_drv.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.26/src/VBox/Additions/linux/drm/vbox_drv.c +++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -310,12 +310,15 @@ static void vbox_master_drop(struct drm_ @@ -342,12 +342,15 @@ static void vbox_master_drop(struct drm_
} }
static struct drm_driver driver = { static struct drm_driver driver = {
@ -36,11 +36,11 @@ Index: VirtualBox-6.1.26/src/VBox/Additions/linux/drm/vbox_drv.c
#else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */ #else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ, .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
#endif /* < 5.4.0 */ #endif /* < 5.4.0 */
Index: VirtualBox-6.1.26/src/VBox/Additions/linux/drm/vbox_main.c Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/src/VBox/Additions/linux/drm/vbox_main.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.26/src/VBox/Additions/linux/drm/vbox_main.c +++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c
@@ -638,8 +638,12 @@ static inline u64 vbox_bo_mmap_offset(st @@ -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) #elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0)
return bo->bo.addr_space_offset; return bo->bo.addr_space_offset;
#else #else
@ -53,10 +53,10 @@ Index: VirtualBox-6.1.26/src/VBox/Additions/linux/drm/vbox_main.c
} }
int int
Index: VirtualBox-6.1.26/include/iprt/cdefs.h Index: VirtualBox-6.1.38/include/iprt/cdefs.h
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/include/iprt/cdefs.h --- VirtualBox-6.1.38.orig/include/iprt/cdefs.h
+++ VirtualBox-6.1.26/include/iprt/cdefs.h +++ VirtualBox-6.1.38/include/iprt/cdefs.h
@@ -1184,14 +1184,15 @@ @@ -1184,14 +1184,15 @@
* Tell the compiler that we're falling through to the next case in a switch. * Tell the compiler that we're falling through to the next case in a switch.
* @sa RT_FALL_THRU */ * @sa RT_FALL_THRU */
@ -76,10 +76,10 @@ Index: VirtualBox-6.1.26/include/iprt/cdefs.h
/** @def RT_IPRT_FORMAT_ATTR /** @def RT_IPRT_FORMAT_ATTR
Index: VirtualBox-6.1.26/kBuild/header.kmk Index: VirtualBox-6.1.38/kBuild/header.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/kBuild/header.kmk --- VirtualBox-6.1.38.orig/kBuild/header.kmk
+++ VirtualBox-6.1.26/kBuild/header.kmk +++ VirtualBox-6.1.38/kBuild/header.kmk
@@ -754,7 +754,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm @@ -754,7 +754,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm
RMDIR_INT := kmk_builtin_rmdir RMDIR_INT := kmk_builtin_rmdir
RMDIR := $(RMDIR_INT) RMDIR := $(RMDIR_INT)
@ -89,11 +89,11 @@ Index: VirtualBox-6.1.26/kBuild/header.kmk
SED_INT := $(SED_EXT) SED_INT := $(SED_EXT)
SED := $(SED_EXT) SED := $(SED_EXT)
Index: VirtualBox-6.1.26/configure Index: VirtualBox-6.1.38/configure
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/configure --- VirtualBox-6.1.38.orig/configure
+++ VirtualBox-6.1.26/configure +++ VirtualBox-6.1.38/configure
@@ -1881,7 +1881,7 @@ check_kbuild() @@ -1886,7 +1886,7 @@ check_kbuild()
fi fi
echo "export PATH" >> $ENV echo "export PATH" >> $ENV
echo "unset path_kbuild_bin path_dev_bin" >> $ENV echo "unset path_kbuild_bin path_dev_bin" >> $ENV
@ -102,7 +102,7 @@ Index: VirtualBox-6.1.26/configure
elif [ "$OS.$BUILD_MACHINE" = "darwin.amd64" ]; then elif [ "$OS.$BUILD_MACHINE" = "darwin.amd64" ]; then
# Currently there are no amd64 kBuild bins. So use the x86 variant in any case. # Currently there are no amd64 kBuild bins. So use the x86 variant in any case.
KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.x86" KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.x86"
@@ -1897,10 +1897,10 @@ check_kbuild() @@ -1902,10 +1902,10 @@ check_kbuild()
echo "echo \"\$PATH\" | grep -q \"\$path_dev_bin\" || PATH=\"\$path_dev_bin:\$PATH\"" >> $ENV echo "echo \"\$PATH\" | grep -q \"\$path_dev_bin\" || PATH=\"\$path_dev_bin:\$PATH\"" >> $ENV
echo "export PATH" >> $ENV echo "export PATH" >> $ENV
echo "unset path_kbuild_bin path_dev_bin" >> $ENV echo "unset path_kbuild_bin path_dev_bin" >> $ENV
@ -115,10 +115,10 @@ Index: VirtualBox-6.1.26/configure
else else
fail fail
fi fi
Index: VirtualBox-6.1.26/tools/bin/backport-commit.sh Index: VirtualBox-6.1.38/tools/bin/backport-commit.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/tools/bin/backport-commit.sh --- VirtualBox-6.1.38.orig/tools/bin/backport-commit.sh
+++ VirtualBox-6.1.26/tools/bin/backport-commit.sh +++ VirtualBox-6.1.38/tools/bin/backport-commit.sh
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
# #
# Determin script dir so we can source the common bits. # Determin script dir so we can source the common bits.
@ -128,10 +128,10 @@ Index: VirtualBox-6.1.26/tools/bin/backport-commit.sh
MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows. MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
if test "${MY_SCRIPT_DIR}" = "$0"; then if test "${MY_SCRIPT_DIR}" = "$0"; then
MY_SCRIPT_DIR=`pwd -L` MY_SCRIPT_DIR=`pwd -L`
Index: VirtualBox-6.1.26/tools/bin/backport-common.sh Index: VirtualBox-6.1.38/tools/bin/backport-common.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/tools/bin/backport-common.sh --- VirtualBox-6.1.38.orig/tools/bin/backport-common.sh
+++ VirtualBox-6.1.26/tools/bin/backport-common.sh +++ VirtualBox-6.1.38/tools/bin/backport-common.sh
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-# $Id: backport-common.sh $ -# $Id: backport-common.sh $
+ $Id: backport-common.sh $ + $Id: backport-common.sh $
@ -147,10 +147,10 @@ Index: VirtualBox-6.1.26/tools/bin/backport-common.sh
# #
# Functions. # Functions.
Index: VirtualBox-6.1.26/tools/bin/backport-merge-and-commit.sh Index: VirtualBox-6.1.38/tools/bin/backport-merge-and-commit.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/tools/bin/backport-merge-and-commit.sh --- VirtualBox-6.1.38.orig/tools/bin/backport-merge-and-commit.sh
+++ VirtualBox-6.1.26/tools/bin/backport-merge-and-commit.sh +++ VirtualBox-6.1.38/tools/bin/backport-merge-and-commit.sh
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
# #
# Determin script dir so we can invoke the two worker scripts. # Determin script dir so we can invoke the two worker scripts.
@ -160,10 +160,10 @@ Index: VirtualBox-6.1.26/tools/bin/backport-merge-and-commit.sh
MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows. MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
if test "${MY_SCRIPT_DIR}" = "$0"; then if test "${MY_SCRIPT_DIR}" = "$0"; then
MY_SCRIPT_DIR=`pwd -L` MY_SCRIPT_DIR=`pwd -L`
Index: VirtualBox-6.1.26/tools/bin/backport-merge.sh Index: VirtualBox-6.1.38/tools/bin/backport-merge.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/tools/bin/backport-merge.sh --- VirtualBox-6.1.38.orig/tools/bin/backport-merge.sh
+++ VirtualBox-6.1.26/tools/bin/backport-merge.sh +++ VirtualBox-6.1.38/tools/bin/backport-merge.sh
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
# #
# Determin script dir so we can source the common bits. # Determin script dir so we can source the common bits.
@ -173,10 +173,10 @@ Index: VirtualBox-6.1.26/tools/bin/backport-merge.sh
MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows. MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
if test "${MY_SCRIPT_DIR}" = "$0"; then if test "${MY_SCRIPT_DIR}" = "$0"; then
MY_SCRIPT_DIR=`pwd -L` MY_SCRIPT_DIR=`pwd -L`
Index: VirtualBox-6.1.26/tools/bin/gen-slickedit-workspace.sh Index: VirtualBox-6.1.38/tools/bin/gen-slickedit-workspace.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/tools/bin/gen-slickedit-workspace.sh --- VirtualBox-6.1.38.orig/tools/bin/gen-slickedit-workspace.sh
+++ VirtualBox-6.1.26/tools/bin/gen-slickedit-workspace.sh +++ VirtualBox-6.1.38/tools/bin/gen-slickedit-workspace.sh
@@ -23,7 +23,7 @@ MY_CAT="kmk_cat" @@ -23,7 +23,7 @@ MY_CAT="kmk_cat"
MY_CP="kmk_cp" MY_CP="kmk_cp"
MY_MKDIR="kmk_mkdir" MY_MKDIR="kmk_mkdir"
@ -186,10 +186,10 @@ Index: VirtualBox-6.1.26/tools/bin/gen-slickedit-workspace.sh
MY_RM="kmk_rm" MY_RM="kmk_rm"
MY_SLEEP="kmk_sleep" MY_SLEEP="kmk_sleep"
MY_EXPR="kmk_expr" MY_EXPR="kmk_expr"
Index: VirtualBox-6.1.26/src/VBox/Main/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/src/VBox/Main/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-6.1.26/src/VBox/Main/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk
@@ -235,7 +235,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE @@ -235,7 +235,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE
| $$(dir $$@) | $$(dir $$@)
$(call KB_FN_AUTO_CMD_DEPS_COMMANDS) $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
@ -199,11 +199,11 @@ Index: VirtualBox-6.1.26/src/VBox/Main/Makefile.kmk
$(QUIET)$(RM) -- $(VBOX_XIDL_FILE).ts-tmp $(QUIET)$(RM) -- $(VBOX_XIDL_FILE).ts-tmp
$(QUIET)$(CP) --changed -fv -- $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE) $(QUIET)$(CP) --changed -fv -- $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE)
Index: VirtualBox-6.1.26/src/VBox/Runtime/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/Runtime/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.26.orig/src/VBox/Runtime/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/Runtime/Makefile.kmk
+++ VirtualBox-6.1.26/src/VBox/Runtime/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/Runtime/Makefile.kmk
@@ -3662,6 +3662,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V @@ -3689,6 +3689,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V
# #
# Generate the status code data. # Generate the status code data.
# #

6
fixes_for_leap15.3.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.24/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h Index: VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
=================================================================== ===================================================================
--- VirtualBox-6.1.24.orig/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.24/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +++ VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -137,9 +137,9 @@ @@ -137,9 +137,9 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/completion.h> #include <linux/completion.h>

15
fixes_for_leap15.4.patch
View File

@ -1,15 +0,0 @@
Index: VirtualBox-6.1.26/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
===================================================================
--- VirtualBox-6.1.26.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-6.1.26/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -137,9 +137,7 @@
#include <linux/interrupt.h>
#include <linux/completion.h>
#include <linux/compiler.h>
-#if RTLNX_VER_MIN(5,9,0) || RTLNX_SUSE_MAJ_PREREQ(15,3) /* linux/fs.h defined HAVE_UNLOCKED_IOCTL from 2.6.11 up to 5.9 (also 5.3.18-56 in SLES15-SP3), when it became an implicit assumption. */
-# define HAVE_UNLOCKED_IOCTL 1 /* We use this in a couple of places, so for now just define it for 5.9+ too. */
-#endif
+#define HAVE_UNLOCKED_IOCTL 1 /* We use this in a couple of places, so for now just define it for 5.9+ too. */
#if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38)
# include <linux/smp_lock.h>
#endif

66
fixes_for_makefile.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.14/src/VBox/HostDrivers/linux/Makefile Index: VirtualBox-6.1.38/src/VBox/HostDrivers/linux/Makefile
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/HostDrivers/linux/Makefile --- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/linux/Makefile
+++ VirtualBox-6.1.14/src/VBox/HostDrivers/linux/Makefile +++ VirtualBox-6.1.38/src/VBox/HostDrivers/linux/Makefile
@@ -35,9 +35,6 @@ endif @@ -35,9 +35,6 @@ endif
ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),) ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
obj-m += vboxnetadp/ obj-m += vboxnetadp/
@ -133,10 +133,10 @@ Index: VirtualBox-6.1.14/src/VBox/HostDrivers/linux/Makefile
if test -f $$module.ko; then \ if test -f $$module.ko; then \
echo "Installing $$module module"; \ echo "Installing $$module module"; \
/sbin/insmod $$module.ko; \ /sbin/insmod $$module.ko; \
Index: VirtualBox-6.1.14/src/VBox/Additions/linux/Makefile Index: VirtualBox-6.1.38/src/VBox/Additions/linux/Makefile
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/Makefile --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/Makefile
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/Makefile +++ VirtualBox-6.1.38/src/VBox/Additions/linux/Makefile
@@ -24,6 +24,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/ @@ -24,6 +24,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/
else # ! KERNELRELEASE else # ! KERNELRELEASE
@ -177,11 +177,11 @@ Index: VirtualBox-6.1.14/src/VBox/Additions/linux/Makefile
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \
fi fi
Index: VirtualBox-6.1.14/include/iprt/x86.h Index: VirtualBox-6.1.38/include/iprt/x86.h
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/include/iprt/x86.h --- VirtualBox-6.1.38.orig/include/iprt/x86.h
+++ VirtualBox-6.1.14/include/iprt/x86.h +++ VirtualBox-6.1.38/include/iprt/x86.h
@@ -840,37 +840,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI @@ -860,37 +860,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
* reserved flags. * reserved flags.
* @{ */ * @{ */
/** Bit 0 - PE - Protection Enabled */ /** Bit 0 - PE - Protection Enabled */
@ -241,7 +241,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
#define X86_CR0_PAGING RT_BIT_32(31) #define X86_CR0_PAGING RT_BIT_32(31)
#define X86_CR0_BIT_PG 31 /**< Bit number of X86_CR0_PG */ #define X86_CR0_BIT_PG 31 /**< Bit number of X86_CR0_PG */
/** @} */ /** @} */
@@ -879,9 +901,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI @@ -899,9 +921,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
/** @name CR3 /** @name CR3
* @{ */ * @{ */
/** Bit 3 - PWT - Page-level Writes Transparent. */ /** Bit 3 - PWT - Page-level Writes Transparent. */
@ -255,7 +255,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** Bits 12-31 - - Page directory page number. */ /** Bits 12-31 - - Page directory page number. */
#define X86_CR3_PAGE_MASK (0xfffff000) #define X86_CR3_PAGE_MASK (0xfffff000)
/** Bits 5-31 - - PAE Page directory page number. */ /** Bits 5-31 - - PAE Page directory page number. */
@@ -894,46 +920,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI @@ -914,46 +940,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
/** @name CR4 /** @name CR4
* @{ */ * @{ */
/** Bit 0 - VME - Virtual-8086 Mode Extensions. */ /** Bit 0 - VME - Virtual-8086 Mode Extensions. */
@ -340,7 +340,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** Bit 23 - CET - Control-flow Enhancement Technology enabled. */ /** Bit 23 - CET - Control-flow Enhancement Technology enabled. */
#define X86_CR4_CET RT_BIT_32(23) #define X86_CR4_CET RT_BIT_32(23)
/** @} */ /** @} */
@@ -1147,12 +1211,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1167,12 +1231,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
/** Machine check type register (P5). */ /** Machine check type register (P5). */
#define MSR_P5_MC_TYPE UINT32_C(0x00000001) #define MSR_P5_MC_TYPE UINT32_C(0x00000001)
/** Time Stamp Counter. */ /** Time Stamp Counter. */
@ -357,7 +357,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
#ifndef MSR_IA32_APICBASE /* qemu cpu.h kludge */ #ifndef MSR_IA32_APICBASE /* qemu cpu.h kludge */
# define MSR_IA32_APICBASE 0x1b # define MSR_IA32_APICBASE 0x1b
@@ -1178,7 +1246,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1198,7 +1266,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_CORE_THREAD_COUNT 0x35 #define MSR_CORE_THREAD_COUNT 0x35
/** CPU Feature control. */ /** CPU Feature control. */
@ -367,7 +367,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** Feature control - Lock MSR from writes (R/W0). */ /** Feature control - Lock MSR from writes (R/W0). */
#define MSR_IA32_FEATURE_CONTROL_LOCK RT_BIT_64(0) #define MSR_IA32_FEATURE_CONTROL_LOCK RT_BIT_64(0)
/** Feature control - Enable VMX inside SMX operation (R/WL). */ /** Feature control - Enable VMX inside SMX operation (R/WL). */
@@ -1203,11 +1273,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1223,11 +1293,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_FEATURE_CONTROL_LMCE RT_BIT_64(20) #define MSR_IA32_FEATURE_CONTROL_LMCE RT_BIT_64(20)
/** Per-processor TSC adjust MSR. */ /** Per-processor TSC adjust MSR. */
@ -383,7 +383,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** IBRS - Indirect branch restricted speculation. */ /** IBRS - Indirect branch restricted speculation. */
#define MSR_IA32_SPEC_CTRL_F_IBRS RT_BIT_32(0) #define MSR_IA32_SPEC_CTRL_F_IBRS RT_BIT_32(0)
/** STIBP - Single thread indirect branch predictors. */ /** STIBP - Single thread indirect branch predictors. */
@@ -1215,7 +1289,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1237,7 +1311,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
/** Prediction command register. /** Prediction command register.
* Write only, logical processor scope, no state since write only. */ * Write only, logical processor scope, no state since write only. */
@ -393,7 +393,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** IBPB - Indirect branch prediction barrie when written as 1. */ /** IBPB - Indirect branch prediction barrie when written as 1. */
#define MSR_IA32_PRED_CMD_F_IBPB RT_BIT_32(0) #define MSR_IA32_PRED_CMD_F_IBPB RT_BIT_32(0)
@@ -1226,7 +1302,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1248,7 +1324,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_BIOS_SIGN_ID 0x8B #define MSR_IA32_BIOS_SIGN_ID 0x8B
/** SMM monitor control. */ /** SMM monitor control. */
@ -403,7 +403,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** SMM control - Valid. */ /** SMM control - Valid. */
#define MSR_IA32_SMM_MONITOR_VALID RT_BIT_64(0) #define MSR_IA32_SMM_MONITOR_VALID RT_BIT_64(0)
/** SMM control - VMXOFF unblocks SMI. */ /** SMM control - VMXOFF unblocks SMI. */
@@ -1235,10 +1313,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1257,10 +1335,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_SMM_MONITOR_MSGEG_PHYSADDR(a) (((a) >> 12) & UINT64_C(0xfffff)) #define MSR_IA32_SMM_MONITOR_MSGEG_PHYSADDR(a) (((a) >> 12) & UINT64_C(0xfffff))
/** SMBASE - Base address of SMRANGE image (Read-only, SMM only). */ /** SMBASE - Base address of SMRANGE image (Read-only, SMM only). */
@ -418,7 +418,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** General performance counter no. 1. */ /** General performance counter no. 1. */
#define MSR_IA32_PMC1 0xC2 #define MSR_IA32_PMC1 0xC2
/** General performance counter no. 2. */ /** General performance counter no. 2. */
@@ -1261,18 +1343,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1283,18 +1365,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_FSB_CLOCK_STS 0xCD #define MSR_IA32_FSB_CLOCK_STS 0xCD
/** C-State configuration control. Intel specific: Nehalem, Sandy Bridge. */ /** C-State configuration control. Intel specific: Nehalem, Sandy Bridge. */
@ -445,7 +445,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** CPU is no subject to meltdown problems. */ /** CPU is no subject to meltdown problems. */
#define MSR_IA32_ARCH_CAP_F_RDCL_NO RT_BIT_32(0) #define MSR_IA32_ARCH_CAP_F_RDCL_NO RT_BIT_32(0)
/** CPU has better IBRS and you can leave it on all the time. */ /** CPU has better IBRS and you can leave it on all the time. */
@@ -1286,7 +1376,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1308,7 +1398,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_ARCH_CAP_F_MDS_NO RT_BIT_32(4) #define MSR_IA32_ARCH_CAP_F_MDS_NO RT_BIT_32(4)
/** Flush command register. */ /** Flush command register. */
@ -455,7 +455,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** Flush the level 1 data cache when this bit is written. */ /** Flush the level 1 data cache when this bit is written. */
#define MSR_IA32_FLUSH_CMD_F_L1D RT_BIT_32(0) #define MSR_IA32_FLUSH_CMD_F_L1D RT_BIT_32(0)
@@ -1307,14 +1399,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1329,14 +1421,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#endif #endif
/** Machine Check Global Capabilities Register. */ /** Machine Check Global Capabilities Register. */
@ -476,7 +476,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** Default PAT MSR value on processor powerup / reset (see Intel spec. 11.12.4 /** Default PAT MSR value on processor powerup / reset (see Intel spec. 11.12.4
* "Programming the PAT", AMD spec. 7.8.2 "PAT Indexing") */ * "Programming the PAT", AMD spec. 7.8.2 "PAT Indexing") */
#define MSR_IA32_CR_PAT_INIT_VAL UINT64_C(0x0007040600070406) #define MSR_IA32_CR_PAT_INIT_VAL UINT64_C(0x0007040600070406)
@@ -1333,36 +1431,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1355,36 +1453,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_FLEX_RATIO 0x194 #define MSR_FLEX_RATIO 0x194
/** Performance state value and starting with Intel core more. /** Performance state value and starting with Intel core more.
* Apple uses the >=core features to determine TSC granularity on older CPUs. */ * Apple uses the >=core features to determine TSC granularity on older CPUs. */
@ -535,7 +535,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** Trace/Profile Resource Control (R/W) */ /** Trace/Profile Resource Control (R/W) */
#define MSR_IA32_DEBUGCTL UINT32_C(0x000001d9) #define MSR_IA32_DEBUGCTL UINT32_C(0x000001d9)
@@ -1500,7 +1620,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1522,7 +1642,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
/** @} */ /** @} */
/** Intel TSX (Transactional Synchronization Extensions) control MSR. */ /** Intel TSX (Transactional Synchronization Extensions) control MSR. */
@ -545,7 +545,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** Variable range MTRRs. /** Variable range MTRRs.
* @{ */ * @{ */
@@ -1550,89 +1672,167 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1572,89 +1694,167 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_PERF_GLOBAL_OVF_CTRL 0x390 #define MSR_IA32_PERF_GLOBAL_OVF_CTRL 0x390
/** Precise Event Based sampling (Intel only). */ /** Precise Event Based sampling (Intel only). */
@ -713,7 +713,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** X2APIC MSR range start. */ /** X2APIC MSR range start. */
#define MSR_IA32_X2APIC_START 0x800 #define MSR_IA32_X2APIC_START 0x800
@@ -1767,23 +1967,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1789,23 +1989,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
/** The mask which give the SYSCALL EIP. */ /** The mask which give the SYSCALL EIP. */
#define MSR_K6_STAR_SYSCALL_EIP_MASK UINT32_C(0xffffffff) #define MSR_K6_STAR_SYSCALL_EIP_MASK UINT32_C(0xffffffff)
/** K6 WHCR - Write Handling Control Register. */ /** K6 WHCR - Write Handling Control Register. */
@ -761,7 +761,7 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** K8 LSTAR - Long mode SYSCALL target (RIP). */ /** K8 LSTAR - Long mode SYSCALL target (RIP). */
#define MSR_K8_LSTAR UINT32_C(0xc0000082) #define MSR_K8_LSTAR UINT32_C(0xc0000082)
@@ -1799,14 +2023,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1821,14 +2045,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_K8_KERNEL_GS_BASE UINT32_C(0xc0000102) #define MSR_K8_KERNEL_GS_BASE UINT32_C(0xc0000102)
/** K8 TSC_AUX - Used with RDTSCP. */ /** K8 TSC_AUX - Used with RDTSCP. */
#define MSR_K8_TSC_AUX UINT32_C(0xc0000103) #define MSR_K8_TSC_AUX UINT32_C(0xc0000103)
@ -782,11 +782,11 @@ Index: VirtualBox-6.1.14/include/iprt/x86.h
/** SMM MSRs. */ /** SMM MSRs. */
#define MSR_K7_SMBASE UINT32_C(0xc0010111) #define MSR_K7_SMBASE UINT32_C(0xc0010111)
Index: VirtualBox-6.1.14/include/VBox/vmm/hm_vmx.h Index: VirtualBox-6.1.38/include/VBox/vmm/hm_vmx.h
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/include/VBox/vmm/hm_vmx.h --- VirtualBox-6.1.38.orig/include/VBox/vmm/hm_vmx.h
+++ VirtualBox-6.1.14/include/VBox/vmm/hm_vmx.h +++ VirtualBox-6.1.38/include/VBox/vmm/hm_vmx.h
@@ -1473,7 +1473,9 @@ AssertCompileSize(VMXABORT, 4); @@ -1462,7 +1462,9 @@ AssertCompileSize(VMXABORT, 4);
/** VMCS (and related regions) memory type - Uncacheable. */ /** VMCS (and related regions) memory type - Uncacheable. */
#define VMX_BASIC_MEM_TYPE_UC 0 #define VMX_BASIC_MEM_TYPE_UC 0
/** VMCS (and related regions) memory type - Write back. */ /** VMCS (and related regions) memory type - Write back. */
@ -796,10 +796,10 @@ Index: VirtualBox-6.1.14/include/VBox/vmm/hm_vmx.h
/** Width of physical addresses used for VMCS and associated memory regions /** Width of physical addresses used for VMCS and associated memory regions
* (1=32-bit, 0=processor's physical address width). */ * (1=32-bit, 0=processor's physical address width). */
#define VMX_BASIC_PHYSADDR_WIDTH_32BIT RT_BIT_64(48) #define VMX_BASIC_PHYSADDR_WIDTH_32BIT RT_BIT_64(48)
Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.h Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_drv.h --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.h +++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -87,6 +87,12 @@ @@ -87,6 +87,12 @@
#else #else
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)

6
fixes_for_python.patch
View File

@ -6,10 +6,10 @@ to "#!/usr/bin/python3".
Larry Finger Larry Finger
Index: VirtualBox-6.1.14/src/VBox/Frontends/VBoxShell/vboxshell.py Index: VirtualBox-6.1.38/src/VBox/Frontends/VBoxShell/vboxshell.py
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VBoxShell/vboxshell.py --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
+++ VirtualBox-6.1.14/src/VBox/Frontends/VBoxShell/vboxshell.py +++ VirtualBox-6.1.38/src/VBox/Frontends/VBoxShell/vboxshell.py
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/env python -#!/usr/bin/env python
+#!/usr/bin/python3 +#!/usr/bin/python3

36
fixes_for_qt5.13.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.2/include/VBox/VBoxGL2D.h Index: VirtualBox-6.1.38/include/VBox/VBoxGL2D.h
=================================================================== ===================================================================
--- VirtualBox-6.1.2.orig/include/VBox/VBoxGL2D.h --- VirtualBox-6.1.38.orig/include/VBox/VBoxGL2D.h
+++ VirtualBox-6.1.2/include/VBox/VBoxGL2D.h +++ VirtualBox-6.1.38/include/VBox/VBoxGL2D.h
@@ -113,7 +113,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN @@ -113,7 +113,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN
/* GL_ARB_pixel_buffer_object*/ /* GL_ARB_pixel_buffer_object*/
#ifndef Q_WS_MAC #ifndef Q_WS_MAC
@ -11,10 +11,10 @@ Index: VirtualBox-6.1.2/include/VBox/VBoxGL2D.h
#endif #endif
#ifndef GL_READ_ONLY #ifndef GL_READ_ONLY
Index: VirtualBox-6.1.2/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h Index: VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h
=================================================================== ===================================================================
--- VirtualBox-6.1.2.orig/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.2/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
@@ -465,7 +465,12 @@ GLAPI void APIENTRY glBlendEquation (GLe @@ -465,7 +465,12 @@ GLAPI void APIENTRY glBlendEquation (GLe
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1 #define GL_VERSION_1_5 1
@ -28,10 +28,10 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.
typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLintptr;
#define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_SIZE 0x8764
#define GL_BUFFER_USAGE 0x8765 #define GL_BUFFER_USAGE 0x8765
Index: VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
=================================================================== ===================================================================
--- VirtualBox-6.1.2.orig/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.2/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
@@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe @@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1 #define GL_VERSION_1_5 1
@ -44,10 +44,10 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorea
typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLintptr;
#define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_SIZE 0x8764
#define GL_BUFFER_USAGE 0x8765 #define GL_BUFFER_USAGE 0x8765
Index: VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
=================================================================== ===================================================================
--- VirtualBox-6.1.2.orig/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.2/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
@@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe @@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1 #define GL_VERSION_1_5 1
@ -60,10 +60,10 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLintptr;
#define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_SIZE 0x8764
#define GL_BUFFER_USAGE 0x8765 #define GL_BUFFER_USAGE 0x8765
Index: VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h Index: VirtualBox-6.1.38/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
=================================================================== ===================================================================
--- VirtualBox-6.1.2.orig/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.2/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
@@ -3708,7 +3708,11 @@ typedef char GLchar; /* native charact @@ -3708,7 +3708,11 @@ typedef char GLchar; /* native charact
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
/* GL types for handling large vertex buffer objects */ /* GL types for handling large vertex buffer objects */
@ -76,10 +76,10 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
#endif #endif
#ifndef GL_ARB_vertex_buffer_object #ifndef GL_ARB_vertex_buffer_object
Index: VirtualBox-6.1.2/src/VBox/Devices/Graphics/vmsvga_glext/glext.h Index: VirtualBox-6.1.38/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
=================================================================== ===================================================================
--- VirtualBox-6.1.2.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h --- VirtualBox-6.1.38.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
+++ VirtualBox-6.1.2/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +++ VirtualBox-6.1.38/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
@@ -6194,7 +6194,11 @@ typedef char GLchar; @@ -6194,7 +6194,11 @@ typedef char GLchar;
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
/* GL types for handling large vertex buffer objects */ /* GL types for handling large vertex buffer objects */

52
fixes_for_sle12.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_drv.c Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/drm/vbox_drv.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_drv.c +++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -362,7 +362,9 @@ static struct drm_driver driver = { @@ -362,7 +362,9 @@ static struct drm_driver driver = {
.master_drop = vbox_master_drop, .master_drop = vbox_master_drop,
#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2) #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
@ -12,10 +12,10 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_drv.c
# endif # endif
#endif #endif
Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_main.c Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/drm/vbox_main.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_main.c +++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_main.c
@@ -622,11 +622,13 @@ int vbox_dumb_destroy(struct drm_file *f @@ -622,11 +622,13 @@ int vbox_dumb_destroy(struct drm_file *f
#endif #endif
@ -30,10 +30,10 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_main.c
void vbox_gem_free_object(struct drm_gem_object *obj) void vbox_gem_free_object(struct drm_gem_object *obj)
{ {
Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_ttm.c
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/drm/vbox_ttm.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c +++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -297,7 +297,7 @@ static struct ttm_backend_func vbox_tt_b @@ -297,7 +297,7 @@ static struct ttm_backend_func vbox_tt_b
}; };
#endif #endif
@ -52,7 +52,7 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) { if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
#elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_RANGE(8,5, 8,99) #elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
if (ttm_tt_init(tt, bo, page_flags)) { if (ttm_tt_init(tt, bo, page_flags)) {
@@ -331,7 +331,7 @@ static struct ttm_tt *vbox_ttm_tt_create @@ -333,7 +333,7 @@ static struct ttm_tt *vbox_ttm_tt_create
} }
#if RTLNX_VER_MAX(4,17,0) #if RTLNX_VER_MAX(4,17,0)
@ -61,7 +61,7 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
static int vbox_ttm_tt_populate(struct ttm_tt *ttm) static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
{ {
return ttm_pool_populate(ttm); return ttm_pool_populate(ttm);
@@ -385,7 +385,7 @@ static struct ttm_bo_driver vbox_bo_driv @@ -387,7 +387,7 @@ static struct ttm_bo_driver vbox_bo_driv
.io_mem_reserve = &vbox_ttm_io_mem_reserve, .io_mem_reserve = &vbox_ttm_io_mem_reserve,
.io_mem_free = &vbox_ttm_io_mem_free, .io_mem_free = &vbox_ttm_io_mem_free,
#if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5) #if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
@ -70,7 +70,7 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
.io_mem_pfn = ttm_bo_default_io_mem_pfn, .io_mem_pfn = ttm_bo_default_io_mem_pfn,
# endif # endif
#endif #endif
@@ -622,7 +622,7 @@ int vbox_bo_create(struct drm_device *de @@ -624,7 +624,7 @@ int vbox_bo_create(struct drm_device *de
ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size, ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
ttm_bo_type_device, &vboxbo->placement, ttm_bo_type_device, &vboxbo->placement,
@ -79,7 +79,7 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
align >> PAGE_SHIFT, false, NULL, acc_size, align >> PAGE_SHIFT, false, NULL, acc_size,
#elif RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_RANGE(8,6, 8,99) /* < 5.13.0, < RHEL(8.6, 8.99) */ #elif RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_RANGE(8,6, 8,99) /* < 5.13.0, < RHEL(8.6, 8.99) */
align >> PAGE_SHIFT, false, acc_size, align >> PAGE_SHIFT, false, acc_size,
@@ -664,7 +664,7 @@ static inline u64 vbox_bo_gpu_offset(str @@ -666,7 +666,7 @@ static inline u64 vbox_bo_gpu_offset(str
int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr) int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr)
{ {
@ -88,7 +88,7 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
struct ttm_operation_ctx ctx = { false, false }; struct ttm_operation_ctx ctx = { false, false };
#endif #endif
int ret; int ret;
@@ -687,7 +687,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 @@ -689,7 +689,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT; PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
#endif #endif
@ -97,7 +97,7 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
#else #else
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
@@ -709,7 +709,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 @@ -711,7 +711,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
int vbox_bo_unpin(struct vbox_bo *bo) int vbox_bo_unpin(struct vbox_bo *bo)
{ {
@ -106,7 +106,7 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
# if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) # if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
struct ttm_operation_ctx ctx = { false, false }; struct ttm_operation_ctx ctx = { false, false };
# endif # endif
@@ -732,7 +732,7 @@ int vbox_bo_unpin(struct vbox_bo *bo) @@ -734,7 +734,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT; PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
#endif #endif
@ -115,7 +115,7 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
#elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) #elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
@@ -755,7 +755,7 @@ int vbox_bo_unpin(struct vbox_bo *bo) @@ -757,7 +757,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
*/ */
int vbox_bo_push_sysram(struct vbox_bo *bo) int vbox_bo_push_sysram(struct vbox_bo *bo)
{ {
@ -124,7 +124,7 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
struct ttm_operation_ctx ctx = { false, false }; struct ttm_operation_ctx ctx = { false, false };
# endif # endif
int i, ret; int i, ret;
@@ -776,7 +776,7 @@ int vbox_bo_push_sysram(struct vbox_bo * @@ -778,7 +778,7 @@ int vbox_bo_push_sysram(struct vbox_bo *
for (i = 0; i < bo->placement.num_placement; i++) for (i = 0; i < bo->placement.num_placement; i++)
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT; PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
@ -133,10 +133,10 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_ttm.c
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
# else # else
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_drv.h Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/drm/vbox_drv.h --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_drv.h +++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -87,6 +87,9 @@ @@ -87,6 +87,9 @@
#else #else
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
@ -147,11 +147,11 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_drv.h
/** @def RTLNX_RHEL_RANGE /** @def RTLNX_RHEL_RANGE
* Check that it's a RedHat kernel in the given version range. * Check that it's a RedHat kernel in the given version range.
Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_mode.c Index: VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_mode.c
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/VBox/Additions/linux/drm/vbox_mode.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_mode.c +++ VirtualBox-6.1.38/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -548,7 +548,8 @@ static void vbox_set_edid(struct drm_con @@ -552,7 +552,8 @@ static void vbox_set_edid(struct drm_con
for (i = 0; i < EDID_SIZE - 1; ++i) for (i = 0; i < EDID_SIZE - 1; ++i)
sum += edid[i]; sum += edid[i];
edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF; edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
@ -161,7 +161,7 @@ Index: VirtualBox-6.1.34/src/VBox/Additions/linux/drm/vbox_mode.c
drm_connector_update_edid_property(connector, (struct edid *)edid); drm_connector_update_edid_property(connector, (struct edid *)edid);
#else #else
drm_mode_connector_update_edid_property(connector, (struct edid *)edid); drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
@@ -723,7 +724,7 @@ static int vbox_connector_init(struct dr @@ -727,7 +728,7 @@ static int vbox_connector_init(struct dr
drm_connector_register(connector); drm_connector_register(connector);
#endif #endif

8
gcc5-real-support.patch
View File

@ -1,8 +1,8 @@
Index: VirtualBox-5.2.0/configure Index: VirtualBox-6.1.38/configure
=================================================================== ===================================================================
--- VirtualBox-5.2.0.orig/configure --- VirtualBox-6.1.38.orig/configure
+++ VirtualBox-5.2.0/configure +++ VirtualBox-6.1.38/configure
@@ -429,8 +429,13 @@ check_gcc() @@ -442,8 +442,13 @@ check_gcc()
log_failure "cannot execute '$CXX -dumpversion'" log_failure "cannot execute '$CXX -dumpversion'"
fail really fail really
fi fi

6
handle_gsoap_208103.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.16/src/VBox/Main/webservice/vboxweb.cpp Index: VirtualBox-6.1.38/src/VBox/Main/webservice/vboxweb.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.16.orig/src/VBox/Main/webservice/vboxweb.cpp --- VirtualBox-6.1.38.orig/src/VBox/Main/webservice/vboxweb.cpp
+++ VirtualBox-6.1.16/src/VBox/Main/webservice/vboxweb.cpp +++ VirtualBox-6.1.38/src/VBox/Main/webservice/vboxweb.cpp
@@ -945,9 +945,9 @@ static void doQueuesLoop() @@ -945,9 +945,9 @@ static void doQueuesLoop()
continue; // timeout, not necessary to bother gsoap continue; // timeout, not necessary to bother gsoap
// r < 0, errno // r < 0, errno

24
internal-headers.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -23,6 +23,9 @@ vboxvideo_70_DEFS := \ @@ -23,6 +23,9 @@ vboxvideo_70_DEFS := \
ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here. ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this? vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this?
@ -12,10 +12,10 @@ Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
vboxvideo_15_DEFS := \ vboxvideo_15_DEFS := \
$(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_ $(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_
Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/edid.c Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c
=================================================================== ===================================================================
--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/edid.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/edid.c
+++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/edid.c +++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/edid.c
@@ -35,10 +35,6 @@ @@ -35,10 +35,6 @@
* Michael Thayer <michael.thayer@oracle.com> * Michael Thayer <michael.thayer@oracle.com>
*/ */
@ -27,10 +27,10 @@ Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/edid.c
#include "misc.h" #include "misc.h"
#include "xf86DDC.h" #include "xf86DDC.h"
#include "xf86Crtc.h" #include "xf86Crtc.h"
Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c
=================================================================== ===================================================================
--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/pointer.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
+++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c +++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/pointer.c
@@ -39,10 +39,6 @@ @@ -39,10 +39,6 @@
#include "cursorstr.h" #include "cursorstr.h"
#include "servermd.h" #include "servermd.h"
@ -42,10 +42,10 @@ Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
#include "vboxvideo.h" #include "vboxvideo.h"
#ifdef XORG_7X #ifdef XORG_7X
Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.h Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
=================================================================== ===================================================================
--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h --- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
+++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.h +++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
@@ -42,8 +42,8 @@ @@ -42,8 +42,8 @@
# pragma once # pragma once
#endif #endif

6
modify_for_4_8_bo_move.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.28/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c Index: VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
=================================================================== ===================================================================
--- VirtualBox-6.1.28.orig/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.28/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +++ VirtualBox-6.1.38/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#include <iprt/assert.h> #include <iprt/assert.h>
#include <iprt/errcore.h> #include <iprt/errcore.h>

20
remove_vbox_video_build.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.14/Makefile.kmk Index: VirtualBox-6.1.38/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/Makefile.kmk --- VirtualBox-6.1.38.orig/Makefile.kmk
+++ VirtualBox-6.1.14/Makefile.kmk +++ VirtualBox-6.1.38/Makefile.kmk
@@ -724,7 +724,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \ @@ -724,7 +724,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \
src/VBox/Additions/x11/vboxmouse \ src/VBox/Additions/x11/vboxmouse \
src/VBox/Additions/x11/vboxmouse/xorg70 \ src/VBox/Additions/x11/vboxmouse/xorg70 \
@ -10,11 +10,11 @@ Index: VirtualBox-6.1.14/Makefile.kmk
src/VBox/NetworkServices \ src/VBox/NetworkServices \
src/VBox/NetworkServices/Dhcpd \ src/VBox/NetworkServices/Dhcpd \
src/VBox/NetworkServices/NAT \ src/VBox/NetworkServices/NAT \
Index: VirtualBox-6.1.14/src/VBox/Additions/x11/vboxvideo/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ VirtualBox-6.1.14/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -395,7 +395,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s @@ -398,7 +398,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s
vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES) vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES)
vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS) vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS)
@ -24,10 +24,10 @@ Index: VirtualBox-6.1.14/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
# Build using local X.Org headers. We assume X.Org Server 1.7 or later. # Build using local X.Org headers. We assume X.Org Server 1.7 or later.
DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
Index: VirtualBox-6.1.14/src/VBox/Additions/x11/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/Additions/x11/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Additions/x11/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/Makefile.kmk
+++ VirtualBox-6.1.14/src/VBox/Additions/x11/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/Additions/x11/Makefile.kmk
@@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk @@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk

16
security_fixes.patch
View File

@ -5,11 +5,11 @@
# #
# January 31, 2019 - Larry Finger # January 31, 2019 - Larry Finger
# #
Index: VirtualBox-6.0.6/src/VBox/Additions/linux/installer/vboxadd.sh Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh
=================================================================== ===================================================================
--- VirtualBox-6.0.6.orig/src/VBox/Additions/linux/installer/vboxadd.sh --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-6.0.6/src/VBox/Additions/linux/installer/vboxadd.sh +++ VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -489,9 +489,11 @@ dmnstatus() @@ -611,9 +611,11 @@ dmnstatus()
fi fi
} }
@ -24,11 +24,11 @@ Index: VirtualBox-6.0.6/src/VBox/Additions/linux/installer/vboxadd.sh
case "$1" in case "$1" in
# Does setup without clean-up first and marks all kernels currently found on the # 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. # system so that we can see later if any were added.
Index: VirtualBox-6.0.6/src/VBox/Installer/linux/vboxdrv.sh Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh
=================================================================== ===================================================================
--- VirtualBox-6.0.6.orig/src/VBox/Installer/linux/vboxdrv.sh --- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-6.0.6/src/VBox/Installer/linux/vboxdrv.sh +++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh
@@ -37,6 +37,9 @@ DEVICE=/dev/vboxdrv @@ -38,6 +38,9 @@ DEVICE=/dev/vboxdrv
MODPROBE=/sbin/modprobe MODPROBE=/sbin/modprobe
SCRIPTNAME=vboxdrv.sh SCRIPTNAME=vboxdrv.sh

8
smap.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-5.1.4/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c Index: VirtualBox-6.1.38/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
=================================================================== ===================================================================
--- VirtualBox-5.1.4.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c --- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ VirtualBox-5.1.4/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +++ VirtualBox-6.1.38/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
@@ -50,6 +50,12 @@ @@ -51,6 +51,12 @@
# include <iprt/power.h> # include <iprt/power.h>
# define VBOX_WITH_SUSPEND_NOTIFICATION # define VBOX_WITH_SUSPEND_NOTIFICATION
#endif #endif

8
turn_off_cloud_net.patch
View File

@ -1,8 +1,8 @@
Index: VirtualBox-6.1.12/Config.kmk Index: VirtualBox-6.1.38/Config.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.12.orig/Config.kmk --- VirtualBox-6.1.38.orig/Config.kmk
+++ VirtualBox-6.1.12/Config.kmk +++ VirtualBox-6.1.38/Config.kmk
@@ -802,7 +802,7 @@ endif @@ -806,7 +806,7 @@ endif
# Use new VBoxNetDhcpd instead of old VBoxNetDHCP # Use new VBoxNetDhcpd instead of old VBoxNetDHCP
VBOX_WITH_DHCPD = 1 VBOX_WITH_DHCPD = 1
# Experimental suport for cloud network integration # Experimental suport for cloud network integration

48
vb-6.1.16-modal-dialog-parent.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/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.36/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
*/ */
@ -19,10 +19,10 @@ Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlo
QString strFilePath; QString strFilePath;
if (!fileNames.isEmpty()) if (!fileNames.isEmpty())
Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp
+++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp
@@ -397,10 +397,10 @@ void UIFilePathSelector::selectPath() @@ -397,10 +397,10 @@ void UIFilePathSelector::selectPath()
switch (m_enmMode) switch (m_enmMode)
{ {
@ -45,10 +45,10 @@ Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSel
} }
/* Do nothing if nothing chosen: */ /* Do nothing if nothing chosen: */
Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp
+++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp
@@ -232,16 +232,16 @@ void UIEmptyFilePathSelector::choose() @@ -232,16 +232,16 @@ void UIEmptyFilePathSelector::choose()
switch (mMode) switch (mMode)
{ {
@ -69,10 +69,10 @@ Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePa
} }
if (path.isEmpty()) if (path.isEmpty())
return; return;
Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp
+++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp
@@ -441,7 +441,7 @@ void UIMediumSelector::sltButtonLeaveEmp @@ -441,7 +441,7 @@ void UIMediumSelector::sltButtonLeaveEmp
void UIMediumSelector::sltAddMedium() void UIMediumSelector::sltAddMedium()
@ -82,10 +82,10 @@ Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelect
if (uMediumID.isNull()) if (uMediumID.isNull())
return; return;
repopulateTreeWidget(); repopulateTreeWidget();
Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp
+++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp
@@ -3197,7 +3197,7 @@ void UICommon::updateMachineStorage(cons @@ -3197,7 +3197,7 @@ void UICommon::updateMachineStorage(cons
} }
else if (target.type == UIMediumTarget::UIMediumTargetType_WithFileDialog) else if (target.type == UIMediumTarget::UIMediumTargetType_WithFileDialog)
@ -95,10 +95,10 @@ Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp
strMachineFolder, false /* fUseLastFolder */); strMachineFolder, false /* fUseLastFolder */);
} }
else if(target.type == UIMediumTarget::UIMediumTargetType_CreateAdHocVISO) else if(target.type == UIMediumTarget::UIMediumTargetType_CreateAdHocVISO)
Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
+++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
@@ -486,7 +486,7 @@ void UIMediumManagerWidget::sltHandleMac @@ -486,7 +486,7 @@ void UIMediumManagerWidget::sltHandleMac
void UIMediumManagerWidget::sltAddMedium() void UIMediumManagerWidget::sltAddMedium()
{ {
@ -108,10 +108,10 @@ Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManage
strDefaultMachineFolder, true /* use most recent medium folder */); strDefaultMachineFolder, true /* use most recent medium folder */);
} }
Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -1176,7 +1176,7 @@ void UIExtraDataManagerWindow::sltSave() @@ -1176,7 +1176,7 @@ void UIExtraDataManagerWindow::sltSave()
/* Compose initial file-name: */ /* Compose initial file-name: */
const QString strInitialFileName = QDir(uiCommon().homeFolder()).absoluteFilePath(QString("%1_ExtraData.xml").arg(currentChooserName())); const QString strInitialFileName = QDir(uiCommon().homeFolder()).absoluteFilePath(QString("%1_ExtraData.xml").arg(currentChooserName()));
@ -130,10 +130,10 @@ Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraData
"Choose file to load extra-data from.."); "Choose file to load extra-data from..");
/* Make sure file-name was chosen: */ /* Make sure file-name was chosen: */
if (strFileName.isEmpty()) if (strFileName.isEmpty())
Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp
+++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp
@@ -78,7 +78,7 @@ void UITextEditor::retranslateUi() @@ -78,7 +78,7 @@ void UITextEditor::retranslateUi()
void UITextEditor::open() void UITextEditor::open()

8
vbox-default-os-type.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
=================================================================== ===================================================================
--- VirtualBox-6.0.0.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+++ VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
@@ -251,15 +251,15 @@ void UINameAndSystemEditor::sltFamilyCha @@ -306,15 +306,15 @@ void UINameAndSystemEditor::sltFamilyCha
if (iIndexWin7 != -1) if (iIndexWin7 != -1)
m_pComboType->setCurrentIndex(iIndexWin7); m_pComboType->setCurrentIndex(iIndexWin7);
} }

8
vbox-deprec-gsoap-service-proxies.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-5.1.4/src/VBox/Main/webservice/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-5.1.4.orig/src/VBox/Main/webservice/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-5.1.4/src/VBox/Main/webservice/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk
@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts @@ -772,7 +772,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT)) $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
$(RM) -f $@ $(RM) -f $@

18
vbox-disable-updates.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
=================================================================== ===================================================================
--- VirtualBox-6.0.0.orig/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.0.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
@@ -110,8 +110,8 @@ void UIGlobalSettingsUpdate::getFromCach @@ -104,8 +104,8 @@ void UIGlobalSettingsUpdate::getFromCach
/* Get old update data from the cache: */ /* Get old update data from the cache: */
const UIDataSettingsGlobalUpdate &oldUpdateData = m_pCache->base(); const UIDataSettingsGlobalUpdate &oldUpdateData = m_pCache->base();
@ -13,11 +13,11 @@ Index: VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlob
if (m_pCheckBoxUpdate->isChecked()) if (m_pCheckBoxUpdate->isChecked())
{ {
m_pComboBoxUpdatePeriod->setCurrentIndex(oldUpdateData.m_periodIndex); m_pComboBoxUpdatePeriod->setCurrentIndex(oldUpdateData.m_periodIndex);
Index: VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
=================================================================== ===================================================================
--- VirtualBox-6.0.0.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+++ VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -91,8 +91,6 @@ void UISettingsDialogGlobal::retranslate @@ -86,8 +86,6 @@ void UISettingsDialogGlobal::retranslate
m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input")); m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@ -26,7 +26,7 @@ Index: VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDia
#endif #endif
/* Language page: */ /* Language page: */
@@ -208,16 +206,6 @@ void UISettingsDialogGlobal::prepare() @@ -203,16 +201,6 @@ void UISettingsDialogGlobal::prepare()
iPageIndex, "#input", pSettingsPage); iPageIndex, "#input", pSettingsPage);
break; break;
} }

10
vbox-fpie.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-6.1.4/Config.kmk Index: VirtualBox-6.1.38/Config.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.4.orig/Config.kmk --- VirtualBox-6.1.38.orig/Config.kmk
+++ VirtualBox-6.1.4/Config.kmk +++ VirtualBox-6.1.38/Config.kmk
@@ -5533,6 +5532,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi @@ -5663,6 +5663,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
ifeq ($(KBUILD_TARGET),linux) ifeq ($(KBUILD_TARGET),linux)
# not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
# TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
@ -12,7 +12,7 @@ Index: VirtualBox-6.1.4/Config.kmk
endif endif
ifeq ($(KBUILD_TARGET),win) # No CRT! ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBOXR3HARDENEDEXE_SDKS = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS) TEMPLATE_VBOXR3HARDENEDEXE_SDKS = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS)
@@ -5554,8 +5556,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! @@ -5684,8 +5687,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE) TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)
else ifn1of ($(KBUILD_TARGET), os2 solaris) else ifn1of ($(KBUILD_TARGET), os2 solaris)
# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH) # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)

10
vbox-gsoapssl-deps.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-5.1.2/src/VBox/Main/webservice/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-5.1.2.orig/src/VBox/Main/webservice/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-5.1.2/src/VBox/Main/webservice/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/Main/webservice/Makefile.kmk
@@ -303,6 +303,7 @@ endif @@ -355,6 +355,7 @@ ifdef VBOX_GSOAP_INSTALLED
vboxwebsrv_LIBS += \ vboxwebsrv_LIBS += \
$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \ $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
$(VBOX_GSOAP_CXX_LIBS) \ $(VBOX_GSOAP_CXX_LIBS) \
@ -10,7 +10,7 @@ Index: VirtualBox-5.1.2/src/VBox/Main/webservice/Makefile.kmk
$(LIB_RUNTIME) $(LIB_RUNTIME)
vboxwebsrv_LIBS.solaris += socket nsl vboxwebsrv_LIBS.solaris += socket nsl
ifdef VBOX_WITH_WEBSERVICES_SSL ifdef VBOX_WITH_WEBSERVICES_SSL
@@ -483,6 +484,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) | @@ -534,6 +535,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) |
webtest_LIBS += \ webtest_LIBS += \
$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \ $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
$(VBOX_GSOAP_CXX_LIBS) \ $(VBOX_GSOAP_CXX_LIBS) \

170
vbox-no-build-dates.diff
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.10/src/VBox/Frontends/VBoxFB/VBoxFB.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+++ VirtualBox-6.1.10/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[]) @@ -62,7 +62,7 @@ int main(int argc, char *argv[])
printf("VirtualBox DirectFB GUI built %s %s\n" printf("VirtualBox DirectFB GUI built %s %s\n"
@ -11,10 +11,10 @@ Index: VirtualBox-6.1.10/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
for (;;) for (;;)
{ {
Index: VirtualBox-6.1.10/src/VBox/Runtime/common/string/uniread.cpp Index: VirtualBox-6.1.38/src/VBox/Runtime/common/string/uniread.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Runtime/common/string/uniread.cpp --- VirtualBox-6.1.38.orig/src/VBox/Runtime/common/string/uniread.cpp
+++ VirtualBox-6.1.10/src/VBox/Runtime/common/string/uniread.cpp +++ VirtualBox-6.1.38/src/VBox/Runtime/common/string/uniread.cpp
@@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const @@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const
" * IPRT - Unicode Tables.\n" " * IPRT - Unicode Tables.\n"
" *\n" " *\n"
@ -24,10 +24,10 @@ Index: VirtualBox-6.1.10/src/VBox/Runtime/common/string/uniread.cpp
" */\n" " */\n"
"\n" "\n"
"/*\n" "/*\n"
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/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.10/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
@@ -42,16 +42,13 @@ @@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/ /**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/ /************************************************************************/
@ -50,10 +50,10 @@ Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
#if !defined(_PRODUCTION) #if !defined(_PRODUCTION)
#define _PRODUCTION "" #define _PRODUCTION ""
#endif #endif
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c --- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
@@ -44,16 +44,10 @@ @@ -44,16 +44,10 @@
#ifndef XP_MAC #ifndef XP_MAC
#include "_pr_bld.h" #include "_pr_bld.h"
@ -73,10 +73,10 @@ Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
#if !defined(_PRODUCTION) #if !defined(_PRODUCTION)
#define _PRODUCTION "" #define _PRODUCTION ""
#endif #endif
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c --- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
@@ -42,16 +42,13 @@ @@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/ /**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/ /************************************************************************/
@ -99,10 +99,10 @@ Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
#if !defined(_PRODUCTION) #if !defined(_PRODUCTION)
#define _PRODUCTION "" #define _PRODUCTION ""
#endif #endif
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c --- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
@@ -42,16 +42,13 @@ @@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/ /**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/ /************************************************************************/
@ -125,10 +125,10 @@ Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
#if !defined(_PRODUCTION) #if !defined(_PRODUCTION)
#define _PRODUCTION "" #define _PRODUCTION ""
#endif #endif
Index: VirtualBox-6.1.10/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp Index: VirtualBox-6.1.38/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/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.10/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +++ VirtualBox-6.1.38/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
@@ -308,7 +308,7 @@ static int vboxInitLogging(const char *p @@ -308,7 +308,7 @@ static int vboxInitLogging(const char *p
#endif #endif
"Log opened %s\n", "Log opened %s\n",
@ -138,10 +138,10 @@ Index: VirtualBox-6.1.10/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.10/src/VBox/Devices/PC/BIOS/bios.c Index: VirtualBox-6.1.38/src/VBox/Devices/PC/BIOS/bios.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Devices/PC/BIOS/bios.c --- VirtualBox-6.1.38.orig/src/VBox/Devices/PC/BIOS/bios.c
+++ VirtualBox-6.1.10/src/VBox/Devices/PC/BIOS/bios.c +++ VirtualBox-6.1.38/src/VBox/Devices/PC/BIOS/bios.c
@@ -143,7 +143,7 @@ void set_mode(uint8_t mode); @@ -143,7 +143,7 @@ void set_mode(uint8_t mode);
#define BX_PCIBIOS 1 #define BX_PCIBIOS 1
@ -151,11 +151,11 @@ Index: VirtualBox-6.1.10/src/VBox/Devices/PC/BIOS/bios.c
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// print_bios_banner // print_bios_banner
// displays a the bios version // displays a the bios version
Index: VirtualBox-6.1.10/src/VBox/Additions/common/VBoxService/VBoxService.cpp Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxService/VBoxService.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp --- VirtualBox-6.1.38.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ VirtualBox-6.1.10/src/VBox/Additions/common/VBoxService/VBoxService.cpp +++ VirtualBox-6.1.38/src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -243,7 +243,7 @@ static DECLCALLBACK(void) vgsvcLogHeader @@ -245,7 +245,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
"VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n" "VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
"Log opened %s\n", "Log opened %s\n",
RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET, RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET,
@ -164,10 +164,10 @@ Index: VirtualBox-6.1.10/src/VBox/Additions/common/VBoxService/VBoxService.cpp
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.10/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ VirtualBox-6.1.10/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
@@ -187,7 +187,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA @@ -187,7 +187,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature
@ -177,10 +177,10 @@ Index: VirtualBox-6.1.10/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
# Clean up # Clean up
$(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/ $(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.10/src/VBox/ExtPacks/Skeleton/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/ExtPacks/Skeleton/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ VirtualBox-6.1.10/src/VBox/ExtPacks/Skeleton/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/ExtPacks/Skeleton/Makefile.kmk
@@ -161,7 +161,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_SKELETON_MA @@ -161,7 +161,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_SKELETON_MA
$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.signature $(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.signature
@ -190,11 +190,11 @@ Index: VirtualBox-6.1.10/src/VBox/ExtPacks/Skeleton/Makefile.kmk
# Clean up # Clean up
$(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/ $(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.10/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ VirtualBox-6.1.10/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
@@ -346,7 +346,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) @@ -343,7 +343,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature
# Tar it up. # Tar it up.
@ -203,10 +203,10 @@ Index: VirtualBox-6.1.10/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
# Clean up # Clean up
$(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/ $(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.10/src/VBox/ExtPacks/VNC/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VNC/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/ExtPacks/VNC/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ VirtualBox-6.1.10/src/VBox/ExtPacks/VNC/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/ExtPacks/VNC/Makefile.kmk
@@ -154,7 +154,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED @@ -154,7 +154,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature
@ -216,11 +216,11 @@ Index: VirtualBox-6.1.10/src/VBox/ExtPacks/VNC/Makefile.kmk
# Clean up # Clean up
$(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/ $(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp --- VirtualBox-6.1.38.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ VirtualBox-6.1.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +++ VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
@@ -318,7 +318,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv @@ -319,7 +319,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv
} }
VGDrvCommonInitLoggers(); VGDrvCommonInitLoggers();
@ -229,10 +229,10 @@ Index: VirtualBox-6.1.10/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
/* /*
* Check if the NT version is supported and initialize g_enmVGDrvNtVer. * Check if the NT version is supported and initialize g_enmVGDrvNtVer.
Index: VirtualBox-6.1.10/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp Index: VirtualBox-6.1.38/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/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.10/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +++ VirtualBox-6.1.38/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
@@ -872,7 +872,7 @@ static DECLCALLBACK(void) vboxGreeterLog @@ -872,7 +872,7 @@ static DECLCALLBACK(void) vboxGreeterLog
"vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release log\n" "vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release log\n"
"Log opened %s\n", "Log opened %s\n",
@ -242,10 +242,10 @@ Index: VirtualBox-6.1.10/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.c
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.10/src/VBox/Additions/solaris/Mouse/vboxms.c Index: VirtualBox-6.1.38/src/VBox/Additions/solaris/Mouse/vboxms.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Additions/solaris/Mouse/vboxms.c --- VirtualBox-6.1.38.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
+++ VirtualBox-6.1.10/src/VBox/Additions/solaris/Mouse/vboxms.c +++ VirtualBox-6.1.38/src/VBox/Additions/solaris/Mouse/vboxms.c
@@ -256,7 +256,7 @@ static VBMSSTATE g_OpenNodeSt @@ -256,7 +256,7 @@ static VBMSSTATE g_OpenNodeSt
int _init(void) int _init(void)
{ {
@ -255,10 +255,10 @@ Index: VirtualBox-6.1.10/src/VBox/Additions/solaris/Mouse/vboxms.c
mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL); mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL);
/* /*
* Prevent module autounloading. * Prevent module autounloading.
Index: VirtualBox-6.1.10/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c Index: VirtualBox-6.1.38/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/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.10/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
@@ -247,10 +247,10 @@ Returns: @@ -247,10 +247,10 @@ Returns:
UTILITY_NAME, UTILITY_NAME,
UTILITY_MAJOR_VERSION, UTILITY_MAJOR_VERSION,
@ -272,10 +272,10 @@ Index: VirtualBox-6.1.10/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInf
Usage (); Usage ();
return -1; return -1;
} }
Index: VirtualBox-6.1.10/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp --- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ VirtualBox-6.1.10/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +++ VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
@@ -118,7 +118,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI @@ -118,7 +118,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI
static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject) static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject)
{ {
@ -294,11 +294,11 @@ Index: VirtualBox-6.1.10/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
NTSTATUS Status = vboxUsbRtGlobalsInit(); NTSTATUS Status = vboxUsbRtGlobalsInit();
Assert(Status == STATUS_SUCCESS); Assert(Status == STATUS_SUCCESS);
Index: VirtualBox-6.1.10/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp --- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ VirtualBox-6.1.10/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +++ VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
@@ -1515,7 +1515,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB @@ -1516,7 +1516,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB
RTLogDestinations(0, "debugger"); RTLogDestinations(0, "debugger");
#endif #endif
@ -307,10 +307,10 @@ Index: VirtualBox-6.1.10/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals)); memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals));
Index: VirtualBox-6.1.10/src/VBox/Main/glue/VBoxLogRelCreate.cpp Index: VirtualBox-6.1.38/src/VBox/Main/glue/VBoxLogRelCreate.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp --- VirtualBox-6.1.38.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+++ VirtualBox-6.1.10/src/VBox/Main/glue/VBoxLogRelCreate.cpp +++ VirtualBox-6.1.38/src/VBox/Main/glue/VBoxLogRelCreate.cpp
@@ -61,7 +61,7 @@ static DECLCALLBACK(void) vboxHeaderFoot @@ -61,7 +61,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
#endif #endif
"Log opened %s\n", "Log opened %s\n",
@ -320,10 +320,10 @@ Index: VirtualBox-6.1.10/src/VBox/Main/glue/VBoxLogRelCreate.cpp
pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE); pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c --- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
@@ -141,7 +141,7 @@ int main(int argc, char **argv) @@ -141,7 +141,7 @@ int main(int argc, char **argv)
{ {
PRIntn tab = 0; PRIntn tab = 0;
@ -333,10 +333,10 @@ Index: VirtualBox-6.1.10/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
printf("Depend.c build time is %s %s\n", buildDate, buildTime); printf("Depend.c build time is %s %s\n", buildDate, buildTime);
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/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.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
@@ -458,7 +458,7 @@ int @@ -458,7 +458,7 @@ int
main() main()
{ {
@ -346,10 +346,10 @@ Index: VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/pro
#ifdef TEST_STD_STRING #ifdef TEST_STD_STRING
cout << "Testing std::string." << endl; cout << "Testing std::string." << endl;
#else #else
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/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.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
@@ -425,7 +425,7 @@ int @@ -425,7 +425,7 @@ int
main() main()
{ {
@ -359,10 +359,10 @@ Index: VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/tes
#if 0 #if 0
{ {
Index: VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp --- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+++ VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
@@ -102,7 +102,7 @@ class test_message @@ -102,7 +102,7 @@ class test_message
public: public:
test_message() test_message()
@ -372,10 +372,10 @@ Index: VirtualBox-6.1.10/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
} }
~test_message() ~test_message()
Index: VirtualBox-6.1.10/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c Index: VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/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.10/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
@@ -29,9 +29,8 @@ @@ -29,9 +29,8 @@
#include "build_id.h" #include "build_id.h"
@ -387,10 +387,10 @@ Index: VirtualBox-6.1.10/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_i
#ifndef ElfW #ifndef ElfW
#define ElfW(type) Elf_##type #define ElfW(type) Elf_##type
Index: VirtualBox-6.1.10/src/libs/zlib-1.2.11/os400/make.sh Index: VirtualBox-6.1.38/src/libs/zlib-1.2.11/os400/make.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/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.10/src/libs/zlib-1.2.11/os400/make.sh +++ VirtualBox-6.1.38/src/libs/zlib-1.2.11/os400/make.sh
@@ -258,8 +258,8 @@ fi @@ -258,8 +258,8 @@ fi
# Create and compile the identification source file. # Create and compile the identification source file.
@ -402,10 +402,10 @@ Index: VirtualBox-6.1.10/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 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 make_module OS400 os400.c
LINK= # No need to rebuild service program yet. LINK= # No need to rebuild service program yet.
Index: VirtualBox-6.1.10/src/VBox/Additions/x11/VBoxClient/logging.cpp Index: VirtualBox-6.1.38/src/VBox/Additions/x11/VBoxClient/logging.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.10.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp --- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
+++ VirtualBox-6.1.10/src/VBox/Additions/x11/VBoxClient/logging.cpp +++ VirtualBox-6.1.38/src/VBox/Additions/x11/VBoxClient/logging.cpp
@@ -162,10 +162,10 @@ static DECLCALLBACK(void) vbClLogHeaderF @@ -162,10 +162,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
case RTLOGPHASE_BEGIN: case RTLOGPHASE_BEGIN:
{ {

16
vbox-permissions_warning.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-4.3.6/src/apps/Makefile.kmk Index: VirtualBox-6.1.38/src/apps/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-4.3.6.orig/src/apps/Makefile.kmk --- VirtualBox-6.1.38.orig/src/apps/Makefile.kmk
+++ VirtualBox-4.3.6/src/apps/Makefile.kmk +++ VirtualBox-6.1.38/src/apps/Makefile.kmk
@@ -34,5 +34,7 @@ if1of ($(KBUILD_TARGET),darwin solaris l @@ -31,5 +31,7 @@ if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUP
endif endif
endif endif
@ -10,10 +10,10 @@ Index: VirtualBox-4.3.6/src/apps/Makefile.kmk
+ +
include $(FILE_KBUILD_SUB_FOOTER) include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk Index: VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/Makefile.kmk
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk +++ VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/Makefile.kmk
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+## @file +## @file
@ -47,10 +47,10 @@ Index: VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk
+ +
+include $(KBUILD_PATH)/subfooter.kmk +include $(KBUILD_PATH)/subfooter.kmk
+ +
Index: VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp Index: VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp +++ VirtualBox-6.1.38/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+#include <QtWidgets/QApplication> +#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox> +#include <QtWidgets/QMessageBox>

12
vbox-python-py310.patch
View File

@ -1,9 +1,9 @@
# https://www.virtualbox.org/changeset/90537/vbox # https://www.virtualbox.org/changeset/90537/vbox
Index: VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/libs/xpcom18a4/python/Makefile.kmk --- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk +++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/Makefile.kmk
@@ -625,6 +625,52 @@ VBoxPython3_10m_x86_LIBS = $(VBOX_ @@ -625,6 +625,52 @@ VBoxPython3_10m_x86_LIBS = $(VBOX_
endif endif
endif endif
@ -57,10 +57,10 @@ Index: VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk
ifdef VBOX_PYTHONDEF_INC ifdef VBOX_PYTHONDEF_INC
# #
# Python without versioning # Python without versioning
Index: VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/PyXPCOM.h Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyXPCOM.h
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h --- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
+++ VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/PyXPCOM.h +++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyXPCOM.h
@@ -137,7 +137,7 @@ inline PyObject *PyBool_FromLong(long ok @@ -137,7 +137,7 @@ inline PyObject *PyBool_FromLong(long ok
# define PyInt_Check(o) PyLong_Check(o) # define PyInt_Check(o) PyLong_Check(o)
# define PyInt_AsLong(o) PyLong_AsLong(o) # define PyInt_AsLong(o) PyLong_AsLong(o)

48
vbox-python-selection.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.34/src/bldprogs/scm.cpp Index: VirtualBox-6.1.38/src/bldprogs/scm.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/bldprogs/scm.cpp --- VirtualBox-6.1.38.orig/src/bldprogs/scm.cpp
+++ VirtualBox-6.1.34/src/bldprogs/scm.cpp +++ VirtualBox-6.1.38/src/bldprogs/scm.cpp
@@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA @@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA
pszTreatAs = "shell"; pszTreatAs = "shell";
else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0) else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0)
@ -11,10 +11,10 @@ Index: VirtualBox-6.1.34/src/bldprogs/scm.cpp
else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0) else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0)
|| (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) ) || (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) )
pszTreatAs = "perl"; pszTreatAs = "perl";
Index: VirtualBox-6.1.34/src/libs/libxml2-2.9.4/configure Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/configure
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/libs/libxml2-2.9.4/configure --- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/configure
+++ VirtualBox-6.1.34/src/libs/libxml2-2.9.4/configure +++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/configure
@@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES= @@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES=
PYTHON_TESTS= PYTHON_TESTS=
pythondir= pythondir=
@ -39,10 +39,10 @@ Index: VirtualBox-6.1.34/src/libs/libxml2-2.9.4/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PYTHON+:} false; then : if ${ac_cv_path_PYTHON+:} false; then :
Index: VirtualBox-6.1.34/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec Index: VirtualBox-6.1.38/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec --- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ VirtualBox-6.1.34/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +++ VirtualBox-6.1.38/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
@@ -22,6 +22,9 @@ @@ -22,6 +22,9 @@
%define VBOXDOCDIR %{_defaultdocdir}/%NAME% %define VBOXDOCDIR %{_defaultdocdir}/%NAME%
%global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$ %global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$
@ -53,10 +53,10 @@ Index: VirtualBox-6.1.34/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
Summary: Oracle VM VirtualBox Summary: Oracle VM VirtualBox
Name: %NAME% Name: %NAME%
Index: VirtualBox-6.1.34/src/libs/libxml2-2.9.4/libxml.spec.in Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/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.34/src/libs/libxml2-2.9.4/libxml.spec.in +++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
+%global with_python2 0 +%global with_python2 0
%global with_python3 1 %global with_python3 1
@ -121,10 +121,10 @@ Index: VirtualBox-6.1.34/src/libs/libxml2-2.9.4/libxml.spec.in
%if 0%{?with_python3} %if 0%{?with_python3}
%files python3 %files python3
Index: VirtualBox-6.1.34/src/libs/libxml2-2.9.4/libxml2.spec Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/libs/libxml2-2.9.4/libxml2.spec --- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/libxml2.spec
+++ VirtualBox-6.1.34/src/libs/libxml2-2.9.4/libxml2.spec +++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec
@@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot} @@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot}
%if 0%{?with_python3} %if 0%{?with_python3}
@ -134,10 +134,10 @@ Index: VirtualBox-6.1.34/src/libs/libxml2-2.9.4/libxml2.spec
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
%endif # with_python3 %endif # with_python3
Index: VirtualBox-6.1.34/src/libs/xpcom18a4/python/src/ErrorUtils.cpp Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp --- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-6.1.34/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc @@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc
{ // a temp scope so I can use temp locals. { // a temp scope so I can use temp locals.
#if PY_MAJOR_VERSION <= 2 #if PY_MAJOR_VERSION <= 2
@ -147,10 +147,10 @@ Index: VirtualBox-6.1.34/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
#else #else
/* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */ /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult); const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
Index: VirtualBox-6.1.34/src/libs/xpcom18a4/python/src/PyGBase.cpp Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyGBase.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp --- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-6.1.34/src/libs/xpcom18a4/python/src/PyGBase.cpp +++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -183,7 +183,11 @@ PyG_Base::~PyG_Base() @@ -183,7 +183,11 @@ PyG_Base::~PyG_Base()
// Get the correct interface pointer for this object given the IID. // Get the correct interface pointer for this object given the IID.
void *PyG_Base::ThisAsIID( const nsIID &iid ) void *PyG_Base::ThisAsIID( const nsIID &iid )
@ -164,10 +164,10 @@ Index: VirtualBox-6.1.34/src/libs/xpcom18a4/python/src/PyGBase.cpp
if (iid.Equals(NS_GET_IID(nsISupports))) if (iid.Equals(NS_GET_IID(nsISupports)))
return (nsISupports *)(nsIInternalPython *)this; return (nsISupports *)(nsIInternalPython *)this;
if (iid.Equals(NS_GET_IID(nsISupportsWeakReference))) if (iid.Equals(NS_GET_IID(nsISupportsWeakReference)))
Index: VirtualBox-6.1.34/src/libs/xpcom18a4/python/gen_python_deps.py Index: VirtualBox-6.1.38/src/libs/xpcom18a4/python/gen_python_deps.py
=================================================================== ===================================================================
--- VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/gen_python_deps.py --- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-6.1.34/src/libs/xpcom18a4/python/gen_python_deps.py +++ VirtualBox-6.1.38/src/libs/xpcom18a4/python/gen_python_deps.py
@@ -86,7 +86,7 @@ def main(argv): @@ -86,7 +86,7 @@ def main(argv):
else: else:
multi = 1 multi = 1

8
vbox-smc-napa.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-5.1.2/src/VBox/Devices/PC/vbox.dsl Index: VirtualBox-6.1.38/src/VBox/Devices/PC/vbox.dsl
=================================================================== ===================================================================
--- VirtualBox-5.1.2.orig/src/VBox/Devices/PC/vbox.dsl --- VirtualBox-6.1.38.orig/src/VBox/Devices/PC/vbox.dsl
+++ VirtualBox-5.1.2/src/VBox/Devices/PC/vbox.dsl +++ VirtualBox-6.1.38/src/VBox/Devices/PC/vbox.dsl
@@ -1179,7 +1179,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, @@ -1197,7 +1197,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
Device (SMC) Device (SMC)
{ {
Name (_HID, EisaId ("APP0001")) Name (_HID, EisaId ("APP0001"))

16
vbox-suid-warning.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-6.0.4/src/apps/Makefile.kmk Index: VirtualBox-6.1.38/src/apps/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.0.4.orig/src/apps/Makefile.kmk --- VirtualBox-6.1.38.orig/src/apps/Makefile.kmk
+++ VirtualBox-6.0.4/src/apps/Makefile.kmk +++ VirtualBox-6.1.38/src/apps/Makefile.kmk
@@ -33,5 +33,7 @@ include $(PATH_SUB_CURRENT)/VBoxPermissi @@ -35,5 +35,7 @@ include $(PATH_SUB_CURRENT)/VBoxPermissi
include $(PATH_SUB_CURRENT)/VBoxUSB_DevRules/Makefile.kmk include $(PATH_SUB_CURRENT)/VBoxUSB_DevRules/Makefile.kmk
@ -10,10 +10,10 @@ Index: VirtualBox-6.0.4/src/apps/Makefile.kmk
+ +
include $(FILE_KBUILD_SUB_FOOTER) include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-6.0.4/src/apps/VBoxSUIDMessage/Makefile.kmk Index: VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/Makefile.kmk
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-6.0.4/src/apps/VBoxSUIDMessage/Makefile.kmk +++ VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/Makefile.kmk
@@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+## @file +## @file
@ -48,10 +48,10 @@ Index: VirtualBox-6.0.4/src/apps/VBoxSUIDMessage/Makefile.kmk
+include $(KBUILD_PATH)/subfooter.kmk +include $(KBUILD_PATH)/subfooter.kmk
+ +
+ +
Index: VirtualBox-6.0.4/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp Index: VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-6.0.4/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp +++ VirtualBox-6.1.38/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
+#include <QtWidgets/QApplication> +#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox> +#include <QtWidgets/QMessageBox>

22
vbox-usb-warning.diff
View File

@ -1,19 +1,19 @@
Index: VirtualBox-5.1.22/src/apps/Makefile.kmk Index: VirtualBox-6.1.38/src/apps/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-5.1.22.orig/src/apps/Makefile.kmk --- VirtualBox-6.1.38.orig/src/apps/Makefile.kmk
+++ VirtualBox-5.1.22/src/apps/Makefile.kmk +++ VirtualBox-6.1.38/src/apps/Makefile.kmk
@@ -31,5 +31,7 @@ endif @@ -33,5 +33,7 @@ endif
include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk
+include $(PATH_SUB_CURRENT)/VBoxUSB_DevRules/Makefile.kmk +include $(PATH_SUB_CURRENT)/VBoxUSB_DevRules/Makefile.kmk
+ +
include $(FILE_KBUILD_SUB_FOOTER) include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-5.1.22/src/apps/VBoxUSB_DevRules/Makefile.kmk Index: VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/Makefile.kmk
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-5.1.22/src/apps/VBoxUSB_DevRules/Makefile.kmk +++ VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/Makefile.kmk
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+## @file +## @file
@ -45,10 +45,10 @@ Index: VirtualBox-5.1.22/src/apps/VBoxUSB_DevRules/Makefile.kmk
+include $(KBUILD_PATH)/subfooter.kmk +include $(KBUILD_PATH)/subfooter.kmk
+ +
+ +
Index: VirtualBox-5.1.22/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp Index: VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-5.1.22/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp +++ VirtualBox-6.1.38/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
+#include <QtWidgets/QApplication> +#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox> +#include <QtWidgets/QMessageBox>

42
vbox-vboxadd-init-script.diff
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.36/src/VBox/Additions/linux/installer/vboxadd.sh Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Additions/linux/installer/vboxadd.sh --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-6.1.36/src/VBox/Additions/linux/installer/vboxadd.sh +++ VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -26,11 +26,14 @@ @@ -26,11 +26,14 @@
# Provides: vboxadd # Provides: vboxadd
# Required-Start: # Required-Start:
@ -170,10 +170,10 @@ Index: VirtualBox-6.1.36/src/VBox/Additions/linux/installer/vboxadd.sh
fail "modprobe vboxguest failed" fail "modprobe vboxguest failed"
case "$no_udev" in 1) case "$no_udev" in 1)
sleep .5;; sleep .5;;
Index: VirtualBox-6.1.36/src/VBox/Additions/linux/installer/vboxadd-service.sh Index: VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd-service.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh --- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
+++ VirtualBox-6.1.36/src/VBox/Additions/linux/installer/vboxadd-service.sh +++ VirtualBox-6.1.38/src/VBox/Additions/linux/installer/vboxadd-service.sh
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
# Provides: vboxadd-service # Provides: vboxadd-service
# Required-Start: vboxadd # Required-Start: vboxadd
@ -183,10 +183,10 @@ Index: VirtualBox-6.1.36/src/VBox/Additions/linux/installer/vboxadd-service.sh
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# X-Conflicts-With: systemd-timesyncd.service # X-Conflicts-With: systemd-timesyncd.service
# Description: VirtualBox Additions Service # Description: VirtualBox Additions Service
Index: VirtualBox-6.1.36/src/VBox/Installer/linux/vboxautostart-service.sh Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxautostart-service.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Installer/linux/vboxautostart-service.sh --- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxautostart-service.sh
+++ VirtualBox-6.1.36/src/VBox/Installer/linux/vboxautostart-service.sh +++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxautostart-service.sh
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
# Provides: vboxautostart-service # Provides: vboxautostart-service
# Required-Start: vboxdrv # Required-Start: vboxdrv
@ -196,10 +196,10 @@ Index: VirtualBox-6.1.36/src/VBox/Installer/linux/vboxautostart-service.sh
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Description: VirtualBox autostart service # Description: VirtualBox autostart service
### END INIT INFO ### END INIT INFO
Index: VirtualBox-6.1.36/src/VBox/Installer/linux/vboxballoonctrl-service.sh Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxballoonctrl-service.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh --- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+++ VirtualBox-6.1.36/src/VBox/Installer/linux/vboxballoonctrl-service.sh +++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxballoonctrl-service.sh
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
# Provides: vboxballoonctrl-service # Provides: vboxballoonctrl-service
# Required-Start: vboxdrv # Required-Start: vboxdrv
@ -209,10 +209,10 @@ Index: VirtualBox-6.1.36/src/VBox/Installer/linux/vboxballoonctrl-service.sh
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Description: VirtualBox watchdog daemon # Description: VirtualBox watchdog daemon
### END INIT INFO ### END INIT INFO
Index: VirtualBox-6.1.36/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh Index: VirtualBox-6.1.38/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh --- VirtualBox-6.1.38.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+++ VirtualBox-6.1.36/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +++ VirtualBox-6.1.38/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
# Provides: testboxscript-service # Provides: testboxscript-service
# Required-Start: $network # Required-Start: $network
@ -222,10 +222,10 @@ Index: VirtualBox-6.1.36/src/VBox/ValidationKit/testboxscript/linux/testboxscrip
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Description: TestBoxScript service # Description: TestBoxScript service
### END INIT INFO ### END INIT INFO
Index: VirtualBox-6.1.36/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh Index: VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/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.36/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +++ VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
# Provides: vboxtxs # Provides: vboxtxs
# Required-Start: $network # Required-Start: $network
@ -235,10 +235,10 @@ Index: VirtualBox-6.1.36/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Description: VirtualBox Test Execution Service # Description: VirtualBox Test Execution Service
### END INIT INFO ### END INIT INFO
Index: VirtualBox-6.1.36/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh Index: VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh --- VirtualBox-6.1.38.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+++ VirtualBox-6.1.36/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +++ VirtualBox-6.1.38/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
# Provides: vboxtxs # Provides: vboxtxs
# Required-Start: $network # Required-Start: $network

6
vbox-vboxdrv-init-script.diff
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.36/src/VBox/Installer/linux/vboxdrv.sh Index: VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh
=================================================================== ===================================================================
--- VirtualBox-6.1.36.orig/src/VBox/Installer/linux/vboxdrv.sh --- VirtualBox-6.1.38.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-6.1.36/src/VBox/Installer/linux/vboxdrv.sh +++ VirtualBox-6.1.38/src/VBox/Installer/linux/vboxdrv.sh
@@ -19,11 +19,12 @@ @@ -19,11 +19,12 @@
# #
### BEGIN INIT INFO ### BEGIN INIT INFO

12
vbox_remove_smp_mflags.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-5.1.16/src/libs/libxml2-2.9.4/libxml.spec.in Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in
=================================================================== ===================================================================
--- VirtualBox-5.1.16.orig/src/libs/libxml2-2.9.4/libxml.spec.in --- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/libxml.spec.in
+++ VirtualBox-5.1.16/src/libs/libxml2-2.9.4/libxml.spec.in +++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml.spec.in
@@ -94,7 +94,7 @@ at parse time or later once the document @@ -94,7 +94,7 @@ at parse time or later once the document
%build %build
@ -11,10 +11,10 @@ Index: VirtualBox-5.1.16/src/libs/libxml2-2.9.4/libxml.spec.in
%install %install
rm -fr %{buildroot} rm -fr %{buildroot}
Index: VirtualBox-5.1.16/src/libs/libxml2-2.9.4/libxml2.spec Index: VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec
=================================================================== ===================================================================
--- VirtualBox-5.1.16.orig/src/libs/libxml2-2.9.4/libxml2.spec --- VirtualBox-6.1.38.orig/src/libs/libxml2-2.9.4/libxml2.spec
+++ VirtualBox-5.1.16/src/libs/libxml2-2.9.4/libxml2.spec +++ VirtualBox-6.1.38/src/libs/libxml2-2.9.4/libxml2.spec
@@ -94,7 +94,7 @@ at parse time or later once the document @@ -94,7 +94,7 @@ at parse time or later once the document
%build %build

92
virtualbox-fix-ui-background-color.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
@@ -124,10 +124,6 @@ void UITools::preparePalette() @@ -124,10 +124,6 @@ void UITools::preparePalette()
{ {
/* Setup palette: */ /* Setup palette: */
@ -13,10 +13,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools
} }
void UITools::prepareLayout() void UITools::prepareLayout()
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
@@ -1323,7 +1323,7 @@ void UIVirtualBoxManager::prepareMenuBar @@ -1323,7 +1323,7 @@ void UIVirtualBoxManager::prepareMenuBar
/* Make sure menu-bar fills own solid background: */ /* Make sure menu-bar fills own solid background: */
menuBar()->setAutoFillBackground(true); menuBar()->setAutoFillBackground(true);
@ -26,10 +26,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxM
pal.setColor(QPalette::Active, QPalette::Button, color); pal.setColor(QPalette::Active, QPalette::Button, color);
menuBar()->setPalette(pal); menuBar()->setPalette(pal);
} }
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
@@ -121,10 +121,6 @@ void UIChooser::preparePalette() @@ -121,10 +121,6 @@ void UIChooser::preparePalette()
{ {
/* Setup palette: */ /* Setup palette: */
@ -41,10 +41,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
} }
void UIChooser::prepareLayout() void UIChooser::prepareLayout()
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
@@ -909,7 +909,7 @@ void UIChooserItemMachine::paintBackgrou @@ -909,7 +909,7 @@ void UIChooserItemMachine::paintBackgrou
else else
{ {
@ -81,10 +81,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
/* Create/assign pen: */ /* Create/assign pen: */
QPen pen(strokeColor); QPen pen(strokeColor);
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
@@ -716,7 +716,7 @@ void UIToolsItem::paintBackground(QPaint @@ -716,7 +716,7 @@ void UIToolsItem::paintBackground(QPaint
/* Prepare color: */ /* Prepare color: */
const QColor backgroundColor = isEnabled() const QColor backgroundColor = isEnabled()
@ -123,10 +123,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools
/* Create/assign pen: */ /* Create/assign pen: */
QPen pen(strokeColor); QPen pen(strokeColor);
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
@@ -352,14 +352,6 @@ void UIVirtualBoxManagerWidget::prepare( @@ -352,14 +352,6 @@ void UIVirtualBoxManagerWidget::prepare(
{ {
/* Configure palette: */ /* Configure palette: */
@ -151,10 +151,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxM
/* Set the initial distribution. The right site is bigger. */ /* Set the initial distribution. The right site is bigger. */
m_pSplitter->setStretchFactor(0, 2); m_pSplitter->setStretchFactor(0, 2);
m_pSplitter->setStretchFactor(1, 3); m_pSplitter->setStretchFactor(1, 3);
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
@@ -646,7 +646,7 @@ void UIChooserItem::paintFlatButton(QPai @@ -646,7 +646,7 @@ void UIChooserItem::paintFlatButton(QPai
/* Prepare colors: */ /* Prepare colors: */
@ -164,10 +164,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
/* Prepare pen: */ /* Prepare pen: */
QPen pen; QPen pen;
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
@@ -245,10 +245,6 @@ void UIChooserView::prepare() @@ -245,10 +245,6 @@ void UIChooserView::prepare()
void UIChooserView::preparePalette() void UIChooserView::preparePalette()
{ {
@ -179,10 +179,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
} }
void UIChooserView::resizeEvent(QResizeEvent *pEvent) void UIChooserView::resizeEvent(QResizeEvent *pEvent)
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
@@ -182,10 +182,6 @@ void UIToolsView::prepare() @@ -182,10 +182,6 @@ void UIToolsView::prepare()
void UIToolsView::preparePalette() void UIToolsView::preparePalette()
{ {
@ -194,10 +194,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools
} }
void UIToolsView::resizeEvent(QResizeEvent *pEvent) void UIToolsView::resizeEvent(QResizeEvent *pEvent)
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
@@ -1185,7 +1185,7 @@ void UIDetailsElement::paintBackground(Q @@ -1185,7 +1185,7 @@ void UIDetailsElement::paintBackground(Q
const QPalette pal = palette(); const QPalette pal = palette();
@ -216,10 +216,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDet
QPen pen(strokeColor); QPen pen(strokeColor);
pen.setWidth(0); pen.setWidth(0);
pPainter->setPen(pen); pPainter->setPen(pen);
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
@@ -110,7 +110,7 @@ void UIToolBar::paintEvent(QPaintEvent * @@ -110,7 +110,7 @@ void UIToolBar::paintEvent(QPaintEvent *
const QRect rectangle = pEvent->rect(); const QRect rectangle = pEvent->rect();
@ -229,11 +229,11 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
QLinearGradient gradient(rectangle.topLeft(), rectangle.bottomLeft()); QLinearGradient gradient(rectangle.topLeft(), rectangle.bottomLeft());
gradient.setColorAt(0, backgroundColor.lighter(130)); gradient.setColorAt(0, backgroundColor.lighter(130));
gradient.setColorAt(1, backgroundColor.lighter(125)); gradient.setColorAt(1, backgroundColor.lighter(125));
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
@@ -700,7 +700,7 @@ void UIDetailsSet::paintBackground(QPain @@ -706,7 +706,7 @@ void UIDetailsSet::paintBackground(QPain
const QRect optionRect = pOptions->rect; const QRect optionRect = pOptions->rect;
/* Paint default background: */ /* Paint default background: */
@ -242,10 +242,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDet
pPainter->fillRect(optionRect, defaultColor); pPainter->fillRect(optionRect, defaultColor);
/* Restore painter: */ /* Restore painter: */
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
@@ -639,7 +639,7 @@ void UIChooserItemGlobal::paintBackgroun @@ -639,7 +639,7 @@ void UIChooserItemGlobal::paintBackgroun
pPainter->fillRect(rectangle, bgGrad); pPainter->fillRect(rectangle, bgGrad);
#else #else
@ -264,10 +264,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UICho
/* Create/assign pen: */ /* Create/assign pen: */
QPen pen(strokeColor); QPen pen(strokeColor);
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
@@ -283,7 +283,7 @@ void UIDetailsGroup::paintBackground(QPa @@ -283,7 +283,7 @@ void UIDetailsGroup::paintBackground(QPa
#ifdef VBOX_WS_MAC #ifdef VBOX_WS_MAC
const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(145); const QColor defaultColor = palette().color(QPalette::Active, QPalette::Mid).lighter(145);
@ -277,10 +277,10 @@ Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/details/UIDet
#endif #endif
pPainter->fillRect(optionRect, defaultColor); pPainter->fillRect(optionRect, defaultColor);
Index: VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp Index: VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
=================================================================== ===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp --- VirtualBox-6.1.38.orig/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
+++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp +++ VirtualBox-6.1.38/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
@@ -1500,7 +1500,7 @@ void UIChooserItemGroup::paintBackground @@ -1500,7 +1500,7 @@ void UIChooserItemGroup::paintBackground
const QPalette pal = palette(); const QPalette pal = palette();
const QColor headerColor = pal.color(QPalette::Active, const QColor headerColor = pal.color(QPalette::Active,

16
virtualbox-sed-params.patch
View File

@ -1,8 +1,8 @@
Index: VirtualBox-6.0.0/src/VBox/Main/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.0.0.orig/src/VBox/Main/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-6.0.0/src/VBox/Main/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/Main/Makefile.kmk
@@ -1521,7 +1521,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \ @@ -1648,7 +1648,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \
$(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \ $(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
--stringparam generating "dtrace-probes" \ --stringparam generating "dtrace-probes" \
-o "$@" $(VBoxAPIWrap_VBOX_XSLT) $(VBOX_XIDL_FILE) -o "$@" $(VBoxAPIWrap_VBOX_XSLT) $(VBOX_XIDL_FILE)
@ -11,11 +11,11 @@ Index: VirtualBox-6.0.0/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-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" "$(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.0.0/src/VBox/Devices/Makefile.kmk Index: VirtualBox-6.1.38/src/VBox/Devices/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-6.0.0.orig/src/VBox/Devices/Makefile.kmk --- VirtualBox-6.1.38.orig/src/VBox/Devices/Makefile.kmk
+++ VirtualBox-6.0.0/src/VBox/Devices/Makefile.kmk +++ VirtualBox-6.1.38/src/VBox/Devices/Makefile.kmk
@@ -859,8 +859,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1 @@ -880,8 +880,7 @@ endif
$(call MSG_TOOL,iasl,VBoxDD,$<,$@) $(call MSG_TOOL,iasl,VBoxDD,$<,$@)
$(QUIET)$(RM) -f $@ $@.tmp $@.pre $(QUIET)$(RM) -f $@ $@.tmp $@.pre
$(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -x c -o $@.pre $< $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -x c -o $@.pre $<

6
virtualbox-snpritnf-buffer-overflow.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-5.1.4/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
=================================================================== ===================================================================
--- VirtualBox-5.1.4.orig/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-5.1.4/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
@@ -833,6 +833,7 @@ dt_gmatch(const char *s, const char *p) @@ -833,6 +833,7 @@ dt_gmatch(const char *s, const char *p)
#else #else
return (p == NULL || *p == '\0' || RTStrSimplePatternMatch(p, s)); /** @todo implement gmatch. */ return (p == NULL || *p == '\0' || RTStrSimplePatternMatch(p, s)); /** @todo implement gmatch. */

20
virtualbox.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Fri Sep 16 15:03:48 UTC 2022 - Larry Rainey <llrainey15@gmail.com>
- Version bump to 6.1.38r86 released by Oracle September 02 2022
This is a maintenance release. The following items were fixed and/or added:
GUI: Improvements in Native Language Support area
Main: OVF Export: Added support for exporting VMs containing Virtio-SCSI controllers
Recording settings: Fixed a regression which could cause not starting the COM server (VBoxSVC) under certain circumstances (bug #21034)
Recording: More deterministic naming for recorded files (will now overwrite old .webm files if present)
Linux Host and Guest Additions installer: Improved check for systemd presence in the system (bug #19033)
Linux Guest Additions: Introduced initial support for kernel 6.0
Linux Guest Additions: Additional fixes for kernel RHEL 9.1 (bug #21065)
Windows Guest Additions: Improvements in Drag and Drop area
Fixes permission problem with /dev/vboxuser (boo#1203370)
Fixes boo#1203306 - 6.1.38 is available
Fixes missing firewall opening (boo#1203086)
Fixes boo#1201720 CVE items for CVE-2022-21571, CVE-2022-21554
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 12 00:18:58 UTC 2022 - Larry Finger <Larry.Finger@gmail.com> Fri Aug 12 00:18:58 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>

60
virtualbox.spec
View File

@ -52,7 +52,7 @@
%endif %endif
# ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!! # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
Name: virtualbox%{?dash}%{?name_suffix} Name: virtualbox%{?dash}%{?name_suffix}
Version: 6.1.36 Version: 6.1.38
Release: 0 Release: 0
Summary: %{package_summary} Summary: %{package_summary}
# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" # FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
@ -300,11 +300,8 @@ the terms of the GNU Public License (GPL).
########################################## ##########################################
%package qt %package qt
Summary: Qt GUI part for %{name} Summary: Qt GUI part for %{name}
Group: System/Emulators/PC Group: System/Emulators/PC
@ -324,11 +321,8 @@ This package contains the code for the GUI used to control VMs.
######################################### #########################################
%package websrv %package websrv
Summary: WebService GUI part for %{name} Summary: WebService GUI part for %{name}
Group: System/Emulators/PC Group: System/Emulators/PC
@ -345,7 +339,6 @@ The VirtualBox web server is used to control headless VMs using a browser.
########################################### ###########################################
%package guest-tools %package guest-tools
Summary: VirtualBox guest tools Summary: VirtualBox guest tools
Group: System/Emulators/PC Group: System/Emulators/PC
@ -369,11 +362,8 @@ VirtualBox guest addition tools.
########################################### ###########################################
%package -n python3-%{name} %package -n python3-%{name}
Summary: Python bindings for %{name} Summary: Python bindings for %{name}
Group: Development/Libraries/Python Group: Development/Libraries/Python
@ -394,11 +384,8 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
########################################### ###########################################
%package devel %package devel
Summary: Devel files for %{name} Summary: Devel files for %{name}
Group: Development/Libraries/Other Group: Development/Libraries/Other
@ -414,11 +401,8 @@ Development file for %{name}
########################################### ###########################################
%package host-source %package host-source
Summary: Source files for %{name} host kernel modules Summary: Source files for %{name} host kernel modules
Group: Development/Sources Group: Development/Sources
@ -451,11 +435,8 @@ sudo %{_sbindir}/vboxguestconfig
########################################### ###########################################
%package guest-desktop-icons %package guest-desktop-icons
Summary: Icons for guest desktop files Summary: Icons for guest desktop files
Group: System/Emulators/PC Group: System/Emulators/PC
@ -469,11 +450,8 @@ This package contains icons for guest desktop files that were created on the des
########################################### ###########################################
%package vnc %package vnc
Summary: VNC desktop sharing Summary: VNC desktop sharing
Group: System/Emulators/PC Group: System/Emulators/PC
@ -654,7 +632,7 @@ install -d %{buildroot}%{_unitdir}/multi-user.target.wants
install -d -m 755 %{buildroot}%{_sysconfdir}/vbox install -d -m 755 %{buildroot}%{_sysconfdir}/vbox
install -d -m 755 %{buildroot}%{_sysconfdir}/vbox/autostart.d install -d -m 755 %{buildroot}%{_sysconfdir}/vbox/autostart.d
install -d -m 755 %{buildroot}%{_udevrulesdir} install -d -m 755 %{buildroot}%{_udevrulesdir}
install -d -m 755 %{buildroot}/etc/X11/xinit/xinitrc.d install -d -m 755 %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d
########################################### ###########################################
echo "entering guest-tools install section" echo "entering guest-tools install section"
@ -673,9 +651,9 @@ install -p -m 0644 -D %{SOURCE13} %{buildroot}%{_unitdir}/vboxservice.service
install -m 755 out/linux.*/release/bin/additions/VBoxClient %{buildroot}%{_bindir} install -m 755 out/linux.*/release/bin/additions/VBoxClient %{buildroot}%{_bindir}
install -m 755 out/linux.*/release/bin/additions/VBoxDRMClient %{buildroot}%{_bindir} install -m 755 out/linux.*/release/bin/additions/VBoxDRMClient %{buildroot}%{_bindir}
# install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows) # install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows)
install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient %{buildroot}/etc/X11/xinit/xinitrc.d/ install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/
install -d %{buildroot}%{_sysconfdir}/xdg/autostart/ install -d %{buildroot}%{_sysconfdir}/xdg/autostart/
install -m 644 %{SOURCE25} %{buildroot}/etc/xdg/autostart/vboxclient.desktop install -m 644 %{SOURCE25} %{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%if 0%{?suse_version} > 1320 || 0%{?sle_version} == 120300 %if 0%{?suse_version} > 1320 || 0%{?sle_version} == 120300
install -d -m 755 %{buildroot}/media install -d -m 755 %{buildroot}/media
%endif %endif
@ -822,6 +800,7 @@ pushd out/linux.*/release/bin
install -m 755 vboxwebsrv %{buildroot}%{_vbox_instdir} install -m 755 vboxwebsrv %{buildroot}%{_vbox_instdir}
install -m 755 webtest %{buildroot}%{_vbox_instdir} install -m 755 webtest %{buildroot}%{_vbox_instdir}
popd popd
ln -sf %{_unitdir}/vboxweb-service.service %{buildroot}%{_unitdir}/multi-user.target.wants/vboxweb-service.service
# #
###################################################### ######################################################
@ -1040,6 +1019,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%{_unitdir}/vboxautostart-service.service %{_unitdir}/vboxautostart-service.service
%{_unitdir}/multi-user.target.wants/vboxdrv.service %{_unitdir}/multi-user.target.wants/vboxdrv.service
%{_unitdir}/multi-user.target.wants/vboxautostart-service.service %{_unitdir}/multi-user.target.wants/vboxautostart-service.service
%{_unitdir}/multi-user.target.wants/vboxweb-service.service
%{_sbindir}/rcvboxdrv %{_sbindir}/rcvboxdrv
%{_sbindir}/rcvboxautostart %{_sbindir}/rcvboxautostart
%{_sbindir}/vboxconfig %{_sbindir}/vboxconfig
@ -1098,17 +1078,17 @@ export DISABLE_RESTART_ON_UPDATE=yes
%dir %{_libdir}/xorg/modules/drivers %dir %{_libdir}/xorg/modules/drivers
%dir %{_libdir}/xorg/modules/input %dir %{_libdir}/xorg/modules/input
%dir %{_libdir}/dri/ %dir %{_libdir}/dri/
%dir /etc/X11 %dir %{_sysconfdir}/X11
%dir /etc/X11/xinit %dir %{_sysconfdir}/X11/xinit
%dir /etc/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xinit/xinitrc.d
%{_bindir}/VBoxClient %{_bindir}/VBoxClient
%{_bindir}/VBoxDRMClient %{_bindir}/VBoxDRMClient
/etc/X11/xinit/xinitrc.d/98vboxadd-xclient %{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient
%{_unitdir}/vboxclient.service %{_unitdir}/vboxclient.service
%{_unitdir}/vboxservice.service %{_unitdir}/vboxservice.service
%dir /etc/xdg %dir %{_sysconfdir}/xdg
%dir /etc/xdg/autostart %dir %{_sysconfdir}/xdg/autostart
/etc/xdg/autostart/vboxclient.desktop %{_sysconfdir}/xdg/autostart/vboxclient.desktop
%if 0%{?suse_version} > 1320 || 0%{?sle_version} == 120300 %if 0%{?suse_version} > 1320 || 0%{?sle_version} == 120300
%dir /media %dir /media
%endif %endif