pool/virtualbox
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1037192 from home:lwfinger:branches:Virtualization

Browse Source 
- VirtualBox 7.0.4 (released November 18 2022)
  VirtualBox 7.0.2 (released October 20 2022)
  VirtualBox 7.0.0 (released October 10 2022)

OBS-URL: https://build.opensuse.org/request/show/1037192
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=664
This commit is contained in:
Larry Finger 2022-11-21 23:01:58 +00:00 committed by Git OBS Bridge
parent a4bb9742dd
commit 2c52cfe01d
49 changed files with 1078 additions and 1146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Fix_for_server_1.19.patch
View File

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

4
UserManual.pdf
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:925793ac0429b9b7c881811fdf2c3cfe5502713cf195db2de385a864370aeffa
size 4577633
oid sha256:9060cac6da0f52ee5434f4cf9de6dde86af40507f80a41f35c6497629f681d0d
size 4579704

2
VBoxDDR0.r0
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8e19d03fd8bcd84f30876e1e60c9bf928d4c7e28587877d5589858037a07e135
oid sha256:4082b48497f26c10947649c937d1d02b46339a76df2f00c9b4f3a33be4dc8415
size 306128

6
VirtualBox-5.2.10-xclient.patch
View File

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

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

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

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

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

2
_constraints
View File

@ -5,7 +5,7 @@
<size unit="M">8000</size>
</physicalmemory>
<disk>
<size unit="G">5</size>
<size unit="G">9</size>
</disk>
</hardware>
</constraints>

6
fix_conflict_between_host_and_guest.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
Index: VirtualBox-7.0.4/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
+++ VirtualBox-7.0.2/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
@@ -140,7 +140,7 @@ static struct vboxguest_module_info g_VB
RTMemAllocExTag,
RTMemContAlloc,

38
fix_kmp_build.patch
View File

