1
0
forked from pool/virtualbox

Accepting request 1060705 from home:larryr:branches:Virtualization

- VirtualBox 7.0.6 (released January 17 2023)
This is a maintenance release. The following items were fixed and/or added: [1]
- VMM: Fixed guru running the FreeBSD loader on older Intel CPUs without unrestricted guest support (bug #21332)
- GUI: Fixed virtual machines grouping when VM was created or modified in command line (bugs #11500, #20933)
- GUI: Introduced generic changes in settings dialogs
- VirtioNet: Fixed broken network after loading saved state (bug #21172)
- Storage: Added support for increasing the size of the following VMDK image variants: monolithicFlat, monolithicSparse, twoGbMaxExtentSparse, twoGbMaxExtentFlat
- VBoxManage: Added missing --directory switch for guestcontrol mktemp command
- Mouse Integration: Guest was provided with extended host mouse state (bug #21139)
- DnD: Introduced generic improvements
- Guest Control: Fixed handling creation mode for temporary directories (bug #21394)
- Linux Host and Guest: Added initial support for building UEK7 kernel on Oracle Linux 8
- Linux Host and Guest: Added initial support for RHEL 9.1 kernel
- Linux Guest Additions: Added initial support for kernel 6.2 for vboxvideo
- Audio: The "--audio" option in VBoxManage is now marked as deprecated; please use "--audio-driver" and "--audio-enabled" instead. This will allow more flexibility when changing the driver and/or controlling the audio functionality 
Additionally, it fixes 6 CVE's: [2]
CVE-2023-21886 	Oracle VM VirtualBox 	Core 	Multiple 	Yes 	8.1 	Network 	High 	None 	None 	Un-
changed 	High 	High 	High 	Prior to 6.1.42, prior to 7.0.6 	 
CVE-2023-21898 	Oracle VM VirtualBox 	Core 	None 	No 	5.5 	Local 	Low 	Low 	None 	Un-
changed 	None 	None 	High 	Prior to 6.1.42, prior to 7.0.6 	See Note 1
CVE-2023-21899 	Oracle VM VirtualBox 	Core 	None 	No 	5.5 	Local 	Low 	Low 	None 	Un-
changed 	None 	None 	High 	Prior to 6.1.42, prior to 7.0.6 	See Note 1
CVE-2023-21884 	Oracle VM VirtualBox 	Core 	None 	No 	4.4 	Local 	Low 	High 	None 	Un-
changed 	None 	None 	High 	Prior to 6.1.42, prior to 7.0.6 	 
CVE-2023-21885 	Oracle VM VirtualBox 	Core 	None 	No 	3.8 	Local 	Low 	Low 	None 	Changed 	Low 	None 	None 	Prior to 6.1.42, prior to 7.0.6 	See Note 2
CVE-2023-21889 	Oracle VM VirtualBox 	Core 	None 	No 	3.8 	Local 	Low 	Low 	None 	Changed 	Low 	None 	None 	Prior to 6.1.42, prior to 7.0.6 	 
								
Note 1: Applies to VirtualBox VMs running Windows 7 and later.
Note 2: Applies to Windows only.
Links:

OBS-URL: https://build.opensuse.org/request/show/1060705
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=673
This commit is contained in:
Larry Rainey 2023-01-24 21:49:25 +00:00 committed by Git OBS Bridge
parent c89542213a
commit 030c30350e
38 changed files with 519 additions and 409 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9060cac6da0f52ee5434f4cf9de6dde86af40507f80a41f35c6497629f681d0d
size 4579704
oid sha256:8feb54658307920a70c70928b16d2376787e90e874fd8d2ad5261fddea1e121b
size 4583320

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/Config.kmk
Index: VirtualBox-7.0.6/Config.kmk
===================================================================
--- VirtualBox-7.0.4.orig/Config.kmk
+++ VirtualBox-7.0.4/Config.kmk
--- VirtualBox-7.0.6.orig/Config.kmk
+++ VirtualBox-7.0.6/Config.kmk
@@ -782,6 +782,7 @@ if1of ($(KBUILD_TARGET), linux solaris)
VBOX_WITH_XPCOM_NAMESPACE_CLEANUP = 1
endif
@ -10,7 +10,7 @@ Index: VirtualBox-7.0.4/Config.kmk
VBOX_WITH_WEBSERVICES = 1
VBOX_WITH_WEBSERVICES_SSL = 1
# The Qt GUI.
@@ -1408,7 +1409,7 @@ endif
@@ -1410,7 +1411,7 @@ endif
VBOX_ONLY_BUILD_NEW := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK VALIDATIONKIT\
, $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
ifneq ($(VBOX_ONLY_BUILD),$(VBOX_ONLY_BUILD_NEW))
@ -19,7 +19,7 @@ Index: VirtualBox-7.0.4/Config.kmk
endif
#
@@ -1578,7 +1579,7 @@ endif
@@ -1580,7 +1581,7 @@ endif
#
ifdef VBOX_HEADLESS
VBOX_WITH_QTGUI=
@ -28,10 +28,10 @@ Index: VirtualBox-7.0.4/Config.kmk
VBOX_WITH_VRDP_RDESKTOP=
endif
Index: VirtualBox-7.0.4/configure
Index: VirtualBox-7.0.6/configure
===================================================================
--- VirtualBox-7.0.4.orig/configure
+++ VirtualBox-7.0.4/configure
--- VirtualBox-7.0.6.orig/configure
+++ VirtualBox-7.0.6/configure
@@ -1202,8 +1202,8 @@ check_sdl()
if [ -n "$foundsdl" ]; then
cat > $ODIR.tmp_src.cc << EOF
@ -43,10 +43,10 @@ Index: VirtualBox-7.0.4/configure
#undef main
extern "C" int main(int argc, char** argv)
{
Index: VirtualBox-7.0.4/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
Index: VirtualBox-7.0.6/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
+++ VirtualBox-7.0.4/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
--- VirtualBox-7.0.6.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
+++ VirtualBox-7.0.6/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
@@ -45,7 +45,7 @@
# pragma warning(disable: 4121) /* warning C4121: 'SDL_SysWMmsg' : alignment of a member was sensitive to packing*/
# pragma warning(disable: 4668) /* warning C4668: '__GNUC__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
@ -56,10 +56,10 @@ Index: VirtualBox-7.0.4/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
#ifdef _MSC_VER
# pragma warning(pop)
#endif
Index: VirtualBox-7.0.4/src/VBox/Frontends/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/Frontends/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Frontends/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/Frontends/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/VBox/Frontends/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/Frontends/Makefile.kmk
@@ -44,9 +44,9 @@ ifndef VBOX_ONLY_DOCS
include $(PATH_SUB_CURRENT)/VBoxBugReport/Makefile.kmk
endif
@ -72,10 +72,10 @@ Index: VirtualBox-7.0.4/src/VBox/Frontends/Makefile.kmk
ifdef VBOX_WITH_VBOXFB
include $(PATH_SUB_CURRENT)/VBoxFB/Makefile.kmk
endif
Index: VirtualBox-7.0.4/src/libs/Makefile.kmk
Index: VirtualBox-7.0.6/src/libs/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/Makefile.kmk
+++ VirtualBox-7.0.4/src/libs/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/libs/Makefile.kmk
+++ VirtualBox-7.0.6/src/libs/Makefile.kmk
@@ -104,13 +104,7 @@ endif
@ -90,10 +90,10 @@ Index: VirtualBox-7.0.4/src/libs/Makefile.kmk
# zlib is used by the IPRT compression code, libpng and others.
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h
Index: VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h
--- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h
+++ VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h
@@ -49,7 +49,6 @@ typedef enum
# define RT_C_DECLS_END }
#endif
@ -110,10 +110,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/VBoxVideoIPRT.h
#define __STDC_LIMIT_MACROS /* define *INT*_MAX on C++ too. */
#include "compiler.h" /* Can pull in <sdtint.h>. Must come after xf86_ansic.h on XFree86. */
#include <X11/Xfuncproto.h>
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/xf86_ansic.h
Index: VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/xf86_ansic.h
===================================================================
--- /dev/null
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/xf86_ansic.h
+++ VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/xf86_ansic.h
@@ -0,0 +1,351 @@
+/*
+ * Copyright 1997-2000 by The XFree86 Project, Inc
@ -466,10 +466,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/xf86_ansic.h
+#define getsecs(a, b) xf86getsecs(a, b)
+#endif
+#endif /* _XF86_ANSIC_H */
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/compiler.h
Index: VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/compiler.h
===================================================================
--- /dev/null
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/compiler.h
+++ VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/compiler.h
@@ -0,0 +1,1743 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.99 2003/01/29 15:23:20 tsi Exp $ */
+/*
@ -2214,10 +2214,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/compiler.h
+# endif /* __alpha__ */
+
+#endif /* _COMPILER_H */
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/xorg-server.h
Index: VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/xorg-server.h
===================================================================
--- /dev/null
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/xorg-server.h
+++ VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/xorg-server.h
@@ -0,0 +1,247 @@
+/* include/xorg-server.h. Generated from xorg-server.h.in by configure. */
+/* xorg-server.h.in -*- c -*-
@ -2466,11 +2466,11 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/xorg-server.h
+
+#endif /* _XORG_SERVER_H_ */
+
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -410,7 +410,7 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
--- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -411,7 +411,7 @@ ifdef XX_VBOX_USE_SYSTEM_XORG_HEADERS
SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_system_CFLAGS := \
@ -2479,4 +2479,3 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
vboxvideo_drv_system_DEFS := $(filter-out _XORG_SERVER_H_ _DIX_CONFIG_H_, $(vboxvideo_15_DEFS))
vboxvideo_drv_system_INCS += \
$(PATH_ROOT)/src/VBox/Runtime/include \

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
Index: VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-7.0.4/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
--- VirtualBox-7.0.6.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -86,6 +86,10 @@
#define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h"
@ -13,10 +13,10 @@ Index: VirtualBox-7.0.4/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
typedef struct VBOXNETFLTNOTIFIER {
struct notifier_block Notifier;
PVBOXNETFLTINS pThis;
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -342,12 +342,15 @@ static void vbox_master_drop(struct drm_
}
@ -36,10 +36,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
#else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
#endif /* < 5.4.0 */
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_main.c
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_main.c
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_main.c
@@ -659,8 +659,12 @@ static inline u64 vbox_bo_mmap_offset(st
#elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0)
return bo->bo.addr_space_offset;
@ -53,10 +53,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_main.c
}
int
Index: VirtualBox-7.0.4/include/iprt/cdefs.h
Index: VirtualBox-7.0.6/include/iprt/cdefs.h
===================================================================
--- VirtualBox-7.0.4.orig/include/iprt/cdefs.h
+++ VirtualBox-7.0.4/include/iprt/cdefs.h
--- VirtualBox-7.0.6.orig/include/iprt/cdefs.h
+++ VirtualBox-7.0.6/include/iprt/cdefs.h
@@ -1399,14 +1399,15 @@
#if RT_CLANG_PREREQ(4, 0) && RT_CPLUSPLUS_PREREQ(201100)
# define RT_FALL_THROUGH() [[clang::fallthrough]]
@ -76,10 +76,10 @@ Index: VirtualBox-7.0.4/include/iprt/cdefs.h
/** @def RT_IPRT_FORMAT_ATTR
Index: VirtualBox-7.0.4/kBuild/header.kmk
Index: VirtualBox-7.0.6/kBuild/header.kmk
===================================================================
--- VirtualBox-7.0.4.orig/kBuild/header.kmk
+++ VirtualBox-7.0.4/kBuild/header.kmk
--- VirtualBox-7.0.6.orig/kBuild/header.kmk
+++ VirtualBox-7.0.6/kBuild/header.kmk
@@ -764,7 +764,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm
RMDIR_INT := kmk_builtin_rmdir
RMDIR := $(RMDIR_INT)
@ -89,10 +89,10 @@ Index: VirtualBox-7.0.4/kBuild/header.kmk
SED_INT := $(SED_EXT)
SED := $(SED_EXT)
Index: VirtualBox-7.0.4/configure
Index: VirtualBox-7.0.6/configure
===================================================================
--- VirtualBox-7.0.4.orig/configure
+++ VirtualBox-7.0.4/configure
--- VirtualBox-7.0.6.orig/configure
+++ VirtualBox-7.0.6/configure
@@ -2000,7 +2000,7 @@ check_kbuild()
fi
echo "export KBUILD_PATH KBUILD_DEVTOOLS PATH" >> $ENV
@ -111,10 +111,10 @@ Index: VirtualBox-7.0.4/configure
else
fail
fi
Index: VirtualBox-7.0.4/tools/bin/backport-commit.sh
Index: VirtualBox-7.0.6/tools/bin/backport-commit.sh
===================================================================
--- VirtualBox-7.0.4.orig/tools/bin/backport-commit.sh
+++ VirtualBox-7.0.4/tools/bin/backport-commit.sh
--- VirtualBox-7.0.6.orig/tools/bin/backport-commit.sh
+++ VirtualBox-7.0.6/tools/bin/backport-commit.sh
@@ -29,7 +29,7 @@
#
# Determin script dir so we can source the common bits.
@ -124,10 +124,10 @@ Index: VirtualBox-7.0.4/tools/bin/backport-commit.sh
MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
if test "${MY_SCRIPT_DIR}" = "$0"; then
MY_SCRIPT_DIR=`pwd -L`
Index: VirtualBox-7.0.4/tools/bin/backport-common.sh
Index: VirtualBox-7.0.6/tools/bin/backport-common.sh
===================================================================
--- VirtualBox-7.0.4.orig/tools/bin/backport-common.sh
+++ VirtualBox-7.0.4/tools/bin/backport-common.sh
--- VirtualBox-7.0.6.orig/tools/bin/backport-common.sh
+++ VirtualBox-7.0.6/tools/bin/backport-common.sh
@@ -1,4 +1,4 @@
-# $Id: backport-common.sh $
+ $Id: backport-common.sh $
@ -143,10 +143,10 @@ Index: VirtualBox-7.0.4/tools/bin/backport-common.sh
#
# Functions.
Index: VirtualBox-7.0.4/tools/bin/backport-merge-and-commit.sh
Index: VirtualBox-7.0.6/tools/bin/backport-merge-and-commit.sh
===================================================================
--- VirtualBox-7.0.4.orig/tools/bin/backport-merge-and-commit.sh
+++ VirtualBox-7.0.4/tools/bin/backport-merge-and-commit.sh
--- VirtualBox-7.0.6.orig/tools/bin/backport-merge-and-commit.sh
+++ VirtualBox-7.0.6/tools/bin/backport-merge-and-commit.sh
@@ -29,7 +29,7 @@
#
# Determin script dir so we can invoke the two worker scripts.
@ -156,10 +156,10 @@ Index: VirtualBox-7.0.4/tools/bin/backport-merge-and-commit.sh
MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
if test "${MY_SCRIPT_DIR}" = "$0"; then
MY_SCRIPT_DIR=`pwd -L`
Index: VirtualBox-7.0.4/tools/bin/backport-merge.sh
Index: VirtualBox-7.0.6/tools/bin/backport-merge.sh
===================================================================
--- VirtualBox-7.0.4.orig/tools/bin/backport-merge.sh
+++ VirtualBox-7.0.4/tools/bin/backport-merge.sh
--- VirtualBox-7.0.6.orig/tools/bin/backport-merge.sh
+++ VirtualBox-7.0.6/tools/bin/backport-merge.sh
@@ -29,7 +29,7 @@
#
# Determin script dir so we can source the common bits.
@ -169,10 +169,10 @@ Index: VirtualBox-7.0.4/tools/bin/backport-merge.sh
MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
if test "${MY_SCRIPT_DIR}" = "$0"; then
MY_SCRIPT_DIR=`pwd -L`
Index: VirtualBox-7.0.4/src/VBox/Main/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/Main/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/Main/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/Main/Makefile.kmk
@@ -267,7 +267,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE
| $$(dir $$@)
$(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
@ -182,11 +182,11 @@ Index: VirtualBox-7.0.4/src/VBox/Main/Makefile.kmk
$(QUIET)$(RM) -- $(VBOX_XIDL_FILE).ts-tmp
$(QUIET)$(CP) --changed -fv -- $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE)
Index: VirtualBox-7.0.4/src/VBox/Runtime/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/Runtime/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Runtime/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/Runtime/Makefile.kmk
@@ -4476,6 +4476,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V
--- VirtualBox-7.0.6.orig/src/VBox/Runtime/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/Runtime/Makefile.kmk
@@ -4480,6 +4480,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V
#
# Generate the status code data.
#

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
Index: VirtualBox-7.0.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-7.0.4/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
--- VirtualBox-7.0.6.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-7.0.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -147,9 +147,9 @@
#include <linux/interrupt.h>
#include <linux/completion.h>
@ -14,10 +14,10 @@ Index: VirtualBox-7.0.4/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
#if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38)
# include <linux/smp_lock.h>
#endif
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyXPCOM.h
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyXPCOM.h
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyXPCOM.h
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyXPCOM.h
@@ -191,7 +191,7 @@ extern "C" PyAPI_FUNC(const char *) PyUn
# endif
@ -27,10 +27,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyXPCOM.h
DECLINLINE(int) PyRun_SimpleString(const char *pszCode)
{
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -121,7 +121,7 @@ void DoLogMessage(const char *methodName
#if PY_MAJOR_VERSION <= 2
c += PyString_AsString(repr);
@ -73,10 +73,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
#endif
result = (char *)PyMem_Malloc(strlen(tempResult)+1);
if (result==NULL)
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyGBase.cpp
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyGBase.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyGBase.cpp
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -117,7 +117,7 @@ PyG_Base::PyG_Base(PyObject *instance, c
#if PY_MAJOR_VERSION <= 2
szRepr = PyString_AsString(r);
@ -86,10 +86,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyGBase.cpp
#endif
if (szRepr==NULL) szRepr = "";
int reprOffset = *szRepr=='<' ? 1 : 0;
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyIID.cpp
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyIID.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyIID.cpp
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyIID.cpp
@@ -137,7 +137,7 @@ Py_nsIID::IIDFromPyObject(PyObject *ob,
ok = iid.Parse(PyString_AsString(ob));
#else
@ -99,10 +99,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyIID.cpp
#endif
if (!ok) {
PyXPCOM_BuildPyException(NS_ERROR_ILLEGAL_VALUE);
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/VariantUtils.cpp
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/VariantUtils.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/VariantUtils.cpp
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/VariantUtils.cpp
@@ -141,7 +141,7 @@ PyObject *PyObject_FromNSString( const n
#if PY_MAJOR_VERSION <= 2
char* dest = (char *)PyString_AS_STRING(ret);

View File

@ -1,8 +1,8 @@
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.h
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -166,9 +166,9 @@
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -160,9 +160,9 @@
# include <drm/drm_device.h>
# include <drm/drm_ioctl.h>
# include <drm/drm_fourcc.h>
@ -15,10 +15,20 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.h
# include <drm/drm_vblank.h>
#else /* < 5.5.0 || RHEL < 8.3 || SLES < 15-SP3 */
# include <drm/drmP.h>
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -188,9 +188,7 @@
# include <drm/ttm/ttm_resource.h>
#endif
-#if RTLNX_VER_MIN(6,0,0)
# include <drm/drm_framebuffer.h>
-#endif
#include "vboxvideo_guest.h"
#include "vboxvideo_vbe.h"
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -52,13 +52,7 @@
/** Detect whether kernel mode setting is OFF. */
@ -33,7 +43,7 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
#else /* !CONFIG_VGA_CONSOLE */
# define VBOX_VIDEO_NOMODESET() 0
#endif /* !CONFIG_VGA_CONSOLE */
@@ -372,7 +366,7 @@ static struct drm_driver driver = {
@@ -369,7 +363,7 @@ static struct drm_driver driver = {
#endif
.fops = &vbox_fops,
@ -42,10 +52,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
.irq_handler = vbox_irq_handler,
#endif
.name = DRIVER_NAME,
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_irq.c
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_irq.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_irq.c
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_irq.c
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_irq.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_irq.c
@@ -205,21 +205,11 @@ int vbox_irq_init(struct vbox_private *v
{
INIT_WORK(&vbox->hotplug_work, vbox_hotplug_worker);
@ -68,10 +78,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_irq.c
-#endif
flush_work(&vbox->hotplug_work);
}
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_ttm.c
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_ttm.c
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -320,7 +320,7 @@ static struct ttm_tt *vbox_ttm_tt_create
if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
#elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
@ -81,3 +91,29 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_ttm.c
if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) {
#else
if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) {
@@ -622,11 +622,7 @@ int vbox_bo_create(struct drm_device *de
drm_vma_node_reset(&vboxbo->bo.base.vma_node);
#endif
-#if RTLNX_VER_MIN(6,1,0)
ret = ttm_bo_init_validate(&vbox->ttm.bdev, &vboxbo->bo,
-#else
- ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
-#endif /* < 6.1.0 */
ttm_bo_type_device, &vboxbo->placement,
#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) && !defined(SUSE_SLE12)
align >> PAGE_SHIFT, false, NULL, acc_size,
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_mode.c
===================================================================
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -46,9 +46,7 @@
# include <drm/drm_probe_helper.h>
#endif
-#if RTLNX_VER_MIN(6,0,0)
# include <drm/drm_edid.h>
-#endif
#include "VBoxVideo.h"

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/VBox/HostDrivers/linux/Makefile
Index: VirtualBox-7.0.6/src/VBox/HostDrivers/linux/Makefile
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/HostDrivers/linux/Makefile
+++ VirtualBox-7.0.4/src/VBox/HostDrivers/linux/Makefile
--- VirtualBox-7.0.6.orig/src/VBox/HostDrivers/linux/Makefile
+++ VirtualBox-7.0.6/src/VBox/HostDrivers/linux/Makefile
@@ -43,11 +43,8 @@ obj-m = vboxdrv/
obj-m += vboxnetflt/
endif
@ -140,10 +140,10 @@ Index: VirtualBox-7.0.4/src/VBox/HostDrivers/linux/Makefile
if test -f $$module.ko; then \
echo "Installing $$module module"; \
$(SUDO) /sbin/insmod $$module.ko; \
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/Makefile
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/Makefile
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/Makefile
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/Makefile
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/Makefile
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/Makefile
@@ -34,6 +34,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/
else # ! KERNELRELEASE
@ -184,10 +184,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/Makefile
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \
fi
Index: VirtualBox-7.0.4/include/iprt/x86.h
Index: VirtualBox-7.0.6/include/iprt/x86.h
===================================================================
--- VirtualBox-7.0.4.orig/include/iprt/x86.h
+++ VirtualBox-7.0.4/include/iprt/x86.h
--- VirtualBox-7.0.6.orig/include/iprt/x86.h
+++ VirtualBox-7.0.6/include/iprt/x86.h
@@ -894,37 +894,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
* reserved flags.
* @{ */
@ -347,7 +347,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** Bit 23 - CET - Control-flow Enhancement Technology enabled. */
#define X86_CR4_CET RT_BIT_32(23)
/** @} */
@@ -1207,12 +1271,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1224,12 +1288,16 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
/** Machine check type register (P5). */
#define MSR_P5_MC_TYPE UINT32_C(0x00000001)
/** Time Stamp Counter. */
@ -364,7 +364,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
#ifndef MSR_IA32_APICBASE /* qemu cpu.h kludge */
# define MSR_IA32_APICBASE 0x1b
@@ -1238,7 +1306,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1255,7 +1323,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_CORE_THREAD_COUNT 0x35
/** CPU Feature control. */
@ -374,7 +374,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** Feature control - Lock MSR from writes (R/W0). */
#define MSR_IA32_FEATURE_CONTROL_LOCK RT_BIT_64(0)
/** Feature control - Enable VMX inside SMX operation (R/WL). */
@@ -1263,11 +1333,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1280,11 +1350,15 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_FEATURE_CONTROL_LMCE RT_BIT_64(20)
/** Per-processor TSC adjust MSR. */
@ -390,7 +390,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** IBRS - Indirect branch restricted speculation. */
#define MSR_IA32_SPEC_CTRL_F_IBRS RT_BIT_32(0)
/** STIBP - Single thread indirect branch predictors. */
@@ -1277,7 +1351,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1294,7 +1368,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
/** Prediction command register.
* Write only, logical processor scope, no state since write only. */
@ -400,7 +400,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** IBPB - Indirect branch prediction barrie when written as 1. */
#define MSR_IA32_PRED_CMD_F_IBPB RT_BIT_32(0)
@@ -1288,7 +1364,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1305,7 +1381,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_BIOS_SIGN_ID 0x8B
/** SMM monitor control. */
@ -410,7 +410,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** SMM control - Valid. */
#define MSR_IA32_SMM_MONITOR_VALID RT_BIT_64(0)
/** SMM control - VMXOFF unblocks SMI. */
@@ -1297,10 +1375,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1314,10 +1392,14 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_SMM_MONITOR_MSGEG_PHYSADDR(a) (((a) >> 12) & UINT64_C(0xfffff))
/** SMBASE - Base address of SMRANGE image (Read-only, SMM only). */
@ -425,7 +425,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** General performance counter no. 1. */
#define MSR_IA32_PMC1 0xC2
/** General performance counter no. 2. */
@@ -1323,18 +1405,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1340,18 +1422,26 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_FSB_CLOCK_STS 0xCD
/** C-State configuration control. Intel specific: Nehalem, Sandy Bridge. */
@ -452,7 +452,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** CPU is no subject to meltdown problems. */
#define MSR_IA32_ARCH_CAP_F_RDCL_NO RT_BIT_32(0)
/** CPU has better IBRS and you can leave it on all the time. */
@@ -1348,7 +1438,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1365,7 +1455,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_ARCH_CAP_F_MDS_NO RT_BIT_32(4)
/** Flush command register. */
@ -462,7 +462,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** Flush the level 1 data cache when this bit is written. */
#define MSR_IA32_FLUSH_CMD_F_L1D RT_BIT_32(0)
@@ -1369,14 +1461,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1386,14 +1478,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#endif
/** Machine Check Global Capabilities Register. */
@ -483,7 +483,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** Default PAT MSR value on processor powerup / reset (see Intel spec. 11.12.4
* "Programming the PAT", AMD spec. 7.8.2 "PAT Indexing") */
#define MSR_IA32_CR_PAT_INIT_VAL UINT64_C(0x0007040600070406)
@@ -1395,36 +1493,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1412,36 +1510,58 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_FLEX_RATIO 0x194
/** Performance state value and starting with Intel core more.
* Apple uses the >=core features to determine TSC granularity on older CPUs. */
@ -542,7 +542,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** Trace/Profile Resource Control (R/W) */
#define MSR_IA32_DEBUGCTL UINT32_C(0x000001d9)
@@ -1605,7 +1725,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1622,7 +1742,9 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
/** @} */
/** Intel TSX (Transactional Synchronization Extensions) control MSR. */
@ -552,7 +552,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** Variable range MTRRs.
* @{ */
@@ -1655,93 +1777,171 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1672,93 +1794,171 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_PERF_GLOBAL_OVF_CTRL 0x390
/** Precise Event Based sampling (Intel only). */
@ -724,7 +724,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** X2APIC MSR range start. */
#define MSR_IA32_X2APIC_START 0x800
@@ -1876,23 +2076,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1893,23 +2093,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
/** The mask which give the SYSCALL EIP. */
#define MSR_K6_STAR_SYSCALL_EIP_MASK UINT32_C(0xffffffff)
/** K6 WHCR - Write Handling Control Register. */
@ -772,7 +772,7 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** K8 LSTAR - Long mode SYSCALL target (RIP). */
#define MSR_K8_LSTAR UINT32_C(0xc0000082)
@@ -1908,14 +2132,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1925,14 +2149,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_K8_KERNEL_GS_BASE UINT32_C(0xc0000102)
/** K8 TSC_AUX - Used with RDTSCP. */
#define MSR_K8_TSC_AUX UINT32_C(0xc0000103)
@ -793,10 +793,10 @@ Index: VirtualBox-7.0.4/include/iprt/x86.h
/** SMM MSRs. */
#define MSR_K7_SMBASE UINT32_C(0xc0010111)
Index: VirtualBox-7.0.4/include/VBox/vmm/hm_vmx.h
Index: VirtualBox-7.0.6/include/VBox/vmm/hm_vmx.h
===================================================================
--- VirtualBox-7.0.4.orig/include/VBox/vmm/hm_vmx.h
+++ VirtualBox-7.0.4/include/VBox/vmm/hm_vmx.h
--- VirtualBox-7.0.6.orig/include/VBox/vmm/hm_vmx.h
+++ VirtualBox-7.0.6/include/VBox/vmm/hm_vmx.h
@@ -1633,7 +1633,9 @@ AssertCompileSize(VMXABORT, 4);
/** VMCS (and related regions) memory type - Uncacheable. */
#define VMX_BASIC_MEM_TYPE_UC 0
@ -807,10 +807,10 @@ Index: VirtualBox-7.0.4/include/VBox/vmm/hm_vmx.h
/** Width of physical addresses used for VMCS and associated memory regions
* (1=32-bit, 0=processor's physical address width). */
#define VMX_BASIC_PHYSADDR_WIDTH_32BIT RT_BIT_64(48)
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.h
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.h
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -87,6 +87,12 @@
#else
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)

View File

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

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/include/VBox/VBoxGL2D.h
Index: VirtualBox-7.0.6/include/VBox/VBoxGL2D.h
===================================================================
--- VirtualBox-7.0.4.orig/include/VBox/VBoxGL2D.h
+++ VirtualBox-7.0.4/include/VBox/VBoxGL2D.h
--- VirtualBox-7.0.6.orig/include/VBox/VBoxGL2D.h
+++ VirtualBox-7.0.6/include/VBox/VBoxGL2D.h
@@ -123,7 +123,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN
/* GL_ARB_pixel_buffer_object*/
#ifndef Q_WS_MAC
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.4/include/VBox/VBoxGL2D.h
#endif
#ifndef GL_READ_ONLY
Index: VirtualBox-7.0.4/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
Index: VirtualBox-7.0.6/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
+++ VirtualBox-7.0.4/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
--- VirtualBox-7.0.6.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
+++ VirtualBox-7.0.6/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
@@ -466,7 +466,12 @@ GLAPI void APIENTRY glBlendEquation (GLe
#ifndef GL_VERSION_1_5
@ -28,10 +28,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.
typedef khronos_intptr_t GLintptr;
#define GL_BUFFER_SIZE 0x8764
#define GL_BUFFER_USAGE 0x8765
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
Index: VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
--- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
+++ VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
@@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe
#ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1
@ -44,10 +44,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorea
typedef ptrdiff_t GLintptr;
#define GL_BUFFER_SIZE 0x8764
#define GL_BUFFER_USAGE 0x8765
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
Index: VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
--- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
+++ VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
@@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe
#ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1
@ -60,10 +60,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
typedef ptrdiff_t GLintptr;
#define GL_BUFFER_SIZE 0x8764
#define GL_BUFFER_USAGE 0x8765
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
Index: VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
--- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
+++ VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
@@ -3708,7 +3708,11 @@ typedef char GLchar; /* native charact
#ifndef GL_VERSION_1_5
/* GL types for handling large vertex buffer objects */
@ -76,10 +76,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
#endif
#ifndef GL_ARB_vertex_buffer_object
Index: VirtualBox-7.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
Index: VirtualBox-7.0.6/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
+++ VirtualBox-7.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
--- VirtualBox-7.0.6.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
+++ VirtualBox-7.0.6/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
@@ -4680,6 +4680,14 @@ GLAPI void APIENTRY glWeightuivARB (GLin
GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
GLAPI void APIENTRY glVertexBlendARB (GLint count);

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -362,7 +362,9 @@ static struct drm_driver driver = {
.master_drop = vbox_master_drop,
#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
@ -12,10 +12,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
# endif
#endif
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_main.c
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_main.c
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_main.c
@@ -622,11 +622,13 @@ int vbox_dumb_destroy(struct drm_file *f
#endif
@ -30,10 +30,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_main.c
void vbox_gem_free_object(struct drm_gem_object *obj)
{
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_ttm.c
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_ttm.c
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -297,7 +297,7 @@ static struct ttm_backend_func vbox_tt_b
};
#endif
@ -133,10 +133,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_ttm.c
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
# else
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.h
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.h
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -87,6 +87,9 @@
#else
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
@ -147,10 +147,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.h
/** @def RTLNX_RHEL_RANGE
* Check that it's a RedHat kernel in the given version range.
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_mode.c
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_mode.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_mode.c
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -552,7 +552,8 @@ static void vbox_set_edid(struct drm_con
for (i = 0; i < EDID_SIZE - 1; ++i)
sum += edid[i];

View File

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

View File

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

View File

@ -1,21 +1,30 @@
Index: VirtualBox-7.0.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
Index: VirtualBox-7.0.6/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+++ VirtualBox-7.0.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
--- VirtualBox-7.0.6.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+++ VirtualBox-7.0.6/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -45,7 +45,7 @@
#include <iprt/assert.h>
#include <iprt/errcore.h>
#include "r0drv/alloc-r0drv.h"
-
+#include <linux/kmemleak.h>
#include "internal/initterm.h"
#if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP)
# if RTLNX_VER_MIN(2,6,23) && RTLNX_VER_MAX(5,8,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
@@ -311,6 +311,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb
fFlags &= ~RTMEMHDR_FLAG_KMALLOC;
pHdr = vmalloc(cb + sizeof(*pHdr));
}
@@ -78,11 +78,12 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb
&& !(fFlags & RTMEMHDR_FLAG_ANY_CTX) ))
{
fFlags &= ~RTMEMHDR_FLAG_KMALLOC;
- pHdr = vmalloc(cb + sizeof(*pHdr));
- }
+ pHdr = vmalloc(cb + sizeof(*pHdr));
+ }
+ kmemleak_not_leak(pHdr);
}
else
pHdr = vmalloc(cb + sizeof(*pHdr));
}
- else
- pHdr = vmalloc(cb + sizeof(*pHdr));
+ else
+ pHdr = vmalloc(cb + sizeof(*pHdr));
if (RT_LIKELY(pHdr))
{
/*

View File

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

View File

@ -5,11 +5,11 @@
#
# January 31, 2019 - Larry Finger
#
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -864,9 +864,11 @@ dmnstatus()
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -869,9 +869,11 @@ dmnstatus()
fi
}
@ -24,10 +24,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
case "$1" in
# Does setup without clean-up first and marks all kernels currently found on the
# system so that we can see later if any were added.
Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxdrv.sh
Index: VirtualBox-7.0.6/src/VBox/Installer/linux/vboxdrv.sh
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-7.0.4/src/VBox/Installer/linux/vboxdrv.sh
--- VirtualBox-7.0.6.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-7.0.6/src/VBox/Installer/linux/vboxdrv.sh
@@ -48,6 +48,9 @@ DEVICE=/dev/vboxdrv
MODPROBE=/sbin/modprobe
SCRIPTNAME=vboxdrv.sh

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/VBox/Main/webservice/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/Main/webservice/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/Main/webservice/Makefile.kmk
@@ -848,7 +848,7 @@ $(if-expr !defined(VBOX_WITHOUT_NOINLINE
$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))

View File

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

View File

@ -1,8 +1,8 @@
Index: VirtualBox-7.0.4/Config.kmk
Index: VirtualBox-7.0.6/Config.kmk
===================================================================
--- VirtualBox-7.0.4.orig/Config.kmk
+++ VirtualBox-7.0.4/Config.kmk
@@ -6674,6 +6674,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
--- VirtualBox-7.0.6.orig/Config.kmk
+++ VirtualBox-7.0.6/Config.kmk
@@ -6770,6 +6770,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
ifeq ($(KBUILD_TARGET),linux)
# not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
# TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
@ -12,7 +12,7 @@ Index: VirtualBox-7.0.4/Config.kmk
endif
ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBOXR3HARDENEDEXE_SDKS = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS)
@@ -6706,8 +6709,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
@@ -6802,8 +6805,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBOXR3HARDENEDEXE_VBOX_IMPORT_CHECKER.win = noimports
else ifn1of ($(KBUILD_TARGET), os2)
ifneq ($(KBUILD_TYPE),asan) # Keep RPATH in asan builds so we can find libasan.so.X and libubsan.so.Y.

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/VBox/Main/webservice/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/Main/webservice/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/Main/webservice/Makefile.kmk
@@ -410,6 +410,7 @@ ifdef VBOX_GSOAP_INSTALLED
vboxwebsrv_LIBS += \
$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
Index: VirtualBox-7.0.6/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+++ VirtualBox-7.0.4/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
--- VirtualBox-7.0.6.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+++ VirtualBox-7.0.6/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
printf("VirtualBox DirectFB GUI built %s %s\n"
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.4/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
for (;;)
{
Index: VirtualBox-7.0.4/src/VBox/Runtime/common/string/uniread.cpp
Index: VirtualBox-7.0.6/src/VBox/Runtime/common/string/uniread.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Runtime/common/string/uniread.cpp
+++ VirtualBox-7.0.4/src/VBox/Runtime/common/string/uniread.cpp
--- VirtualBox-7.0.6.orig/src/VBox/Runtime/common/string/uniread.cpp
+++ VirtualBox-7.0.6/src/VBox/Runtime/common/string/uniread.cpp
@@ -1046,7 +1046,7 @@ int PrintHeader(const char *argv0, const
" * IPRT - Unicode Tables.\n"
" *\n"
@ -24,10 +24,10 @@ Index: VirtualBox-7.0.4/src/VBox/Runtime/common/string/uniread.cpp
" */\n"
"\n"
"/*\n"
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@ -50,10 +50,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
@@ -44,16 +44,10 @@
#ifndef XP_MAC
#include "_pr_bld.h"
@ -73,10 +73,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@ -99,10 +99,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@ -125,10 +125,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-7.0.4/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
Index: VirtualBox-7.0.6/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+++ VirtualBox-7.0.4/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
--- VirtualBox-7.0.6.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+++ VirtualBox-7.0.6/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
@@ -327,7 +327,7 @@ static int vboxInitLogging(const char *p
#endif
"Log opened %s\n",
@ -138,10 +138,10 @@ Index: VirtualBox-7.0.4/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.c
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-7.0.4/src/VBox/Devices/PC/BIOS/bios.c
Index: VirtualBox-7.0.6/src/VBox/Devices/PC/BIOS/bios.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Devices/PC/BIOS/bios.c
+++ VirtualBox-7.0.4/src/VBox/Devices/PC/BIOS/bios.c
--- VirtualBox-7.0.6.orig/src/VBox/Devices/PC/BIOS/bios.c
+++ VirtualBox-7.0.6/src/VBox/Devices/PC/BIOS/bios.c
@@ -164,7 +164,7 @@ void set_mode(uint8_t mode);
#define BX_PCIBIOS 1
@ -151,10 +151,10 @@ Index: VirtualBox-7.0.4/src/VBox/Devices/PC/BIOS/bios.c
//--------------------------------------------------------------------------
// print_bios_banner
// displays a the bios version
Index: VirtualBox-7.0.4/src/VBox/Additions/common/VBoxService/VBoxService.cpp
Index: VirtualBox-7.0.6/src/VBox/Additions/common/VBoxService/VBoxService.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ VirtualBox-7.0.4/src/VBox/Additions/common/VBoxService/VBoxService.cpp
--- VirtualBox-7.0.6.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ VirtualBox-7.0.6/src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -255,7 +255,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
"VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
"Log opened %s\n",
@ -164,10 +164,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/common/VBoxService/VBoxService.cpp
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-7.0.4/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
@@ -193,7 +193,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature
@ -177,10 +177,10 @@ Index: VirtualBox-7.0.4/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/
Index: VirtualBox-7.0.4/src/VBox/ExtPacks/Skeleton/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/ExtPacks/Skeleton/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/ExtPacks/Skeleton/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/ExtPacks/Skeleton/Makefile.kmk
@@ -161,7 +161,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_SKELETON_MA
$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.signature
@ -190,10 +190,10 @@ Index: VirtualBox-7.0.4/src/VBox/ExtPacks/Skeleton/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/
Index: VirtualBox-7.0.4/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
@@ -354,7 +354,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature
@ -203,10 +203,10 @@ Index: VirtualBox-7.0.4/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/
Index: VirtualBox-7.0.4/src/VBox/ExtPacks/VNC/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/ExtPacks/VNC/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/ExtPacks/VNC/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/ExtPacks/VNC/Makefile.kmk
@@ -164,7 +164,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature
@ -216,10 +216,10 @@ Index: VirtualBox-7.0.4/src/VBox/ExtPacks/VNC/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/
Index: VirtualBox-7.0.4/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
Index: VirtualBox-7.0.6/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ VirtualBox-7.0.4/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
--- VirtualBox-7.0.6.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ VirtualBox-7.0.6/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
@@ -329,7 +329,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv
}
VGDrvCommonInitLoggers();
@ -229,10 +229,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
/*
* Check if the NT version is supported and initialize g_enmVGDrvNtVer.
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
@@ -882,7 +882,7 @@ static DECLCALLBACK(void) vboxGreeterLog
"vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release log\n"
"Log opened %s\n",
@ -242,10 +242,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cp
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-7.0.4/src/VBox/Additions/solaris/Mouse/vboxms.c
Index: VirtualBox-7.0.6/src/VBox/Additions/solaris/Mouse/vboxms.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
+++ VirtualBox-7.0.4/src/VBox/Additions/solaris/Mouse/vboxms.c
--- VirtualBox-7.0.6.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
+++ VirtualBox-7.0.6/src/VBox/Additions/solaris/Mouse/vboxms.c
@@ -266,7 +266,7 @@ static VBMSSTATE g_OpenNodeSt
int _init(void)
{
@ -255,10 +255,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/solaris/Mouse/vboxms.c
mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL);
/*
* Prevent module autounloading.
Index: VirtualBox-7.0.4/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
Index: VirtualBox-7.0.6/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+++ VirtualBox-7.0.4/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
--- VirtualBox-7.0.6.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+++ VirtualBox-7.0.6/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
@@ -251,10 +251,10 @@ Returns:
UTILITY_NAME,
UTILITY_MAJOR_VERSION,
@ -272,10 +272,10 @@ Index: VirtualBox-7.0.4/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo
Usage ();
return -1;
}
Index: VirtualBox-7.0.4/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
Index: VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ VirtualBox-7.0.4/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
--- VirtualBox-7.0.6.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
@@ -128,7 +128,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI
static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject)
{
@ -294,10 +294,10 @@ Index: VirtualBox-7.0.4/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
NTSTATUS Status = vboxUsbRtGlobalsInit();
Assert(Status == STATUS_SUCCESS);
Index: VirtualBox-7.0.4/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
Index: VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ VirtualBox-7.0.4/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
--- VirtualBox-7.0.6.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
@@ -1518,7 +1518,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB
RTLogDestinations(0, "debugger");
#endif
@ -307,10 +307,10 @@ Index: VirtualBox-7.0.4/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals));
Index: VirtualBox-7.0.4/src/VBox/Main/glue/VBoxLogRelCreate.cpp
Index: VirtualBox-7.0.6/src/VBox/Main/glue/VBoxLogRelCreate.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+++ VirtualBox-7.0.4/src/VBox/Main/glue/VBoxLogRelCreate.cpp
--- VirtualBox-7.0.6.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+++ VirtualBox-7.0.6/src/VBox/Main/glue/VBoxLogRelCreate.cpp
@@ -71,7 +71,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
#endif
"Log opened %s\n",
@ -320,10 +320,10 @@ Index: VirtualBox-7.0.4/src/VBox/Main/glue/VBoxLogRelCreate.cpp
pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
{
PRIntn tab = 0;
@ -333,10 +333,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
printf("Depend.c build time is %s %s\n", buildDate, buildTime);
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
@@ -458,7 +458,7 @@ int
main()
{
@ -346,10 +346,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/prof
#ifdef TEST_STD_STRING
cout << "Testing std::string." << endl;
#else
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
@@ -425,7 +425,7 @@ int
main()
{
@ -359,10 +359,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test
#if 0
{
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
@@ -102,7 +102,7 @@ class test_message
public:
test_message()
@ -372,10 +372,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
}
~test_message()
Index: VirtualBox-7.0.4/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
Index: VirtualBox-7.0.6/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
+++ VirtualBox-7.0.4/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
--- VirtualBox-7.0.6.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
+++ VirtualBox-7.0.6/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
@@ -30,9 +30,8 @@
#include "build_id.h"
#include "macros.h"
@ -387,11 +387,11 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id
#ifndef ElfW
#define ElfW(type) Elf_##type
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/VBoxClient/logging.cpp
Index: VirtualBox-7.0.6/src/VBox/Additions/x11/VBoxClient/logging.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/VBoxClient/logging.cpp
@@ -203,10 +203,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
--- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
+++ VirtualBox-7.0.6/src/VBox/Additions/x11/VBoxClient/logging.cpp
@@ -328,10 +328,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
case RTLOGPHASE_BEGIN:
{
pfnLog(pLoggerRelease,

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/apps/Makefile.kmk
Index: VirtualBox-7.0.6/src/apps/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.4/src/apps/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.6/src/apps/Makefile.kmk
@@ -28,5 +28,7 @@
SUB_DEPTH = ../..
include $(KBUILD_PATH)/subheader.kmk
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.4/src/apps/Makefile.kmk
+
include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-7.0.4/src/apps/VBoxPermissionMessage/Makefile.kmk
Index: VirtualBox-7.0.6/src/apps/VBoxPermissionMessage/Makefile.kmk
===================================================================
--- /dev/null
+++ VirtualBox-7.0.4/src/apps/VBoxPermissionMessage/Makefile.kmk
+++ VirtualBox-7.0.6/src/apps/VBoxPermissionMessage/Makefile.kmk
@@ -0,0 +1,32 @@
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+## @file
@ -47,10 +47,10 @@ Index: VirtualBox-7.0.4/src/apps/VBoxPermissionMessage/Makefile.kmk
+
+include $(KBUILD_PATH)/subfooter.kmk
+
Index: VirtualBox-7.0.4/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
Index: VirtualBox-7.0.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
===================================================================
--- /dev/null
+++ VirtualBox-7.0.4/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
+++ VirtualBox-7.0.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
@@ -0,0 +1,12 @@
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>

View File

@ -1,10 +1,10 @@
# https://www.virtualbox.org/changeset/90537/vbox
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/Makefile.kmk
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/python/Makefile.kmk
@@ -702,6 +702,52 @@ VBoxPython3_10m_x86_LIBS = $(VBOX_
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/Makefile.kmk
@@ -703,6 +703,52 @@ VBoxPython3_10m_x86_LIBS = $(VBOX_
endif
endif

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/bldprogs/scm.cpp
Index: VirtualBox-7.0.6/src/bldprogs/scm.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/bldprogs/scm.cpp
+++ VirtualBox-7.0.4/src/bldprogs/scm.cpp
--- VirtualBox-7.0.6.orig/src/bldprogs/scm.cpp
+++ VirtualBox-7.0.6/src/bldprogs/scm.cpp
@@ -2335,7 +2335,7 @@ static int scmProcessFileInner(PSCMRWSTA
pszTreatAs = "shell";
else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0)
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.4/src/bldprogs/scm.cpp
else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0)
|| (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) )
pszTreatAs = "perl";
Index: VirtualBox-7.0.4/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
Index: VirtualBox-7.0.6/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ VirtualBox-7.0.4/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
--- VirtualBox-7.0.6.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ VirtualBox-7.0.6/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
@@ -32,6 +32,9 @@
%define VBOXDOCDIR %{_defaultdocdir}/%NAME%
%global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$
@ -25,10 +25,10 @@ Index: VirtualBox-7.0.4/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
Summary: Oracle VM VirtualBox
Name: %NAME%
Index: VirtualBox-7.0.4/src/libs/libxml2-2.9.14/libxml.spec.in
Index: VirtualBox-7.0.6/src/libs/libxml2-2.9.14/libxml.spec.in
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/libxml2-2.9.14/libxml.spec.in
+++ VirtualBox-7.0.4/src/libs/libxml2-2.9.14/libxml.spec.in
--- VirtualBox-7.0.6.orig/src/libs/libxml2-2.9.14/libxml.spec.in
+++ VirtualBox-7.0.6/src/libs/libxml2-2.9.14/libxml.spec.in
@@ -1,3 +1,4 @@
+%global with_python2 0
%global with_python3 1
@ -93,10 +93,10 @@ Index: VirtualBox-7.0.4/src/libs/libxml2-2.9.14/libxml.spec.in
%if 0%{?with_python3}
%files -n python3-%{name}
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -438,7 +438,9 @@ char *PyTraceback_AsString(PyObject *exc
{ // a temp scope so I can use temp locals.
@ -108,10 +108,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
#else
/* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyGBase.cpp
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyGBase.cpp
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyGBase.cpp
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -183,7 +183,11 @@ PyG_Base::~PyG_Base()
// Get the correct interface pointer for this object given the IID.
void *PyG_Base::ThisAsIID( const nsIID &iid )
@ -125,10 +125,10 @@ Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyGBase.cpp
if (iid.Equals(NS_GET_IID(nsISupports)))
return (nsISupports *)(nsIInternalPython *)this;
if (iid.Equals(NS_GET_IID(nsISupportsWeakReference)))
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/gen_python_deps.py
Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/gen_python_deps.py
===================================================================
--- VirtualBox-7.0.4.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-7.0.4/src/libs/xpcom18a4/python/gen_python_deps.py
--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/gen_python_deps.py
@@ -96,7 +96,7 @@ def main(argv):
else:
multi = 1

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -36,11 +36,14 @@
# Provides: vboxadd
# Required-Start:
@ -74,7 +74,7 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
fi
done
for i in ${OLDMODULES}; do
@@ -559,9 +541,9 @@ create_udev_rule()
@@ -564,9 +546,9 @@ create_udev_rule()
udevcontrol reload_rules >/dev/null 2>&1 || true
fi
}
@ -87,7 +87,7 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
# And a post-installation script for rebuilding modules when a new kernel
# is installed.
mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d
@@ -742,18 +724,17 @@ setup()
@@ -747,18 +729,17 @@ setup()
already available for kernel $TARGET_VER and do not require to be rebuilt."
else
info "Building the VirtualBox Guest Additions kernel modules. This may take a while."
@ -115,7 +115,7 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
fi
fi
create_vbox_user
@@ -770,17 +751,14 @@ Please install them and execute
@@ -775,17 +756,14 @@ Please install them and execute
# Put the X.Org driver in place. This is harmless if it is not needed.
# Also set up the OpenGL library.
myerr=`"${INSTALL_DIR}/init/vboxadd-x11" setup 2>&1`
@ -136,7 +136,7 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
depmod
# Remove old module sources
@@ -790,12 +768,13 @@ cleanup()
@@ -795,12 +773,13 @@ cleanup()
fi
# Clean-up X11-related bits
@ -154,7 +154,7 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
fi
rm -f /sbin/mount.vboxsf 2>/dev/null
rm -f /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
@@ -834,7 +813,7 @@ for your Linux distribution."
@@ -839,7 +818,7 @@ for your Linux distribution."
rm -f $userdev || {
fail "Cannot remove $userdev"
}
@ -163,10 +163,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
fail "modprobe vboxguest failed"
case "$no_udev" in 1)
sleep .5;;
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd-service.sh
Index: VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd-service.sh
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd-service.sh
--- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
+++ VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd-service.sh
@@ -36,7 +36,7 @@
# Provides: vboxadd-service
# Required-Start: vboxadd
@ -176,10 +176,10 @@ Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd-service.sh
# Default-Stop: 0 1 6
# X-Conflicts-With: systemd-timesyncd.service
# Description: VirtualBox Additions Service
Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxautostart-service.sh
Index: VirtualBox-7.0.6/src/VBox/Installer/linux/vboxautostart-service.sh
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Installer/linux/vboxautostart-service.sh
+++ VirtualBox-7.0.4/src/VBox/Installer/linux/vboxautostart-service.sh
--- VirtualBox-7.0.6.orig/src/VBox/Installer/linux/vboxautostart-service.sh
+++ VirtualBox-7.0.6/src/VBox/Installer/linux/vboxautostart-service.sh
@@ -33,7 +33,7 @@
# Provides: vboxautostart-service
# Required-Start: vboxdrv
@ -189,10 +189,10 @@ Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxautostart-service.sh
# Default-Stop: 0 1 6
# Description: VirtualBox autostart service
### END INIT INFO
Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxballoonctrl-service.sh
Index: VirtualBox-7.0.6/src/VBox/Installer/linux/vboxballoonctrl-service.sh
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+++ VirtualBox-7.0.4/src/VBox/Installer/linux/vboxballoonctrl-service.sh
--- VirtualBox-7.0.6.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+++ VirtualBox-7.0.6/src/VBox/Installer/linux/vboxballoonctrl-service.sh
@@ -33,7 +33,7 @@
# Provides: vboxballoonctrl-service
# Required-Start: vboxdrv
@ -202,10 +202,10 @@ Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxballoonctrl-service.sh
# Default-Stop: 0 1 6
# Description: VirtualBox watchdog daemon
### END INIT INFO
Index: VirtualBox-7.0.4/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
Index: VirtualBox-7.0.6/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+++ VirtualBox-7.0.4/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
--- VirtualBox-7.0.6.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+++ VirtualBox-7.0.6/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
@@ -41,7 +41,7 @@
# Provides: testboxscript-service
# Required-Start: $network
@ -215,10 +215,10 @@ Index: VirtualBox-7.0.4/src/VBox/ValidationKit/testboxscript/linux/testboxscript
# Default-Stop: 0 1 6
# Description: TestBoxScript service
### END INIT INFO
Index: VirtualBox-7.0.4/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
Index: VirtualBox-7.0.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+++ VirtualBox-7.0.4/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
--- VirtualBox-7.0.6.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+++ VirtualBox-7.0.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
@@ -41,7 +41,7 @@
# Provides: vboxtxs
# Required-Start: $network
@ -228,10 +228,10 @@ Index: VirtualBox-7.0.4/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-
# Default-Stop: 0 1 6
# Description: VirtualBox Test Execution Service
### END INIT INFO
Index: VirtualBox-7.0.4/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
Index: VirtualBox-7.0.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+++ VirtualBox-7.0.4/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
--- VirtualBox-7.0.6.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+++ VirtualBox-7.0.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
@@ -41,7 +41,7 @@
# Provides: vboxtxs
# Required-Start: $network

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxdrv.sh
Index: VirtualBox-7.0.6/src/VBox/Installer/linux/vboxdrv.sh
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-7.0.4/src/VBox/Installer/linux/vboxdrv.sh
--- VirtualBox-7.0.6.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-7.0.6/src/VBox/Installer/linux/vboxdrv.sh
@@ -29,11 +29,12 @@
#
### BEGIN INIT INFO
@ -19,7 +19,7 @@ Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxdrv.sh
### END INIT INFO
## @todo This file duplicates a lot of script with vboxadd.sh. When making
@@ -520,13 +521,6 @@ See the documentation for your Linux dis
@@ -526,13 +527,6 @@ See the documentation for your Linux dis
fi
fi
# ensure permissions
@ -33,7 +33,7 @@ Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxdrv.sh
if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
fi
@@ -684,31 +678,7 @@ setup()
@@ -690,31 +684,7 @@ setup()
log "Error building the module:"
module_build_log "$myerr"
failure "Look at $LOG to find out what went wrong"
@ -66,11 +66,11 @@ Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxdrv.sh
# Secure boot on Ubuntu, Debian and Oracle Linux.
if test -n "$HAVE_SEC_BOOT"; then
Index: VirtualBox-7.0.4/Config.kmk
Index: VirtualBox-7.0.6/Config.kmk
===================================================================
--- VirtualBox-7.0.4.orig/Config.kmk
+++ VirtualBox-7.0.4/Config.kmk
@@ -3111,6 +3111,9 @@ else
--- VirtualBox-7.0.6.orig/Config.kmk
+++ VirtualBox-7.0.6/Config.kmk
@@ -3154,6 +3154,9 @@ else
$(SED_EXT) -n 's|.*version \([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|p' )
endif
endif

View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.4/src/VBox/Main/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/Main/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/Main/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/Main/Makefile.kmk
@@ -1876,7 +1876,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \
$(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
--stringparam generating "dtrace-probes" \
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.4/src/VBox/Main/Makefile.kmk
"$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d" \
"$@" \
"$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end$(if-expr "$(VBOX_HOST_DTRACE_VERSION)" == "dtrace: Sun D 1.6.2",-alternative,).d"
Index: VirtualBox-7.0.4/src/VBox/Devices/Makefile.kmk
Index: VirtualBox-7.0.6/src/VBox/Devices/Makefile.kmk
===================================================================
--- VirtualBox-7.0.4.orig/src/VBox/Devices/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/Devices/Makefile.kmk
--- VirtualBox-7.0.6.orig/src/VBox/Devices/Makefile.kmk
+++ VirtualBox-7.0.6/src/VBox/Devices/Makefile.kmk
@@ -989,8 +989,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
$(call MSG_TOOL,iasl,VBoxDD,$<,$@)
$(QUIET)$(RM) -f $@ $@.tmp $@.pre

View File

@ -1,3 +1,45 @@
-------------------------------------------------------------------
Tue Jan 24 20:15:06 UTC 2023 - Larry Rainey <llrainey15@gmail.com>
- VirtualBox 7.0.6 (released January 17 2023)
This is a maintenance release. The following items were fixed and/or added: [1]
- VMM: Fixed guru running the FreeBSD loader on older Intel CPUs without unrestricted guest support (bug #21332)
- GUI: Fixed virtual machines grouping when VM was created or modified in command line (bugs #11500, #20933)
- GUI: Introduced generic changes in settings dialogs
- VirtioNet: Fixed broken network after loading saved state (bug #21172)
- Storage: Added support for increasing the size of the following VMDK image variants: monolithicFlat, monolithicSparse, twoGbMaxExtentSparse, twoGbMaxExtentFlat
- VBoxManage: Added missing --directory switch for guestcontrol mktemp command
- Mouse Integration: Guest was provided with extended host mouse state (bug #21139)
- DnD: Introduced generic improvements
- Guest Control: Fixed handling creation mode for temporary directories (bug #21394)
- Linux Host and Guest: Added initial support for building UEK7 kernel on Oracle Linux 8
- Linux Host and Guest: Added initial support for RHEL 9.1 kernel
- Linux Guest Additions: Added initial support for kernel 6.2 for vboxvideo
- Audio: The "--audio" option in VBoxManage is now marked as deprecated; please use "--audio-driver" and "--audio-enabled" instead. This will allow more flexibility when changing the driver and/or controlling the audio functionality
Additionally, it fixes 6 CVE's: [2]
CVE-2023-21886 Oracle VM VirtualBox Core Multiple Yes 8.1 Network High None None Un-
changed High High High Prior to 6.1.42, prior to 7.0.6
CVE-2023-21898 Oracle VM VirtualBox Core None No 5.5 Local Low Low None Un-
changed None None High Prior to 6.1.42, prior to 7.0.6 See Note 1
CVE-2023-21899 Oracle VM VirtualBox Core None No 5.5 Local Low Low None Un-
changed None None High Prior to 6.1.42, prior to 7.0.6 See Note 1
CVE-2023-21884 Oracle VM VirtualBox Core None No 4.4 Local Low High None Un-
changed None None High Prior to 6.1.42, prior to 7.0.6
CVE-2023-21885 Oracle VM VirtualBox Core None No 3.8 Local Low Low None Changed Low None None Prior to 6.1.42, prior to 7.0.6 See Note 2
CVE-2023-21889 Oracle VM VirtualBox Core None No 3.8 Local Low Low None Changed Low None None Prior to 6.1.42, prior to 7.0.6
Note 1: Applies to VirtualBox VMs running Windows 7 and later.
Note 2: Applies to Windows only.
Links:
[1] https://www.virtualbox.org/wiki/Changelog-7.0#v6
[2] https://www.oracle.com/security-alerts/cpujan2023.html#AppendixOVIR
-------------------------------------------------------------------
Tue Jan 24 14:34:08 UTC 2023 - Marcus Meissner <meissner@suse.com>

View File

@ -1,5 +1,5 @@
#
# spec file for package virtualbox
# spec file
#
# Copyright (c) 2023 SUSE LLC
#
@ -51,7 +51,7 @@
%endif
# ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
Name: virtualbox%{?dash}%{?name_suffix}
Version: 7.0.4
Version: 7.0.6
Release: 0
Summary: %{package_summary}
# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
@ -312,6 +312,9 @@ the terms of the GNU Public License (GPL).
@ -351,6 +354,9 @@ This package contains the code for the GUI used to control VMs.
@ -386,6 +392,9 @@ The VirtualBox web server is used to control headless VMs using a browser.
@ -428,6 +437,9 @@ VirtualBox guest addition tools.
@ -468,6 +480,9 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
@ -503,6 +518,9 @@ Development file for %{name}
@ -555,6 +573,9 @@ sudo %{_sbindir}/vboxguestconfig
@ -588,6 +609,9 @@ This package contains icons for guest desktop files that were created on the des