Accepting request 1142682 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/1142682
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=268
This commit is contained in:
Ana Guerrero 2024-01-30 17:24:47 +00:00 committed by Git OBS Bridge
commit a81a1046f6
39 changed files with 403 additions and 422 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:fd75f42e3e30c009c5421773f1e05dd1b2705aea8609331e2732277acc0ae740 oid sha256:c1be96694b4da49489db88b3593b8ce981b93766fd0869a32bbe872621bedb04
size 4593947 size 4595857

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Additions/x11/Installer/98vboxadd-xclient Index: VirtualBox-7.0.14/src/VBox/Additions/x11/Installer/98vboxadd-xclient
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient --- VirtualBox-7.0.14.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+++ VirtualBox-7.0.12/src/VBox/Additions/x11/Installer/98vboxadd-xclient +++ VirtualBox-7.0.14/src/VBox/Additions/x11/Installer/98vboxadd-xclient
@@ -31,15 +31,9 @@ for i in $HOME/.vboxclient-*.pid; do @@ -31,15 +31,9 @@ for i in $HOME/.vboxclient-*.pid; do
test -w $i || rm -f $i test -w $i || rm -f $i
done done

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/Support/SUPDrvGip.cpp Index: VirtualBox-7.0.14/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp --- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/Support/SUPDrvGip.cpp +++ VirtualBox-7.0.14/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
@@ -4537,9 +4537,11 @@ static int supdrvTscDeltaThreadWait(PSUP @@ -4537,9 +4537,11 @@ static int supdrvTscDeltaThreadWait(PSUP
*/ */
static void supdrvTscDeltaThreadStartMeasurement(PSUPDRVDEVEXT pDevExt, bool fForceAll) static void supdrvTscDeltaThreadStartMeasurement(PSUPDRVDEVEXT pDevExt, bool fForceAll)

View File

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

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/configure Index: VirtualBox-7.0.14/configure
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/configure --- VirtualBox-7.0.14.orig/configure
+++ VirtualBox-7.0.12/configure +++ VirtualBox-7.0.14/configure
@@ -1191,21 +1191,19 @@ check_sdl() @@ -1191,21 +1191,19 @@ check_sdl()
fail fail
fi fi
@ -50,10 +50,10 @@ Index: VirtualBox-7.0.12/configure
[ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf [ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf
[ $WITH_X11 -eq 1 ] && check_x [ $WITH_X11 -eq 1 ] && check_x
# TODO check for xcomposite-dev (X11/extensions/Xcomposite.h, additions only) # TODO check for xcomposite-dev (X11/extensions/Xcomposite.h, additions only)
Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/Frontends/VBoxSDL/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/Frontends/VBoxSDL/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/Frontends/VBoxSDL/Makefile.kmk
@@ -51,7 +51,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K @@ -51,7 +51,7 @@ if !defined(VBOX_WITH_HARDENING) || "$(K
PROGRAMS += VBoxSDL PROGRAMS += VBoxSDL
endif endif

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h Index: VirtualBox-7.0.14/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h --- VirtualBox-7.0.14.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
+++ VirtualBox-7.0.12/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h +++ VirtualBox-7.0.14/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
#include <intrin.h> #include <intrin.h>
#endif #endif
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.12/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
#include "util_likely.h" #include "util_likely.h"
#include "util_math.h" #include "util_math.h"
Index: VirtualBox-7.0.12/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h Index: VirtualBox-7.0.14/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h --- VirtualBox-7.0.14.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
+++ VirtualBox-7.0.12/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h +++ VirtualBox-7.0.14/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
@@ -66,6 +66,9 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CO @@ -66,6 +66,9 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CO
OF THIS SOFTWARE. OF THIS SOFTWARE.

View File

@ -1,8 +1,8 @@
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c Index: VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c --- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -89,6 +89,17 @@ @@ -89,6 +89,21 @@
#define VBOXNETFLT_OS_SPECFIC 1 #define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h" #include "../VBoxNetFltInternal.h"
@ -13,17 +13,21 @@ Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
+# define OPENSUSE_155 +# define OPENSUSE_155
+# endif +# endif
+ +
+#if RTLNX_SUSE_MAJ_PREREQ(15, 6) +#if !defined(skb_gso_segment)
+#if defined(CONFIG_SUSE_VERSION) && (CONFIG_SUSE_VERSION == 15)
+//#include <config/net/mpls/gso.h>
+#else
+#include <net/gso.h> +#include <net/gso.h>
+#endif +#endif
+#endif
+ +
typedef struct VBOXNETFLTNOTIFIER { typedef struct VBOXNETFLTNOTIFIER {
struct notifier_block Notifier; struct notifier_block Notifier;
PVBOXNETFLTINS pThis; PVBOXNETFLTINS pThis;
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.c --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c +++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
#include "vbox_drv.h" #include "vbox_drv.h"
@ -51,26 +55,10 @@ Index: VirtualBox-7.0.12/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 */
@@ -389,13 +393,13 @@ static struct drm_driver driver = { Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_main.c
#elif RTLNX_VER_MAX(5,12,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
.dumb_destroy = drm_gem_dumb_destroy,
#endif
-#if RTLNX_VER_MAX(6,6,0)
+#if RTLNX_VER_MAX(6,6,0) && !RTLNX_SUSE_MAJ_PREREQ(15, 5)
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
#endif
.gem_prime_import = drm_gem_prime_import,
.gem_prime_import_sg_table = vbox_gem_prime_import_sg_table,
-#if RTLNX_VER_MAX(6,6,0)
+#if RTLNX_VER_MAX(6,6,0) && !RTLNX_SUSE_MAJ_PREREQ(15, 5)
.gem_prime_mmap = vbox_gem_prime_mmap,
#endif
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_main.c --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c +++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_main.c
@@ -663,8 +663,12 @@ static inline u64 vbox_bo_mmap_offset(st @@ -663,8 +663,12 @@ static inline u64 vbox_bo_mmap_offset(st
#elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0) #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;
@ -84,10 +72,10 @@ Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c
} }
int int
Index: VirtualBox-7.0.12/include/iprt/cdefs.h Index: VirtualBox-7.0.14/include/iprt/cdefs.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/include/iprt/cdefs.h --- VirtualBox-7.0.14.orig/include/iprt/cdefs.h
+++ VirtualBox-7.0.12/include/iprt/cdefs.h +++ VirtualBox-7.0.14/include/iprt/cdefs.h
@@ -1399,14 +1399,15 @@ @@ -1399,14 +1399,15 @@
#if RT_CLANG_PREREQ(4, 0) && RT_CPLUSPLUS_PREREQ(201100) #if RT_CLANG_PREREQ(4, 0) && RT_CPLUSPLUS_PREREQ(201100)
# define RT_FALL_THROUGH() [[clang::fallthrough]] # define RT_FALL_THROUGH() [[clang::fallthrough]]
@ -107,10 +95,10 @@ Index: VirtualBox-7.0.12/include/iprt/cdefs.h
/** @def RT_IPRT_FORMAT_ATTR /** @def RT_IPRT_FORMAT_ATTR
Index: VirtualBox-7.0.12/kBuild/header.kmk Index: VirtualBox-7.0.14/kBuild/header.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/kBuild/header.kmk --- VirtualBox-7.0.14.orig/kBuild/header.kmk
+++ VirtualBox-7.0.12/kBuild/header.kmk +++ VirtualBox-7.0.14/kBuild/header.kmk
@@ -764,7 +764,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm @@ -764,7 +764,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm
RMDIR_INT := kmk_builtin_rmdir RMDIR_INT := kmk_builtin_rmdir
RMDIR := $(RMDIR_INT) RMDIR := $(RMDIR_INT)
@ -120,10 +108,10 @@ Index: VirtualBox-7.0.12/kBuild/header.kmk
SED_INT := $(SED_EXT) SED_INT := $(SED_EXT)
SED := $(SED_EXT) SED := $(SED_EXT)
Index: VirtualBox-7.0.12/configure Index: VirtualBox-7.0.14/configure
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/configure --- VirtualBox-7.0.14.orig/configure
+++ VirtualBox-7.0.12/configure +++ VirtualBox-7.0.14/configure
@@ -2039,7 +2039,7 @@ check_kbuild() @@ -2039,7 +2039,7 @@ check_kbuild()
fi fi
echo "export KBUILD_PATH KBUILD_DEVTOOLS PATH" >> $ENV echo "export KBUILD_PATH KBUILD_DEVTOOLS PATH" >> $ENV
@ -142,10 +130,10 @@ Index: VirtualBox-7.0.12/configure
else else
fail fail
fi fi
Index: VirtualBox-7.0.12/tools/bin/backport-commit.sh Index: VirtualBox-7.0.14/tools/bin/backport-commit.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/tools/bin/backport-commit.sh --- VirtualBox-7.0.14.orig/tools/bin/backport-commit.sh
+++ VirtualBox-7.0.12/tools/bin/backport-commit.sh +++ VirtualBox-7.0.14/tools/bin/backport-commit.sh
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
# #
# Determin script dir so we can source the common bits. # Determin script dir so we can source the common bits.
@ -155,10 +143,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/tools/bin/backport-common.sh Index: VirtualBox-7.0.14/tools/bin/backport-common.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/tools/bin/backport-common.sh --- VirtualBox-7.0.14.orig/tools/bin/backport-common.sh
+++ VirtualBox-7.0.12/tools/bin/backport-common.sh +++ VirtualBox-7.0.14/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 $
@ -174,10 +162,10 @@ Index: VirtualBox-7.0.12/tools/bin/backport-common.sh
# #
# Functions. # Functions.
Index: VirtualBox-7.0.12/tools/bin/backport-merge-and-commit.sh Index: VirtualBox-7.0.14/tools/bin/backport-merge-and-commit.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/tools/bin/backport-merge-and-commit.sh --- VirtualBox-7.0.14.orig/tools/bin/backport-merge-and-commit.sh
+++ VirtualBox-7.0.12/tools/bin/backport-merge-and-commit.sh +++ VirtualBox-7.0.14/tools/bin/backport-merge-and-commit.sh
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
# #
# Determin script dir so we can invoke the two worker scripts. # Determin script dir so we can invoke the two worker scripts.
@ -187,10 +175,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/tools/bin/backport-merge.sh Index: VirtualBox-7.0.14/tools/bin/backport-merge.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/tools/bin/backport-merge.sh --- VirtualBox-7.0.14.orig/tools/bin/backport-merge.sh
+++ VirtualBox-7.0.12/tools/bin/backport-merge.sh +++ VirtualBox-7.0.14/tools/bin/backport-merge.sh
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
# #
# Determin script dir so we can source the common bits. # Determin script dir so we can source the common bits.
@ -200,10 +188,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Main/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/Main/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Main/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/Main/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/Main/Makefile.kmk
@@ -264,7 +264,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE @@ -264,7 +264,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE
| $$(dir $$@) | $$(dir $$@)
$(call KB_FN_AUTO_CMD_DEPS_COMMANDS) $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
@ -213,10 +201,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Runtime/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/Runtime/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Runtime/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/Runtime/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/Runtime/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/Runtime/Makefile.kmk
@@ -4421,6 +4421,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V @@ -4421,6 +4421,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V
# #
# Generate the status code data. # Generate the status code data.
@ -225,10 +213,10 @@ Index: VirtualBox-7.0.12/src/VBox/Runtime/Makefile.kmk
$(IPRT_OUT_DIR)/errmsgdata.h: \ $(IPRT_OUT_DIR)/errmsgdata.h: \
$(VBOX_PATH_RUNTIME_SRC)/common/err/errmsg.sed \ $(VBOX_PATH_RUNTIME_SRC)/common/err/errmsg.sed \
$(PATH_ROOT)/include/iprt/err.h \ $(PATH_ROOT)/include/iprt/err.h \
Index: VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h Index: VirtualBox-7.0.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h --- VirtualBox-7.0.14.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +++ VirtualBox-7.0.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -147,9 +147,9 @@ @@ -147,9 +147,9 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/completion.h> #include <linux/completion.h>
@ -241,10 +229,10 @@ Index: VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
#if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38) #if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38)
# include <linux/smp_lock.h> # include <linux/smp_lock.h>
#endif #endif
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyXPCOM.h Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyXPCOM.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyXPCOM.h +++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyXPCOM.h
@@ -191,7 +191,7 @@ extern "C" PyAPI_FUNC(const char *) PyUn @@ -191,7 +191,7 @@ extern "C" PyAPI_FUNC(const char *) PyUn
# endif # endif
@ -254,10 +242,10 @@ Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyXPCOM.h
DECLINLINE(int) PyRun_SimpleString(const char *pszCode) DECLINLINE(int) PyRun_SimpleString(const char *pszCode)
{ {
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -121,7 +121,7 @@ void DoLogMessage(const char *methodName @@ -121,7 +121,7 @@ void DoLogMessage(const char *methodName
#if PY_MAJOR_VERSION <= 2 #if PY_MAJOR_VERSION <= 2
c += PyString_AsString(repr); c += PyString_AsString(repr);
@ -298,10 +286,10 @@ Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
#endif #endif
result = (char *)PyMem_Malloc(strlen(tempResult)+1); result = (char *)PyMem_Malloc(strlen(tempResult)+1);
if (result==NULL) if (result==NULL)
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyGBase.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp +++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -117,7 +117,7 @@ PyG_Base::PyG_Base(PyObject *instance, c @@ -117,7 +117,7 @@ PyG_Base::PyG_Base(PyObject *instance, c
#if PY_MAJOR_VERSION <= 2 #if PY_MAJOR_VERSION <= 2
szRepr = PyString_AsString(r); szRepr = PyString_AsString(r);
@ -311,10 +299,10 @@ Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp
#endif #endif
if (szRepr==NULL) szRepr = ""; if (szRepr==NULL) szRepr = "";
int reprOffset = *szRepr=='<' ? 1 : 0; int reprOffset = *szRepr=='<' ? 1 : 0;
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyIID.cpp Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyIID.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyIID.cpp --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyIID.cpp +++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyIID.cpp
@@ -137,7 +137,7 @@ Py_nsIID::IIDFromPyObject(PyObject *ob, @@ -137,7 +137,7 @@ Py_nsIID::IIDFromPyObject(PyObject *ob,
ok = iid.Parse(PyString_AsString(ob)); ok = iid.Parse(PyString_AsString(ob));
#else #else
@ -324,10 +312,10 @@ Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyIID.cpp
#endif #endif
if (!ok) { if (!ok) {
PyXPCOM_BuildPyException(NS_ERROR_ILLEGAL_VALUE); PyXPCOM_BuildPyException(NS_ERROR_ILLEGAL_VALUE);
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/VariantUtils.cpp Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/VariantUtils.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/VariantUtils.cpp +++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/VariantUtils.cpp
@@ -141,7 +141,7 @@ PyObject *PyObject_FromNSString( const n @@ -141,7 +141,7 @@ PyObject *PyObject_FromNSString( const n
#if PY_MAJOR_VERSION <= 2 #if PY_MAJOR_VERSION <= 2
char* dest = (char *)PyString_AS_STRING(ret); char* dest = (char *)PyString_AS_STRING(ret);
@ -373,10 +361,10 @@ Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/VariantUtils.cpp
BREAK_FALSE; BREAK_FALSE;
const char *sz = PyBytes_AS_STRING(val_use); const char *sz = PyBytes_AS_STRING(val_use);
Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp Index: VirtualBox-7.0.14/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp --- VirtualBox-7.0.14.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp +++ VirtualBox-7.0.14/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
@@ -710,7 +710,7 @@ static const char *keyModToStr(unsigned @@ -710,7 +710,7 @@ static const char *keyModToStr(unsigned
RT_CASE_RET_STR(KMOD_NUM); RT_CASE_RET_STR(KMOD_NUM);
RT_CASE_RET_STR(KMOD_CAPS); RT_CASE_RET_STR(KMOD_CAPS);
@ -386,10 +374,10 @@ Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
default: default:
break; break;
} }
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.h --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h +++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
# pragma once # pragma once
#endif #endif
@ -398,10 +386,10 @@ Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h
#include <linux/version.h> #include <linux/version.h>
/* iprt/linux/version.h copy - start */ /* iprt/linux/version.h copy - start */
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_ttm.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_ttm.c --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c +++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -38,6 +38,10 @@ @@ -38,6 +38,10 @@
# include <drm/ttm/ttm_tt.h> # include <drm/ttm/ttm_tt.h>
#endif #endif
@ -425,10 +413,10 @@ Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c
return tt; return tt;
} }
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_fb.c Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_fb.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_fb.c --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_fb.c
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_fb.c +++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_fb.c
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
@ -437,19 +425,10 @@ Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_fb.c
#include <VBoxVideo.h> #include <VBoxVideo.h>
@@ -196,7 +197,7 @@ static struct fb_ops vboxfb_ops = { Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_mode.c
.owner = THIS_MODULE,
.fb_check_var = drm_fb_helper_check_var,
.fb_set_par = drm_fb_helper_set_par,
-#if RTLNX_VER_MIN(6,5,0)
+#if RTLNX_VER_MIN(6,5,0) || RTLNX_SUSE_MAJ_PREREQ(15, 6)
.fb_read = fb_sys_read,
.fb_write = fb_sys_write,
.fb_fillrect = sys_fillrect,
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_mode.c --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c +++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -53,6 +53,7 @@ @@ -53,6 +53,7 @@
#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2) || RTLNX_SUSE_MAJ_PREREQ(15,5) #if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2) || RTLNX_SUSE_MAJ_PREREQ(15,5)
# include <drm/drm_edid.h> # include <drm/drm_edid.h>
@ -458,10 +437,10 @@ Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c
#include "VBoxVideo.h" #include "VBoxVideo.h"
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c Index: VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c --- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c +++ VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
#define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface)) #define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface))
@ -471,25 +450,3 @@ Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.
# define VBOX_DEV_ADDR_SET(dev, addr, len) dev_addr_mod(dev, 0, addr, len) # define VBOX_DEV_ADDR_SET(dev, addr, len) dev_addr_mod(dev, 0, addr, len)
#else /* < 5.17.0 */ #else /* < 5.17.0 */
# define VBOX_DEV_ADDR_SET(dev, addr, len) memcpy(dev->dev_addr, addr, len) # define VBOX_DEV_ADDR_SET(dev, addr, len) memcpy(dev->dev_addr, addr, len)
Index: VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+++ VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
@@ -1342,7 +1342,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
fWrite, /* force write access. */
# endif
&pMemLnx->apPages[0] /* Page array. */
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && !RTLNX_SUSE_MAJ_PREREQ(15, 6)
, papVMAs /* vmas */
# endif
);
@@ -1389,7 +1389,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
fWrite, /* force write access. */
# endif
&pMemLnx->apPages[0] /* Page array. */
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && !RTLNX_SUSE_MAJ_PREREQ(15, 6)
, papVMAs /* vmas */
# endif
);

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/linux/Makefile Index: VirtualBox-7.0.14/src/VBox/HostDrivers/linux/Makefile
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/linux/Makefile --- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/linux/Makefile
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/linux/Makefile +++ VirtualBox-7.0.14/src/VBox/HostDrivers/linux/Makefile
@@ -43,11 +43,8 @@ obj-m = vboxdrv/ @@ -43,11 +43,8 @@ obj-m = vboxdrv/
obj-m += vboxnetflt/ obj-m += vboxnetflt/
endif endif
@ -140,10 +140,10 @@ Index: VirtualBox-7.0.12/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"; \
$(SUDO) /sbin/insmod $$module.ko; \ $(SUDO) /sbin/insmod $$module.ko; \
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/Makefile Index: VirtualBox-7.0.14/src/VBox/Additions/linux/Makefile
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/Makefile --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/Makefile
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/Makefile +++ VirtualBox-7.0.14/src/VBox/Additions/linux/Makefile
@@ -34,6 +34,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/ @@ -34,6 +34,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/
else # ! KERNELRELEASE else # ! KERNELRELEASE
@ -184,11 +184,11 @@ Index: VirtualBox-7.0.12/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-7.0.12/include/iprt/x86.h Index: VirtualBox-7.0.14/include/iprt/x86.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/include/iprt/x86.h --- VirtualBox-7.0.14.orig/include/iprt/x86.h
+++ VirtualBox-7.0.12/include/iprt/x86.h +++ VirtualBox-7.0.14/include/iprt/x86.h
@@ -895,37 +895,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI @@ -937,37 +937,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
* reserved flags. * reserved flags.
* @{ */ * @{ */
/** Bit 0 - PE - Protection Enabled */ /** Bit 0 - PE - Protection Enabled */
@ -248,7 +248,7 @@ Index: VirtualBox-7.0.12/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 */
/** @} */ /** @} */
@@ -934,9 +956,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI @@ -976,9 +998,13 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
/** @name CR3 /** @name CR3
* @{ */ * @{ */
/** Bit 3 - PWT - Page-level Writes Transparent. */ /** Bit 3 - PWT - Page-level Writes Transparent. */
@ -262,7 +262,7 @@ Index: VirtualBox-7.0.12/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. */
@@ -955,46 +981,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI @@ -997,46 +1023,84 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
/** @name CR4 /** @name CR4
* @{ */ * @{ */
/** Bit 0 - VME - Virtual-8086 Mode Extensions. */ /** Bit 0 - VME - Virtual-8086 Mode Extensions. */
@ -347,7 +347,7 @@ Index: VirtualBox-7.0.12/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)
/** @} */ /** @} */
@@ -1225,12 +1289,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1267,12 +1331,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. */
@ -364,7 +364,7 @@ Index: VirtualBox-7.0.12/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
@@ -1256,7 +1324,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1298,7 +1366,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. */
@ -374,7 +374,7 @@ Index: VirtualBox-7.0.12/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). */
@@ -1281,11 +1351,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1323,11 +1393,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. */
@ -390,7 +390,7 @@ Index: VirtualBox-7.0.12/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. */
@@ -1295,7 +1369,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1337,7 +1411,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. */
@ -400,7 +400,7 @@ Index: VirtualBox-7.0.12/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)
@@ -1306,7 +1382,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1348,7 +1424,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. */
@ -410,7 +410,7 @@ Index: VirtualBox-7.0.12/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. */
@@ -1315,10 +1393,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1357,10 +1435,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). */
@ -425,7 +425,7 @@ Index: VirtualBox-7.0.12/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. */
@@ -1341,18 +1423,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1383,18 +1465,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. */
@ -452,7 +452,7 @@ Index: VirtualBox-7.0.12/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. */
@@ -1366,7 +1456,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1408,7 +1498,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. */
@ -462,7 +462,7 @@ Index: VirtualBox-7.0.12/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)
@@ -1387,14 +1479,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1429,14 +1521,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#endif #endif
/** Machine Check Global Capabilities Register. */ /** Machine Check Global Capabilities Register. */
@ -483,7 +483,7 @@ Index: VirtualBox-7.0.12/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)
@@ -1413,36 +1511,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1455,36 +1553,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. */
@ -542,7 +542,7 @@ Index: VirtualBox-7.0.12/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)
@@ -1623,7 +1743,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1665,7 +1785,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
/** @} */ /** @} */
/** Intel TSX (Transactional Synchronization Extensions) control MSR. */ /** Intel TSX (Transactional Synchronization Extensions) control MSR. */
@ -552,7 +552,7 @@ Index: VirtualBox-7.0.12/include/iprt/x86.h
/** Variable range MTRRs. /** Variable range MTRRs.
* @{ */ * @{ */
@@ -1673,93 +1795,171 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1715,93 +1837,171 @@ 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). */
@ -724,7 +724,7 @@ Index: VirtualBox-7.0.12/include/iprt/x86.h
/** X2APIC MSR range start. */ /** X2APIC MSR range start. */
#define MSR_IA32_X2APIC_START 0x800 #define MSR_IA32_X2APIC_START 0x800
@@ -1894,23 +2094,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1936,23 +2136,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. */
@ -772,7 +772,7 @@ Index: VirtualBox-7.0.12/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)
@@ -1926,14 +2150,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C @@ -1968,14 +2192,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)
@ -793,10 +793,10 @@ Index: VirtualBox-7.0.12/include/iprt/x86.h
/** SMM MSRs. */ /** SMM MSRs. */
#define MSR_K7_SMBASE UINT32_C(0xc0010111) #define MSR_K7_SMBASE UINT32_C(0xc0010111)
Index: VirtualBox-7.0.12/include/VBox/vmm/hm_vmx.h Index: VirtualBox-7.0.14/include/VBox/vmm/hm_vmx.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/include/VBox/vmm/hm_vmx.h --- VirtualBox-7.0.14.orig/include/VBox/vmm/hm_vmx.h
+++ VirtualBox-7.0.12/include/VBox/vmm/hm_vmx.h +++ VirtualBox-7.0.14/include/VBox/vmm/hm_vmx.h
@@ -1633,7 +1633,9 @@ AssertCompileSize(VMXABORT, 4); @@ -1633,7 +1633,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
@ -807,10 +807,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.h --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h +++ VirtualBox-7.0.14/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)