@ -1,8 +1,8 @@
Index: VirtualBox-7.0.2/Config.kmk
Index: VirtualBox-7.0.4/Config.kmk
===================================================================
--- VirtualBox-7.0.2.orig/Config.kmk
+++ VirtualBox-7.0.2/Config.kmk
@@ -780,6 +780,7 @@ if1of ($(KBUILD_TARGET), linux solaris)
--- VirtualBox-7.0.4.orig/Config.kmk
+++ VirtualBox-7.0.4/Config.kmk
@@ -782,6 +782,7 @@ if1of ($(KBUILD_TARGET), linux solaris)
VBOX_WITH_XPCOM_NAMESPACE_CLEANUP = 1
endif
# The webservices api.
@ -10,7 +10,7 @@ Index: VirtualBox-7.0.2/Config.kmk
VBOX_WITH_WEBSERVICES = 1
VBOX_WITH_WEBSERVICES_SSL = 1
# The Qt GUI.
@@ -1406,7 +1407,7 @@ endif
@@ -1408,7 +1409,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.2/Config.kmk
endif
#
@@ -1576,7 +1577,7 @@ endif
@@ -1578,7 +1579,7 @@ endif
#
ifdef VBOX_HEADLESS
VBOX_WITH_QTGUI=
@ -28,11 +28,11 @@ Index: VirtualBox-7.0.2/Config.kmk
VBOX_WITH_VRDP_RDESKTOP=
endif
Index: VirtualBox-7.0.2/configure
Index: VirtualBox-7.0.4/configure
===================================================================
--- VirtualBox-7.0.2.orig/configure
+++ VirtualBox-7.0.2/configure
@@ -1201,8 +1201,8 @@ check_sdl()
--- VirtualBox-7.0.4.orig/configure
+++ VirtualBox-7.0.4/configure
@@ -1202,8 +1202,8 @@ check_sdl()
if [ -n "$foundsdl" ]; then
cat > $ODIR.tmp_src.cc << EOF
#include <cstdio>
@ -43,10 +43,10 @@ Index: VirtualBox-7.0.2/configure
#undef main
extern "C" int main(int argc, char** argv)
{
Index: VirtualBox-7.0.2/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
Index: VirtualBox-7.0.4/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
+++ VirtualBox-7.0.2/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
@@ -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.2/src/VBox/Frontends/VBoxSDL/VBoxSDL.h
#ifdef _MSC_VER
# pragma warning(pop)
#endif
Index: VirtualBox-7.0.2/src/VBox/Frontends/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/Frontends/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Frontends/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/Frontends/Makefile.kmk
--- VirtualBox-7.0.4.orig/src/VBox/Frontends/Makefile.kmk
+++ VirtualBox-7.0.4/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.2/src/VBox/Frontends/Makefile.kmk
ifdef VBOX_WITH_VBOXFB
include $(PATH_SUB_CURRENT)/VBoxFB/Makefile.kmk
endif
Index: VirtualBox-7.0.2/src/libs/Makefile.kmk
Index: VirtualBox-7.0.4/src/libs/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/Makefile.kmk
+++ VirtualBox-7.0.2/src/libs/Makefile.kmk
--- VirtualBox-7.0.4.orig/src/libs/Makefile.kmk
+++ VirtualBox-7.0.4/src/libs/Makefile.kmk
@@ -104,13 +104,7 @@ endif

8
fix_lib_search.patch
View File

@ -1,8 +1,8 @@
Index: VirtualBox-7.0.2/configure
Index: VirtualBox-7.0.4/configure
===================================================================
--- VirtualBox-7.0.2.orig/configure
+++ VirtualBox-7.0.2/configure
@@ -1629,14 +1629,14 @@ EOF
--- VirtualBox-7.0.4.orig/configure
+++ VirtualBox-7.0.4/configure
@@ -1630,14 +1630,14 @@ EOF
INCQT5="$q/include $q/include/QtCore"
FLGQT5="-DQT_SHARED -std=c++11"
I_INCQT5=`prefix_I "$INCQT5"`

52
fix_v7_build.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
Index: VirtualBox-7.0.4/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
+++ VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
--- VirtualBox-7.0.4.orig/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
+++ VirtualBox-7.0.4/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
@@ -28,7 +28,7 @@ BEGINCODE
extern NAME(dtrace_probe)
@ -11,10 +11,10 @@ Index: VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
%ifidn __OUTPUT_FORMAT__,elf
section .note.GNU-stack noalloc noexec nowrite progbits
Index: VirtualBox-7.0.2/src/VBox/VMM/Config.kmk
Index: VirtualBox-7.0.4/src/VBox/VMM/Config.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/VMM/Config.kmk
+++ VirtualBox-7.0.2/src/VBox/VMM/Config.kmk
--- VirtualBox-7.0.4.orig/src/VBox/VMM/Config.kmk
+++ VirtualBox-7.0.4/src/VBox/VMM/Config.kmk
@@ -58,9 +58,7 @@ else
VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
endif
@ -25,10 +25,10 @@ Index: VirtualBox-7.0.2/src/VBox/VMM/Config.kmk
# part of global DEFS
ifdef VBOX_WITH_MULTI_CORE
VMM_COMMON_DEFS += VBOX_WITH_MULTI_CORE
Index: VirtualBox-7.0.2/src/VBox/VMM/testcase/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/VMM/testcase/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/VMM/testcase/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/VMM/testcase/Makefile.kmk
--- VirtualBox-7.0.4.orig/src/VBox/VMM/testcase/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/VMM/testcase/Makefile.kmk
@@ -358,7 +358,6 @@ tstIEMAImplAsm_ASFLAGS.x86 := -Werror
tstIEMAImplAsm_INCS := ../include .
tstIEMAImplAsm_SOURCES = \
@ -37,10 +37,10 @@ Index: VirtualBox-7.0.2/src/VBox/VMM/testcase/Makefile.kmk
../VMMAll/IEMAllAImplC.cpp \
$(tstIEMAImpl_CLEAN)
tstIEMAImplAsm_SOURCES.x86 += tstIEMAImplDataSseBinary.asm
Index: VirtualBox-7.0.2/src/VBox/VMM/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/VMM/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/VMM/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/VMM/Makefile.kmk
--- VirtualBox-7.0.4.orig/src/VBox/VMM/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/VMM/Makefile.kmk
@@ -226,7 +226,6 @@ VBoxVMM_SOURCES = \
VMMAll/VMMAll.cpp
VBoxVMM_SOURCES.amd64 += \
@ -57,11 +57,11 @@ Index: VirtualBox-7.0.2/src/VBox/VMM/Makefile.kmk
VMMAll/IEMAllAImplC.cpp \
VMMAll/IEMAllCImpl.cpp \
VMMAll/IEMAllCImplSvmInstr.cpp \
Index: VirtualBox-7.0.2/src/VBox/Devices/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/Devices/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Devices/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/Devices/Makefile.kmk
@@ -1234,6 +1234,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
--- VirtualBox-7.0.4.orig/src/VBox/Devices/Makefile.kmk
+++ VirtualBox-7.0.4/src/VBox/Devices/Makefile.kmk
@@ -1233,6 +1233,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
else
VBoxDDR0_TEMPLATE = VBoxR0
endif
@ -69,10 +69,10 @@ Index: VirtualBox-7.0.2/src/VBox/Devices/Makefile.kmk
VBoxDDR0_DEFS = \
$(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
$(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,) \
Index: VirtualBox-7.0.2/src/VBox/Devices/Network/DevE1000.cpp
Index: VirtualBox-7.0.4/src/VBox/Devices/Network/DevE1000.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Devices/Network/DevE1000.cpp
+++ VirtualBox-7.0.2/src/VBox/Devices/Network/DevE1000.cpp
--- VirtualBox-7.0.4.orig/src/VBox/Devices/Network/DevE1000.cpp
+++ VirtualBox-7.0.4/src/VBox/Devices/Network/DevE1000.cpp
@@ -44,7 +44,11 @@
#include <iprt/ctype.h>
#include <iprt/net.h>
@ -85,3 +85,17 @@ Index: VirtualBox-7.0.2/src/VBox/Devices/Network/DevE1000.cpp
#include <iprt/time.h>
#include <iprt/uuid.h>
#include <VBox/vmm/pdmdev.h>
Index: VirtualBox-7.0.4/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
@@ -45,6 +45,9 @@
#include "product-generated.h"
#include "revision-generated.h"
+#if RTLNX_VER_MIN(6, 1, 0)
+#include <linux/stdarg.h>
+#endif
#include <iprt/assert.h>
#include <iprt/spinlock.h>
#include <iprt/semaphore.h>

6
fixes_for_Leap42.3.patch
View File

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

12
fixes_for_Qt5.11.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
Index: VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
--- VirtualBox-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+++ VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
@@ -97,6 +97,7 @@
#include <QtWidgets/qgraphicsitem.h>
#include <QtWidgets/qgraphicslayoutitem.h>
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
#include <QtCore/QMetaType>
#include <QtGui/qevent.h>
#include <QtGui/qtouchdevice.h>
Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
Index: VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
--- VirtualBox-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+++ VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
@@ -27,6 +27,7 @@
/* Qt includes: */

14
fixes_for_gcc10.patch
View File

@ -1,8 +1,8 @@
Index: VirtualBox-7.0.2/Config.kmk
Index: VirtualBox-7.0.4/Config.kmk
===================================================================
--- VirtualBox-7.0.2.orig/Config.kmk
+++ VirtualBox-7.0.2/Config.kmk
@@ -3100,15 +3100,17 @@ else
--- VirtualBox-7.0.4.orig/Config.kmk
+++ VirtualBox-7.0.4/Config.kmk
@@ -3102,15 +3102,17 @@ else
# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
# Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
# gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
@ -26,10 +26,10 @@ Index: VirtualBox-7.0.2/Config.kmk
ifndef DONT_USE_YASM
include $(KBUILD_PATH)/tools/YASM.kmk
if1of ($(KBUILD_HOST), win os2)
Index: VirtualBox-7.0.2/src/VBox/Debugger/DBGCDumpImage.cpp
Index: VirtualBox-7.0.4/src/VBox/Debugger/DBGCDumpImage.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Debugger/DBGCDumpImage.cpp
+++ VirtualBox-7.0.2/src/VBox/Debugger/DBGCDumpImage.cpp
--- VirtualBox-7.0.4.orig/src/VBox/Debugger/DBGCDumpImage.cpp
+++ VirtualBox-7.0.4/src/VBox/Debugger/DBGCDumpImage.cpp
@@ -478,7 +478,7 @@ static const char *dbgcMachoCpuType(int3
{
switch (iType)

76
fixes_for_leap15.2.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
Index: VirtualBox-7.0.4/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-7.0.2/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
@@ -86,6 +86,10 @@
#define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h"
@ -13,10 +13,10 @@ Index: VirtualBox-7.0.2/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
typedef struct VBOXNETFLTNOTIFIER {
struct notifier_block Notifier;
PVBOXNETFLTINS pThis;
Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_drv.c
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.2/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
@@ -342,12 +342,15 @@ static void vbox_master_drop(struct drm_
}
@ -36,10 +36,10 @@ Index: VirtualBox-7.0.2/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.2/src/VBox/Additions/linux/drm/vbox_main.c
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-7.0.2/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
@@ -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.2/src/VBox/Additions/linux/drm/vbox_main.c
}
int
Index: VirtualBox-7.0.2/include/iprt/cdefs.h
Index: VirtualBox-7.0.4/include/iprt/cdefs.h
===================================================================
--- VirtualBox-7.0.2.orig/include/iprt/cdefs.h
+++ VirtualBox-7.0.2/include/iprt/cdefs.h
--- VirtualBox-7.0.4.orig/include/iprt/cdefs.h
+++ VirtualBox-7.0.4/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.2/include/iprt/cdefs.h
/** @def RT_IPRT_FORMAT_ATTR
Index: VirtualBox-7.0.2/kBuild/header.kmk
Index: VirtualBox-7.0.4/kBuild/header.kmk
===================================================================
--- VirtualBox-7.0.2.orig/kBuild/header.kmk
+++ VirtualBox-7.0.2/kBuild/header.kmk
--- VirtualBox-7.0.4.orig/kBuild/header.kmk
+++ VirtualBox-7.0.4/kBuild/header.kmk
@@ -764,7 +764,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm
RMDIR_INT := kmk_builtin_rmdir
RMDIR := $(RMDIR_INT)
@ -89,11 +89,11 @@ Index: VirtualBox-7.0.2/kBuild/header.kmk
SED_INT := $(SED_EXT)
SED := $(SED_EXT)
Index: VirtualBox-7.0.2/configure
Index: VirtualBox-7.0.4/configure
===================================================================
--- VirtualBox-7.0.2.orig/configure
+++ VirtualBox-7.0.2/configure
@@ -1960,7 +1960,7 @@ check_kbuild()
--- VirtualBox-7.0.4.orig/configure
+++ VirtualBox-7.0.4/configure
@@ -2000,7 +2000,7 @@ check_kbuild()
fi
echo "export KBUILD_PATH KBUILD_DEVTOOLS PATH" >> $ENV
echo "unset path_kbuild_bin path_tools_bin" >> $ENV
@ -102,7 +102,7 @@ Index: VirtualBox-7.0.2/configure
echo '' >> $ENV
echo "# Legacy - do not use:" >> $ENV
@@ -1970,7 +1970,7 @@ check_kbuild()
@@ -2010,7 +2010,7 @@ check_kbuild()
echo '' >> $ENV
elif check_avail "kmk" KBUILDDIR really; then
# check for installed kBuild
@ -111,10 +111,10 @@ Index: VirtualBox-7.0.2/configure
else
fail
fi
Index: VirtualBox-7.0.2/tools/bin/backport-commit.sh
Index: VirtualBox-7.0.4/tools/bin/backport-commit.sh
===================================================================
--- VirtualBox-7.0.2.orig/tools/bin/backport-commit.sh
+++ VirtualBox-7.0.2/tools/bin/backport-commit.sh
--- VirtualBox-7.0.4.orig/tools/bin/backport-commit.sh
+++ VirtualBox-7.0.4/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.2/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.2/tools/bin/backport-common.sh
Index: VirtualBox-7.0.4/tools/bin/backport-common.sh
===================================================================
--- VirtualBox-7.0.2.orig/tools/bin/backport-common.sh
+++ VirtualBox-7.0.2/tools/bin/backport-common.sh
--- VirtualBox-7.0.4.orig/tools/bin/backport-common.sh
+++ VirtualBox-7.0.4/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.2/tools/bin/backport-common.sh
#
# Functions.
Index: VirtualBox-7.0.2/tools/bin/backport-merge-and-commit.sh
Index: VirtualBox-7.0.4/tools/bin/backport-merge-and-commit.sh
===================================================================
--- VirtualBox-7.0.2.orig/tools/bin/backport-merge-and-commit.sh
+++ VirtualBox-7.0.2/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
@@ -29,7 +29,7 @@
#
# Determin script dir so we can invoke the two worker scripts.
@ -156,10 +156,10 @@ Index: VirtualBox-7.0.2/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.2/tools/bin/backport-merge.sh
Index: VirtualBox-7.0.4/tools/bin/backport-merge.sh
===================================================================
--- VirtualBox-7.0.2.orig/tools/bin/backport-merge.sh
+++ VirtualBox-7.0.2/tools/bin/backport-merge.sh
--- VirtualBox-7.0.4.orig/tools/bin/backport-merge.sh
+++ VirtualBox-7.0.4/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.2/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.2/src/VBox/Main/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/Main/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/Main/Makefile.kmk
--- VirtualBox-7.0.4.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-7.0.4/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,10 +182,10 @@ Index: VirtualBox-7.0.2/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.2/src/VBox/Runtime/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/Runtime/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Runtime/Makefile.kmk
+++ VirtualBox-7.0.2/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
#
# Generate the status code data.

36
fixes_for_leap15.3.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
Index: VirtualBox-7.0.4/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-7.0.2/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
@@ -147,9 +147,9 @@
#include <linux/interrupt.h>
#include <linux/completion.h>
@ -14,10 +14,10 @@ Index: VirtualBox-7.0.2/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.2/src/libs/xpcom18a4/python/src/PyXPCOM.h
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyXPCOM.h
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
+++ VirtualBox-7.0.2/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
@@ -191,7 +191,7 @@ extern "C" PyAPI_FUNC(const char *) PyUn
# endif
@ -27,10 +27,10 @@ Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyXPCOM.h
DECLINLINE(int) PyRun_SimpleString(const char *pszCode)
{
Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-7.0.2/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
@@ -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.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
#endif
result = (char *)PyMem_Malloc(strlen(tempResult)+1);
if (result==NULL)
Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyGBase.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-7.0.2/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
@@ -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.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
#endif
if (szRepr==NULL) szRepr = "";
int reprOffset = *szRepr=='<' ? 1 : 0;
Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyIID.cpp
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyIID.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
+++ VirtualBox-7.0.2/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
@@ -137,7 +137,7 @@ Py_nsIID::IIDFromPyObject(PyObject *ob,
ok = iid.Parse(PyString_AsString(ob));
#else
@ -99,10 +99,10 @@ Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyIID.cpp
#endif
if (!ok) {
PyXPCOM_BuildPyException(NS_ERROR_ILLEGAL_VALUE);
Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/VariantUtils.cpp
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/VariantUtils.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
+++ VirtualBox-7.0.2/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
@@ -141,7 +141,7 @@ PyObject *PyObject_FromNSString( const n
#if PY_MAJOR_VERSION <= 2
char* dest = (char *)PyString_AS_STRING(ret);

136
fixes_for_leap15.4.patch
View File

@ -1,136 +0,0 @@
Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyXPCOM.h
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyXPCOM.h
@@ -191,7 +191,7 @@ extern "C" PyAPI_FUNC(const char *) PyUn
# endif
/* PyUnicode_AsUTF8 is just PyUnicode_AsUTF8AndSize without returning a size. */
-# define PyUnicode_AsUTF8(o) PyUnicode_AsUTF8AndSize(o, NULL)
+// # define PyUnicode_AsUTF8(o) (const char *)PyUnicode_AsUTF8AndSize(o, NULL)
DECLINLINE(int) PyRun_SimpleString(const char *pszCode)
{
Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-7.0.2/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);
#else
- c += PyUnicode_AsUTF8(repr);
+ c += PyUnicode_AsUTF8AndSize(repr, NULL);
#endif
Py_DECREF(repr);
}
@@ -203,7 +203,7 @@ PRBool PyXPCOM_FormatGivenException(nsCS
#if PY_MAJOR_VERSION <= 2
streamout += PyString_AsString(temp);
#else
- streamout += PyUnicode_AsUTF8(temp);
+ streamout += PyUnicode_AsUTF8AndSize(temp, NULL);
#endif
Py_DECREF(temp);
} else
@@ -215,7 +215,7 @@ PRBool PyXPCOM_FormatGivenException(nsCS
#if PY_MAJOR_VERSION <= 2
streamout += PyString_AsString(temp);
#else
- streamout += PyUnicode_AsUTF8(temp);
+ streamout += PyUnicode_AsUTF8AndSize(temp, NULL);
#endif
Py_DECREF(temp);
} else
@@ -438,12 +438,11 @@ char *PyTraceback_AsString(PyObject *exc
{ // a temp scope so I can use temp locals.
#if PY_MAJOR_VERSION <= 2
- char *tempResult = (char *)PyString_AsString(obResult);
+ char *tempResult = PyString_AsString(obResult);
#elif PY_MINOR_VERSION <= 6
- char *tempResult = (char *)PyUnicode_AsUTF8(obResult);
+ const char *tempResult = PyUnicode_AsUTF8AndSize(obResult, NULL);
#else
- /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
- const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
+ const char *tempResult = (const char *)PyUnicode_AsUTF8AndSize(obResult, NULL);
#endif
result = (char *)PyMem_Malloc(strlen(tempResult)+1);
if (result==NULL)
Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-7.0.2/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);
#else
- szRepr = PyUnicode_AsUTF8(r);
+ szRepr = PyUnicode_AsUTF8AndSize(r, NULL);
#endif
if (szRepr==NULL) szRepr = "";
int reprOffset = *szRepr=='<' ? 1 : 0;
Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyIID.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
+++ VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/PyIID.cpp
@@ -137,7 +137,7 @@ Py_nsIID::IIDFromPyObject(PyObject *ob,
ok = iid.Parse(PyString_AsString(ob));
#else
if (PyUnicode_Check(ob)) {
- ok = iid.Parse(PyUnicode_AsUTF8(ob));
+ ok = iid.Parse(PyUnicode_AsUTF8AndSize(ob, NULL));
#endif
if (!ok) {
PyXPCOM_BuildPyException(NS_ERROR_ILLEGAL_VALUE);
Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/VariantUtils.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
+++ VirtualBox-7.0.2/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);
#else
- char* dest = (char *)PyUnicode_AsUTF8(ret);
+ char* dest = (char *)PyUnicode_AsUTF8AndSize(ret, NULL);
#endif
copy_string(s.BeginReading(fromBegin), s.EndReading(fromEnd), dest);
}
@@ -393,7 +393,7 @@ PRBool FillSingleArray(void *array_ptr,
#if PY_MAJOR_VERSION <= 2
sequence_ob = PyObject_Str(sequence_ob);
#else
- sequence_ob = PyUnicode_AsUTF8String(sequence_ob);
+ sequence_ob = (PyObject *)PyUnicode_AsUTF8AndSize(sequence_ob, NULL);
#endif
} else
release_seq = PR_FALSE;
@@ -402,7 +402,7 @@ PRBool FillSingleArray(void *array_ptr,
#if PY_MAJOR_VERSION <= 2
memcpy(pthis, PyString_AS_STRING(sequence_ob), sequence_size);
#else
- memcpy(pthis, PyUnicode_AsUTF8(sequence_ob), sequence_size);
+ memcpy(pthis, PyUnicode_AsUTF8AndSize(sequence_ob, NULL), sequence_size);
#endif
if (release_seq)
{
@@ -477,7 +477,7 @@ PRBool FillSingleArray(void *array_ptr,
PyErr_SetString(PyExc_TypeError, "This parameter must be a unicode object");
BREAK_FALSE;
}
- FILL_SIMPLE_POINTER( char, *PyUnicode_AsUTF8(val) );
+ FILL_SIMPLE_POINTER( char, *PyUnicode_AsUTF8AndSize(val, NULL) );
#endif
break;
@@ -549,7 +549,7 @@ PRBool FillSingleArray(void *array_ptr,
PyErr_SetString(PyExc_TypeError, "This parameter must be a unicode object");
BREAK_FALSE;
}
- if ((val_use = PyUnicode_AsUTF8String(val))==NULL)
+ if ((val_use = (PyObject *)PyUnicode_AsUTF8AndSize(val, NULL))==NULL)
BREAK_FALSE;
const char *sz = PyBytes_AS_STRING(val_use);

40
fixes_for_makefile.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/VBox/HostDrivers/linux/Makefile
Index: VirtualBox-7.0.4/src/VBox/HostDrivers/linux/Makefile
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/HostDrivers/linux/Makefile
+++ VirtualBox-7.0.2/src/VBox/HostDrivers/linux/Makefile
--- VirtualBox-7.0.4.orig/src/VBox/HostDrivers/linux/Makefile
+++ VirtualBox-7.0.4/src/VBox/HostDrivers/linux/Makefile
@@ -43,11 +43,8 @@ obj-m = vboxdrv/
obj-m += vboxnetflt/
endif
@ -140,10 +140,10 @@ Index: VirtualBox-7.0.2/src/VBox/HostDrivers/linux/Makefile
if test -f $$module.ko; then \
echo "Installing $$module module"; \
$(SUDO) /sbin/insmod $$module.ko; \
Index: VirtualBox-7.0.2/src/VBox/Additions/linux/Makefile
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/Makefile
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/Makefile
+++ VirtualBox-7.0.2/src/VBox/Additions/linux/Makefile
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/Makefile
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/Makefile
@@ -34,6 +34,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/
else # ! KERNELRELEASE
@ -184,10 +184,10 @@ Index: VirtualBox-7.0.2/src/VBox/Additions/linux/Makefile
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \
fi
Index: VirtualBox-7.0.2/include/iprt/x86.h
Index: VirtualBox-7.0.4/include/iprt/x86.h
===================================================================
--- VirtualBox-7.0.2.orig/include/iprt/x86.h
+++ VirtualBox-7.0.2/include/iprt/x86.h
--- VirtualBox-7.0.4.orig/include/iprt/x86.h
+++ VirtualBox-7.0.4/include/iprt/x86.h
@@ -894,37 +894,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
* reserved flags.
* @{ */
@ -552,7 +552,7 @@ Index: VirtualBox-7.0.2/include/iprt/x86.h
/** Variable range MTRRs.
* @{ */
@@ -1655,91 +1777,169 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1655,93 +1777,171 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
#define MSR_IA32_PERF_GLOBAL_OVF_CTRL 0x390
/** Precise Event Based sampling (Intel only). */
@ -640,6 +640,8 @@ Index: VirtualBox-7.0.2/include/iprt/x86.h
#define MSR_IA32_VMX_VMFUNC 0x491
/** Tertiary processor-based VM execution controls. */
#define MSR_IA32_VMX_PROCBASED_CTLS3 0x492
/** Secondary VM-exit controls. */
#define MSR_IA32_VMX_EXIT_CTLS2 0x493
+#endif
/** Intel PT - Enable and control for trace packet generation. */
@ -722,7 +724,7 @@ Index: VirtualBox-7.0.2/include/iprt/x86.h
/** X2APIC MSR range start. */
#define MSR_IA32_X2APIC_START 0x800
@@ -1874,23 +2074,47 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1876,23 +2076,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. */
@ -770,7 +772,7 @@ Index: VirtualBox-7.0.2/include/iprt/x86.h
/** K8 LSTAR - Long mode SYSCALL target (RIP). */
#define MSR_K8_LSTAR UINT32_C(0xc0000082)
@@ -1906,14 +2130,20 @@ AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C
@@ -1908,14 +2132,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)
@ -791,11 +793,11 @@ Index: VirtualBox-7.0.2/include/iprt/x86.h
/** SMM MSRs. */
#define MSR_K7_SMBASE UINT32_C(0xc0010111)
Index: VirtualBox-7.0.2/include/VBox/vmm/hm_vmx.h
Index: VirtualBox-7.0.4/include/VBox/vmm/hm_vmx.h
===================================================================
--- VirtualBox-7.0.2.orig/include/VBox/vmm/hm_vmx.h
+++ VirtualBox-7.0.2/include/VBox/vmm/hm_vmx.h
@@ -1631,7 +1631,9 @@ AssertCompileSize(VMXABORT, 4);
--- VirtualBox-7.0.4.orig/include/VBox/vmm/hm_vmx.h
+++ VirtualBox-7.0.4/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
/** VMCS (and related regions) memory type - Write back. */
@ -805,10 +807,10 @@ Index: VirtualBox-7.0.2/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.2/src/VBox/Additions/linux/drm/vbox_drv.h
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.2/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
@@ -87,6 +87,12 @@
#else
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)

6
fixes_for_python.patch
View File

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

36
fixes_for_qt5.13.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/include/VBox/VBoxGL2D.h
Index: VirtualBox-7.0.4/include/VBox/VBoxGL2D.h
===================================================================
--- VirtualBox-7.0.2.orig/include/VBox/VBoxGL2D.h
+++ VirtualBox-7.0.2/include/VBox/VBoxGL2D.h
--- VirtualBox-7.0.4.orig/include/VBox/VBoxGL2D.h
+++ VirtualBox-7.0.4/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.2/include/VBox/VBoxGL2D.h
#endif
#ifndef GL_READ_ONLY
Index: VirtualBox-7.0.2/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
Index: VirtualBox-7.0.4/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
+++ VirtualBox-7.0.2/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
@@ -466,7 +466,12 @@ GLAPI void APIENTRY glBlendEquation (GLe
#ifndef GL_VERSION_1_5
@ -28,10 +28,10 @@ Index: VirtualBox-7.0.2/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.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
+++ VirtualBox-7.0.2/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
@@ -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.2/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.2/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
+++ VirtualBox-7.0.2/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
@@ -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.2/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.2/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
+++ VirtualBox-7.0.2/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
@@ -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.2/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
#endif
#ifndef GL_ARB_vertex_buffer_object
Index: VirtualBox-7.0.2/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
Index: VirtualBox-7.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
+++ VirtualBox-7.0.2/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
@@ -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);

30
fixes_for_sle12.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_drv.c
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-7.0.2/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
@@ -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.2/src/VBox/Additions/linux/drm/vbox_drv.c
# endif
#endif
Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_main.c
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-7.0.2/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
@@ -622,11 +622,13 @@ int vbox_dumb_destroy(struct drm_file *f
#endif
@ -30,10 +30,10 @@ Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_main.c
void vbox_gem_free_object(struct drm_gem_object *obj)
{
Index: VirtualBox-7.0.2/src/VBox/Additions/linux/drm/vbox_ttm.c
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-7.0.2/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
@@ -297,7 +297,7 @@ static struct ttm_backend_func vbox_tt_b
};
#endif
@ -133,10 +133,10 @@ Index: VirtualBox-7.0.2/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.2/src/VBox/Additions/linux/drm/vbox_drv.h
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-7.0.2/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
@@ -87,6 +87,9 @@
#else
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
@ -147,10 +147,10 @@ Index: VirtualBox-7.0.2/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.2/src/VBox/Additions/linux/drm/vbox_mode.c
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/drm/vbox_mode.c
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-7.0.2/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
@@ -552,7 +552,8 @@ static void vbox_set_edid(struct drm_con
for (i = 0; i < EDID_SIZE - 1; ++i)
sum += edid[i];

8
gcc5-real-support.patch
View File

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

6
handle_gsoap_208103.patch
View File

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

24
internal-headers.patch
View File

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

6
modify_for_4_8_bo_move.patch
View File

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

18
remove_vbox_video_build.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/Makefile.kmk
Index: VirtualBox-7.0.4/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/Makefile.kmk
+++ VirtualBox-7.0.2/Makefile.kmk
--- VirtualBox-7.0.4.orig/Makefile.kmk
+++ VirtualBox-7.0.4/Makefile.kmk
@@ -823,7 +823,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \
src/VBox/Additions/x11/vboxmouse \
src/VBox/Additions/x11/vboxmouse/xorg70 \
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.2/Makefile.kmk
src/VBox/NetworkServices \
src/VBox/NetworkServices/Dhcpd \
src/VBox/NetworkServices/NAT \
Index: VirtualBox-7.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ VirtualBox-7.0.2/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
vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES)
vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS)
@ -24,10 +24,10 @@ Index: VirtualBox-7.0.2/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.2/src/VBox/Additions/x11/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/Makefile.kmk
+++ VirtualBox-7.0.2/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
@@ -32,7 +32,7 @@ include $(KBUILD_PATH)/subheader.kmk
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk

14
security_fixes.patch
View File

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

1093
set_noexec_stack.patch
View File

File diff suppressed because it is too large Load Diff

6
smap.diff
View File

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

8
turn_off_cloud_net.patch
View File

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

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

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

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

@ -1,8 +1,8 @@
Index: VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-6.1.40/src/VBox/Main/webservice/Makefile.kmk
@@ -772,7 +772,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
--- VirtualBox-7.0.4.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-7.0.4/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))
$(RM) -f $@

10
vbox-disable-updates.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
Index: VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -101,8 +101,6 @@ void UISettingsDialogGlobal::retranslate
--- 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
@@ -98,8 +98,6 @@ void UISettingsDialogGlobal::retranslate
m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@ -11,7 +11,7 @@ Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDia
#endif
/* Language page: */
@@ -227,17 +225,7 @@ void UISettingsDialogGlobal::prepare()
@@ -224,17 +222,7 @@ void UISettingsDialogGlobal::prepare()
addPageHelpKeyword(iPageIndex, "preferences");
break;
}

10
vbox-fpie.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-7.0.2/Config.kmk
Index: VirtualBox-7.0.4/Config.kmk
===================================================================
--- VirtualBox-7.0.2.orig/Config.kmk
+++ VirtualBox-7.0.2/Config.kmk
@@ -6620,6 +6620,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
--- VirtualBox-7.0.4.orig/Config.kmk
+++ VirtualBox-7.0.4/Config.kmk
@@ -6622,6 +6622,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.2/Config.kmk
endif
ifeq ($(KBUILD_TARGET),win) # No CRT!
TEMPLATE_VBOXR3HARDENEDEXE_SDKS = VBOX_NTDLL $(TEMPLATE_VBOXR3EXE_SDKS)
@@ -6652,8 +6655,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
@@ -6654,8 +6657,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.

6
vbox-gsoapssl-deps.diff
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.0_BETA1/src/VBox/Main/webservice/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- VirtualBox-7.0.0_BETA1.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-7.0.0_BETA1/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
@@ -410,6 +410,7 @@ ifdef VBOX_GSOAP_INSTALLED
vboxwebsrv_LIBS += \
$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \

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

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

14
vbox-permissions_warning.diff
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/apps/Makefile.kmk
Index: VirtualBox-7.0.4/src/apps/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.2/src/apps/Makefile.kmk
--- VirtualBox-7.0.4.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.4/src/apps/Makefile.kmk
@@ -28,5 +28,7 @@
SUB_DEPTH = ../..
include $(KBUILD_PATH)/subheader.kmk
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.2/src/apps/Makefile.kmk
+
include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-7.0.2/src/apps/VBoxPermissionMessage/Makefile.kmk
Index: VirtualBox-7.0.4/src/apps/VBoxPermissionMessage/Makefile.kmk
===================================================================
--- /dev/null
+++ VirtualBox-7.0.2/src/apps/VBoxPermissionMessage/Makefile.kmk
+++ VirtualBox-7.0.4/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.2/src/apps/VBoxPermissionMessage/Makefile.kmk
+
+include $(KBUILD_PATH)/subfooter.kmk
+
Index: VirtualBox-7.0.2/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
Index: VirtualBox-7.0.4/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
===================================================================
--- /dev/null
+++ VirtualBox-7.0.2/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
+++ VirtualBox-7.0.4/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
@@ -0,0 +1,12 @@
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>

6
vbox-python-py310.patch
View File

@ -1,9 +1,9 @@
# https://www.virtualbox.org/changeset/90537/vbox
Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/Makefile.kmk
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/Makefile.kmk
+++ VirtualBox-7.0.2/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_
endif
endif

36
vbox-python-selection.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/bldprogs/scm.cpp
Index: VirtualBox-7.0.4/src/bldprogs/scm.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/bldprogs/scm.cpp
+++ VirtualBox-7.0.2/src/bldprogs/scm.cpp
--- VirtualBox-7.0.4.orig/src/bldprogs/scm.cpp
+++ VirtualBox-7.0.4/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.2/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.2/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
Index: VirtualBox-7.0.4/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ VirtualBox-7.0.2/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
@@ -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.2/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
Summary: Oracle VM VirtualBox
Name: %NAME%
Index: VirtualBox-7.0.2/src/libs/libxml2-2.9.14/libxml.spec.in
Index: VirtualBox-7.0.4/src/libs/libxml2-2.9.14/libxml.spec.in
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/libxml2-2.9.14/libxml.spec.in
+++ VirtualBox-7.0.2/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
@@ -1,3 +1,4 @@
+%global with_python2 0
%global with_python3 1
@ -93,10 +93,10 @@ Index: VirtualBox-7.0.2/src/libs/libxml2-2.9.14/libxml.spec.in
%if 0%{?with_python3}
%files -n python3-%{name}
Index: VirtualBox-7.0.2/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ VirtualBox-7.0.2/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
@@ -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.2/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.2/src/libs/xpcom18a4/python/src/PyGBase.cpp
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/src/PyGBase.cpp
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ VirtualBox-7.0.2/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
@@ -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.2/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.2/src/libs/xpcom18a4/python/gen_python_deps.py
Index: VirtualBox-7.0.4/src/libs/xpcom18a4/python/gen_python_deps.py
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-7.0.2/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
@@ -96,7 +96,7 @@ def main(argv):
else:
multi = 1

6
vbox-smc-napa.diff
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/VBox/Devices/PC/vbox.dsl
Index: VirtualBox-7.0.4/src/VBox/Devices/PC/vbox.dsl
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Devices/PC/vbox.dsl
+++ VirtualBox-7.0.2/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
@@ -1225,7 +1225,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
Device (SMC)
{

14
vbox-suid-warning.diff
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/apps/Makefile.kmk
Index: VirtualBox-7.0.4/src/apps/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.2/src/apps/Makefile.kmk
--- VirtualBox-7.0.4.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.4/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.2/src/apps/Makefile.kmk
+
include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-7.0.2/src/apps/VBoxSUIDMessage/Makefile.kmk
Index: VirtualBox-7.0.4/src/apps/VBoxSUIDMessage/Makefile.kmk
===================================================================
--- /dev/null
+++ VirtualBox-7.0.2/src/apps/VBoxSUIDMessage/Makefile.kmk
+++ VirtualBox-7.0.4/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.2/src/apps/VBoxSUIDMessage/Makefile.kmk
+include $(KBUILD_PATH)/subfooter.kmk
+
+
Index: VirtualBox-7.0.2/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
Index: VirtualBox-7.0.4/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
===================================================================
--- /dev/null
+++ VirtualBox-7.0.2/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
+++ VirtualBox-7.0.4/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
@@ -0,0 +1,15 @@
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>

14
vbox-usb-warning.diff
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/apps/Makefile.kmk
Index: VirtualBox-7.0.4/src/apps/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.2/src/apps/Makefile.kmk
--- VirtualBox-7.0.4.orig/src/apps/Makefile.kmk
+++ VirtualBox-7.0.4/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.2/src/apps/Makefile.kmk
+
include $(FILE_KBUILD_SUB_FOOTER)
Index: VirtualBox-7.0.2/src/apps/VBoxUSB_DevRules/Makefile.kmk
Index: VirtualBox-7.0.4/src/apps/VBoxUSB_DevRules/Makefile.kmk
===================================================================
--- /dev/null
+++ VirtualBox-7.0.2/src/apps/VBoxUSB_DevRules/Makefile.kmk
+++ VirtualBox-7.0.4/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.2/src/apps/VBoxUSB_DevRules/Makefile.kmk
+include $(KBUILD_PATH)/subfooter.kmk
+
+
Index: VirtualBox-7.0.2/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
Index: VirtualBox-7.0.4/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
===================================================================
--- /dev/null
+++ VirtualBox-7.0.2/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
+++ VirtualBox-7.0.4/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
@@ -0,0 +1,25 @@
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>

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

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd.sh
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
--- VirtualBox-7.0.0_BETA2.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-7.0.0_BETA2/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
@@ -36,11 +36,14 @@
# Provides: vboxadd
# Required-Start:
@ -18,7 +18,7 @@ Index: VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd.sh
### END INIT INFO
## @todo This file duplicates a lot of script with vboxdrv.sh. When making
@@ -131,20 +134,11 @@ module_build_log()
@@ -145,20 +148,11 @@ module_build_log()
dev=/dev/vboxguest
userdev=/dev/vboxuser
@ -39,7 +39,7 @@ Index: VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd.sh
# Attempt to detect VirtualBox Guest Additions version and revision information.
VBOXCLIENT="${INSTALL_DIR}/bin/VBoxClient"
VBOX_VERSION="`"$VBOXCLIENT" --version | cut -d r -f1`"
@@ -194,12 +188,6 @@ do_vboxguest_non_udev()
@@ -208,12 +202,6 @@ do_vboxguest_non_udev()
fail "Cannot create device $dev with major $maj and minor $min"
}
fi
@ -52,7 +52,7 @@ Index: VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd.sh
if [ ! -c $userdev ]; then
maj=10
@@ -210,12 +198,6 @@ do_vboxguest_non_udev()
@@ -224,12 +212,6 @@ do_vboxguest_non_udev()
rmmod vboxguest 2>/dev/null
fail "Cannot create device $userdev with major $maj and minor $min"
}
@ -65,7 +65,7 @@ Index: VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd.sh
fi
fi
}
@@ -277,7 +259,7 @@ cleanup_modules()
@@ -293,7 +275,7 @@ cleanup_modules()
done
if test -z "${keep}"; then
rm -rf /lib/modules/"${KERN_VER}"
@ -74,7 +74,7 @@ Index: VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd.sh
fi
done
for i in ${OLDMODULES}; do
@@ -509,9 +491,9 @@ create_udev_rule()
@@ -559,9 +541,9 @@ create_udev_rule()
udevcontrol reload_rules >/dev/null 2>&1 || true
fi
}
@ -87,7 +87,7 @@ Index: VirtualBox-7.0.0_BETA2/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
@@ -692,18 +674,17 @@ setup()
@@ -742,18 +724,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.0_BETA2/src/VBox/Additions/linux/installer/vboxadd.sh
fi
fi
create_vbox_user
@@ -720,17 +701,14 @@ Please install them and execute
@@ -770,17 +751,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.0_BETA2/src/VBox/Additions/linux/installer/vboxadd.sh
depmod
# Remove old module sources
@@ -740,12 +718,13 @@ cleanup()
@@ -790,12 +768,13 @@ cleanup()
fi
# Clean-up X11-related bits
@ -154,7 +154,7 @@ Index: VirtualBox-7.0.0_BETA2/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
@@ -791,7 +770,7 @@ for your Linux distribution."
@@ -834,7 +813,7 @@ for your Linux distribution."
rm -f $userdev || {
fail "Cannot remove $userdev"
}
@ -163,10 +163,10 @@ Index: VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd.sh
fail "modprobe vboxguest failed"
case "$no_udev" in 1)
sleep .5;;
Index: VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd-service.sh
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/installer/vboxadd-service.sh
===================================================================
--- VirtualBox-7.0.0_BETA2.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
+++ VirtualBox-7.0.0_BETA2/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
@@ -36,7 +36,7 @@
# Provides: vboxadd-service
# Required-Start: vboxadd
@ -176,10 +176,10 @@ Index: VirtualBox-7.0.0_BETA2/src/VBox/Additions/linux/installer/vboxadd-service
# Default-Stop: 0 1 6
# X-Conflicts-With: systemd-timesyncd.service
# Description: VirtualBox Additions Service
Index: VirtualBox-7.0.0_BETA2/src/VBox/Installer/linux/vboxautostart-service.sh
Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxautostart-service.sh
===================================================================
--- VirtualBox-7.0.0_BETA2.orig/src/VBox/Installer/linux/vboxautostart-service.sh
+++ VirtualBox-7.0.0_BETA2/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
@@ -33,7 +33,7 @@
# Provides: vboxautostart-service
# Required-Start: vboxdrv
@ -189,10 +189,10 @@ Index: VirtualBox-7.0.0_BETA2/src/VBox/Installer/linux/vboxautostart-service.sh
# Default-Stop: 0 1 6
# Description: VirtualBox autostart service
### END INIT INFO
Index: VirtualBox-7.0.0_BETA2/src/VBox/Installer/linux/vboxballoonctrl-service.sh
Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxballoonctrl-service.sh
===================================================================
--- VirtualBox-7.0.0_BETA2.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+++ VirtualBox-7.0.0_BETA2/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
@@ -33,7 +33,7 @@
# Provides: vboxballoonctrl-service
# Required-Start: vboxdrv
@ -202,10 +202,10 @@ Index: VirtualBox-7.0.0_BETA2/src/VBox/Installer/linux/vboxballoonctrl-service.s
# Default-Stop: 0 1 6
# Description: VirtualBox watchdog daemon
### END INIT INFO
Index: VirtualBox-7.0.0_BETA2/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
Index: VirtualBox-7.0.4/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
===================================================================
--- VirtualBox-7.0.0_BETA2.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+++ VirtualBox-7.0.0_BETA2/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
@@ -41,7 +41,7 @@
# Provides: testboxscript-service
# Required-Start: $network
@ -215,10 +215,10 @@ Index: VirtualBox-7.0.0_BETA2/src/VBox/ValidationKit/testboxscript/linux/testbox
# Default-Stop: 0 1 6
# Description: TestBoxScript service
### END INIT INFO
Index: VirtualBox-7.0.0_BETA2/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
Index: VirtualBox-7.0.4/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
===================================================================
--- VirtualBox-7.0.0_BETA2.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+++ VirtualBox-7.0.0_BETA2/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
@@ -41,7 +41,7 @@
# Provides: vboxtxs
# Required-Start: $network
@ -228,10 +228,10 @@ Index: VirtualBox-7.0.0_BETA2/src/VBox/ValidationKit/utils/TestExecServ/linux/vb
# Default-Stop: 0 1 6
# Description: VirtualBox Test Execution Service
### END INIT INFO
Index: VirtualBox-7.0.0_BETA2/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
Index: VirtualBox-7.0.4/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
===================================================================
--- VirtualBox-7.0.0_BETA2.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+++ VirtualBox-7.0.0_BETA2/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
@@ -41,7 +41,7 @@
# Provides: vboxtxs
# Required-Start: $network

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

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/VBox/Installer/linux/vboxdrv.sh
Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxdrv.sh
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Installer/linux/vboxdrv.sh
+++ VirtualBox-7.0.2/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
@@ -29,11 +29,12 @@
#
### BEGIN INIT INFO
@ -33,26 +33,7 @@ Index: VirtualBox-7.0.2/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
@@ -658,15 +652,9 @@ setup()
{
begin_msg "Building VirtualBox kernel modules" console
log "Building the main VirtualBox module."
-
- # Detect if kernel was built with clang.
- unset LLVM
- vbox_cc_is_clang=$(kernel_get_config_opt "CONFIG_MODULE_SIG_HASH")
- if test "${vbox_cc_is_clang}" = "y"; then
- log "Using clang compiler."
- export LLVM=1
- fi
-
+ vbox_cc_is_clang=$(/lib/modules/"$KERN_VER"/build/scripts/config \
+ --file /lib/modules/"$KERN_VER"/build/.config \
+ --state CONFIG_CC_IS_CLANG 2>/dev/null)
if ! myerr=`$BUILDINTMP \
--save-module-symvers /tmp/vboxdrv-Module.symvers \
--module-source "$MODULE_SRC/vboxdrv" \
@@ -684,31 +672,7 @@ setup()
@@ -684,31 +678,7 @@ setup()
log "Error building the module:"
module_build_log "$myerr"
failure "Look at $LOG to find out what went wrong"
@ -85,10 +66,10 @@ Index: VirtualBox-7.0.2/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.2/Makefile.kmk
Index: VirtualBox-7.0.4/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/Makefile.kmk
+++ VirtualBox-7.0.2/Makefile.kmk
--- VirtualBox-7.0.4.orig/Makefile.kmk
+++ VirtualBox-7.0.4/Makefile.kmk
@@ -69,8 +69,7 @@ OTHER_CLEAN += \
$(VBOX_VERSION_STAMP) \
$(wildcard $(PATH_OUT)/version-stamp-*.*.*) \
@ -99,11 +80,11 @@ Index: VirtualBox-7.0.2/Makefile.kmk
if !defined(VBOX_ONLY_ADDITIONS) \
Index: VirtualBox-7.0.2/Config.kmk
Index: VirtualBox-7.0.4/Config.kmk
===================================================================
--- VirtualBox-7.0.2.orig/Config.kmk
+++ VirtualBox-7.0.2/Config.kmk
@@ -3223,34 +3223,6 @@ $(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/
--- VirtualBox-7.0.4.orig/Config.kmk
+++ VirtualBox-7.0.4/Config.kmk
@@ -3225,34 +3225,6 @@ $(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/
$(QUIET)$(APPEND) -tn "$@" "int foobar(void)" "{" " return 42;" "}" ""
# No $(QUIET) here as it's interesting to see what goes into the file.
@ -138,7 +119,7 @@ Index: VirtualBox-7.0.2/Config.kmk
# HC compiler switch detection.
$(QUIET)$(APPEND) '$@' 'VBOX_GCC_VERSION_CC ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC))'
$(QUIET)$(APPEND) '$@' 'VBOX_GCC_VERSION_CXX ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CXX))'
@@ -3449,30 +3421,9 @@ endif
@@ -3451,30 +3423,9 @@ endif
$(QUIET)$(CAT) $@
$(QUIET)$(ECHO) '=========== END OF $@ ========='

6
vbox_remove_smp_mflags.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/libs/libxml2-2.9.14/libxml.spec.in
Index: VirtualBox-7.0.4/src/libs/libxml2-2.9.14/libxml.spec.in
===================================================================
--- VirtualBox-7.0.2.orig/src/libs/libxml2-2.9.14/libxml.spec.in
+++ VirtualBox-7.0.2/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
@@ -103,7 +103,7 @@ sed -i 's|#!/usr/bin/python |#!%{__pytho
%build

12
virtualbox-sed-params.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-7.0.2/src/VBox/Main/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/Main/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/Main/Makefile.kmk
--- VirtualBox-7.0.4.orig/src/VBox/Main/Makefile.kmk
+++ VirtualBox-7.0.4/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.2/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.2/src/VBox/Devices/Makefile.kmk
Index: VirtualBox-7.0.4/src/VBox/Devices/Makefile.kmk
===================================================================
--- VirtualBox-7.0.2.orig/src/VBox/Devices/Makefile.kmk
+++ VirtualBox-7.0.2/src/VBox/Devices/Makefile.kmk
--- VirtualBox-7.0.4.orig/src/VBox/Devices/Makefile.kmk
+++ VirtualBox-7.0.4/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

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

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

36
virtualbox.changes
View File

@ -1,8 +1,42 @@
-------------------------------------------------------------------
Mon Nov 21 16:10:35 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>
Removed file "fixes_for_leap15.4.patch" - fixed upstream.
- VirtualBox 7.0.4 (released November 18 2022)
This is a maintenance release. The following items were fixed and/or added:
VMM: Added nested paging support for nested virtualization (Intel hosts only)
VMM: Fixed rare guru meditations with certain guests on macOS 10.15 (Catalina) (bug #21237)
VMM: Fixed possible VM process crash on Windows hosts when Hyper-V is used with certain guests (bug #21174)
VMM: Fixed Windows XP guest hang or BSOD on AMD CPUs under certain circumstances (bug #21256)
GUI: Various bugfixes for the Guest Control file manager
GUI: Added more informative file operations in the Guest Control file manager
GUI: Added an option to the global settings (the display page) to resize user interface font
GUI: Fixed a regression in new vm wizard. Selected virtual disks are no longer deleted when the wizard is cancelled (bug #21244)
GUI: Added a new menu item to the devices menu to optionally upgrade the guest additions.
VirtioSCSI: Fixed recognition of the virtio SCSI controller by the EFI firmware (bug #21200)
VirtioSCSI: Fixed hang when shutting down the VM if the virtio SCSI controller is used (bug #21144)
virtio-net: Workaround a bug in the virtio-net driver included in FreeBSD version up to 12.3 which renders the device non functional (bug #21201)
Storage: Fixed I/O errors with the VirtioSCSI controller when the host I/O cache is enabled (bug #19717)
VBoxManage: Fixed regression when 'createmedium disk --variant RawDisk' command resulted in invalid .vmdk file (bug #21125)
Main: Restored input pointing device behavior in multi-monitor VM configuration (bug #21137)
Main: Fixed progress indication during automatic Linux Guest Additions installation
Guest Control: Fixed path handling issues (bug #21095)
3D: Fixed VM process crash on macOS with 3D enabled (bug #21232)
Linux Host and Guest: General improvements in startup scripts
Linux Guest Additions: Introduced initial support for RHEL 8.7 and 9.2 kernels (bug #21272, #21258)
Linux Guest Additions: Introduced initial support for SLES 15.4 kernels
Linux Guest Additions: Fixed kernel modules rebuild behavior on system shutdown
-------------------------------------------------------------------
Tue Nov 15 20:59:55 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>
added file "set_noexec_stack.patch" to remove executable stack in yasm-compiled routines
addwd file "fix_v7_build.patch"
added file "fix_v7_build.patch"
added file "fixes_for_leap15.4.patch"
added file "VBoxDDR0.r0"
deleted file "/vb-6.1.16-modal-dialog-parent.patch"

58
virtualbox.spec
View File

@ -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.2
Version: 7.0.4
Release: 0
Summary: %{package_summary}
# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
@ -316,6 +316,13 @@ hardware. VirtualBox is freely available as Open Source Software under
the terms of the GNU Public License (GPL).
##########################################
%package qt
Summary: Qt GUI part for %{name}
@ -334,6 +341,13 @@ Obsoletes: %{name}-ose-qt < %{version}
This package contains the code for the GUI used to control VMs.
#########################################
%package websrv
Summary: WebService GUI part for %{name}
@ -346,6 +360,13 @@ Obsoletes: %{name}-vboxwebsrv < %{version}
%description websrv
The VirtualBox web server is used to control headless VMs using a browser.
###########################################
%package guest-tools
@ -369,6 +390,13 @@ Requires(pre): net-tools-deprecated
VirtualBox guest addition tools.
###########################################
%package -n python3-%{name}
Summary: Python bindings for %{name}
@ -388,6 +416,13 @@ Obsoletes: python3-%{name}-ose < %{version}
Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
###########################################
%package devel
Summary: Devel files for %{name}
@ -402,6 +437,13 @@ Obsoletes: %{name}-ose-devel < %{version}
Development file for %{name}
###########################################
%package host-source
Summary: Source files for %{name} host kernel modules
@ -433,6 +475,13 @@ These can be built for custom kernels using
sudo %{_sbindir}/vboxguestconfig
###########################################
%package guest-desktop-icons
Summary: Icons for guest desktop files
@ -445,6 +494,13 @@ BuildArch: noarch
This package contains icons for guest desktop files that were created on the desktop.
###########################################
%package vnc
Summary: VNC desktop sharing