Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package virtualbox for openSUSE:Factory
checked in at 2023-05-05 17:12:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virtualbox (Old)
and /work/SRC/openSUSE:Factory/.virtualbox.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox"
Fri May 5 17:12:16 2023 rev:255 rq:1084830 version:7.0.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2023-03-24
15:16:08.661537046 +0100
+++ /work/SRC/openSUSE:Factory/.virtualbox.new.1533/virtualbox.changes
2023-05-05 17:12:19.915048566 +0200
@@ -1,0 +2,50 @@
+Thu May 4 15:24:39 UTC 2023 - Larry Rainey <llraine...@gmail.com>
+
+- VirtualBox 7.0.8 (released April 18 2023)
+
+This is a maintenance release. The following items were fixed and/or added:
+
+ VMM: Introduced general improvements in nested visualization area
+ GUI: Brought back Restore current snapshot checkbox of Close VM dialog
(bugs #21189, #21491)
+ GUI: Fixes and validation for VM settings USB filters editor, filter port
value is now properly saved/restored
+ GUI: Fixes for VM name and OS type embedded editors of Details pane
+ GUI: Cloud related wizards should now propose enabled profiles before
disabled
+ Oracle VM VirtualBox Extension Pack: Fixed shipping the cryptographic
support module for full VM encryption
+ E1000: Fixed possible guru meditation when changing network attachments
(bug #21488)
+ virtio-net: Follow up fixes for FreeBSD 12.3 and pfSense 2.6.0 (bug #21201)
+ 3D: Fixed various graphics issues with Windows 7 guests (bugs #21129,
#21196, #21208, #21521)
+ Main/UefiVariableStore: Added API to add signatures to the MOK list
(Machine Owner Key)
+ VBoxManage: Introduced modifynvram enrollmok sub-command to enroll Machine
Owner Key into NVRAM, so Linux guest kernel can pick it up in order to verify
signature of modules signed with this key
+ Guest Control/Main: Fixed deleting files via built-in toolbox
+ Linux host: Added possibility to bypass kernel modules signature
verification once VBOX_BYPASS_MODULES_SIGNATURE_CHECK="1" is specified in
/etc/vbox/vbox.cfg, useful in case if Linux distribution does not provide
necessary tools to verify kernel module signature
+ Linux Guest Additions and host Installer: Improved detection if system is
running systemd as the init process
+ Linux Guest Additions and host drivers: Introduce initial support for
kernel 6.3
+ Linux Guest Additions: Added possibility to bypass kernel modules
signature verification once VBOX_BYPASS_MODULES_SIGNATURE_CHECK="1" is
specified in /etc/virtualbox-guest-additions.conf, useful in case if Linux
distribution does not provide necessary tools to verify kernel module signature
+ Linux Guest Additions: Added experimental support for kernel modules and
user services reloading in the end of installation process, thus guest system
reboot after Guest Additions (7.0.8 and newer) upgrade is no longer required in
general case
+ Linux Guest Additions: Fixed vboxvideo build issue with RHEL 8.7, 9.1 and
9.2 kernels (bugs #21446 and #21450)
+
+ Fixes for (boo#1210616)
+CVE-2023-21990 Oracle VM VirtualBox Core None No 8.2 Prior
to 6.1.44, Prior to 7.0.8
+CVE-2023-21987 Oracle VM VirtualBox Core None No 7.8 Prior
to 6.1.44, Prior to 7.0.8
+CVE-2023-22002 Oracle VM VirtualBox Core None No 6.0 Prior
to 6.1.44, Prior to 7.0.8
+CVE-2023-21989 Oracle VM VirtualBox Core None No 6.0 Prior
to 6.1.44, Prior to 7.0.8
+CVE-2023-21998 Oracle VM VirtualBox Core None No 4.6 Prior
to 6.1.44, Prior to 7.0.8
+CVE-2023-22000 Oracle VM VirtualBox Core None No 4.6 Prior
to 6.1.44, Prior to 7.0.8
+CVE-2023-22001 Oracle VM VirtualBox Core None No 4.6 Prior
to 6.1.44, Prior to 7.0.8
+CVE-2023-21988 Oracle VM VirtualBox Core None No 3.8 Prior
to 6.1.44, Prior to 7.0.8
+CVE-2023-21999 Oracle VM VirtualBox Core None No 3.6 Prior
to 6.1.44, Prior to 7.0.8
+CVE-2023-21991 Oracle VM VirtualBox Core None No 3.2 Prior
to 6.1.44, Prior to 7.0.8
+
+ Removed file fixes_for_kernel_6.3.patch - removed upstream.
+ Removed file fix_kmp_build.patch.
+
+ Thanks to Javier de San Pedro for the simplfication of the KMP build.
+
+-------------------------------------------------------------------
+Fri Mar 31 21:14:51 UTC 2023 - Larry Finger <larry.fin...@gmail.com>
+
+- Fix some memory leaks in file "fix_7.0.6_locking_problems.patch"
+ Fix bug in /usr/bin/VirtualBox, aka "virtualbox-wrapper.sh". The wrapper
+ failed whenever the user declined USB passthru. boo#1208941.
+
+-------------------------------------------------------------------
Old:
----
VirtualBox-7.0.6-patched.tar.bz2
fix_kmp_build.patch
fixes_for_kernel_6.3.patch
New:
----
VirtualBox-7.0.8-patched.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox.spec ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.383080412 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.387080435 +0200
@@ -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.6
+Version: 7.0.8
Release: 0
Summary: %{package_summary}
# FIXME: use correct group or remove it, see
"https://en.opensuse.org/openSUSE:Package_group_guidelines";
@@ -155,15 +155,12 @@
Patch32: handle_gsoap_208103.patch
# Fix for struct file_operations backport in 15.3
Patch33: fixes_for_leap15.3.patch
-Patch34: fix_kmp_build.patch
# Fix for backports to 15.5
Patch35: fixes_for_leap15.5.patch
# Fix for GCC13
Patch36: fixes_for_gcc13.patch
-# Fix for kernel 6.3
-Patch37: fixes_for_kernel_6.3.patch
# Fix locking problem in 7.0.6
-Patch38: fix_7.0.6_locking_problems.patch
+Patch37: fix_7.0.6_locking_problems.patch
#
# Common BuildRequires for both virtualbox and virtualbox-kmp
BuildRequires: %{kernel_module_package_buildreqs}
@@ -178,6 +175,7 @@
BuildRequires: libopenssl-devel
BuildRequires: libxslt-devel
BuildRequires: module-init-tools
+BuildRequires: nasm
BuildRequires: pam-devel
BuildRequires: yasm
ExclusiveArch: x86_64
@@ -187,10 +185,7 @@
### Requirements for virtualbox main package ###
%if %{main_package}
BuildRequires: LibVNCServer-devel
-BuildRequires: SDL-devel
BuildRequires: alsa-devel
-#BuildRequires: bin86
-#BuildRequires: dev86
BuildRequires: device-mapper-devel
BuildRequires: dmidecode
BuildRequires: e2fsprogs-devel
@@ -198,8 +193,8 @@
BuildRequires: glibc-devel-static
BuildRequires: glslang-devel
BuildRequires: gsoap-devel >= 2.8.50
-#BuildRequires: infinipath-psm
BuildRequires: java-devel >= 1.6.0
+BuildRequires: libSDL-devel
BuildRequires: libelf-devel
BuildRequires: libidl-devel
BuildRequires: libopenssl-devel
@@ -218,15 +213,11 @@
BuildRequires: pulseaudio-devel
BuildRequires: python-rpm-macros
BuildRequires: python3-devel
-#BuildRequires: sdl12_compat-devel
BuildRequires: sed
BuildRequires: systemd-rpm-macros
BuildRequires: update-desktop-files
BuildRequires: which
-#BuildRequires: xorg-x11
BuildRequires: xorg-x11-server
-#BuildRequires: xorg-x11-server-sdk
-#BuildRequires: zlib-devel-static
BuildRequires: pkgconfig(fontsproto)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(glx)
@@ -235,7 +226,7 @@
BuildRequires: pkgconfig(renderproto)
BuildRequires: pkgconfig(resourceproto)
BuildRequires: pkgconfig(scrnsaverproto)
-BuildRequires: pkgconfig(sdl)
+#BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xau)
@@ -302,8 +293,18 @@
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}
Group: System/Emulators/PC
@@ -320,8 +321,18 @@
%description qt
This package contains the code for the GUI used to control VMs.
-#-########################################
+
+
+
+
+
+
+
+
+
+
+#-########################################
%package websrv
Summary: WebService GUI part for %{name}
Group: System/Emulators/PC
@@ -333,7 +344,17 @@
The VirtualBox web server is used to control headless VMs using a browser.
+
+
+
+
+
+
+
+
+
#-##########################################
+
%package guest-tools
Summary: VirtualBox guest tools
Group: System/Emulators/PC
@@ -354,8 +375,18 @@
%description guest-tools
VirtualBox guest addition tools.
-#-##########################################
+
+
+
+
+
+
+
+
+
+
+#-##########################################
%package -n python3-%{name}
Summary: Python bindings for %{name}
Group: Development/Libraries/Python
@@ -373,8 +404,18 @@
%description -n python3-%{name}
Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
-#-##########################################
+
+
+
+
+
+
+
+
+
+
+#-##########################################
%package devel
Summary: Devel files for %{name}
Group: Development/Libraries/Other
@@ -387,8 +428,18 @@
%description devel
Development file for %{name}
-#-##########################################
+
+
+
+
+
+
+
+
+
+
+#-##########################################
%package host-source
Summary: Source files for %{name} host kernel modules
Group: Development/Sources
@@ -418,8 +469,18 @@
These can be built for custom kernels using
sudo %{_sbindir}/vboxguestconfig
-#-##########################################
+
+
+
+
+
+
+
+
+
+
+#-##########################################
%package guest-desktop-icons
Summary: Icons for guest desktop files
Group: System/Emulators/PC
@@ -430,8 +491,18 @@
%description guest-desktop-icons
This package contains icons for guest desktop files that were created on the
desktop.
-#-##########################################
+
+
+
+
+
+
+
+
+
+
+#-##########################################
%package vnc
Summary: VNC desktop sharing
Group: System/Emulators/PC
@@ -492,7 +563,6 @@
# Patch for Leap 15.3
%patch33 -p1
%endif
-%patch34 -p1
%if 0%{?sle_version} == 150500 && 0%{?is_opensuse}
%patch35 -p1
%endif
@@ -500,7 +570,6 @@
%patch36 -p1
%endif
%patch37 -p1
-%patch38 -p1
### Documents for virtualbox main package ###
%if %{main_package}
@@ -515,25 +584,6 @@
# main_package
%endif
-#
-##########################
-####workaround kmk_sed --v
-#instead of kmk_sed use /usr/bin/sed because of bug
http://svn.netlabs.org/kbuild/ticket/112,
-#but we have to create wrapper which will handle --append and --output options
which are not provided by /usr/bin/sed
-cat >> kmk_sed <<EOF
-#!/usr/bin/bash
-while [ "\$#" != "0" ]; do
- pass=\${pass}" \$1"
- [ "\$1" == "-e" ] && shift && pass=\${pass}" '\$1'"
- shift
-done
-eval "sed \$(echo "\$pass" | sed -e
"s/--output=/>/g;s/--append=/>/g;s/--output/>/g;s/--append/>>/g");"
-EOF
-chmod +x ./kmk_sed
-echo "SED = $RPM_BUILD_DIR/VirtualBox-%{version}/kmk_sed" >> LocalConfig.kmk
-####workaround kmk_sed --^
-##########################
-#
# fix build of vboxvideo kernel module: replace relative drm include path with
absolute include path
sed -i 's:include/drm:%{_prefix}/src/linux/include/drm:'
src/VBox/Additions/linux/drm/Makefile.module.kms
@@ -642,7 +692,7 @@
pushd out/linux.*/release/bin
install -m 755 VBoxManage %{buildroot}%{_vbox_instdir}
install -m 755 VBoxHeadless %{buildroot}%{_vbox_instdir}
-install -m 755 VBoxSDL
%{buildroot}%{_vbox_instdir}
+#install -m 755 VBoxSDL
%{buildroot}%{_vbox_instdir}
install -m 755 VBoxNetNAT %{buildroot}%{_vbox_instdir}
install -m 755 VBoxAutostart %{buildroot}%{_vbox_instdir}
install -m 755 VBoxVolInfo %{buildroot}%{_vbox_instdir}
@@ -658,7 +708,7 @@
# create links to vbox tools in PATH - they could be usefull for controlling
vbox from command line
ln -s %{_vbox_instdir}/VBoxManage
%{buildroot}%{_bindir}/VBoxManage
ln -s %{_vbox_instdir}/VBoxHeadless
%{buildroot}%{_bindir}/VBoxHeadless
-ln -s %{_vbox_instdir}/VBoxSDL %{buildroot}%{_bindir}/VBoxSDL
+#ln -s %{_vbox_instdir}/VBoxSDL
%{buildroot}%{_bindir}/VBoxSDL
ln -s %{_vbox_instdir}/vboximg-mount
%{buildroot}%{_bindir}/vboximg-mount
install -m 755 VBoxSVC
%{buildroot}%{_vbox_instdir}
install -m 755 VBoxXPCOMIPCD %{buildroot}%{_vbox_instdir}
@@ -849,7 +899,7 @@
%post qt
%set_permissions %{_vbox_instdir}/VirtualBoxVM
-%set_permissions %{_vbox_instdir}/VBoxSDL
+#%set_permissions %{_vbox_instdir}/VBoxSDL
%verifyscript
%verify_permissions -e %{_vbox_instdir}/VBoxNetNAT
@@ -859,7 +909,7 @@
%verifyscript qt
%verify_permissions -e %{_vbox_instdir}/VirtualBoxVM
-%verify_permissions -e %{_vbox_instdir}/VBoxSDL
+#%verify_permissions -e %{_vbox_instdir}/VBoxSDL
%post guest-tools
%service_add_post vboxadd-service.service
@@ -933,7 +983,7 @@
%doc README.autostart UserManual.pdf README.build
%{_bindir}/VBoxManage
%{_bindir}/VBoxHeadless
-%{_bindir}/VBoxSDL
+#%{_bindir}/VBoxSDL
%{_bindir}/vboximg-mount
%dir %{_vbox_instdir}
%{_vbox_instdir}/VBoxAutostart
@@ -1011,7 +1061,7 @@
%attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxUSB_DevRules
%attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBox6
%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM
-%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL
+#%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL
%{_vbox_instdir}/VirtualBox
#wrapper script is in bindir
%attr(0755,root,root) %{_bindir}/VirtualBox
@@ -1023,8 +1073,8 @@
%{_vbox_instdir}/VBoxSVGA3D.so
%{_vbox_instdir}/VirtualBoxVM.so
%{_vbox_instdir}/VBoxDbg.so
-%{_bindir}/VBoxSDL
-%{_vbox_instdir}/VBoxSDL.so
+#%{_bindir}/VBoxSDL
+#%{_vbox_instdir}/VBoxSDL.so
%{_vbox_instdir}/VBoxKeyboard.so
%{_vbox_instdir}/VBoxSharedClipboard.so
%{_datadir}/pixmaps/virtualbox.png
@@ -1115,70 +1165,15 @@
#ensure we don't ever use them
rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
-# Craft LocalConfig.kmk
-echo "
-VBOX_GCC_OPT := %{optflags}
-VBOX_GCC_WERR :=
-VBOX_BUILD_PUBLISHER := _SUSE
-
-VBOX_OSE := 1
-VBOX_WITH_DOCS :=
-VBOX_WITHOUT_LINUX_TEST_BUILDS := 1
-VBOX_WITH_TESTCASES :=
-SDK_VBOX_LIBXML2_DEFS := _REENTRANT
-SDK_VBOX_LIBXML2_INCS := %{_includedir}/libxml2
-SDK_VBOX_LIBXML2_LIBS := xml2
-SDK_VBOX_OPENSSL_INCS :=
-SDK_VBOX_OPENSSL_LIBS := ssl crypto
-SDK_VBOX_BLD_OPENSSL_LIBS := ssl crypto
-SDK_VBOX_LIBCURL_INCS :=
-SDK_VBOX_LIBCURL_LIBS := curl
-" > LocalConfig.kmk
-
-COMMON_KMK_FLAGS="
- KBUILD_VERBOSE=2 \
- KBUILD_TARGET=linux \
- BUILD_TARGET=linux \
-"
-# Build additions to export the source code of vbox{guest,sf,video} to
-# out/linux.*/release/bin/additions/src/
-%{_bindir}/kmk %{?_smp_mflags} \
- ${COMMON_KMK_FLAGS} \
- VBOX_WITH_X11_ADDITIONS= \
- VBOX_ONLY_ADDITIONS=1
-
-# The following kmk commands are used to extract the source of
-# vbox{drv,netflt,netadp} without building the whole virtualbox
-# program.
-
-# 1. build src/bldprogs/ to get bin2c and VBoxTpG
-%{_bindir}/kmk %{?_smp_mflags} -C src/bldprogs/ \
- ${COMMON_KMK_FLAGS} \
- VBOX_ONLY_EXTPACKS=1
-
-# 2. build src/VBox/HostDrivers/ with VBOX_ONLY_EXTPACKS=1 to
-# get SUPR3.a for src/VBox/Runtime/
-%{_bindir}/kmk %{?_smp_mflags} -C src/VBox/HostDrivers/ \
- ${COMMON_KMK_FLAGS} \
- VBOX_ONLY_EXTPACKS=1
-
-# 3. build src/VBox/Runtime/ with VBOX_ONLY_BUILD=1 to get
-# VBoxRt.so for src/VBox/HostDrivers/Support/
-%{_bindir}/kmk %{?_smp_mflags} -C src/VBox/Runtime/ \
- ${COMMON_KMK_FLAGS} \
- VBOX_ONLY_BUILD=1
-
-# 4. build src/VBox/HostDrivers/ to export the source of
-# host kernel modules to out/linux.*/release/bin/src/
-%{_bindir}/kmk %{?_smp_mflags} -C src/VBox/HostDrivers/ \
- ${COMMON_KMK_FLAGS}
-#
+./src/VBox/Additions/linux/export_modules.sh --folder kmp_additions
+./src/VBox/HostDrivers/linux/export_modules.sh --folder kmp_host
+
# build kernel modules for guest and host (check novel-kmp package as example)
# host modules : vboxdrv,vboxnetflt,vboxnetadp
# guest modules : vboxguest,vboxsf,vboxvideo
echo "build kernel modules"
-for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp} \
- out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do
+for vbox_module in kmp_host/vbox{drv,netflt,netadp} \
+ kmp_additions/vbox{guest,sf,video}; do
#get the module name from path
module_name=$(basename "$vbox_module")
++++++ UserManual.pdf ++++++
(binary differes)
++++++ VirtualBox-5.2.10-xclient.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.451080808 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.455080831 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+Index: VirtualBox-7.0.8/src/VBox/Additions/x11/Installer/98vboxadd-xclient
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-+++ VirtualBox-7.0.6/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient
++++ VirtualBox-7.0.8/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
++++++ VirtualBox-7.0.6-patched.tar.bz2 -> VirtualBox-7.0.8-patched.tar.bz2
++++++
/work/SRC/openSUSE:Factory/virtualbox/VirtualBox-7.0.6-patched.tar.bz2
/work/SRC/openSUSE:Factory/.virtualbox.new.1533/VirtualBox-7.0.8-patched.tar.bz2
differ: char 11, line 1
++++++ fix-missing-includes-with-qt-5.15.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.539081320 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.551081390 +0200
@@ -1,7 +1,7 @@
-Index:
VirtualBox-7.0.6/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
+Index:
VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
-+++ VirtualBox-7.0.6/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
+---
VirtualBox-7.0.8.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
++++ VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
@@ -28,6 +28,7 @@
/* Qt includes: */
#include <QApplication>
@@ -10,10 +10,10 @@
#include <QPaintEvent>
#include <QStyle>
#include <QVBoxLayout>
-Index: VirtualBox-7.0.6/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
+Index: VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
-+++ VirtualBox-7.0.6/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
+---
VirtualBox-7.0.8.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
++++ VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
@@ -47,7 +47,6 @@ class QIcon;
class QLabel;
class QMouseEvent;
++++++ fix_7.0.6_locking_problems.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.567081483 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.571081507 +0200
@@ -1,61 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/HostDrivers/Support/SUPDrv.cpp
+Index: VirtualBox-7.0.8/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/HostDrivers/Support/SUPDrv.cpp
-+++ VirtualBox-7.0.6/src/VBox/HostDrivers/Support/SUPDrv.cpp
-@@ -871,8 +871,8 @@ void VBOXCALL supdrvDeleteDevExt(PSUPDRV
-
- /* kill the GIP. */
- supdrvGipDestroy(pDevExt);
-- RTSpinlockDestroy(pDevExt->hGipSpinlock);
- pDevExt->hGipSpinlock = NIL_RTSPINLOCK;
-+ RTSpinlockDestroy(pDevExt->hGipSpinlock);
-
- supdrvTracerTerm(pDevExt);
-
-@@ -5351,8 +5351,8 @@ static int supdrvIOCtl_LdrOpen(PSUPDRVDE
- rc = supdrvLdrAddUsage(pDevExt, pSession, pImage, true
/*fRing3Usage*/);
- if (RT_FAILURE(rc))
- {
-- supdrvLdrUnlock(pDevExt);
- pImage->uMagic = SUPDRVLDRIMAGE_MAGIC_DEAD;
-+ supdrvLdrUnlock(pDevExt);
- RTMemFree(pImage);
- Log(("supdrvIOCtl_LdrOpen(%s): failed - %Rrc\n", pReq->u.In.szName,
rc));
- return rc;
-@@ -6095,6 +6095,7 @@ static int supdrvIOCtl_LdrFree(PSUPDRVDE
- /* free it */
- pUsage->pImage = NULL;
- pUsage->pNext = NULL;
-+ RTSpinlockRelease(pDevExt->Spinlock);
- RTMemFree(pUsage);
-
- /*
-@@ -6106,7 +6107,10 @@ static int supdrvIOCtl_LdrFree(PSUPDRVDE
- supdrvLdrSubtractUsage(pDevExt, pImage, 1);
- }
- else
-+ {
-+ RTSpinlockRelease(pDevExt->Spinlock);
- Log(("supdrvIOCtl_LdrFree: Dangling objects in %p/%s!\n",
pImage->pvImage, pImage->szName));
-+ }
- }
- else
- {
-@@ -6334,9 +6338,9 @@ static int supdrvIOCtl_LdrQuerySymbol(PS
- rc = VERR_INVALID_HANDLE;
- }
-
-+ pReq->u.Out.pvSymbol = pvSymbol;
- supdrvLdrUnlock(pDevExt);
-
-- pReq->u.Out.pvSymbol = pvSymbol;
- return rc;
- }
-
-Index: VirtualBox-7.0.6/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
-===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
-+++ VirtualBox-7.0.6/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
+--- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
++++ VirtualBox-7.0.8/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
@@ -4537,9 +4537,9 @@ static int supdrvTscDeltaThreadWait(PSUP
*/
static void supdrvTscDeltaThreadStartMeasurement(PSUPDRVDEVEXT pDevExt, bool
fForceAll)
@@ -78,20 +24,4 @@
}
-@@ -4628,13 +4628,13 @@ static int supdrvTscDeltaThreadInit(PSUP
- }
- else
- OSDBGPRINT(("supdrvTscDeltaInit: RTThreadCreate failed.
rc=%Rrc\n", rc));
-- RTSemEventDestroy(pDevExt->hTscDeltaEvent);
- pDevExt->hTscDeltaEvent = NIL_RTSEMEVENT;
-+ RTSemEventDestroy(pDevExt->hTscDeltaEvent);
- }
- else
- OSDBGPRINT(("supdrvTscDeltaInit: RTSemEventCreate failed.
rc=%Rrc\n", rc));
-- RTSpinlockDestroy(pDevExt->hTscDeltaSpinlock);
- pDevExt->hTscDeltaSpinlock = NIL_RTSPINLOCK;
-+ RTSpinlockDestroy(pDevExt->hTscDeltaSpinlock);
- }
- else
- OSDBGPRINT(("supdrvTscDeltaInit: RTSpinlockCreate failed. rc=%Rrc\n",
rc));
++++++ fix_conflict_between_host_and_guest.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.587081600 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.587081600 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
+Index: VirtualBox-7.0.8/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
++++ VirtualBox-7.0.8/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
@@ -140,7 +140,7 @@ static struct vboxguest_module_info g_VB
RTMemAllocExTag,
RTMemContAlloc,
++++++ fixes_for_gcc13.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.607081717 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.611081740 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
+Index: VirtualBox-7.0.8/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
-+++ VirtualBox-7.0.6/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
+--- VirtualBox-7.0.8.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
++++ VirtualBox-7.0.8/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
@@ -13,6 +13,7 @@
#include <intrin.h>
#endif
@@ -10,10 +10,10 @@
#include "util_likely.h"
#include "util_math.h"
-Index:
VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
+Index:
VirtualBox-7.0.8/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
-+++
VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
+---
VirtualBox-7.0.8.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
++++
VirtualBox-7.0.8/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
@@ -66,6 +66,9 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CO
OF THIS SOFTWARE.
++++++ fixes_for_leap15.2.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.627081833 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.631081856 +0200
@@ -1,7 +1,7 @@
-Index:
VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+Index:
VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++ VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+---
VirtualBox-7.0.8.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
++++ VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -86,6 +86,10 @@
#define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h"
@@ -13,10 +13,10 @@
typedef struct VBOXNETFLTNOTIFIER {
struct notifier_block Notifier;
PVBOXNETFLTINS pThis;
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.c
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -342,12 +342,15 @@ static void vbox_master_drop(struct drm_
}
@@ -36,11 +36,11 @@
#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.6/src/VBox/Additions/linux/drm/vbox_main.c
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_main.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_main.c
-@@ -659,8 +659,12 @@ static inline u64 vbox_bo_mmap_offset(st
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_main.c
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_main.c
+@@ -663,8 +663,12 @@ static inline u64 vbox_bo_mmap_offset(st
#elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0)
return bo->bo.addr_space_offset;
#else
@@ -53,10 +53,10 @@
}
int
-Index: VirtualBox-7.0.6/include/iprt/cdefs.h
+Index: VirtualBox-7.0.8/include/iprt/cdefs.h
===================================================================
---- VirtualBox-7.0.6.orig/include/iprt/cdefs.h
-+++ VirtualBox-7.0.6/include/iprt/cdefs.h
+--- VirtualBox-7.0.8.orig/include/iprt/cdefs.h
++++ VirtualBox-7.0.8/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 @@
/** @def RT_IPRT_FORMAT_ATTR
-Index: VirtualBox-7.0.6/kBuild/header.kmk
+Index: VirtualBox-7.0.8/kBuild/header.kmk
===================================================================
---- VirtualBox-7.0.6.orig/kBuild/header.kmk
-+++ VirtualBox-7.0.6/kBuild/header.kmk
+--- VirtualBox-7.0.8.orig/kBuild/header.kmk
++++ VirtualBox-7.0.8/kBuild/header.kmk
@@ -764,7 +764,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm
RMDIR_INT := kmk_builtin_rmdir
RMDIR := $(RMDIR_INT)
@@ -89,10 +89,10 @@
SED_INT := $(SED_EXT)
SED := $(SED_EXT)
-Index: VirtualBox-7.0.6/configure
+Index: VirtualBox-7.0.8/configure
===================================================================
---- VirtualBox-7.0.6.orig/configure
-+++ VirtualBox-7.0.6/configure
+--- VirtualBox-7.0.8.orig/configure
++++ VirtualBox-7.0.8/configure
@@ -2000,7 +2000,7 @@ check_kbuild()
fi
echo "export KBUILD_PATH KBUILD_DEVTOOLS PATH" >> $ENV
@@ -111,10 +111,10 @@
else
fail
fi
-Index: VirtualBox-7.0.6/tools/bin/backport-commit.sh
+Index: VirtualBox-7.0.8/tools/bin/backport-commit.sh
===================================================================
---- VirtualBox-7.0.6.orig/tools/bin/backport-commit.sh
-+++ VirtualBox-7.0.6/tools/bin/backport-commit.sh
+--- VirtualBox-7.0.8.orig/tools/bin/backport-commit.sh
++++ VirtualBox-7.0.8/tools/bin/backport-commit.sh
@@ -29,7 +29,7 @@
#
# Determin script dir so we can source the common bits.
@@ -124,10 +124,10 @@
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.6/tools/bin/backport-common.sh
+Index: VirtualBox-7.0.8/tools/bin/backport-common.sh
===================================================================
---- VirtualBox-7.0.6.orig/tools/bin/backport-common.sh
-+++ VirtualBox-7.0.6/tools/bin/backport-common.sh
+--- VirtualBox-7.0.8.orig/tools/bin/backport-common.sh
++++ VirtualBox-7.0.8/tools/bin/backport-common.sh
@@ -1,4 +1,4 @@
-# $Id: backport-common.sh $
+ $Id: backport-common.sh $
@@ -143,10 +143,10 @@
#
# Functions.
-Index: VirtualBox-7.0.6/tools/bin/backport-merge-and-commit.sh
+Index: VirtualBox-7.0.8/tools/bin/backport-merge-and-commit.sh
===================================================================
---- VirtualBox-7.0.6.orig/tools/bin/backport-merge-and-commit.sh
-+++ VirtualBox-7.0.6/tools/bin/backport-merge-and-commit.sh
+--- VirtualBox-7.0.8.orig/tools/bin/backport-merge-and-commit.sh
++++ VirtualBox-7.0.8/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 @@
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.6/tools/bin/backport-merge.sh
+Index: VirtualBox-7.0.8/tools/bin/backport-merge.sh
===================================================================
---- VirtualBox-7.0.6.orig/tools/bin/backport-merge.sh
-+++ VirtualBox-7.0.6/tools/bin/backport-merge.sh
+--- VirtualBox-7.0.8.orig/tools/bin/backport-merge.sh
++++ VirtualBox-7.0.8/tools/bin/backport-merge.sh
@@ -29,7 +29,7 @@
#
# Determin script dir so we can source the common bits.
@@ -169,10 +169,10 @@
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.6/src/VBox/Main/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/Main/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Main/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/Main/Makefile.kmk
+--- VirtualBox-7.0.8.orig/src/VBox/Main/Makefile.kmk
++++ VirtualBox-7.0.8/src/VBox/Main/Makefile.kmk
@@ -267,7 +267,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE
| $$(dir $$@)
$(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
@@ -182,11 +182,11 @@
$(QUIET)$(RM) -- $(VBOX_XIDL_FILE).ts-tmp
$(QUIET)$(CP) --changed -fv -- $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE)
-Index: VirtualBox-7.0.6/src/VBox/Runtime/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/Runtime/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Runtime/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/Runtime/Makefile.kmk
-@@ -4480,6 +4480,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V
+--- VirtualBox-7.0.8.orig/src/VBox/Runtime/Makefile.kmk
++++ VirtualBox-7.0.8/src/VBox/Runtime/Makefile.kmk
+@@ -4411,6 +4411,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V
#
# Generate the status code data.
#
++++++ fixes_for_leap15.3.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.643081926 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.647081949 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+Index: VirtualBox-7.0.8/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-+++ VirtualBox-7.0.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+--- VirtualBox-7.0.8.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
++++ VirtualBox-7.0.8/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 @@
#if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38)
# include <linux/smp_lock.h>
#endif
-Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyXPCOM.h
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyXPCOM.h
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyXPCOM.h
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
++++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyXPCOM.h
@@ -191,7 +191,7 @@ extern "C" PyAPI_FUNC(const char *) PyUn
# endif
@@ -27,10 +27,10 @@
DECLINLINE(int) PyRun_SimpleString(const char *pszCode)
{
-Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
++++ VirtualBox-7.0.8/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);
@@ -58,25 +58,10 @@
#endif
Py_DECREF(temp);
} else
-@@ -440,10 +440,11 @@ char *PyTraceback_AsString(PyObject *exc
- #if PY_MAJOR_VERSION <= 2
- char *tempResult = (char *)PyString_AsString(obResult);
- #elif PY_MINOR_VERSION <= 6
-- char *tempResult = (char *)PyUnicode_AsUTF8(obResult);
-+ char *tempResult = (char *)PyBytes_AsString(obResult);
-+#elif PY_MINOR_VERSION <= 6
-+ 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.6/src/libs/xpcom18a4/python/src/PyGBase.cpp
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyGBase.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyGBase.cpp
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
++++ VirtualBox-7.0.8/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 +71,10 @@
#endif
if (szRepr==NULL) szRepr = "";
int reprOffset = *szRepr=='<' ? 1 : 0;
-Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyIID.cpp
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/PyIID.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyIID.cpp
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
++++ VirtualBox-7.0.8/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 +84,10 @@
#endif
if (!ok) {
PyXPCOM_BuildPyException(NS_ERROR_ILLEGAL_VALUE);
-Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/VariantUtils.cpp
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/src/VariantUtils.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/VariantUtils.cpp
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
++++ VirtualBox-7.0.8/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);
++++++ fixes_for_leap15.5.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.659082019 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.663082043 +0200
@@ -1,8 +1,8 @@
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -160,9 +160,9 @@
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.h
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h
+@@ -166,9 +166,9 @@
# include <drm/drm_device.h>
# include <drm/drm_ioctl.h>
# include <drm/drm_fourcc.h>
@@ -15,35 +15,30 @@
# include <drm/drm_vblank.h>
#else /* < 5.5.0 || RHEL < 8.3 || SLES < 15-SP3 */
# include <drm/drmP.h>
-@@ -188,9 +188,7 @@
+@@ -198,9 +198,7 @@
# include <drm/ttm/ttm_resource.h>
#endif
--#if RTLNX_VER_MIN(6,0,0)
+-#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
# include <drm/drm_framebuffer.h>
-#endif
#include "vboxvideo_guest.h"
#include "vboxvideo_vbe.h"
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
-@@ -52,13 +52,7 @@
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.c
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c
+@@ -52,7 +52,7 @@
/** Detect whether kernel mode setting is OFF. */
#if defined(CONFIG_VGA_CONSOLE)
--# if RTLNX_VER_MIN(5,17,0)
+-# if RTLNX_VER_MIN(5,17,0) || RTLNX_RHEL_RANGE(8,7, 8,99) ||
RTLNX_RHEL_MIN(9,1)
++# if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,7, 8,99) ||
RTLNX_RHEL_MIN(9,1)
# define VBOX_VIDEO_NOMODESET() drm_firmware_drivers_only() && vbox_modeset
== -1
--# elif RTLNX_VER_MIN(4,7,0)
--# define VBOX_VIDEO_NOMODESET() vgacon_text_force() && vbox_modeset == -1
--# else /* < 4.7.0 */
--# define VBOX_VIDEO_NOMODESET() 0
--# endif /* < 4.7.0 */
- #else /* !CONFIG_VGA_CONSOLE */
- # define VBOX_VIDEO_NOMODESET() 0
- #endif /* !CONFIG_VGA_CONSOLE */
-@@ -369,7 +363,7 @@ static struct drm_driver driver = {
+ # elif RTLNX_VER_MIN(4,7,0)
+ # define VBOX_VIDEO_NOMODESET() vgacon_text_force() && vbox_modeset == -1
+@@ -372,7 +372,7 @@ static struct drm_driver driver = {
#endif
.fops = &vbox_fops,
@@ -52,10 +47,10 @@
.irq_handler = vbox_irq_handler,
#endif
.name = DRIVER_NAME,
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_irq.c
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_irq.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_irq.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_irq.c
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_irq.c
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_irq.c
@@ -205,21 +205,11 @@ int vbox_irq_init(struct vbox_private *v
{
INIT_WORK(&vbox->hotplug_work, vbox_hotplug_worker);
@@ -78,20 +73,28 @@
-#endif
flush_work(&vbox->hotplug_work);
}
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_ttm.c
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -320,7 +320,7 @@ static struct ttm_tt *vbox_ttm_tt_create
- if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
- #elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
- if (ttm_tt_init(tt, bo, page_flags)) {
--#elif RTLNX_VER_MAX(5,19,0)
-+#elif RTLNX_VER_MAX(5,14,0)
- if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) {
- #else
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c
+@@ -321,16 +321,7 @@ static struct ttm_tt *vbox_ttm_tt_create
+ #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
+ tt->func = &vbox_tt_backend_func;
+ #endif
+-#if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) {
-@@ -622,11 +622,7 @@ int vbox_bo_create(struct drm_device *de
+-#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99)
+- if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) {
+-#elif RTLNX_VER_MIN(4,17,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) ||
RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
+- if (ttm_tt_init(tt, bo, page_flags)) {
+-#else
+- if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
+-#endif
+-
+ kfree(tt);
+ return NULL;
+ }
+@@ -628,11 +619,7 @@ int vbox_bo_create(struct drm_device *de
drm_vma_node_reset(&vboxbo->bo.base.vma_node);
#endif
@@ -103,17 +106,52 @@
ttm_bo_type_device, &vboxbo->placement,
#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) &&
!defined(SUSE_SLE12)
align >> PAGE_SHIFT, false, NULL, acc_size,
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_mode.c
+Index: VirtualBox-7.0.8/src/libs/openssl-3.0.7/Config.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -46,9 +46,7 @@
- # include <drm/drm_probe_helper.h>
- #endif
+--- VirtualBox-7.0.8.orig/src/libs/openssl-3.0.7/Config.kmk
++++ VirtualBox-7.0.8/src/libs/openssl-3.0.7/Config.kmk
+@@ -247,9 +247,6 @@ ifneq ($(KBUILD_TARGET),win)
+ TEMPLATE_LibCrypto_ASFLAGS.amd64 = -m64
+ TEMPLATE_LibCrypto_ASDEFS = $(NO_SUCH_VARIABLE)
+ TEMPLATE_LibCrypto_ASDEFS.darwin = OPENSSL_MANGLE_ASM
+- if "$(VBOX_AS_VERSION)" != "" && "$(VBOX_AS_VERSION)" vlt "GNU assembler
version 2.20"
+- TEMPLATE_LibCrypto_ASFLAGS.solaris = -include
$(VBOX_PATH_OPENSSL)/crypto/old-solaris-asm-trick.h
+- endif
+ endif
--#if RTLNX_VER_MIN(6,0,0)
- # include <drm/drm_edid.h>
+ TEMPLATE_LibCrypto_DEFS = \
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_fb.c
+===================================================================
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_fb.c
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_fb.c
+@@ -47,6 +47,7 @@
+ #include <drm/drm_crtc.h>
+ #include <drm/drm_fb_helper.h>
+ #include <drm/drm_crtc_helper.h>
++#include <drm/drm_framebuffer.h>
+
+ #include <VBoxVideo.h>
+
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_mode.c
+===================================================================
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_mode.c
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_mode.c
+@@ -39,10 +39,8 @@
+ #include "vbox_drv.h"
+ #include <linux/export.h>
+ #include <drm/drm_crtc_helper.h>
+-#if RTLNX_VER_MIN(6,3,0)
+ # include <drm/drm_modeset_helper_vtables.h>
+ # include <drm/drm_modeset_helper.h>
-#endif
+ #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
+ # include <drm/drm_plane_helper.h>
+ #endif
+@@ -53,6 +51,7 @@
+ #if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
+ # include <drm/drm_edid.h>
+ #endif
++#include <drm/drm_edid.h>
#include "VBoxVideo.h"
++++++ fixes_for_makefile.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.675082112 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.679082136 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/HostDrivers/linux/Makefile
+Index: VirtualBox-7.0.8/src/VBox/HostDrivers/linux/Makefile
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/HostDrivers/linux/Makefile
-+++ VirtualBox-7.0.6/src/VBox/HostDrivers/linux/Makefile
+--- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/linux/Makefile
++++ VirtualBox-7.0.8/src/VBox/HostDrivers/linux/Makefile
@@ -43,11 +43,8 @@ obj-m = vboxdrv/
obj-m += vboxnetflt/
endif
@@ -140,10 +140,10 @@
if test -f $$module.ko; then \
echo "Installing $$module module"; \
$(SUDO) /sbin/insmod $$module.ko; \
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/Makefile
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/Makefile
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/Makefile
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/Makefile
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/Makefile
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/Makefile
@@ -34,6 +34,7 @@ obj-m = vboxguest/ vboxsf/ vboxvideo/
else # ! KERNELRELEASE
@@ -184,10 +184,10 @@
$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo install; \
fi
-Index: VirtualBox-7.0.6/include/iprt/x86.h
+Index: VirtualBox-7.0.8/include/iprt/x86.h
===================================================================
---- VirtualBox-7.0.6.orig/include/iprt/x86.h
-+++ VirtualBox-7.0.6/include/iprt/x86.h
+--- VirtualBox-7.0.8.orig/include/iprt/x86.h
++++ VirtualBox-7.0.8/include/iprt/x86.h
@@ -894,37 +894,59 @@ typedef const X86CPUIDFEATEDX *PCX86CPUI
* reserved flags.
* @{ */
@@ -793,10 +793,10 @@
/** SMM MSRs. */
#define MSR_K7_SMBASE UINT32_C(0xc0010111)
-Index: VirtualBox-7.0.6/include/VBox/vmm/hm_vmx.h
+Index: VirtualBox-7.0.8/include/VBox/vmm/hm_vmx.h
===================================================================
---- VirtualBox-7.0.6.orig/include/VBox/vmm/hm_vmx.h
-+++ VirtualBox-7.0.6/include/VBox/vmm/hm_vmx.h
+--- VirtualBox-7.0.8.orig/include/VBox/vmm/hm_vmx.h
++++ VirtualBox-7.0.8/include/VBox/vmm/hm_vmx.h
@@ -1633,7 +1633,9 @@ AssertCompileSize(VMXABORT, 4);
/** VMCS (and related regions) memory type - Uncacheable. */
#define VMX_BASIC_MEM_TYPE_UC 0
@@ -807,10 +807,10 @@
/** 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.6/src/VBox/Additions/linux/drm/vbox_drv.h
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.h
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -87,6 +87,12 @@
#else
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
++++++ fixes_for_python.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.691082206 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.695082229 +0200
@@ -6,10 +6,10 @@
Larry Finger
-Index: VirtualBox-7.0.6/src/VBox/Frontends/VBoxShell/vboxshell.py
+Index: VirtualBox-7.0.8/src/VBox/Frontends/VBoxShell/vboxshell.py
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
-+++ VirtualBox-7.0.6/src/VBox/Frontends/VBoxShell/vboxshell.py
+--- VirtualBox-7.0.8.orig/src/VBox/Frontends/VBoxShell/vboxshell.py
++++ VirtualBox-7.0.8/src/VBox/Frontends/VBoxShell/vboxshell.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
++++++ fixes_for_qt5.13.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.707082299 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.711082322 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/include/VBox/VBoxGL2D.h
+Index: VirtualBox-7.0.8/include/VBox/VBoxGL2D.h
===================================================================
---- VirtualBox-7.0.6.orig/include/VBox/VBoxGL2D.h
-+++ VirtualBox-7.0.6/include/VBox/VBoxGL2D.h
+--- VirtualBox-7.0.8.orig/include/VBox/VBoxGL2D.h
++++ VirtualBox-7.0.8/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 @@
#endif
#ifndef GL_READ_ONLY
-Index:
VirtualBox-7.0.6/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
+Index:
VirtualBox-7.0.8/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
-+++ VirtualBox-7.0.6/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
+---
VirtualBox-7.0.8.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/include/GL/glext.h
++++ VirtualBox-7.0.8/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,58 +28,10 @@
typedef khronos_intptr_t GLintptr;
#define GL_BUFFER_SIZE 0x8764
#define GL_BUFFER_USAGE 0x8765
-Index:
VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
+Index: VirtualBox-7.0.8/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
-+++
VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h
-@@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe
- #ifndef GL_VERSION_1_5
- #define GL_VERSION_1_5 1
- #include <stddef.h>
-+#if __BITS_PER_LONG != 64
- typedef ptrdiff_t GLsizeiptr;
-+#else
-+typedef long int GLsizeiptr;
-+#endif
- typedef ptrdiff_t GLintptr;
- #define GL_BUFFER_SIZE 0x8764
- #define GL_BUFFER_USAGE 0x8765
-Index:
VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
-===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
-+++ VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h
-@@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe
- #ifndef GL_VERSION_1_5
- #define GL_VERSION_1_5 1
- #include <stddef.h>
-+#if __BITS_PER_LONG != 64
- typedef ptrdiff_t GLsizeiptr;
-+#else
-+typedef long int GLsizeiptr;
-+#endif
- typedef ptrdiff_t GLintptr;
- #define GL_BUFFER_SIZE 0x8764
- #define GL_BUFFER_USAGE 0x8765
-Index: VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
-===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
-+++ VirtualBox-7.0.6/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h
-@@ -3708,7 +3708,11 @@ typedef char GLchar; /* native
charact
- #ifndef GL_VERSION_1_5
- /* GL types for handling large vertex buffer objects */
- typedef ptrdiff_t GLintptr;
-+#if __BITS_PER_LONG != 64
- typedef ptrdiff_t GLsizeiptr;
-+#else
-+typedef long int GLsizeiptr;
-+#endif
- #endif
-
- #ifndef GL_ARB_vertex_buffer_object
-Index: VirtualBox-7.0.6/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
-===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
-+++ VirtualBox-7.0.6/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
+--- VirtualBox-7.0.8.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
++++ VirtualBox-7.0.8/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);
++++++ fixes_for_sle12.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.723082392 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.727082415 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.c
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.c
++++ VirtualBox-7.0.8/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,11 +12,11 @@
# endif
#endif
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_main.c
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_main.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_main.c
-@@ -622,11 +622,13 @@ int vbox_dumb_destroy(struct drm_file *f
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_main.c
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_main.c
+@@ -626,11 +626,13 @@ int vbox_dumb_destroy(struct drm_file *f
#endif
#if RTLNX_VER_MAX(4,19,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) &&
!RTLNX_RHEL_MAJ_PREREQ(8,1) && !RTLNX_SUSE_MAJ_PREREQ(15,1) &&
!RTLNX_SUSE_MAJ_PREREQ(12,5)
@@ -30,11 +30,11 @@
void vbox_gem_free_object(struct drm_gem_object *obj)
{
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_ttm.c
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -297,7 +297,7 @@ static struct ttm_backend_func vbox_tt_b
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c
+@@ -302,7 +302,7 @@ static struct ttm_backend_func vbox_tt_b
};
#endif
@@ -43,16 +43,7 @@
static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
unsigned long size,
u32 page_flags,
-@@ -316,7 +316,7 @@ static struct ttm_tt *vbox_ttm_tt_create
- #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
- tt->func = &vbox_tt_backend_func;
- #endif
--#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
-+#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) &&
!defined(SUSE_SLE12)
- if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
- #elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
- if (ttm_tt_init(tt, bo, page_flags)) {
-@@ -333,7 +333,7 @@ static struct ttm_tt *vbox_ttm_tt_create
+@@ -339,7 +339,7 @@ static struct ttm_tt *vbox_ttm_tt_create
}
#if RTLNX_VER_MAX(4,17,0)
@@ -61,7 +52,7 @@
static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
{
return ttm_pool_populate(ttm);
-@@ -387,7 +387,7 @@ static struct ttm_bo_driver vbox_bo_driv
+@@ -393,7 +393,7 @@ static struct ttm_bo_driver vbox_bo_driv
.io_mem_reserve = &vbox_ttm_io_mem_reserve,
.io_mem_free = &vbox_ttm_io_mem_free,
#if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
@@ -70,7 +61,7 @@
.io_mem_pfn = ttm_bo_default_io_mem_pfn,
# endif
#endif
-@@ -628,7 +628,7 @@ int vbox_bo_create(struct drm_device *de
+@@ -634,7 +634,7 @@ int vbox_bo_create(struct drm_device *de
ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
#endif /* < 6.1.0 */
ttm_bo_type_device, &vboxbo->placement,
@@ -79,7 +70,7 @@
align >> PAGE_SHIFT, false, NULL, acc_size,
#elif RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_RANGE(8,6, 8,99) /* < 5.13.0, <
RHEL(8.6, 8.99) */
align >> PAGE_SHIFT, false, acc_size,
-@@ -670,7 +670,7 @@ static inline u64 vbox_bo_gpu_offset(str
+@@ -676,7 +676,7 @@ static inline u64 vbox_bo_gpu_offset(str
int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr)
{
@@ -88,7 +79,7 @@
struct ttm_operation_ctx ctx = { false, false };
#endif
int ret;
-@@ -693,7 +693,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
+@@ -699,7 +699,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
#endif
@@ -97,7 +88,7 @@
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
#else
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-@@ -715,7 +715,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
+@@ -721,7 +721,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32
int vbox_bo_unpin(struct vbox_bo *bo)
{
@@ -106,7 +97,7 @@
# if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
struct ttm_operation_ctx ctx = { false, false };
# endif
-@@ -738,7 +738,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
+@@ -744,7 +744,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
#endif
@@ -115,7 +106,7 @@
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
#elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-@@ -761,7 +761,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
+@@ -767,7 +767,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
*/
int vbox_bo_push_sysram(struct vbox_bo *bo)
{
@@ -124,7 +115,7 @@
struct ttm_operation_ctx ctx = { false, false };
# endif
int i, ret;
-@@ -782,7 +782,7 @@ int vbox_bo_push_sysram(struct vbox_bo *
+@@ -788,7 +788,7 @@ int vbox_bo_push_sysram(struct vbox_bo *
for (i = 0; i < bo->placement.num_placement; i++)
PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
@@ -133,10 +124,10 @@
ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
# else
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_drv.h
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.h
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -87,6 +87,9 @@
#else
# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
@@ -147,11 +138,11 @@
/** @def RTLNX_RHEL_RANGE
* Check that it's a RedHat kernel in the given version range.
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_mode.c
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_mode.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -552,7 +552,8 @@ static void vbox_set_edid(struct drm_con
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/drm/vbox_mode.c
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/drm/vbox_mode.c
+@@ -556,7 +556,8 @@ static void vbox_set_edid(struct drm_con
for (i = 0; i < EDID_SIZE - 1; ++i)
sum += edid[i];
edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
@@ -161,7 +152,7 @@
drm_connector_update_edid_property(connector, (struct edid *)edid);
#else
drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
-@@ -727,7 +728,7 @@ static int vbox_connector_init(struct dr
+@@ -731,7 +732,7 @@ static int vbox_connector_init(struct dr
drm_connector_register(connector);
#endif
++++++ gcc5-real-support.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.739082485 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.743082509 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/configure
+Index: VirtualBox-7.0.8/configure
===================================================================
---- VirtualBox-7.0.6.orig/configure
-+++ VirtualBox-7.0.6/configure
+--- VirtualBox-7.0.8.orig/configure
++++ VirtualBox-7.0.8/configure
@@ -473,8 +473,13 @@ check_gcc()
log_failure "cannot execute '$CXX -dumpversion'"
fail really
++++++ handle_gsoap_208103.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.751082556 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.755082578 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/Main/webservice/vboxweb.cpp
+Index: VirtualBox-7.0.8/src/VBox/Main/webservice/vboxweb.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Main/webservice/vboxweb.cpp
-+++ VirtualBox-7.0.6/src/VBox/Main/webservice/vboxweb.cpp
+--- VirtualBox-7.0.8.orig/src/VBox/Main/webservice/vboxweb.cpp
++++ VirtualBox-7.0.8/src/VBox/Main/webservice/vboxweb.cpp
@@ -955,9 +955,9 @@ static void doQueuesLoop()
continue; // timeout, not necessary to bother gsoap
// r < 0, errno
++++++ modify_for_4_8_bo_move.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.767082648 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.771082672 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+Index: VirtualBox-7.0.8/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
-+++ VirtualBox-7.0.6/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+--- VirtualBox-7.0.8.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
++++ VirtualBox-7.0.8/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -45,7 +45,7 @@
#include <iprt/assert.h>
#include <iprt/errcore.h>
++++++ remove_vbox_video_build.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.783082741 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.787082765 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/Makefile.kmk
+Index: VirtualBox-7.0.8/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/Makefile.kmk
-+++ VirtualBox-7.0.6/Makefile.kmk
+--- VirtualBox-7.0.8.orig/Makefile.kmk
++++ VirtualBox-7.0.8/Makefile.kmk
@@ -824,7 +824,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \
src/VBox/Additions/x11/vboxmouse \
src/VBox/Additions/x11/vboxmouse/xorg70 \
@@ -10,10 +10,10 @@
src/VBox/NetworkServices \
src/VBox/NetworkServices/Dhcpd \
src/VBox/NetworkServices/NAT \
-Index: VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
++++ VirtualBox-7.0.8/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -404,7 +404,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s
vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES)
vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS)
@@ -24,10 +24,10 @@
# 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.6/src/VBox/Additions/x11/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/Additions/x11/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/Additions/x11/Makefile.kmk
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/x11/Makefile.kmk
++++ VirtualBox-7.0.8/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
++++++ security_fixes.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.799082835 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.803082858 +0200
@@ -5,11 +5,11 @@
#
# January 31, 2019 - Larry Finger
#
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd.sh
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/installer/vboxadd.sh
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd.sh
-@@ -890,9 +890,11 @@ dmnstatus()
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/installer/vboxadd.sh
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh
+@@ -1109,9 +1109,11 @@ dmnstatus()
fi
}
@@ -24,11 +24,11 @@
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.6/src/VBox/Installer/linux/vboxdrv.sh
+Index: VirtualBox-7.0.8/src/VBox/Installer/linux/vboxdrv.sh
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Installer/linux/vboxdrv.sh
-+++ VirtualBox-7.0.6/src/VBox/Installer/linux/vboxdrv.sh
-@@ -47,6 +47,9 @@ DEVICE=/dev/vboxdrv
+--- VirtualBox-7.0.8.orig/src/VBox/Installer/linux/vboxdrv.sh
++++ VirtualBox-7.0.8/src/VBox/Installer/linux/vboxdrv.sh
+@@ -48,6 +48,9 @@ DEVICE=/dev/vboxdrv
MODPROBE=/sbin/modprobe
SCRIPTNAME=vboxdrv.sh
++++++ smap.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.815082928 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.819082951 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+Index: VirtualBox-7.0.8/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
-+++ VirtualBox-7.0.6/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+--- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
++++ VirtualBox-7.0.8/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
@@ -61,6 +61,12 @@
# include <iprt/power.h>
# define VBOX_WITH_SUSPEND_NOTIFICATION
++++++ turn_off_cloud_net.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.831083021 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.835083044 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/Config.kmk
+Index: VirtualBox-7.0.8/Config.kmk
===================================================================
---- VirtualBox-7.0.6.orig/Config.kmk
-+++ VirtualBox-7.0.6/Config.kmk
+--- VirtualBox-7.0.8.orig/Config.kmk
++++ VirtualBox-7.0.8/Config.kmk
@@ -972,11 +972,9 @@ if1of ($(KBUILD_TARGET), freebsd linux)
endif
# Use new VBoxNetDhcpd instead of old VBoxNetDHCP
++++++ vbox-default-os-type.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.859083185 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.863083207 +0200
@@ -1,7 +1,7 @@
-Index:
VirtualBox-7.0.6/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
+Index:
VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
-+++
VirtualBox-7.0.6/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
+---
VirtualBox-7.0.8.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
++++
VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
@@ -397,15 +397,15 @@ void UINameAndSystemEditor::sltFamilyCha
if (iIndexWin10 != -1)
m_pComboType->setCurrentIndex(iIndexWin10);
++++++ vbox-deprec-gsoap-service-proxies.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.875083277 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.879083301 +0200
@@ -1,14 +1,14 @@
-Index: VirtualBox-7.0.6/src/VBox/Main/webservice/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/Main/webservice/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Main/webservice/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/Main/webservice/Makefile.kmk
-@@ -848,7 +848,7 @@ $(if-expr !defined(VBOX_WITHOUT_NOINLINE
- $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
+--- VirtualBox-7.0.8.orig/src/VBox/Main/webservice/Makefile.kmk
++++ VirtualBox-7.0.8/src/VBox/Main/webservice/Makefile.kmk
+@@ -848,7 +848,7 @@ ifdef VBOX_GSOAP_INSTALLED
+ $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
$(RM) -f $@
- $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2)
$(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT)
$(GSOAPH_RELEVANT)
+ $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2)
$(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT)
$(GSOAPH_RELEVANT)
- ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
+ ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
$(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
$(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output
"$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
++++++ vbox-disable-updates.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.891083370 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.895083394 +0200
@@ -1,7 +1,7 @@
-Index:
VirtualBox-7.0.6/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+Index:
VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++
VirtualBox-7.0.6/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+---
VirtualBox-7.0.8.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++
VirtualBox-7.0.8/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -98,8 +98,6 @@ void UISettingsDialogGlobal::retranslate
m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
++++++ vbox-fpie.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.903083440 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.907083464 +0200
@@ -1,25 +1,25 @@
-Index: VirtualBox-7.0.6/Config.kmk
+Index: VirtualBox-7.0.8/Config.kmk
===================================================================
---- VirtualBox-7.0.6.orig/Config.kmk
-+++ VirtualBox-7.0.6/Config.kmk
-@@ -6770,6 +6770,9 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.darwi
+--- VirtualBox-7.0.8.orig/Config.kmk
++++ VirtualBox-7.0.8/Config.kmk
+@@ -6749,6 +6749,9 @@ TEMPLATE_VBoxR3HardenedExe_LDFLAGS.darwi
ifeq ($(KBUILD_TARGET),linux)
- # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
- # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
+ # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
+ # TEMPLATE_VBoxR3HardenedExe_LIBS += cap
+ TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS.linux =
$(TEMPLATE_VBOXR3EXE_CXXFLAGS.linux) -fPIE
+ TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS.linux = $(TEMPLATE_VBOXR3EXE_CFLAGS.linux)
-fPIE
+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux =
$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux) -pie
endif
ifeq ($(KBUILD_TARGET),win) # No CRT!
- TEMPLATE_VBOXR3HARDENEDEXE_SDKS = VBOX_NTDLL
$(TEMPLATE_VBOXR3EXE_SDKS)
-@@ -6802,8 +6805,8 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
- TEMPLATE_VBOXR3HARDENEDEXE_VBOX_IMPORT_CHECKER.win = noimports
+ TEMPLATE_VBoxR3HardenedExe_SDKS = VBoxNtDll
$(TEMPLATE_VBoxR3Exe_SDKS)
+@@ -6781,8 +6784,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.
-- TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out
'$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
-- TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out
$(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
-+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out
'$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) -pie
-+ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out
$(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) -pie
+- TEMPLATE_VBoxR3HardenedExe_LDFLAGS = $(filter-out
'$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3Exe_LDFLAGS))
+- TEMPLATE_VBoxR3HardenedExe_LDFLAGS.linux = $(filter-out
$(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3Exe_LDFLAGS.linux))
++ TEMPLATE_VBoxR3HardenedExe_LDFLAGS = $(filter-out
'$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3Exe_LDFLAGS)) -pie
++ TEMPLATE_VBoxR3HardenedExe_LDFLAGS.linux = $(filter-out
$(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3Exe_LDFLAGS.linux)) -pie
endif
endif
++++++ vbox-gsoapssl-deps.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.919083533 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.923083557 +0200
@@ -1,21 +1,41 @@
-Index: VirtualBox-7.0.6/src/VBox/Main/webservice/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/Main/webservice/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Main/webservice/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/Main/webservice/Makefile.kmk
-@@ -410,6 +410,7 @@ ifdef VBOX_GSOAP_INSTALLED
- vboxwebsrv_LIBS += \
- $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
- $(VBOX_GSOAP_CXX_LIBS) \
+--- VirtualBox-7.0.8.orig/src/VBox/Main/webservice/Makefile.kmk
++++ VirtualBox-7.0.8/src/VBox/Main/webservice/Makefile.kmk
+@@ -412,11 +412,12 @@ ifdef VBOX_GSOAP_INSTALLED
+ endif
+ endif
+ vboxwebsrv_LIBS += \
+- $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
+- $(VBOX_GSOAP_CXX_LIBS) \
+- $(LIB_RUNTIME)
+- vboxwebsrv_LIBS.solaris += socket nsl
+- ifdef VBOX_WITH_WEBSERVICES_SSL
++ $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
++ $(VBOX_GSOAP_CXX_LIBS) \
+ ssl crypto z \
- $(LIB_RUNTIME)
- vboxwebsrv_LIBS.solaris += socket nsl
- ifdef VBOX_WITH_WEBSERVICES_SSL
-@@ -586,6 +587,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) |
- webtest_LIBS += \
- $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
- $(VBOX_GSOAP_CXX_LIBS) \
++ $(LIB_RUNTIME)
++ vboxwebsrv_LIBS.solaris += socket nsl
++ ifdef VBOX_WITH_WEBSERVICES_SSL
+ vboxwebsrv_DEFS += WITH_OPENSSL
+ vboxwebsrv_SDKS += VBoxOpenSsl
+ endif
+@@ -588,11 +589,12 @@ ifdef VBOX_GSOAP_INSTALLED
+ $(VBOXWEB_OUT_DIR) \
+ .
+ webtest_LIBS += \
+- $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
+- $(VBOX_GSOAP_CXX_LIBS) \
+- $(LIB_RUNTIME)
+- webtest_LIBS.solaris += nsl
+- ifdef VBOX_WITH_WEBSERVICES_SSL
++ $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
++ $(VBOX_GSOAP_CXX_LIBS) \
+ ssl crypto z \
- $(LIB_RUNTIME)
- webtest_LIBS.solaris += nsl
- ifdef VBOX_WITH_WEBSERVICES_SSL
++ $(LIB_RUNTIME)
++ webtest_LIBS.solaris += nsl
++ ifdef VBOX_WITH_WEBSERVICES_SSL
+ webtest_DEFS += WITH_OPENSSL
+ webtest_SDKS += VBoxOpenSsl
+ endif
++++++ vbox-no-build-dates.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.939083650 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.943083674 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+Index: VirtualBox-7.0.8/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
-+++ VirtualBox-7.0.6/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+--- VirtualBox-7.0.8.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
++++ VirtualBox-7.0.8/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
printf("VirtualBox DirectFB GUI built %s %s\n"
@@ -9,13 +9,13 @@
- "Copyright (C) 2004-2005 secunet Security Networks AG\n",
__DATE__, __TIME__);
+ "Copyright (C) 2004-2005 secunet Security Networks AG\n");
- for (;;)
- {
-Index: VirtualBox-7.0.6/src/VBox/Runtime/common/string/uniread.cpp
+ fputs("\nWARNING! Unmaintained code.\nWARNING! Needs fixing &
debugging!\n\n", stdout);
+
+Index: VirtualBox-7.0.8/src/VBox/Runtime/common/string/uniread.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Runtime/common/string/uniread.cpp
-+++ VirtualBox-7.0.6/src/VBox/Runtime/common/string/uniread.cpp
-@@ -1046,7 +1046,7 @@ int PrintHeader(const char *argv0, const
+--- VirtualBox-7.0.8.orig/src/VBox/Runtime/common/string/uniread.cpp
++++ VirtualBox-7.0.8/src/VBox/Runtime/common/string/uniread.cpp
+@@ -1049,7 +1049,7 @@ int PrintHeader(const char *argv0, const
" * IPRT - Unicode Tables.\n"
" *\n"
" * Automatically Generated from %s\n"
@@ -24,10 +24,10 @@
" */\n"
"\n"
"/*\n"
-Index: VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
++++ VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@@ -50,10 +50,10 @@
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
-Index: VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
++++ VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
@@ -44,16 +44,10 @@
#ifndef XP_MAC
#include "_pr_bld.h"
@@ -73,10 +73,10 @@
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
-Index: VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
++++ VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@@ -99,10 +99,10 @@
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
-Index: VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
++++ VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@@ -125,10 +125,10 @@
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
-Index:
VirtualBox-7.0.6/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+Index:
VirtualBox-7.0.8/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
-+++ VirtualBox-7.0.6/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+---
VirtualBox-7.0.8.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
++++ VirtualBox-7.0.8/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 @@
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
-Index: VirtualBox-7.0.6/src/VBox/Devices/PC/BIOS/bios.c
+Index: VirtualBox-7.0.8/src/VBox/Devices/PC/BIOS/bios.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Devices/PC/BIOS/bios.c
-+++ VirtualBox-7.0.6/src/VBox/Devices/PC/BIOS/bios.c
+--- VirtualBox-7.0.8.orig/src/VBox/Devices/PC/BIOS/bios.c
++++ VirtualBox-7.0.8/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 @@
//--------------------------------------------------------------------------
// print_bios_banner
// displays a the bios version
-Index: VirtualBox-7.0.6/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+Index: VirtualBox-7.0.8/src/VBox/Additions/common/VBoxService/VBoxService.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
-+++ VirtualBox-7.0.6/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
++++ VirtualBox-7.0.8/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 @@
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp,
sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
-Index: VirtualBox-7.0.6/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+--- VirtualBox-7.0.8.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
++++ VirtualBox-7.0.8/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 @@
# Clean up
$(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/
-Index: VirtualBox-7.0.6/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/ExtPacks/Skeleton/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+--- VirtualBox-7.0.8.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
++++ VirtualBox-7.0.8/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 @@
# Clean up
$(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/
-Index: VirtualBox-7.0.6/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+--- VirtualBox-7.0.8.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
++++ VirtualBox-7.0.8/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 @@
# Clean up
$(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/
-Index: VirtualBox-7.0.6/src/VBox/ExtPacks/VNC/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/ExtPacks/VNC/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/ExtPacks/VNC/Makefile.kmk
+--- VirtualBox-7.0.8.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
++++ VirtualBox-7.0.8/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 @@
# Clean up
$(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/
-Index: VirtualBox-7.0.6/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+Index: VirtualBox-7.0.8/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
-+++ VirtualBox-7.0.6/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
++++ VirtualBox-7.0.8/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
@@ -329,7 +329,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv
}
VGDrvCommonInitLoggers();
@@ -229,10 +229,10 @@
/*
* Check if the NT version is supported and initialize g_enmVGDrvNtVer.
-Index:
VirtualBox-7.0.6/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+Index:
VirtualBox-7.0.8/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+---
VirtualBox-7.0.8.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
++++ VirtualBox-7.0.8/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 @@
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp,
sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
-Index: VirtualBox-7.0.6/src/VBox/Additions/solaris/Mouse/vboxms.c
+Index: VirtualBox-7.0.8/src/VBox/Additions/solaris/Mouse/vboxms.c
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/solaris/Mouse/vboxms.c
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
++++ VirtualBox-7.0.8/src/VBox/Additions/solaris/Mouse/vboxms.c
@@ -266,7 +266,7 @@ static VBMSSTATE g_OpenNodeSt
int _init(void)
{
@@ -255,10 +255,10 @@
mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL);
/*
* Prevent module autounloading.
-Index:
VirtualBox-7.0.6/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+Index:
VirtualBox-7.0.8/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
-+++
VirtualBox-7.0.6/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+---
VirtualBox-7.0.8.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
++++
VirtualBox-7.0.8/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 @@
Usage ();
return -1;
}
-Index: VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+Index: VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
-+++ VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+--- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
++++ VirtualBox-7.0.8/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 @@
NTSTATUS Status = vboxUsbRtGlobalsInit();
Assert(Status == STATUS_SUCCESS);
-Index: VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+Index: VirtualBox-7.0.8/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
-+++ VirtualBox-7.0.6/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+--- VirtualBox-7.0.8.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
++++ VirtualBox-7.0.8/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 @@
memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals));
-Index: VirtualBox-7.0.6/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+Index: VirtualBox-7.0.8/src/VBox/Main/glue/VBoxLogRelCreate.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
-+++ VirtualBox-7.0.6/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+--- VirtualBox-7.0.8.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
++++ VirtualBox-7.0.8/src/VBox/Main/glue/VBoxLogRelCreate.cpp
@@ -71,7 +71,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
#endif
"Log opened %s\n",
@@ -320,10 +320,10 @@
pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp,
sizeof(szTmp));
-Index: VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
++++ VirtualBox-7.0.8/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 @@
printf("Depend.c build time is %s %s\n", buildDate, buildTime);
-Index:
VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+Index:
VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
===================================================================
----
VirtualBox-7.0.6.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
-+++
VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+---
VirtualBox-7.0.8.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
++++
VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
@@ -458,7 +458,7 @@ int
main()
{
@@ -346,10 +346,10 @@
#ifdef TEST_STD_STRING
cout << "Testing std::string." << endl;
#else
-Index:
VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+Index:
VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
===================================================================
----
VirtualBox-7.0.6.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
-+++
VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+---
VirtualBox-7.0.8.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
++++
VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
@@ -425,7 +425,7 @@ int
main()
{
@@ -359,10 +359,10 @@
#if 0
{
-Index: VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
++++ VirtualBox-7.0.8/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
@@ -102,7 +102,7 @@ class test_message
public:
test_message()
@@ -372,10 +372,10 @@
}
~test_message()
-Index:
VirtualBox-7.0.6/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
+Index:
VirtualBox-7.0.8/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
-+++ VirtualBox-7.0.6/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
+---
VirtualBox-7.0.8.orig/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/util/build_id.c
++++ VirtualBox-7.0.8/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 @@
#ifndef ElfW
#define ElfW(type) Elf_##type
-Index: VirtualBox-7.0.6/src/VBox/Additions/x11/VBoxClient/logging.cpp
+Index: VirtualBox-7.0.8/src/VBox/Additions/x11/VBoxClient/logging.cpp
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
-+++ VirtualBox-7.0.6/src/VBox/Additions/x11/VBoxClient/logging.cpp
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
++++ VirtualBox-7.0.8/src/VBox/Additions/x11/VBoxClient/logging.cpp
@@ -328,10 +328,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
case RTLOGPHASE_BEGIN:
{
++++++ vbox-permissions_warning.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.955083743 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.959083766 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/apps/Makefile.kmk
+Index: VirtualBox-7.0.8/src/apps/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/apps/Makefile.kmk
-+++ VirtualBox-7.0.6/src/apps/Makefile.kmk
+--- VirtualBox-7.0.8.orig/src/apps/Makefile.kmk
++++ VirtualBox-7.0.8/src/apps/Makefile.kmk
@@ -28,5 +28,7 @@
SUB_DEPTH = ../..
include $(KBUILD_PATH)/subheader.kmk
@@ -10,10 +10,10 @@
+
include $(FILE_KBUILD_SUB_FOOTER)
-Index: VirtualBox-7.0.6/src/apps/VBoxPermissionMessage/Makefile.kmk
+Index: VirtualBox-7.0.8/src/apps/VBoxPermissionMessage/Makefile.kmk
===================================================================
--- /dev/null
-+++ VirtualBox-7.0.6/src/apps/VBoxPermissionMessage/Makefile.kmk
++++ VirtualBox-7.0.8/src/apps/VBoxPermissionMessage/Makefile.kmk
@@ -0,0 +1,32 @@
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+## @file
@@ -38,7 +38,7 @@
+
+PROGRAMS += VBoxPermissionMessage
+
-+VBoxPermissionMessage_TEMPLATE = VBOXQTGUIEXE
++VBoxPermissionMessage_TEMPLATE = VBoxQtGuiExe
+VBoxPermissionMessage_SOURCES = VBoxPermissionMessage.cpp
+VBoxPermissionMessage_QT_MODULES = Core Gui
+VBoxPermissionMessage_QT_MODULES += Widgets
@@ -47,10 +47,10 @@
+
+include $(KBUILD_PATH)/subfooter.kmk
+
-Index:
VirtualBox-7.0.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
+Index:
VirtualBox-7.0.8/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
===================================================================
--- /dev/null
-+++ VirtualBox-7.0.6/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
++++ VirtualBox-7.0.8/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
@@ -0,0 +1,12 @@
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
++++++ vbox-python-py310.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.971083837 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.975083859 +0200
@@ -1,13 +1,15 @@
# https://www.virtualbox.org/changeset/90537/vbox
-Index: VirtualBox-7.0.6/src/libs/xpcom18a4/python/Makefile.kmk
+Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/Makefile.kmk
-+++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/Makefile.kmk
-@@ -703,6 +703,52 @@ VBoxPython3_10m_x86_LIBS = $(VBOX_
- endif
- endif
-
+--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/Makefile.kmk
++++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/Makefile.kmk
+@@ -663,11 +663,57 @@ ifndef VBOX_ONLY_SDK
+ VBoxPython3_10m_x86_LIBS = $(VBOX_PYTHON310M_LIB_X86)
+ endif
+ endif
++endif
++
+ifdef VBOX_PYTHON310_INC
+#
+# Python 3.10 version
@@ -27,10 +29,13 @@
+VBoxPython3_10_x86_TEMPLATE = XPCOM
+VBoxPython3_10_x86_INCS = $(VBOX_PYTHON310_INC)
+VBoxPython3_10_x86_LIBS = $(VBOX_PYTHON310_LIB_X86)
-+ endif
+ endif
+ endif
+endif
-+
+
+- ifdef VBOX_PYTHONDEF_INC
+- #
+- # Python without versioning
+ifdef VBOX_PYTHON310M_INC
+#
+# Python 3.10 version with pymalloc
@@ -54,7 +59,10 @@
+ endif
+endif
+
- ifdef VBOX_PYTHONDEF_INC
- #
- # Python without versioning
++ifdef VBOX_PYTHONDEF_INC
++#
++# Python without versioning
+ #
+ DLLS += VBoxPython
+ VBoxPython_EXTENDS = VBoxPythonBase
++++++ vbox-suid-warning.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:25.995083976 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:25.999084000 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/apps/Makefile.kmk
+Index: VirtualBox-7.0.8/src/apps/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/apps/Makefile.kmk
-+++ VirtualBox-7.0.6/src/apps/Makefile.kmk
+--- VirtualBox-7.0.8.orig/src/apps/Makefile.kmk
++++ VirtualBox-7.0.8/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 @@
+
include $(FILE_KBUILD_SUB_FOOTER)
-Index: VirtualBox-7.0.6/src/apps/VBoxSUIDMessage/Makefile.kmk
+Index: VirtualBox-7.0.8/src/apps/VBoxSUIDMessage/Makefile.kmk
===================================================================
--- /dev/null
-+++ VirtualBox-7.0.6/src/apps/VBoxSUIDMessage/Makefile.kmk
++++ VirtualBox-7.0.8/src/apps/VBoxSUIDMessage/Makefile.kmk
@@ -0,0 +1,33 @@
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+## @file
@@ -38,7 +38,7 @@
+
+PROGRAMS += VBoxSUIDMessage
+
-+VBoxSUIDMessage_TEMPLATE = VBOXQTGUIEXE
++VBoxSUIDMessage_TEMPLATE = VBoxQtGuiExe
+VBoxSUIDMessage_SOURCES = VBoxSUIDMessage.cpp
+VBoxSUIDMessage_QT_MODULES = Core Gui
+VBoxSUIDMessage_QT_MODULES += Widgets
@@ -48,10 +48,10 @@
+include $(KBUILD_PATH)/subfooter.kmk
+
+
-Index: VirtualBox-7.0.6/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
+Index: VirtualBox-7.0.8/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
===================================================================
--- /dev/null
-+++ VirtualBox-7.0.6/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
++++ VirtualBox-7.0.8/src/apps/VBoxSUIDMessage/VBoxSUIDMessage.cpp
@@ -0,0 +1,15 @@
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
++++++ vbox-usb-warning.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:26.007084046 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:26.015084093 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/apps/Makefile.kmk
+Index: VirtualBox-7.0.8/src/apps/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/apps/Makefile.kmk
-+++ VirtualBox-7.0.6/src/apps/Makefile.kmk
+--- VirtualBox-7.0.8.orig/src/apps/Makefile.kmk
++++ VirtualBox-7.0.8/src/apps/Makefile.kmk
@@ -30,5 +30,7 @@ include $(KBUILD_PATH)/subheader.kmk
include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk
@@ -10,10 +10,10 @@
+
include $(FILE_KBUILD_SUB_FOOTER)
-Index: VirtualBox-7.0.6/src/apps/VBoxUSB_DevRules/Makefile.kmk
+Index: VirtualBox-7.0.8/src/apps/VBoxUSB_DevRules/Makefile.kmk
===================================================================
--- /dev/null
-+++ VirtualBox-7.0.6/src/apps/VBoxUSB_DevRules/Makefile.kmk
++++ VirtualBox-7.0.8/src/apps/VBoxUSB_DevRules/Makefile.kmk
@@ -0,0 +1,30 @@
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
+## @file
@@ -35,7 +35,7 @@
+
+PROGRAMS += VBoxUSB_DevRules
+
-+VBoxUSB_DevRules_TEMPLATE = VBOXQTGUIEXE
++VBoxUSB_DevRules_TEMPLATE = VBoxQtGuiExe
+VBoxUSB_DevRules_SOURCES = VBoxUSB_DevRules.cpp
+VBoxUSB_DevRules_QT_MODULES = Core Gui
+VBoxUSB_DevRules_QT_MODULES += Widgets
@@ -45,10 +45,10 @@
+include $(KBUILD_PATH)/subfooter.kmk
+
+
-Index: VirtualBox-7.0.6/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
+Index: VirtualBox-7.0.8/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
===================================================================
--- /dev/null
-+++ VirtualBox-7.0.6/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
++++ VirtualBox-7.0.8/src/apps/VBoxUSB_DevRules/VBoxUSB_DevRules.cpp
@@ -0,0 +1,25 @@
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
++++++ vbox-vboxadd-init-script.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:26.027084162 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:26.031084186 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd.sh
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/installer/vboxadd.sh
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd.sh
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/installer/vboxadd.sh
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -36,11 +36,14 @@
# Provides: vboxadd
# Required-Start:
@@ -18,28 +18,7 @@
### END INIT INFO
## @todo This file duplicates a lot of script with vboxdrv.sh. When making
-@@ -145,20 +148,11 @@ module_build_log()
-
- dev=/dev/vboxguest
- userdev=/dev/vboxuser
--config=/var/lib/VBoxGuestAdditions/config
- owner=vboxadd
- group=1
-
--if test -r $config; then
-- . $config
--else
-- fail "Configuration file $config not found"
--fi
--test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
-- fail "Configuration file $config not complete"
- MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
- BUILDINTMP="$MODULE_SRC/build_in_tmp"
--
- # Attempt to detect VirtualBox Guest Additions version and revision
information.
- VBOXCLIENT="${INSTALL_DIR}/bin/VBoxClient"
- VBOX_VERSION="`"$VBOXCLIENT" --version | cut -d r -f1`"
-@@ -208,12 +202,6 @@ do_vboxguest_non_udev()
+@@ -261,12 +264,6 @@ do_vboxguest_non_udev()
fail "Cannot create device $dev with major $maj and minor $min"
}
fi
@@ -52,7 +31,7 @@
if [ ! -c $userdev ]; then
maj=10
-@@ -224,12 +212,6 @@ do_vboxguest_non_udev()
+@@ -277,12 +274,6 @@ do_vboxguest_non_udev()
rmmod vboxguest 2>/dev/null
fail "Cannot create device $userdev with major $maj and minor
$min"
}
@@ -65,7 +44,7 @@
fi
fi
}
-@@ -293,7 +275,7 @@ cleanup_modules()
+@@ -346,7 +337,7 @@ cleanup_modules()
done
if test -z "${keep}"; then
rm -rf /lib/modules/"${KERN_VER}"
@@ -74,7 +53,7 @@
fi
done
for i in ${OLDMODULES}; do
-@@ -564,9 +546,9 @@ create_udev_rule()
+@@ -612,9 +603,9 @@ create_udev_rule()
udevcontrol reload_rules >/dev/null 2>&1 || true
fi
}
@@ -87,7 +66,7 @@
# And a post-installation script for rebuilding modules when a new kernel
# is installed.
mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d
-@@ -747,18 +729,17 @@ setup()
+@@ -804,18 +795,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 +94,7 @@
fi
fi
create_vbox_user
-@@ -775,17 +756,14 @@ Please install them and execute
+@@ -833,17 +823,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 +115,7 @@
depmod
# Remove old module sources
-@@ -795,12 +773,13 @@ cleanup()
+@@ -853,12 +840,13 @@ cleanup()
fi
# Clean-up X11-related bits
@@ -154,19 +133,10 @@
fi
rm -f /sbin/mount.vboxsf 2>/dev/null
rm -f /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
-@@ -839,7 +818,7 @@ for your Linux distribution."
- rm -f $userdev || {
- fail "Cannot remove $userdev"
- }
-- $MODPROBE vboxguest >/dev/null 2>&1 ||
-+ $MODPROBE vboxguest >/dev/null 2>&1 || {
- fail "modprobe vboxguest failed"
- case "$no_udev" in 1)
- sleep .5;;
-Index: VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd-service.sh
+Index: VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd-service.sh
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
-+++ VirtualBox-7.0.6/src/VBox/Additions/linux/installer/vboxadd-service.sh
+--- VirtualBox-7.0.8.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
++++ VirtualBox-7.0.8/src/VBox/Additions/linux/installer/vboxadd-service.sh
@@ -36,7 +36,7 @@
# Provides: vboxadd-service
# Required-Start: vboxadd
@@ -176,10 +146,10 @@
# Default-Stop: 0 1 6
# X-Conflicts-With: systemd-timesyncd.service
# Description: VirtualBox Additions Service
-Index: VirtualBox-7.0.6/src/VBox/Installer/linux/vboxautostart-service.sh
+Index: VirtualBox-7.0.8/src/VBox/Installer/linux/vboxautostart-service.sh
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Installer/linux/vboxautostart-service.sh
-+++ VirtualBox-7.0.6/src/VBox/Installer/linux/vboxautostart-service.sh
+--- VirtualBox-7.0.8.orig/src/VBox/Installer/linux/vboxautostart-service.sh
++++ VirtualBox-7.0.8/src/VBox/Installer/linux/vboxautostart-service.sh
@@ -33,7 +33,7 @@
# Provides: vboxautostart-service
# Required-Start: vboxdrv
@@ -189,10 +159,10 @@
# Default-Stop: 0 1 6
# Description: VirtualBox autostart service
### END INIT INFO
-Index: VirtualBox-7.0.6/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+Index: VirtualBox-7.0.8/src/VBox/Installer/linux/vboxballoonctrl-service.sh
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
-+++ VirtualBox-7.0.6/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+--- VirtualBox-7.0.8.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
++++ VirtualBox-7.0.8/src/VBox/Installer/linux/vboxballoonctrl-service.sh
@@ -33,7 +33,7 @@
# Provides: vboxballoonctrl-service
# Required-Start: vboxdrv
@@ -202,10 +172,10 @@
# Default-Stop: 0 1 6
# Description: VirtualBox watchdog daemon
### END INIT INFO
-Index:
VirtualBox-7.0.6/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+Index:
VirtualBox-7.0.8/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
-+++
VirtualBox-7.0.6/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+---
VirtualBox-7.0.8.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
++++
VirtualBox-7.0.8/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
@@ -41,7 +41,7 @@
# Provides: testboxscript-service
# Required-Start: $network
@@ -215,10 +185,10 @@
# Default-Stop: 0 1 6
# Description: TestBoxScript service
### END INIT INFO
-Index:
VirtualBox-7.0.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+Index:
VirtualBox-7.0.8/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
-+++
VirtualBox-7.0.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+---
VirtualBox-7.0.8.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
++++
VirtualBox-7.0.8/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
@@ -41,7 +41,7 @@
# Provides: vboxtxs
# Required-Start: $network
@@ -228,10 +198,10 @@
# Default-Stop: 0 1 6
# Description: VirtualBox Test Execution Service
### END INIT INFO
-Index:
VirtualBox-7.0.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+Index:
VirtualBox-7.0.8/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
===================================================================
----
VirtualBox-7.0.6.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
-+++ VirtualBox-7.0.6/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+---
VirtualBox-7.0.8.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
++++ VirtualBox-7.0.8/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
@@ -41,7 +41,7 @@
# Provides: vboxtxs
# Required-Start: $network
++++++ vbox-vboxdrv-init-script.diff ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:26.043084256 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:26.051084303 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/Installer/linux/vboxdrv.sh
+Index: VirtualBox-7.0.8/src/VBox/Installer/linux/vboxdrv.sh
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Installer/linux/vboxdrv.sh
-+++ VirtualBox-7.0.6/src/VBox/Installer/linux/vboxdrv.sh
+--- VirtualBox-7.0.8.orig/src/VBox/Installer/linux/vboxdrv.sh
++++ VirtualBox-7.0.8/src/VBox/Installer/linux/vboxdrv.sh
@@ -29,11 +29,12 @@
#
### BEGIN INIT INFO
@@ -19,7 +19,7 @@
### END INIT INFO
## @todo This file duplicates a lot of script with vboxadd.sh. When making
-@@ -526,13 +527,6 @@ See the documentation for your Linux dis
+@@ -535,13 +536,6 @@ See the documentation for your Linux dis
fi
fi
# ensure permissions
@@ -33,7 +33,7 @@
if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out
why"
fi
-@@ -690,31 +684,7 @@ setup()
+@@ -699,31 +693,7 @@ setup()
log "Error building the module:"
module_build_log "$myerr"
failure "Look at $LOG to find out what went wrong"
@@ -66,18 +66,18 @@
# Secure boot on Ubuntu, Debian and Oracle Linux.
if test -n "$HAVE_SEC_BOOT"; then
-Index: VirtualBox-7.0.6/Config.kmk
+Index: VirtualBox-7.0.8/Config.kmk
===================================================================
---- VirtualBox-7.0.6.orig/Config.kmk
-+++ VirtualBox-7.0.6/Config.kmk
-@@ -3154,6 +3154,9 @@ else
- $(SED_EXT) -n 's|.*version
\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000
* \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|p' )
+--- VirtualBox-7.0.8.orig/Config.kmk
++++ VirtualBox-7.0.8/Config.kmk
+@@ -3070,6 +3070,9 @@ else
endif
+ VBOX_MACOSX_ICON_FILE ?=
$(PATH_ROOT)/src/VBox/Artwork/darwin/NonOSE/VirtualBox.icns
endif
+ifndef VBOX_GCC_std
+ VBOX_GCC_std := -std=c++17
+endif
- # YASM macros
- ifndef DONT_USE_YASM
+
+ ifndef VBOX_NOINC_DYNAMIC_CONFIG_KMK
++++++ virtualbox-sed-params.patch ++++++
--- /var/tmp/diff_new_pack.aDNgON/_old 2023-05-05 17:12:26.295085723 +0200
+++ /var/tmp/diff_new_pack.aDNgON/_new 2023-05-05 17:12:26.299085747 +0200
@@ -1,7 +1,7 @@
-Index: VirtualBox-7.0.6/src/VBox/Main/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/Main/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Main/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/Main/Makefile.kmk
+--- VirtualBox-7.0.8.orig/src/VBox/Main/Makefile.kmk
++++ VirtualBox-7.0.8/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,11 +11,11 @@
"$(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.6/src/VBox/Devices/Makefile.kmk
+Index: VirtualBox-7.0.8/src/VBox/Devices/Makefile.kmk
===================================================================
---- VirtualBox-7.0.6.orig/src/VBox/Devices/Makefile.kmk
-+++ VirtualBox-7.0.6/src/VBox/Devices/Makefile.kmk
-@@ -989,8 +989,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
+--- VirtualBox-7.0.8.orig/src/VBox/Devices/Makefile.kmk
++++ VirtualBox-7.0.8/src/VBox/Devices/Makefile.kmk
+@@ -989,8 +989,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(in
$(call MSG_TOOL,iasl,VBoxDD,$<,$@)
$(QUIET)$(RM) -f $@ $@.tmp $@.pre
$(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -x c -o $@.pre $<