View File

@ -6,10 +6,10 @@ to "#!/usr/bin/python3".
Larry Finger Larry Finger
Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxShell/vboxshell.py Index: VirtualBox-7.0.14/src/VBox/Frontends/VBoxShell/vboxshell.py
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxShell/vboxshell.py --- VirtualBox-7.0.14.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxShell/vboxshell.py +++ VirtualBox-7.0.14/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

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/include/VBox/VBoxGL2D.h Index: VirtualBox-7.0.14/include/VBox/VBoxGL2D.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/include/VBox/VBoxGL2D.h --- VirtualBox-7.0.14.orig/include/VBox/VBoxGL2D.h
+++ VirtualBox-7.0.12/include/VBox/VBoxGL2D.h +++ VirtualBox-7.0.14/include/VBox/VBoxGL2D.h
@@ -123,7 +123,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN @@ -123,7 +123,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-7.0.12/include/VBox/VBoxGL2D.h
#endif #endif
#ifndef GL_READ_ONLY #ifndef GL_READ_ONLY
Index: VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h Index: VirtualBox-7.0.14/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h --- VirtualBox-7.0.14.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
+++ VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h +++ VirtualBox-7.0.14/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
@@ -466,7 +466,12 @@ GLAPI void APIENTRY glBlendEquation (GLe @@ -466,7 +466,12 @@ GLAPI void APIENTRY glBlendEquation (GLe
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
@ -28,10 +28,10 @@ Index: VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext
typedef khronos_intptr_t GLintptr; typedef khronos_intptr_t GLintptr;
#define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_SIZE 0x8764
#define GL_BUFFER_USAGE 0x8765 #define GL_BUFFER_USAGE 0x8765
Index: VirtualBox-7.0.12/src/VBox/Devices/Graphics/vmsvga_glext/glext.h Index: VirtualBox-7.0.14/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h --- VirtualBox-7.0.14.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
+++ VirtualBox-7.0.12/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +++ VirtualBox-7.0.14/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
@@ -4680,6 +4680,14 @@ GLAPI void APIENTRY glWeightuivARB (GLin @@ -4680,6 +4680,14 @@ GLAPI void APIENTRY glWeightuivARB (GLin
GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer); GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
GLAPI void APIENTRY glVertexBlendARB (GLint count); GLAPI void APIENTRY glVertexBlendARB (GLint count);

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.c --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c +++ VirtualBox-7.0.14/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-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c
# endif # endif
#endif #endif
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_main.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_main.c --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c +++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_main.c
@@ -626,11 +626,13 @@ int vbox_dumb_destroy(struct drm_file *f @@ -626,11 +626,13 @@ int vbox_dumb_destroy(struct drm_file *f
#endif #endif
@ -30,10 +30,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_ttm.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_ttm.c --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_ttm.c +++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -302,7 +302,7 @@ static struct ttm_backend_func vbox_tt_b @@ -302,7 +302,7 @@ static struct ttm_backend_func vbox_tt_b
}; };
#endif #endif
@ -124,10 +124,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_drv.h
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.h --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.h +++ VirtualBox-7.0.14/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)
@ -138,10 +138,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c Index: VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_mode.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_mode.c --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c +++ VirtualBox-7.0.14/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -557,7 +557,8 @@ static void vbox_set_edid(struct drm_con @@ -557,7 +557,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];

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/configure Index: VirtualBox-7.0.14/configure
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/configure --- VirtualBox-7.0.14.orig/configure
+++ VirtualBox-7.0.12/configure +++ VirtualBox-7.0.14/configure
@@ -475,8 +475,13 @@ check_gcc() @@ -475,8 +475,13 @@ check_gcc()
log_failure "cannot execute '$CXX -dumpversion'" log_failure "cannot execute '$CXX -dumpversion'"
fail really fail really

View File

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

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c Index: VirtualBox-7.0.14/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c --- VirtualBox-7.0.14.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+++ VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +++ VirtualBox-7.0.14/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
#include <iprt/assert.h> #include <iprt/assert.h>
#include <iprt/errcore.h> #include <iprt/errcore.h>

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/configure Index: VirtualBox-7.0.14/configure
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/configure --- VirtualBox-7.0.14.orig/configure
+++ VirtualBox-7.0.12/configure +++ VirtualBox-7.0.14/configure
@@ -2178,7 +2178,7 @@ extern "C" int main(void) @@ -2178,7 +2178,7 @@ extern "C" int main(void)
} }
EOF EOF
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.12/configure
for p in $PYTHONDIR; do for p in $PYTHONDIR; do
for d in $SUPPYTHONLIBS; do for d in $SUPPYTHONLIBS; do
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
Index: VirtualBox-7.0.12/src/VBox/Installer/linux/routines.sh Index: VirtualBox-7.0.14/src/VBox/Installer/linux/routines.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/routines.sh --- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/routines.sh
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/routines.sh +++ VirtualBox-7.0.14/src/VBox/Installer/linux/routines.sh
@@ -444,7 +444,7 @@ maybe_run_python_bindings_installer() { @@ -444,7 +444,7 @@ maybe_run_python_bindings_installer() {
# the VirtualBox API bindings. Needs to prevent double installs which waste # the VirtualBox API bindings. Needs to prevent double installs which waste
# quite a bit of time. # quite a bit of time.

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/Makefile.kmk Index: VirtualBox-7.0.14/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/Makefile.kmk --- VirtualBox-7.0.14.orig/Makefile.kmk
+++ VirtualBox-7.0.12/Makefile.kmk +++ VirtualBox-7.0.14/Makefile.kmk
@@ -824,7 +824,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \ @@ -824,7 +824,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,10 +10,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Additions/x11/vboxvideo/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -404,7 +404,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s @@ -404,7 +404,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-7.0.12/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-7.0.12/src/VBox/Additions/x11/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/Additions/x11/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/Additions/x11/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/Additions/x11/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/Additions/x11/Makefile.kmk
@@ -32,7 +32,7 @@ include $(KBUILD_PATH)/subheader.kmk @@ -32,7 +32,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

View File

@ -5,10 +5,10 @@
# #
# January 31, 2019 - Larry Finger # January 31, 2019 - Larry Finger
# #
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh Index: VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/installer/vboxadd.sh --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh +++ VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -1228,9 +1228,11 @@ dmnstatus() @@ -1228,9 +1228,11 @@ dmnstatus()
fi fi
} }
@ -24,10 +24,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Installer/linux/vboxdrv.sh Index: VirtualBox-7.0.14/src/VBox/Installer/linux/vboxdrv.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxdrv.sh --- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh +++ VirtualBox-7.0.14/src/VBox/Installer/linux/vboxdrv.sh
@@ -48,6 +48,9 @@ DEVICE=/dev/vboxdrv @@ -48,6 +48,9 @@ DEVICE=/dev/vboxdrv
MODPROBE=/sbin/modprobe MODPROBE=/sbin/modprobe
SCRIPTNAME=vboxdrv.sh SCRIPTNAME=vboxdrv.sh

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c Index: VirtualBox-7.0.14/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c --- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +++ VirtualBox-7.0.14/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
@@ -61,6 +61,12 @@ @@ -61,6 +61,12 @@
# include <iprt/power.h> # include <iprt/power.h>
# define VBOX_WITH_SUSPEND_NOTIFICATION # define VBOX_WITH_SUSPEND_NOTIFICATION

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/Config.kmk Index: VirtualBox-7.0.14/Config.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/Config.kmk --- VirtualBox-7.0.14.orig/Config.kmk
+++ VirtualBox-7.0.12/Config.kmk +++ VirtualBox-7.0.14/Config.kmk
@@ -981,11 +981,9 @@ if1of ($(KBUILD_TARGET), freebsd linux) @@ -981,11 +981,9 @@ if1of ($(KBUILD_TARGET), freebsd linux)
endif endif
# Use new VBoxNetDhcpd instead of old VBoxNetDHCP # Use new VBoxNetDhcpd instead of old VBoxNetDHCP

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp Index: VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp --- VirtualBox-7.0.14.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
+++ VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp +++ VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
@@ -397,15 +397,15 @@ void UINameAndSystemEditor::sltFamilyCha @@ -397,15 +397,15 @@ void UINameAndSystemEditor::sltFamilyCha
if (iIndexWin10 != -1) if (iIndexWin10 != -1)
m_pComboType->setCurrentIndex(iIndexWin10); m_pComboType->setCurrentIndex(iIndexWin10);

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/Main/webservice/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Main/webservice/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/Main/webservice/Makefile.kmk
@@ -848,7 +848,7 @@ ifdef VBOX_GSOAP_INSTALLED @@ -848,7 +848,7 @@ ifdef VBOX_GSOAP_INSTALLED
$(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))

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp Index: VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp --- VirtualBox-7.0.14.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+++ VirtualBox-7.0.12/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +++ VirtualBox-7.0.14/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -99,8 +99,6 @@ void UISettingsDialogGlobal::retranslate @@ -99,8 +99,6 @@ void UISettingsDialogGlobal::retranslate
m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input")); m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));

View File

@ -1,8 +1,8 @@
Index: VirtualBox-7.0.12/Config.kmk Index: VirtualBox-7.0.14/Config.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/Config.kmk --- VirtualBox-7.0.14.orig/Config.kmk
+++ VirtualBox-7.0.12/Config.kmk +++ VirtualBox-7.0.14/Config.kmk
@@ -6778,6 +6778,9 @@ TEMPLATE_VBoxR3HardenedExe_LDFLAGS.darwi @@ -6777,6 +6777,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-7.0.12/Config.kmk
endif endif
ifeq ($(KBUILD_TARGET),win) # No CRT! ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBoxR3HardenedExe_SDKS = VBoxNtDll $(TEMPLATE_VBoxR3Exe_SDKS) TEMPLATE_VBoxR3HardenedExe_SDKS = VBoxNtDll $(TEMPLATE_VBoxR3Exe_SDKS)
@@ -6810,8 +6813,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! @@ -6809,8 +6812,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBoxR3HardenedExe_VBOX_IMPORT_CHECKER.win = noimports TEMPLATE_VBoxR3HardenedExe_VBOX_IMPORT_CHECKER.win = noimports
else ifn1of ($(KBUILD_TARGET), os2) else ifn1of ($(KBUILD_TARGET), os2)
ifneq ($(KBUILD_TYPE),asan) # Keep RPATH in asan builds so we can find libasan.so.X and libubsan.so.Y. ifneq ($(KBUILD_TYPE),asan) # Keep RPATH in asan builds so we can find libasan.so.X and libubsan.so.Y.

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/Main/webservice/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Main/webservice/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/Main/webservice/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/Main/webservice/Makefile.kmk
@@ -412,11 +412,12 @@ ifdef VBOX_GSOAP_INSTALLED @@ -412,11 +412,12 @@ ifdef VBOX_GSOAP_INSTALLED
endif endif
endif endif

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxFB/VBoxFB.cpp Index: VirtualBox-7.0.14/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp --- VirtualBox-7.0.14.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+++ VirtualBox-7.0.12/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +++ VirtualBox-7.0.14/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
@@ -72,7 +72,7 @@ int main(int argc, char *argv[]) @@ -72,7 +72,7 @@ int main(int argc, char *argv[])
printf("VirtualBox DirectFB GUI built %s %s\n" printf("VirtualBox DirectFB GUI built %s %s\n"
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.12/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
fputs("\nWARNING! Unmaintained code.\nWARNING! Needs fixing & debugging!\n\n", stdout); fputs("\nWARNING! Unmaintained code.\nWARNING! Needs fixing & debugging!\n\n", stdout);
Index: VirtualBox-7.0.12/src/VBox/Runtime/common/string/uniread.cpp Index: VirtualBox-7.0.14/src/VBox/Runtime/common/string/uniread.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Runtime/common/string/uniread.cpp --- VirtualBox-7.0.14.orig/src/VBox/Runtime/common/string/uniread.cpp
+++ VirtualBox-7.0.12/src/VBox/Runtime/common/string/uniread.cpp +++ VirtualBox-7.0.14/src/VBox/Runtime/common/string/uniread.cpp
@@ -1049,7 +1049,7 @@ int PrintHeader(const char *argv0, const @@ -1049,7 +1049,7 @@ int PrintHeader(const char *argv0, const
" * IPRT - Unicode Tables.\n" " * IPRT - Unicode Tables.\n"
" *\n" " *\n"
@ -24,10 +24,10 @@ Index: VirtualBox-7.0.12/src/VBox/Runtime/common/string/uniread.cpp
" */\n" " */\n"
"\n" "\n"
"/*\n" "/*\n"
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c Index: VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +++ VirtualBox-7.0.14/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-7.0.12/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
#if !defined(_PRODUCTION) #if !defined(_PRODUCTION)
#define _PRODUCTION "" #define _PRODUCTION ""
#endif #endif
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c Index: VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +++ VirtualBox-7.0.14/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-7.0.12/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
#if !defined(_PRODUCTION) #if !defined(_PRODUCTION)
#define _PRODUCTION "" #define _PRODUCTION ""
#endif #endif
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c Index: VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +++ VirtualBox-7.0.14/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-7.0.12/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
#if !defined(_PRODUCTION) #if !defined(_PRODUCTION)
#define _PRODUCTION "" #define _PRODUCTION ""
#endif #endif
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c Index: VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +++ VirtualBox-7.0.14/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-7.0.12/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
#if !defined(_PRODUCTION) #if !defined(_PRODUCTION)
#define _PRODUCTION "" #define _PRODUCTION ""
#endif #endif
Index: VirtualBox-7.0.12/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp Index: VirtualBox-7.0.14/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp --- VirtualBox-7.0.14.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+++ VirtualBox-7.0.12/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp +++ VirtualBox-7.0.14/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
@@ -327,7 +327,7 @@ static int vboxInitLogging(const char *p @@ -327,7 +327,7 @@ static int vboxInitLogging(const char *p
#endif #endif
"Log opened %s\n", "Log opened %s\n",
@ -138,10 +138,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Devices/PC/BIOS/bios.c Index: VirtualBox-7.0.14/src/VBox/Devices/PC/BIOS/bios.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Devices/PC/BIOS/bios.c --- VirtualBox-7.0.14.orig/src/VBox/Devices/PC/BIOS/bios.c
+++ VirtualBox-7.0.12/src/VBox/Devices/PC/BIOS/bios.c +++ VirtualBox-7.0.14/src/VBox/Devices/PC/BIOS/bios.c
@@ -164,7 +164,7 @@ void set_mode(uint8_t mode); @@ -164,7 +164,7 @@ void set_mode(uint8_t mode);
#define BX_PCIBIOS 1 #define BX_PCIBIOS 1
@ -151,10 +151,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Additions/common/VBoxService/VBoxService.cpp Index: VirtualBox-7.0.14/src/VBox/Additions/common/VBoxService/VBoxService.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp --- VirtualBox-7.0.14.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ VirtualBox-7.0.12/src/VBox/Additions/common/VBoxService/VBoxService.cpp +++ VirtualBox-7.0.14/src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -255,7 +255,7 @@ static DECLCALLBACK(void) vgsvcLogHeader @@ -255,7 +255,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
"VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n" "VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
"Log opened %s\n", "Log opened %s\n",
@ -164,10 +164,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
@@ -193,7 +193,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA @@ -193,7 +193,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature $(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature
@ -177,10 +177,10 @@ Index: VirtualBox-7.0.12/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
# Clean up # Clean up
$(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/ $(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/
Index: VirtualBox-7.0.12/src/VBox/ExtPacks/Skeleton/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/ExtPacks/Skeleton/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/ExtPacks/Skeleton/Makefile.kmk +++ VirtualBox-7.0.14/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,10 +190,10 @@ Index: VirtualBox-7.0.12/src/VBox/ExtPacks/Skeleton/Makefile.kmk
# Clean up # Clean up
$(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/ $(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/
Index: VirtualBox-7.0.12/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
@@ -354,7 +354,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) @@ -354,7 +354,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature $(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature
@ -203,10 +203,10 @@ Index: VirtualBox-7.0.12/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
# Clean up # Clean up
$(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/ $(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/
Index: VirtualBox-7.0.12/src/VBox/ExtPacks/VNC/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/ExtPacks/VNC/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/ExtPacks/VNC/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/ExtPacks/VNC/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/ExtPacks/VNC/Makefile.kmk
@@ -164,7 +164,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED @@ -164,7 +164,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \ $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature $(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature
@ -216,10 +216,10 @@ Index: VirtualBox-7.0.12/src/VBox/ExtPacks/VNC/Makefile.kmk
# Clean up # Clean up
$(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/ $(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/
Index: VirtualBox-7.0.12/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp Index: VirtualBox-7.0.14/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp --- VirtualBox-7.0.14.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ VirtualBox-7.0.12/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +++ VirtualBox-7.0.14/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
@@ -329,7 +329,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv @@ -329,7 +329,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv
} }
VGDrvCommonInitLoggers(); VGDrvCommonInitLoggers();
@ -229,10 +229,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp Index: VirtualBox-7.0.14/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp +++ VirtualBox-7.0.14/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
@@ -882,7 +882,7 @@ static DECLCALLBACK(void) vboxGreeterLog @@ -882,7 +882,7 @@ static DECLCALLBACK(void) vboxGreeterLog
"vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release log\n" "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-7.0.12/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-7.0.12/src/VBox/Additions/solaris/Mouse/vboxms.c Index: VirtualBox-7.0.14/src/VBox/Additions/solaris/Mouse/vboxms.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/solaris/Mouse/vboxms.c --- VirtualBox-7.0.14.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
+++ VirtualBox-7.0.12/src/VBox/Additions/solaris/Mouse/vboxms.c +++ VirtualBox-7.0.14/src/VBox/Additions/solaris/Mouse/vboxms.c
@@ -266,7 +266,7 @@ static VBMSSTATE g_OpenNodeSt @@ -266,7 +266,7 @@ static VBMSSTATE g_OpenNodeSt
int _init(void) int _init(void)
{ {
@ -255,10 +255,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c Index: VirtualBox-7.0.14/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c --- VirtualBox-7.0.14.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+++ VirtualBox-7.0.12/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c +++ VirtualBox-7.0.14/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
@@ -251,10 +251,10 @@ Returns: @@ -251,10 +251,10 @@ Returns:
UTILITY_NAME, UTILITY_NAME,
UTILITY_MAJOR_VERSION, UTILITY_MAJOR_VERSION,
@ -272,10 +272,10 @@ Index: VirtualBox-7.0.12/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInf
Usage (); Usage ();
return -1; return -1;
} }
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp Index: VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp --- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp +++ VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
@@ -128,7 +128,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI @@ -128,7 +128,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI
static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject) static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject)
{ {
@ -294,10 +294,10 @@ Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
NTSTATUS Status = vboxUsbRtGlobalsInit(); NTSTATUS Status = vboxUsbRtGlobalsInit();
Assert(Status == STATUS_SUCCESS); Assert(Status == STATUS_SUCCESS);
Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp Index: VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp --- VirtualBox-7.0.14.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp +++ VirtualBox-7.0.14/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
@@ -1518,7 +1518,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB @@ -1518,7 +1518,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB
RTLogDestinations(0, "debugger"); RTLogDestinations(0, "debugger");
#endif #endif
@ -307,10 +307,10 @@ Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals)); memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals));
Index: VirtualBox-7.0.12/src/VBox/Main/glue/VBoxLogRelCreate.cpp Index: VirtualBox-7.0.14/src/VBox/Main/glue/VBoxLogRelCreate.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp --- VirtualBox-7.0.14.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+++ VirtualBox-7.0.12/src/VBox/Main/glue/VBoxLogRelCreate.cpp +++ VirtualBox-7.0.14/src/VBox/Main/glue/VBoxLogRelCreate.cpp
@@ -71,7 +71,7 @@ static DECLCALLBACK(void) vboxHeaderFoot @@ -71,7 +71,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
#endif #endif
"Log opened %s\n", "Log opened %s\n",
@ -320,10 +320,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c Index: VirtualBox-7.0.14/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c +++ VirtualBox-7.0.14/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-7.0.12/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-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp Index: VirtualBox-7.0.14/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp +++ VirtualBox-7.0.14/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-7.0.12/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-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp Index: VirtualBox-7.0.14/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp +++ VirtualBox-7.0.14/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-7.0.12/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/tes
#if 0 #if 0
{ {
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp Index: VirtualBox-7.0.14/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp +++ VirtualBox-7.0.14/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-7.0.12/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
} }
~test_message() ~test_message()
Index: VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c Index: VirtualBox-7.0.14/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c --- VirtualBox-7.0.14.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
+++ VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c +++ VirtualBox-7.0.14/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
@@ -30,9 +30,8 @@ @@ -30,9 +30,8 @@
#include "build_id.h" #include "build_id.h"
#include "macros.h" #include "macros.h"
@ -387,10 +387,10 @@ Index: VirtualBox-7.0.12/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_i
#ifndef ElfW #ifndef ElfW
#define ElfW(type) Elf_##type #define ElfW(type) Elf_##type
Index: VirtualBox-7.0.12/src/VBox/Additions/x11/VBoxClient/logging.cpp Index: VirtualBox-7.0.14/src/VBox/Additions/x11/VBoxClient/logging.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp --- VirtualBox-7.0.14.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
+++ VirtualBox-7.0.12/src/VBox/Additions/x11/VBoxClient/logging.cpp +++ VirtualBox-7.0.14/src/VBox/Additions/x11/VBoxClient/logging.cpp
@@ -328,10 +328,10 @@ static DECLCALLBACK(void) vbClLogHeaderF @@ -328,10 +328,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
case RTLOGPHASE_BEGIN: case RTLOGPHASE_BEGIN:
{ {

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/apps/Makefile.kmk Index: VirtualBox-7.0.14/src/apps/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/apps/Makefile.kmk --- VirtualBox-7.0.14.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.12/src/apps/Makefile.kmk +++ VirtualBox-7.0.14/src/apps/Makefile.kmk
@@ -28,5 +28,7 @@ @@ -28,5 +28,7 @@
SUB_DEPTH = ../.. SUB_DEPTH = ../..
include $(KBUILD_PATH)/subheader.kmk include $(KBUILD_PATH)/subheader.kmk
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.12/src/apps/Makefile.kmk
+ +
include $(FILE_KBUILD_SUB_FOOTER) include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/Makefile.kmk Index: VirtualBox-7.0.14/src/apps/VBoxPermissionMessage/Makefile.kmk
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/Makefile.kmk +++ VirtualBox-7.0.14/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-7.0.12/src/apps/VBoxPermissionMessage/Makefile.kmk
+ +
+include $(KBUILD_PATH)/subfooter.kmk +include $(KBUILD_PATH)/subfooter.kmk
+ +
Index: VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp Index: VirtualBox-7.0.14/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-7.0.12/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp +++ VirtualBox-7.0.14/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>

View File

@ -1,9 +1,9 @@
# https://www.virtualbox.org/changeset/90537/vbox # https://www.virtualbox.org/changeset/90537/vbox
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/Makefile.kmk Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/Makefile.kmk --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/Makefile.kmk +++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/Makefile.kmk
@@ -642,11 +642,57 @@ ifndef VBOX_ONLY_SDK @@ -642,11 +642,57 @@ ifndef VBOX_ONLY_SDK
VBoxPython3_12_x86_LIBS = $(VBOX_PYTHON312_LIB_X86) VBoxPython3_12_x86_LIBS = $(VBOX_PYTHON312_LIB_X86)
endif endif

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/bldprogs/scm.cpp Index: VirtualBox-7.0.14/src/bldprogs/scm.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/bldprogs/scm.cpp --- VirtualBox-7.0.14.orig/src/bldprogs/scm.cpp
+++ VirtualBox-7.0.12/src/bldprogs/scm.cpp +++ VirtualBox-7.0.14/src/bldprogs/scm.cpp
@@ -2367,7 +2367,7 @@ static int scmProcessFileInner(PSCMRWSTA @@ -2367,7 +2367,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-7.0.12/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-7.0.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec Index: VirtualBox-7.0.14/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec --- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec +++ VirtualBox-7.0.14/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
@@ -32,6 +32,9 @@ @@ -32,6 +32,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$
@ -25,10 +25,10 @@ Index: VirtualBox-7.0.12/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
Summary: Oracle VM VirtualBox Summary: Oracle VM VirtualBox
Name: %NAME% Name: %NAME%
Index: VirtualBox-7.0.12/src/libs/libxml2-2.9.14/libxml.spec.in Index: VirtualBox-7.0.14/src/libs/libxml2-2.9.14/libxml.spec.in
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/libxml2-2.9.14/libxml.spec.in --- VirtualBox-7.0.14.orig/src/libs/libxml2-2.9.14/libxml.spec.in
+++ VirtualBox-7.0.12/src/libs/libxml2-2.9.14/libxml.spec.in +++ VirtualBox-7.0.14/src/libs/libxml2-2.9.14/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
@ -93,10 +93,10 @@ Index: VirtualBox-7.0.12/src/libs/libxml2-2.9.14/libxml.spec.in
%if 0%{?with_python3} %if 0%{?with_python3}
%files -n python3-%{name} %files -n python3-%{name}
Index: VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -438,7 +438,9 @@ char *PyTraceback_AsString(PyObject *exc @@ -438,7 +438,9 @@ char *PyTraceback_AsString(PyObject *exc
{ // a temp scope so I can use temp locals. { // a temp scope so I can use temp locals.
@ -108,10 +108,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/src/PyGBase.cpp
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/src/PyGBase.cpp +++ VirtualBox-7.0.14/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 )
@ -125,10 +125,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/libs/xpcom18a4/python/gen_python_deps.py Index: VirtualBox-7.0.14/src/libs/xpcom18a4/python/gen_python_deps.py
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/libs/xpcom18a4/python/gen_python_deps.py --- VirtualBox-7.0.14.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-7.0.12/src/libs/xpcom18a4/python/gen_python_deps.py +++ VirtualBox-7.0.14/src/libs/xpcom18a4/python/gen_python_deps.py
@@ -96,7 +96,7 @@ def main(argv): @@ -96,7 +96,7 @@ def main(argv):
else: else:
multi = 1 multi = 1

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Devices/PC/vbox.dsl Index: VirtualBox-7.0.14/src/VBox/Devices/PC/vbox.dsl
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Devices/PC/vbox.dsl --- VirtualBox-7.0.14.orig/src/VBox/Devices/PC/vbox.dsl
+++ VirtualBox-7.0.12/src/VBox/Devices/PC/vbox.dsl +++ VirtualBox-7.0.14/src/VBox/Devices/PC/vbox.dsl
@@ -1225,7 +1225,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, @@ -1225,7 +1225,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
Device (SMC) Device (SMC)
{ {

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/apps/Makefile.kmk Index: VirtualBox-7.0.14/src/apps/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/apps/Makefile.kmk --- VirtualBox-7.0.14.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.12/src/apps/Makefile.kmk +++ VirtualBox-7.0.14/src/apps/Makefile.kmk
@@ -32,5 +32,7 @@ include $(PATH_SUB_CURRENT)/VBoxPermissi @@ -32,5 +32,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-7.0.12/src/apps/Makefile.kmk
+ +
include $(FILE_KBUILD_SUB_FOOTER) include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/Makefile.kmk Index: VirtualBox-7.0.14/src/apps/VBoxSUIDMessage/Makefile.kmk
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/Makefile.kmk +++ VirtualBox-7.0.14/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-7.0.12/src/apps/VBoxSUIDMessage/Makefile.kmk
+include $(KBUILD_PATH)/subfooter.kmk +include $(KBUILD_PATH)/subfooter.kmk
+ +
+ +
Index: VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp Index: VirtualBox-7.0.14/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-7.0.12/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp +++ VirtualBox-7.0.14/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>

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/apps/Makefile.kmk Index: VirtualBox-7.0.14/src/apps/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/apps/Makefile.kmk --- VirtualBox-7.0.14.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.12/src/apps/Makefile.kmk +++ VirtualBox-7.0.14/src/apps/Makefile.kmk
@@ -30,5 +30,7 @@ include $(KBUILD_PATH)/subheader.kmk @@ -30,5 +30,7 @@ include $(KBUILD_PATH)/subheader.kmk
include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.12/src/apps/Makefile.kmk
+ +
include $(FILE_KBUILD_SUB_FOOTER) include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/Makefile.kmk Index: VirtualBox-7.0.14/src/apps/VBoxUSB_DevRules/Makefile.kmk
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/Makefile.kmk +++ VirtualBox-7.0.14/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-7.0.12/src/apps/VBoxUSB_DevRules/Makefile.kmk
+include $(KBUILD_PATH)/subfooter.kmk +include $(KBUILD_PATH)/subfooter.kmk
+ +
+ +
Index: VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp Index: VirtualBox-7.0.14/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ VirtualBox-7.0.12/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp +++ VirtualBox-7.0.14/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>

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh Index: VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/installer/vboxadd.sh --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh +++ VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -36,11 +36,14 @@ @@ -36,11 +36,14 @@
# Provides: vboxadd # Provides: vboxadd
# Required-Start: # Required-Start:
@ -133,10 +133,10 @@ Index: VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd.sh
fi fi
rm -f /sbin/mount.vboxsf 2>/dev/null rm -f /sbin/mount.vboxsf 2>/dev/null
rm -f /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null rm -f /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd-service.sh Index: VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd-service.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh --- VirtualBox-7.0.14.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
+++ VirtualBox-7.0.12/src/VBox/Additions/linux/installer/vboxadd-service.sh +++ VirtualBox-7.0.14/src/VBox/Additions/linux/installer/vboxadd-service.sh
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
# Provides: vboxadd-service # Provides: vboxadd-service
# Required-Start: vboxadd # Required-Start: vboxadd
@ -146,10 +146,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Installer/linux/vboxautostart-service.sh Index: VirtualBox-7.0.14/src/VBox/Installer/linux/vboxautostart-service.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxautostart-service.sh --- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/vboxautostart-service.sh
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxautostart-service.sh +++ VirtualBox-7.0.14/src/VBox/Installer/linux/vboxautostart-service.sh
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
# Provides: vboxautostart-service # Provides: vboxautostart-service
# Required-Start: vboxdrv # Required-Start: vboxdrv
@ -159,10 +159,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Installer/linux/vboxballoonctrl-service.sh Index: VirtualBox-7.0.14/src/VBox/Installer/linux/vboxballoonctrl-service.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh --- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxballoonctrl-service.sh +++ VirtualBox-7.0.14/src/VBox/Installer/linux/vboxballoonctrl-service.sh
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
# Provides: vboxballoonctrl-service # Provides: vboxballoonctrl-service
# Required-Start: vboxdrv # Required-Start: vboxdrv
@ -172,10 +172,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh Index: VirtualBox-7.0.14/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh --- VirtualBox-7.0.14.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+++ VirtualBox-7.0.12/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +++ VirtualBox-7.0.14/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
# Provides: testboxscript-service # Provides: testboxscript-service
# Required-Start: $network # Required-Start: $network
@ -185,10 +185,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh Index: VirtualBox-7.0.14/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh --- VirtualBox-7.0.14.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+++ VirtualBox-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +++ VirtualBox-7.0.14/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
# Provides: vboxtxs # Provides: vboxtxs
# Required-Start: $network # Required-Start: $network
@ -198,10 +198,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh Index: VirtualBox-7.0.14/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh --- VirtualBox-7.0.14.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+++ VirtualBox-7.0.12/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +++ VirtualBox-7.0.14/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
# Provides: vboxtxs # Provides: vboxtxs
# Required-Start: $network # Required-Start: $network

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh Index: VirtualBox-7.0.14/src/VBox/Installer/linux/vboxdrv.sh
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Installer/linux/vboxdrv.sh --- VirtualBox-7.0.14.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh +++ VirtualBox-7.0.14/src/VBox/Installer/linux/vboxdrv.sh
@@ -29,11 +29,12 @@ @@ -29,11 +29,12 @@
# #
### BEGIN INIT INFO ### BEGIN INIT INFO
@ -66,10 +66,10 @@ Index: VirtualBox-7.0.12/src/VBox/Installer/linux/vboxdrv.sh
# Sign kernel modules if kernel configuration requires it. # Sign kernel modules if kernel configuration requires it.
if test "$(kernel_requires_module_signature)" = "1"; then if test "$(kernel_requires_module_signature)" = "1"; then
Index: VirtualBox-7.0.12/Config.kmk Index: VirtualBox-7.0.14/Config.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/Config.kmk --- VirtualBox-7.0.14.orig/Config.kmk
+++ VirtualBox-7.0.12/Config.kmk +++ VirtualBox-7.0.14/Config.kmk
@@ -3084,6 +3084,9 @@ else @@ -3084,6 +3084,9 @@ else
endif endif
VBOX_MACOSX_ICON_FILE ?= $(PATH_ROOT)/src/VBox/Artwork/darwin/NonOSE/VirtualBox.icns VBOX_MACOSX_ICON_FILE ?= $(PATH_ROOT)/src/VBox/Artwork/darwin/NonOSE/VirtualBox.icns

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.12/src/VBox/Main/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/Main/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Main/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/Main/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/Main/Makefile.kmk
@@ -1895,7 +1895,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \ @@ -1895,7 +1895,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" \
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.12/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-7.0.12/src/VBox/Devices/Makefile.kmk Index: VirtualBox-7.0.14/src/VBox/Devices/Makefile.kmk
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Devices/Makefile.kmk --- VirtualBox-7.0.14.orig/src/VBox/Devices/Makefile.kmk
+++ VirtualBox-7.0.12/src/VBox/Devices/Makefile.kmk +++ VirtualBox-7.0.14/src/VBox/Devices/Makefile.kmk
@@ -989,8 +989,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(in @@ -989,8 +989,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(in
$(call MSG_TOOL,iasl,VBoxDD,$<,$@) $(call MSG_TOOL,iasl,VBoxDD,$<,$@)
$(QUIET)$(RM) -f $@ $@.tmp $@.pre $(QUIET)$(RM) -f $@ $@.tmp $@.pre

View File

@ -9,11 +9,35 @@ Fri Jan 26 12:28:45 UTC 2024 - Bingwu Zhang <xtexchooser@duck.com>
- Install UnattendedTemplates for unattended installing. - Install UnattendedTemplates for unattended installing.
-------------------------------------------------------------------
Wed Jan 16 15:40:02 UTC 2024 - Larry Rainey <llrainey15@gmail.com>
- Version bump to VirtualBox 7.0.14 (released January 16, 2024 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
Audio: Added more fixes for switching host audio devices on Windows hosts using the WAS backend
3D: Added general improvements
OCI: Fixed wrong guest RAM unit usage in VirtualSystemDescription, memory is provided in bytes, "Byte" is the base unit
Main: OVF Import/Export: Added support for importing and exporting VMs containing NVMe storage controllers (bug #19320)
Main: OVF Import/Export: Added support for exporting a VM which contains a medium inserted into a virtual CD/DVD drive which is attached to a Virtio-SCSI controller
Devices: Fixed a problem where Windows guests "forget" in-progress touch events when the user holds down a finger without moving it for a period of time.
macOS Host USB: Added support for newer storage devices
macOS Host: Fixed memory Leak in the VBoxIntNetSwitch process when VM was configured to use 'Internal Networking' (bug #21752)
Linux Host and Guest: Added initial support for RHEL 9.4 kernel
Linux Guest Additions: Fixed kernel panic on RHEL 8.9 kernel caused by vboxvideo (bugs #10381 and #21911)
Solaris Guest Additions: Added support for the Additions to be installed into an alternate root path ('pkgadd -R')
Solaris Guest Additions: Removed requirement to reboot VM after uninstalling GAs
RDP: Fix possible crash when connecting with the Apple Silicon variant of the Microsoft Remote Desktop application (bug #21820).
BIOS: Fixed handle number used for DMI OEM table (bug #19781)
=======
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 26 18:10:45 UTC 2023 - Larry Finger <Larry.Finger@gmail.com> Thu Oct 26 18:10:45 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>
- Update file "fixes_for_leap.patch" to cover API change in Leap 15.6 kernel. - Update file "fixes_for_leap.patch" to cover API change in Leap 15.6 kernel.
>>>>>>> ./virtualbox.changes.new
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 21 19:27:40 UTC 2023 - Larry Finger <Larry.Finger@gmail.com> Sat Oct 21 19:27:40 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>

View File

@ -49,7 +49,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: 7.0.12 Version: 7.0.14
Release: 0 Release: 0
Summary: %{package_summary} Summary: %{package_summary}
License: GPL-2.0-or-later License: GPL-2.0-or-later