Delete ExecCondition from vboxclient.service

Remove bogus ExecCondition= from vboxclient.service, because
VBoxDRMClient is unconditionally launched by udev hardware rule
anyway if it is not running already. vboxadd-service also starts
DRMClient if the udev rule were not to be present.

References: https://bugzilla.opensuse.org/1234870

VirtualBox-7.0.20-patched.tar.bz2

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

cxx17.patch

@@ -0,0 +1,108 @@
+From: Jan Engelhardt <ej@inai.de>
+Date: 2024-09-20 22:48:58.758026690 +0200
+
+The code uses <filesystem>, so ensure we always use -std=c++17 at the
+very least.
+
+Prior to C++17, noexcept cannot be part of a type alias, and so is
+not part of the function signature, and so is not part of the ABI.
+
+In C++17, noexcept is significant. There is a compile error because
+the FNCONSUMER alias as defined in a .h file does not match the
+function body in a .cpp file.
+
+The def file is also wrong, but no one at virtualbox.org noticed for
+some reason, even though the def mismatch also caused a link/build
+failure in its own right.
+
+To resolve the mismatch between .cpp/.h, the function signature is
+augmented by RT_NOEXCEPT, based upon the function head being the
+authoritative source as to whether something was meant to be noexcept
+or not.
+
+In turn, adding RT_NOEXCEPT causes a change in the ABI of VBoxRT.so.
+The closed-source VirtualBox extension pack does not expect that and
+is unable to load [LD_BIND_NOW=1]. To resolve _that_, we add extra
+symbol aliases.
+
+---
+ Config.kmk                                   |    3 +++
+ include/iprt/cpp/restclient.h                |   12 ++++++++++--
+ src/VBox/Runtime/VBox/VBoxRTImp-gcc.def      |    2 +-
+ src/VBox/Runtime/common/rest/rest-binary.cpp |    9 +++++++++
+ 4 files changed, 23 insertions(+), 3 deletions(-)
+
+Index: VirtualBox-7.1.0/Config.kmk
+===================================================================
+--- VirtualBox-7.1.0.orig/Config.kmk
++++ VirtualBox-7.1.0/Config.kmk
+@@ -3093,6 +3093,9 @@ ifeq ($(KBUILD_TARGET),darwin)
+   endif
+  endif
+ endif
++ifndef VBOX_GCC_std
++  VBOX_GCC_std := -std=c++17
++endif
+ 
+ #
+ # Check for incompatible rpath combinations.
+Index: VirtualBox-7.1.0/include/iprt/cpp/restclient.h
+===================================================================
+--- VirtualBox-7.1.0.orig/include/iprt/cpp/restclient.h
++++ VirtualBox-7.1.0/include/iprt/cpp/restclient.h
+@@ -130,7 +130,11 @@ public:
+      *          is the sum of the previously returned @a *pcbActual values.
+      */
+     typedef DECLCALLBACKTYPE(int, FNPRODUCER,(RTCRestBinaryParameter *a_pThis, void *a_pvDst, size_t a_cbDst,
+-                                              uint64_t a_offContent, size_t *a_pcbActual)) /*RT_NOEXCEPT*/;
++                                              uint64_t a_offContent, size_t *a_pcbActual))
++#if defined(__cplusplus) && __cplusplus >= 201700L
++RT_NOEXCEPT
++#endif
++;
+     /** Pointer to a byte producer callback. */
+     typedef FNPRODUCER *PFNPRODUCER;
+ 
+@@ -268,7 +272,11 @@ public:
+      *          is the sum of the previous @a a_cbSrc values.
+      */
+     typedef DECLCALLBACKTYPE(int, FNCONSUMER,(RTCRestBinaryResponse *a_pThis, const void *a_pvSrc, size_t a_cbSrc,
+-                                              uint32_t a_uHttpStatus, uint64_t a_offContent, uint64_t a_cbContent)) /*RT_NOEXCEPT*/;
++                                              uint32_t a_uHttpStatus, uint64_t a_offContent, uint64_t a_cbContent))
++#if defined(__cplusplus) && __cplusplus >= 201700L
++RT_NOEXCEPT
++#endif
++;
+     /** Pointer to a byte consumer callback. */
+     typedef FNCONSUMER *PFNCONSUMER;
+ 
+Index: VirtualBox-7.1.0/src/VBox/Runtime/VBox/VBoxRTImp-gcc.def
+===================================================================
+--- VirtualBox-7.1.0.orig/src/VBox/Runtime/VBox/VBoxRTImp-gcc.def
++++ VirtualBox-7.1.0/src/VBox/Runtime/VBox/VBoxRTImp-gcc.def
+@@ -379,7 +379,7 @@ EXPORTS
+     _ZN22RTCRestBinaryParameter16xmitHttpCallbackEP14RTHTTPINTERNALPvmyPmS2_ ; int64=llong
+     _ZN22RTCRestBinaryParameter19setProducerCallbackEPFiPS_PvmmPmES1_m   ; before-noexcept int64=long
+     _ZN22RTCRestBinaryParameter19setProducerCallbackEPFiPS_PvmyPmES1_y   ; before-noexcept int64=llong
+-    _ZN22RTCRestBinaryParameter19setProducerCallbackEPDoFiPS_PvmyPmES1_m ; after-noexcept  int64=long
++    _ZN22RTCRestBinaryParameter19setProducerCallbackEPDoFiPS_PvmmPmES1_m ; after-noexcept  int64=long
+     _ZN22RTCRestBinaryParameter19setProducerCallbackEPDoFiPS_PvmyPmES1_y ; after-noexcept  int64=llong
+     _ZN22RTCRestBinaryParameterC1Ev
+     _ZN22RTCRestBinaryParameterC2Ev
+Index: VirtualBox-7.1.0/src/VBox/Runtime/common/rest/rest-binary.cpp
+===================================================================
+--- VirtualBox-7.1.0.orig/src/VBox/Runtime/common/rest/rest-binary.cpp
++++ VirtualBox-7.1.0/src/VBox/Runtime/common/rest/rest-binary.cpp
+@@ -706,3 +706,12 @@ void RTCRestBinaryResponse::receiveCompl
+     AssertRC(rc);
+ }
+ 
++// extpack was built with wrong -std=, add a redirect
++extern "C" void DECLEXPORT_CLASS __attribute__((weak,
++alias("_ZN21RTCRestBinaryResponse19setConsumerCallbackEPDoFiPS_PKvmjmmEPv"))) // T symbol that exists
++       _ZN21RTCRestBinaryResponse19setConsumerCallbackEPFiPS_PKvmjmmEPv( // W symbol to make
++	RTCRestBinaryResponse::PFNCONSUMER, void *);
++extern "C" void DECLEXPORT_CLASS __attribute__((weak,
++alias("_ZN22RTCRestBinaryParameter19setProducerCallbackEPDoFiPS_PvmmPmES1_m"))) // T
++       _ZN22RTCRestBinaryParameter19setProducerCallbackEPFiPS_PvmmPmES1_m( // W
++	RTCRestBinaryParameter::PFNPRODUCER, void *, uint64_t);

fixes_for_gcc13.patch

@@ -1,19 +1,11 @@
-Index: VirtualBox-7.0.20/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
+---
-===================================================================
+ src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h |    3 +++
---- VirtualBox-7.0.20.orig/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
+ 1 file changed, 3 insertions(+)
-+++ VirtualBox-7.0.20/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
-@@ -13,6 +13,7 @@
- #include <intrin.h>
- #endif
 
-+#include <cstdint>
+Index: VirtualBox-7.1.0/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
- #include "util_likely.h"
- #include "util_math.h"
- 
-Index: VirtualBox-7.0.20/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
 ===================================================================
---- VirtualBox-7.0.20.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
+--- VirtualBox-7.1.0.orig/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
-+++ VirtualBox-7.0.20/src/VBox/Additions/x11/x11include/XFree86-4.3/Xserver/misc.h
++++ VirtualBox-7.1.0/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.
  

host-source.patch

@@ -0,0 +1,48 @@
+From: Jan Engelhardt <ej@inai.de>
+Date: 2024-11-14 15:11:28.216506193 +0100
+References: https://bugzilla.suse.com/1231346
+
+Stop overriding INSTALL_MOD_DIR, stop using a non-standard path.
+[MODULE_DIR is a 2.4ism and irrelevant here;
+but INSTALL_MOD_DIR affects the 2.6+ install alike.]
+
+---
+ src/VBox/Installer/linux/Makefile-footer.gmk |    2 +-
+ src/VBox/Installer/linux/Makefile-header.gmk |    4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+Index: VirtualBox-7.1.4/src/VBox/Installer/linux/Makefile-footer.gmk
+===================================================================
+--- VirtualBox-7.1.4.orig/src/VBox/Installer/linux/Makefile-footer.gmk
++++ VirtualBox-7.1.4/src/VBox/Installer/linux/Makefile-footer.gmk
+@@ -145,7 +145,7 @@ $(VBOXMOD_0_TARGET):
+ 	$(MAKE) V=$(VBOX_LNX_VERBOSE) $(VBOX_DISABLE_SIGN) -C $(KERN_DIR) $(VBOX_SUBDIR_VAR)=$(CURDIR) SRCROOT=$(CURDIR) $(if $(JOBS),-j$(JOBS),) modules
+ 
+ install: $(VBOXMOD_0_TARGET)
+-	$(MAKE) V=$(VBOX_LNX_VERBOSE) $(VBOX_DISABLE_SIGN) -C $(KERN_DIR) $(VBOX_SUBDIR_VAR)=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) modules_install
++	$(MAKE) V=$(VBOX_LNX_VERBOSE) $(VBOX_DISABLE_SIGN) -C $(KERN_DIR) $(VBOX_SUBDIR_VAR)=$(CURDIR) SRCROOT=$(CURDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) modules_install
+ 
+ modules_install: install
+ 
+Index: VirtualBox-7.1.4/src/VBox/Installer/linux/Makefile-header.gmk
+===================================================================
+--- VirtualBox-7.1.4.orig/src/VBox/Installer/linux/Makefile-header.gmk
++++ VirtualBox-7.1.4/src/VBox/Installer/linux/Makefile-header.gmk
+@@ -261,8 +261,7 @@ endif
+ # Kernel include folder
+ KERN_INCL := $(KERN_DIR)/include
+ # module install folder
+-INSTALL_MOD_DIR ?= misc
+-MODULE_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KERN_VER)/$(INSTALL_MOD_DIR)
++MODULE_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KERN_VER)/updates
+ 
+ # For VBOX_GCC_CHECK_CC
+ VBOX_CLOSEPAR := )
+@@ -298,7 +297,6 @@ endif
+ ifdef DEBUG
+  ifndef VBOX_KERN_QUIET
+ $(warning dbg: INSTALL_MOD_PATH = $(INSTALL_MOD_PATH))
+-$(warning dbg: INSTALL_MOD_DIR  = $(INSTALL_MOD_DIR))
+ $(warning dbg: KERN_DIR         = $(KERN_DIR))
+ $(warning dbg: KERN_INCL        = $(KERN_INCL))
+ $(warning dbg: KERN_VERSION     = $(KERN_VERSION))

vbox-vboxdrv-init-script.diff

@@ -1,7 +1,11 @@
-Index: VirtualBox-7.0.20/src/VBox/Installer/linux/vboxdrv.sh
+---
+ src/VBox/Installer/linux/vboxdrv.sh |   42 ++++++------------------------------
+ 1 file changed, 7 insertions(+), 35 deletions(-)
+
+Index: VirtualBox-7.1.0/src/VBox/Installer/linux/vboxdrv.sh
 ===================================================================
---- VirtualBox-7.0.20.orig/src/VBox/Installer/linux/vboxdrv.sh
+--- VirtualBox-7.1.0.orig/src/VBox/Installer/linux/vboxdrv.sh
-+++ VirtualBox-7.0.20/src/VBox/Installer/linux/vboxdrv.sh
++++ VirtualBox-7.1.0/src/VBox/Installer/linux/vboxdrv.sh
 @@ -29,11 +29,12 @@
  #
  ### BEGIN INIT INFO
@@ -66,17 +70,3 @@ Index: VirtualBox-7.0.20/src/VBox/Installer/linux/vboxdrv.sh
  
      # Sign kernel modules if kernel configuration requires it.
      if test "$(kernel_requires_module_signature)" = "1"; then
-Index: VirtualBox-7.0.20/Config.kmk
-===================================================================
---- VirtualBox-7.0.20.orig/Config.kmk
-+++ VirtualBox-7.0.20/Config.kmk
-@@ -3087,6 +3087,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
- 
- 
- ifndef VBOX_NOINC_DYNAMIC_CONFIG_KMK

vboxclient.service

@@ -1,7 +1,6 @@
 [Unit]
 Description=VirtualBox guest VMSVGA resize client
 ConditionVirtualization=|oracle
-ExecCondition=sh -c '[[ "$XDG_SESSION_TYPE" == "wayland" ]] || exit -1'
 
 [Service]
 Type=simple
@@ -10,4 +9,4 @@ Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
-
+# also Wanted by 90-vboxguest.rules

virtualbox-60-vboxguest.rules

@@ -1,4 +1,3 @@
 KERNEL=="vboxguest", NAME="vboxguest", OWNER="root", MODE="0660" ENV{ID_INPUT}="1", ENV{ID_INPUT_MOUSE}="1"
 KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0660", TAG+="uaccess"
 ACTION=="add|change", SUBSYSTEM=="drm", KERNEL=="card[0-9]", SUBSYSTEMS=="pci", ATTRS{vendor}=="0x15ad", ATTRS{device}=="0x0405", TAG+="systemd", ENV{SYSTEMD_WANTS}="vboxclient.service"
-

virtualbox-kmp-files

@@ -1,9 +0,0 @@
-%defattr (-,root,root)
-%dir %{kernel_module_directory}/%2-%1/
-%dir %{kernel_module_directory}/%2-%1/extra
-%{kernel_module_directory}/%2-%1/extra/vboxdrv.ko
-%{kernel_module_directory}/%2-%1/extra/vboxnetadp.ko
-%{kernel_module_directory}/%2-%1/extra/vboxnetflt.ko
-%{kernel_module_directory}/%2-%1/extra/vboxguest.ko
-%{kernel_module_directory}/%2-%1/extra/vboxsf.ko
-%{kernel_module_directory}/%2-%1/extra/vboxvideo.ko

virtualbox-kmp-preamble

@@ -1,4 +1,3 @@
 Requires: kernel-%1
-Provides: virtualbox-kmp = %version
+Enhances: kernel-%1
 Supplements: (virtualbox-guest-tools and kernel-%1)
-

virtualbox-patch-source.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [ -z "$1" ]; then
+	echo "You need to pass the filename VirtualBox-x.y.z.tar.bz2 as first argument."
+	exit 1
+fi
+
 REMOVE_DIRS=( 
 src/VBox/Additions/WINNT 
 src/VBox/Additions/os2 
@@ -54,4 +59,4 @@ fi
 cp -a "$BASENAME.tar.bz2" "$BASENAME-patched.tar.bz2"
 bunzip2 "$BASENAME-patched.tar.bz2"
 tar --wildcards --delete -f "$BASENAME-patched.tar" "${REMOVE_DIRS[@]}"
-bzip2 "$BASENAME-patched.tar"
+pixz -9 "$BASENAME-patched.tar"

virtualbox-wrapper.sh

@@ -67,4 +67,4 @@ then
     exit 1
 fi
 # Now run the VB GUI
-LD_LIBRARY_PATH="/usr/lib/virtualbox${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" /usr/lib/virtualbox/VirtualBox6 $@
+LD_LIBRARY_PATH="/usr/lib/virtualbox${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" exec /usr/lib/virtualbox/VirtualBoxQt "$@"

virtualbox.changes

@@ -1,3 +1,71 @@
+-------------------------------------------------------------------
+Sat Jan  4 01:40:37 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Remove bogus ExecCondition= from vboxclient.service.
+  [boo#1234870]
+
+-------------------------------------------------------------------
+Sun Dec 29 22:25:33 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Set kvm.enable_virt_at_load=0 via a modprobe file when virtualbox
+  is installed, to workaround kvm.ko stealing VMX mode.
+  <https://lore.kernel.org/kvm/ZwQjUSOle6sWARsr@google.com/T/ >
+
+-------------------------------------------------------------------
+Thu Nov 14 16:03:49 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Use distro-default INSTALL_MOD_DIR for both kmp
+  and for local-built files. Add host-source.patch [boo#1233251].
+
+-------------------------------------------------------------------
+Wed Oct 16 23:37:43 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 7.1.4
+  * NAT: Fixed DHCP problems with certain guests when domain is
+    empty
+  * VMSVGA: Improved flickering, black screen and other screen
+    update issues with recent Linux kernels
+  * Linux Guest Additions: Introduce initial support for kernel 6.12
+  * EFI: Added missing LsiLogic MPT SCSI driver again to fix
+    booting from devices attached to this device if the EFI
+    firmware is used (7.1.0 regression)
+  * EFI: Restored broken network boot support (7.1.0 regression)
+  * Adressed CVE-2024-21248 [boo#1231735],
+    CVE-2024-21273 [boo#1231736], CVE-2024-21259 [boo#1231737],
+    CVE-2024-21263 [boo#1231738]
+
+-------------------------------------------------------------------
+Tue Oct  1 23:30:00 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Edit cxx17.patch to make the Extension Pack work with our
+  compiler flags and RT_NOEXCEPT choices. [boo#1231225]
+
+-------------------------------------------------------------------
+Sun Sep 29 12:00:17 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Set BuildRequire on glslang to 11.5; this is when it starts to
+  recognize GL_EXT_spirv_intrinsics.
+
+-------------------------------------------------------------------
+Fri Sep 20 22:33:49 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 7.1
+  * The GUI now offers a selection between Basic and Experienced
+    user level with reduced or full UI functionality.
+  * VRDE: If user does not set up TLS with custom certificates,
+    enable it with self-signed certificate, including issuing a
+    new one before the old one expires
+  * NAT: New engine with IPv6 support.
+  * Linux host and guest: Added Wayland support for Clipboard
+    sharing.
+- Add cxx17.patch to workaround "new" build failures
+  with gcc14/C++17
+- Move the C++17 command line switch from vbox-vboxadd-init-script.diff
+  to cxx17.patch
+- Add Conflict markers to prevent the situation {virtualbox-7.1
+  combined with virtualbox-qt-7.0}; old VBQT did not have the right
+  (strong enough) Requires lines.
+
 ---------------------------------------------------------------------
 Wed Aug 12  20:12:00 UTC 2024 - Larry Rainey <llrainey15@gmail.com>
 

virtualbox.spec

@@ -17,42 +17,45 @@
 
 
 %if "@BUILD_FLAVOR@" == "kmp"
-### macros for virtualbox-kmp ###
+	# macros for virtualbox-kmp
-%define main_package 0
+	%define main_package 0
-%define kmp_package 1
+	%define kmp_package 1
-%if 0%{?suse_version} > 1600
+	%if 0%{?suse_version} > 1600
-%define kmp_longterm 1
+		%define kmp_longterm 1
-%endif
+	%endif
-%define name_suffix kmp
+	%define name_suffix kmp
-%define dash -
+	%define dash -
-%define package_summary Kernel modules for VirtualBox
+	%define package_summary Kernel modules for VirtualBox
-%if %{undefined kernel_module_directory}
+	%if %{undefined kernel_module_directory}
-%define kernel_module_directory /lib/modules
+		%define kernel_module_directory /lib/modules
-%endif
+	%endif
 %else
-### macros for virtualbox main package ###
+	# macros for virtualbox main package ###
-%define main_package 1
+	%define main_package 1
-%define kmp_package 0
+	%define kmp_package 0
-%define package_summary VirtualBox is an Emulator
+	%define package_summary VirtualBox is an Emulator
-%define qt5ver %(rpm -q --queryformat %%{version} libQt5Core5|perl -ne '/(\\d+)\\.(\\d+)\\.(\\d+)?/&&printf "%%d%%02d%%02d\\n",$1,$2,$3')
+	%define qt5ver %(rpm -q --queryformat %%{version} libQt5Core5|perl -ne '/(\\d+)\\.(\\d+)\\.(\\d+)?/&&printf "%%d%%02d%%02d\\n",$1,$2,$3')
-#Compat macro for new _fillupdir macro introduced in Nov 2017
+	# Compat macro for new _fillupdir macro introduced in Nov 2017
-%if ! %{defined _fillupdir}
+	%if !%{defined _fillupdir}
 		%define _fillupdir %{_localstatedir}/adm/fillup-templates
-%endif
+	%endif
-%if ! %{defined _distconfdir}
+	%if ! %{defined _distconfdir}
-%define _distconfdir %{_sysconfdir}
+		%define _distconfdir %{_sysconfdir}
-%endif
+	%endif
-# Do not provide libGL.so symbols - they are owned by Mesa already and this could potentially confuse rpm/zypp
+	# Do not provide libGL.so symbols - they are owned by Mesa already and
-%global __provides_exclude ^libE?GL.so.1.*$
+	# this could potentially confuse rpm/zypp
-# With 32-bit builds, the job limit cannot be larger than 2, otherwise the build runs out of memory.
+	%global __provides_exclude ^libE?GL.so.1.*$
-# For 64-bit builds, no memory limit is reached when more jobs are run, but the builds crash with strange errors.
+	# With 32-bit builds, the job limit cannot be larger than 2, otherwise
-# For the above reasons, limit the number of jobs to 2.
+	# the build runs out of memory.
-%define _vbox_instdir %{_prefix}/lib/virtualbox
+	# For 64-bit builds, no memory limit is reached when more jobs are run,
-%define _udevrulesdir %{_prefix}/lib/udev/rules.d
+	# but the builds crash with strange errors.
+	# For the above reasons, limit the number of jobs to 2.
+	%define _vbox_instdir %{_prefix}/lib/virtualbox
+	%define _udevrulesdir %{_prefix}/lib/udev/rules.d
 %endif
 # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
 Name:           virtualbox%{?dash}%{?name_suffix}
-Version:        7.0.20
+Version:        7.1.4
 Release:        0
 Summary:        %{package_summary}
 License:        GPL-3.0-or-later
@@ -67,11 +70,10 @@ URL:            https://www.virtualbox.org/
 # script virtualbox-patch-source.sh will do the job :)
 # WARNING: This is not a comment, but the real command to repack source
 #%%(bash %%{_sourcedir}/virtualbox-patch-source.sh VirtualBox-%%{version}.tar.bz2)
-Source0:        VirtualBox-%{version}-patched.tar.bz2
+Source0:        VirtualBox-%{version}-patched.tpxz
 Source1:        UserManual.pdf
 Source3:        virtualbox-60-vboxguest.rules
 Source4:        virtualbox-default.virtualbox
-Source5:        virtualbox-kmp-files
 Source7:        virtualbox-kmp-preamble
 Source8:        update-extpack.sh
 Source9:        virtualbox-wrapper.sh
@@ -113,6 +115,8 @@ Patch8:         turn_off_cloud_net.patch
 Patch9:         vbox-usb-warning.diff
 # Patch for 15.5
 Patch10:        fix_for_leap15.5.patch
+Patch11:        cxx17.patch
+Patch12:        host-source.patch
 #
 # Common BuildRequires for both virtualbox and virtualbox-kmp
 BuildRequires:  %{kernel_module_package_buildreqs}
@@ -122,9 +126,14 @@ BuildRequires:  kernel-syms-longterm
 BuildRequires:  acpica
 BuildRequires:  cmake-full
 BuildRequires:  dwarves
+%if 0%{?suse_version} && 0%{?suse_version} >= 1600
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  kbuild >= 0.1.9998svn3101
+%else
+BuildRequires:  gcc12
+BuildRequires:  gcc12-c++
+%endif
+BuildRequires:  kbuild >= 0.1.9998+svn3613
 BuildRequires:  libcap-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libopenssl-devel
@@ -148,7 +157,7 @@ BuildRequires:  dmidecode
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel-static
-BuildRequires:  glslang-devel
+BuildRequires:  glslang-devel >= 11.5
 BuildRequires:  gsoap-devel >= 2.8.50
 BuildRequires:  java-devel >= 1.6.0
 #BuildRequires:  libSDL2-2_0-0
@@ -156,11 +165,6 @@ BuildRequires:  libelf-devel
 BuildRequires:  libidl-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libopus-devel
-BuildRequires:  libqt5-linguist
-BuildRequires:  libqt5-linguist-devel
-BuildRequires:  libqt5-qtbase-devel
-BuildRequires:  libqt5-qttools-devel
-BuildRequires:  libqt5-qtx11extras-devel
 BuildRequires:  libtpms-devel
 BuildRequires:  libvpx-devel
 BuildRequires:  libxslt-devel
@@ -170,6 +174,7 @@ BuildRequires:  lzfse-devel
 BuildRequires:  pulseaudio-devel
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-devel
+BuildRequires:  qt6-tools-linguist
 BuildRequires:  rpm
 BuildRequires:  sed
 BuildRequires:  systemd-rpm-macros
@@ -177,6 +182,16 @@ BuildRequires:  sysuser-tools
 BuildRequires:  update-desktop-files
 BuildRequires:  which
 BuildRequires:  xorg-x11-server
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6DBus)
+BuildRequires:  pkgconfig(Qt6Gui)
+BuildRequires:  pkgconfig(Qt6Help)
+BuildRequires:  pkgconfig(Qt6Network)
+BuildRequires:  pkgconfig(Qt6PrintSupport)
+BuildRequires:  pkgconfig(Qt6Sql)
+BuildRequires:  pkgconfig(Qt6StateMachine)
+BuildRequires:  pkgconfig(Qt6Widgets)
+BuildRequires:  pkgconfig(Qt6Xml)
 BuildRequires:  pkgconfig(fontsproto)
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(glx)
@@ -203,7 +218,12 @@ BuildRequires:  pkgconfig(xproto)
 BuildRequires:  pkgconfig(xrandr)
 Requires:       %{name}-kmp = %{version}
 Requires(pre):  %fillup_prereq
-Requires(pre):  permissions
+Requires(post): permissions
+Requires(verify): permissions
+Conflicts:      %{name}-qt < %{version}
+Conflicts:      %{name}-qt > %{version}
+Conflicts:      %{name}-websrv < %{version}
+Conflicts:      %{name}-websrv > %{version}
 Recommends:     %{name}-gui = %{version}
 # package i4l-vbox from source package i4l-base shares the directory /etc/vbox
 # with us, but with different owner.
@@ -219,8 +239,13 @@ BuildRequires:  libboost_headers-devel
 BuildRequires:  boost-devel
 %endif
 %ifarch amd64 x86_64 ia32e em64t
+%if 0%{?suse_version} && 0%{?suse_version} >= 1600
 BuildRequires:  gcc-32bit
 BuildRequires:  gcc-c++-32bit
+%else
+BuildRequires:  gcc12-32bit
+BuildRequires:  gcc12-c++-32bit
+%endif
 BuildRequires:  xorg-x11-libX11-devel-32bit
 BuildRequires:  xorg-x11-libXext-devel-32bit
 BuildRequires:  xorg-x11-libXmu-devel-32bit
@@ -239,7 +264,7 @@ BuildRequires:  libpulse-devel
 BuildRequires:  libxml2-devel
 Requires:       ca-certificates
 Requires:       openSUSE-signkey-cert
-%kernel_module_package -p %{SOURCE7} -n virtualbox -f %{SOURCE5} -x kdump um xen pae xenpae pv
+%kernel_module_package -p %{SOURCE7} -n virtualbox -x kdump um xen pae xenpae pv
 # end of kmp_package
 %endif
 ### Description and subpackages of virtualbox main package ###
@@ -256,7 +281,9 @@ the terms of the GNU Public License (GPL).
 Summary:        Qt GUI part for %{name}
 Group:          System/Emulators/PC
 Requires(pre):  %{name} = %{version}
-Requires(pre):  permissions
+Requires:       %{name} = %{version}
+Requires(post): permissions
+Requires(verify): permissions
 Provides:       %{name}-gui = %{version}
 #this is needed during update to trigger installing qt subpackage
 #http://en.opensuse.org/openSUSE:Upgrade_dependencies_explanation#Splitting_and_Merging
@@ -376,11 +403,9 @@ Requires:       %{name} = %{version}
 Virtual Network Computing (VNC) is a graphical desktop sharing system that uses the Remote Frame Buffer
 protocol (RFB) to remotely control another computer. When this optional feature is desired, it is installed
 as an "extpack" for VirtualBox. The implementation is licensed under GPL.
-###########################################
 # main_package
 %endif
 
-### Description of virtualbox-kmp ###
 %if %{kmp_package}
 %description
 This package contains the kernel-modules that VirtualBox uses to create or run virtual machines.
@@ -388,17 +413,7 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
 %endif
 
 %prep
-%setup -q -n VirtualBox-%{version}
+%autosetup -n VirtualBox-%{version} -p1
-%patch -P 1 -p1
-%patch -P 2 -p1
-%patch -P 3 -p1
-%patch -P 4 -p1
-%patch -P 5 -p1
-%patch -P 6 -p1
-%patch -P 7 -p1
-%patch -P 8 -p1
-%patch -P 9 -p1
-%patch -P 10 -p1
 
 ### Documents for virtualbox main package ###
 %if %{main_package}
@@ -419,13 +434,20 @@ sed -i 's:include/drm:%{_prefix}/src/linux/include/drm:' src/VBox/Additions/linu
 ### %%build, %%install, and %%file sections for virtualbox ###
 %if %{main_package}
 %build
+%if 0%{?suse_version} && 0%{?suse_version} < 1600
+# kmk is annoying, does not respond to CXX=g++-12 ...
+mkdir tc
+export PATH="$PWD/tc:$PATH"
+ln -s /usr/bin/gcc-12 tc/gcc
+ln -s /usr/bin/g++-12 tc/g++
+%endif
 # Disable LTO - Link Time Optimization
 	%define _lto_cflags %{nil}
 	#ensure we don't ever use them
 rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
 
 #	--disable-kmods		don't build Linux kernel modules -  but use SUSE specific way see few lines under
-# NOT an autoconf ceonfigure macro
+# NOT an autoconf configure script
 ./configure \
     --enable-vnc \
     --enable-vde \
@@ -475,34 +497,32 @@ EOF
 %sysusers_generate_pre vbox-guest-tools.conf vbox-guest-tools vbox-guest-tools.conf
 
 %install
-#################################
 echo "create directory structure"
-#################################
+mkdir -p \
-install -d -m 755 %{buildroot}%{_sbindir}
+	%{buildroot}%{_sbindir} \
-install -d -m 755 %{buildroot}%{_prefix}/lib
+	%{buildroot}%{_prefix}/lib \
-install -d -m 755 %{buildroot}%{_bindir}
+	%{buildroot}%{_bindir} \
-install -d -m 755 %{buildroot}%{_sbindir}
+	%{buildroot}%{_sbindir} \
-install -d -m 755 %{buildroot}%{_datadir}/virtualbox/nls
+	%{buildroot}%{_datadir}/virtualbox/nls \
-install -d -m 755 %{buildroot}%{_datadir}/virtualbox/UnattendedTemplates
+	%{buildroot}%{_datadir}/virtualbox/UnattendedTemplates \
-install -d -m 755 %{buildroot}%{_datadir}/pixmaps
+	%{buildroot}%{_datadir}/pixmaps \
-install -d -m 755 %{buildroot}%{_datadir}/applications
+	%{buildroot}%{_datadir}/applications \
-install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom
+	%{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom \
-install -d -m 755 %{buildroot}%{_vbox_instdir}/components
+	%{buildroot}%{_vbox_instdir}/components \
-install -d -m 755 %{buildroot}%{_libdir}/dri
+	%{buildroot}%{_libdir}/dri \
-install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/drivers
+	%{buildroot}%{_libdir}/xorg/modules/drivers \
-install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/input
+	%{buildroot}%{_libdir}/xorg/modules/input \
-install -d -m 755 %{buildroot}%{_sysconfdir}/default
+	%{buildroot}%{_sysconfdir}/default \
-install -d -m 755 %{buildroot}%{_sysconfdir}/init.d
+	%{buildroot}%{_sysconfdir}/init.d \
-install -d %{buildroot}%{_unitdir}
+	%{buildroot}%{_unitdir} \
-install -d %{buildroot}%{_unitdir}/multi-user.target.wants
+	%{buildroot}%{_unitdir}/multi-user.target.wants \
-install -d -m 755 %{buildroot}%{_sysconfdir}/vbox
+	%{buildroot}%{_sysconfdir}/vbox \
-install -d -m 755 %{buildroot}%{_sysconfdir}/vbox/autostart.d
+	%{buildroot}%{_sysconfdir}/vbox/autostart.d \
-install -d -m 755 %{buildroot}%{_udevrulesdir}
+	%{buildroot}%{_udevrulesdir} \
-install -d -m 755 %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d
+	%{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d \
+	%{buildroot}%{_modprobedir}
 
-###########################################
 echo "entering guest-tools install section"
-###########################################
 install -m 755 out/linux.*/release/bin/additions/VBoxControl %{buildroot}%{_bindir}
 install -m 755 out/linux.*/release/bin/additions/VBoxService %{buildroot}%{_sbindir}/VBoxService
 install -m 755 out/linux.*/release/bin/additions/mount.vboxsf %{buildroot}%{_sbindir}/mount.vboxsf
@@ -524,64 +544,52 @@ install -m 644 %{SOURCE25} %{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.d
 install -d -m 755 %{buildroot}/media
 %endif
 
-###########################################
 echo "entering VNC extension install section"
-###########################################
 pushd out/linux.*/release/packages/
 mkdir -p "%{buildroot}%{_datadir}/virtualbox/extensions/"
 install -D -m 644 VNC-*.vbox-extpack "%{buildroot}%{_datadir}/virtualbox/extensions/VNC-%{version}.vbox-extpack"
 popd
 
-##############################################
 echo "entering virtualbox(-qt) install section"
-##############################################
 # copy the main files to %%{_vbox_instdir}
 pushd out/linux.*/release/bin
-install -m 755 VBoxManage 			%{buildroot}%{_vbox_instdir}
+cp -a VBoxManage VBoxHeadless VBoxSDL VBoxNetNAT VBoxAutostart VBoxVolInfo \
-install -m 755 VBoxHeadless 			%{buildroot}%{_vbox_instdir}
+	vboxshell.py VBoxBalloonCtrl webtest VBoxDTrace VBoxDbg.so \
-install -m 755 VBoxSDL 				%{buildroot}%{_vbox_instdir}
+	VBoxDxVk.so UICommon.so vboximg-mount %{buildroot}%{_vbox_instdir}
-install -m 755 VBoxNetNAT			%{buildroot}%{_vbox_instdir}
+ls -al VBoxManage VBoxHeadless VBoxSDL VBoxNetNAT VBoxAutostart VBoxVolInfo \
-install -m 755 VBoxAutostart			%{buildroot}%{_vbox_instdir}
+	vboxshell.py VBoxBalloonCtrl webtest VBoxDTrace VBoxDbg.so \
-install -m 755 VBoxVolInfo			%{buildroot}%{_vbox_instdir}
+	VBoxDxVk.so UICommon.so vboximg-mount 0755 || :
-install -m 755 vboxshell.py			%{buildroot}%{_vbox_instdir}
-install -m 755 VBoxBalloonCtrl			%{buildroot}%{_vbox_instdir}
-install -m 755 webtest				%{buildroot}%{_vbox_instdir}
-install -m 755 VBoxDTrace			%{buildroot}%{_vbox_instdir}
-install -m 755 VBoxDbg.so			%{buildroot}%{_vbox_instdir}
-install -m 755 VBoxDbg.so			%{buildroot}%{_vbox_instdir}
-install -m 755 VBoxDxVk.so			%{buildroot}%{_vbox_instdir}
-install -m 755 UICommon.so			%{buildroot}%{_vbox_instdir}
-install -m 755 vboximg-mount			%{buildroot}%{_vbox_instdir}
 # 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}/vboximg-mount		%{buildroot}%{_bindir}/vboximg-mount
-install -m 755 VBoxSVC 				%{buildroot}%{_vbox_instdir}
+cp -a VBoxSVC VBoxExtPackHelperApp VBoxPermissionMessage VBoxSUIDMessage \
-install -m 755 VBoxXPCOMIPCD 			%{buildroot}%{_vbox_instdir}
+	VBoxUSB_DevRules VBoxNetDHCP VBoxNetAdpCtl VirtualBoxVM \
-install -m 755 VBoxExtPackHelperApp		%{buildroot}%{_vbox_instdir}
+	%{buildroot}%{_vbox_instdir}/
-install -m 755 VBoxTestOGL			%{buildroot}%{_vbox_instdir}
+ls -al VBoxSVC VBoxExtPackHelperApp VBoxPermissionMessage VBoxSUIDMessage \
-install -m 755 VBoxPermissionMessage		%{buildroot}%{_vbox_instdir}
+	VBoxUSB_DevRules VBoxNetDHCP VBoxNetAdpCtl VirtualBoxVM 0755 || :
-install -m 755 VBoxSUIDMessage			%{buildroot}%{_vbox_instdir}
+install -m 755 VirtualBox			%{buildroot}%{_vbox_instdir}/VirtualBoxQt
-install -m 755 VBoxUSB_DevRules			%{buildroot}%{_vbox_instdir}
-install -m 755 VBoxNetDHCP			%{buildroot}%{_vbox_instdir}
-install -m 755 VBoxNetAdpCtl			%{buildroot}%{_vbox_instdir}
-install -m 755 VirtualBox			%{buildroot}%{_vbox_instdir}/VirtualBox6
-install -m 755 VirtualBoxVM			%{buildroot}%{_vbox_instdir}
 # compatibility symlink in order to keep old desktop links functional
 ln -s %{_vbox_instdir}/VirtualBoxVM		%{buildroot}%{_vbox_instdir}/VirtualBox
-install -m 755 VBoxEFI*.fd			%{buildroot}%{_vbox_instdir}
+cp -a VBoxEFI*.fd VBoxSysInfo.sh %{buildroot}%{_vbox_instdir}/
-install -m 755 VBoxSysInfo.sh			%{buildroot}%{_vbox_instdir}
+ls -al VBoxEFI*.fd VBoxSysInfo.sh 0755 || :
 install -m 644 *.so		 		%{buildroot}%{_vbox_instdir}
 install -m 644 *.r0 				%{buildroot}%{_vbox_instdir}
 install -m 644 components/*			%{buildroot}%{_vbox_instdir}/components/
 # install languages
 install -m 644 nls/*				%{buildroot}%{_datadir}/virtualbox/nls/
 install -m 644 UnattendedTemplates/*		%{buildroot}%{_datadir}/virtualbox/UnattendedTemplates/
+
+# Workaround kvm.ko usurping VMX.
+# (Linux kernel commit b4886fab6fb620b96ad7eeefb9801c42dfa91741 is the culprit.
+# See also https://lore.kernel.org/kvm/ZwQjUSOle6sWARsr@google.com/T/ )
+echo options kvm enable_virt_at_load=0 >"%buildroot/%_modprobedir/50-virtualbox.conf"
+
 # install kmp src
 mkdir -p %{buildroot}%{_usrsrc}/kernel-modules/virtualbox
 mkdir -p %{buildroot}%{_usrsrc}/kernel-modules/additions
-tar jcf %{buildroot}%{_usrsrc}/kernel-modules/additions/guest_src.tar.bz2 additions/src
+tar -jcf %{buildroot}%{_usrsrc}/kernel-modules/additions/guest_src.tar.bz2 additions/src
 cp -a src %{buildroot}%{_usrsrc}/kernel-modules/virtualbox
 install -m 644 %{SOURCE11}			%{buildroot}%{_udevrulesdir}/60-vboxdrv.rules
 popd
@@ -636,19 +644,15 @@ allow = true
 EOF
 # install udev helper script for creating usb devices
 install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh %{buildroot}%{_vbox_instdir}/VBoxCreateUSBNode.sh
-######################################################
 echo "entering python-virtualbox install section"
-######################################################
+pushd out/linux.*/release/bin/sdk/installer/python
-pushd out/linux.*/release/bin/sdk/installer
 VBOX_INSTALL_PATH=%{_vbox_instdir} python3 vboxapisetup.py install --prefix=%{_prefix} --root=%{buildroot}
 popd
 install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom
 cp -r out/linux.*/release/bin/sdk/bindings/xpcom/python %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom
 %py3_compile %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom/python
 
-######################################################
 echo "entering virtualbox-devel install section"
-######################################################
 cp -r out/linux.*/release/bin/sdk/bindings/auth %{buildroot}%{_vbox_instdir}/sdk/bindings
 
 pushd out/linux.*/release/bin/sdk/bindings/xpcom
@@ -659,19 +663,14 @@ popd
 
 cp out/linux.*/release/bin/sdk/bindings/VirtualBox.xidl %{buildroot}%{_vbox_instdir}/sdk/bindings
 
-######################################################
 echo "entering virtualbox-websrv install section"
-######################################################
 pushd out/linux.*/release/bin
 install -m 755 vboxwebsrv %{buildroot}%{_vbox_instdir}
 install -m 755 webtest %{buildroot}%{_vbox_instdir}
 popd
 ln -sf %{_unitdir}/vboxweb-service.service %{buildroot}%{_unitdir}/multi-user.target.wants/vboxweb-service.service
 
-#
-######################################################
 echo "entering virtualbox-guest-desktop-icons install section"
-######################################################
 install -d -m 755	%{buildroot}%{_datadir}/pixmaps/virtualbox
 
 pushd src/VBox/Frontends/VirtualBox/images
@@ -679,31 +678,15 @@ for icon in os_*.png; do
   install -m 644 "$icon" %{buildroot}%{_datadir}/pixmaps/virtualbox/"$icon";
 done
 popd
-#
-######################################################
-# system users and groups
 
 install -Dm0644 vbox.conf %{buildroot}%{_sysusersdir}/vbox.conf
 install -Dm0644 vbox-guest-tools.conf %{buildroot}%{_sysusersdir}/vbox-guest-tools.conf
-######################################################
-# run fdupes
-######################################################
-#run fdupes because we lost link for virtualbox/components directory
 %fdupes %{buildroot}/%{_vbox_instdir}
-#also some translation files are duplicated
 %fdupes %{buildroot}/%{_datadir}/virtualbox/nls
-#also some icon files are duplicated
 %fdupes %{buildroot}/%{_datadir}/pixmaps/virtualbox
 
-#
-#
-######################################################
-# scriptlets - pre
-######################################################
-
 %pre -f vbox.pre
-%service_add_pre vboxdrv.service
+%service_add_pre vboxdrv.service vboxautostart-service.service
-%service_add_pre vboxautostart-service.service
 
 %pre guest-tools -f vbox-guest-tools.pre
 %service_add_pre vboxadd-service.service
@@ -711,10 +694,6 @@ install -Dm0644 vbox-guest-tools.conf %{buildroot}%{_sysusersdir}/vbox-guest-too
 %pre websrv
 %service_add_pre vboxweb-service.service
 
-#######################################################
-# scriptlets - post
-#######################################################
-
 %post
 /sbin/ldconfig
 #setup our sysconfig file /etc/sysconfig/vbox
@@ -722,8 +701,7 @@ install -Dm0644 vbox-guest-tools.conf %{buildroot}%{_sysusersdir}/vbox-guest-too
 %set_permissions %{_vbox_instdir}/VBoxNetDHCP
 %set_permissions %{_vbox_instdir}/VBoxNetAdpCtl
 %set_permissions %{_vbox_instdir}/VBoxHeadless
-%service_add_post vboxdrv.service
+%service_add_post vboxdrv.service vboxautostart-service.service
-%service_add_post vboxautostart-service.service
 # add new autostart stuff to the existing default config, if missing
 grep -q VBOXAUTOSTART %{_sysconfdir}/default/virtualbox || {
     cat >> %{_sysconfdir}/default/virtualbox << EOF
@@ -758,9 +736,7 @@ done
 %verify_permissions -e %{_vbox_instdir}/VBoxSDL
 
 %post guest-tools
-%service_add_post vboxadd-service.service
+%service_add_post vboxadd-service.service vboxclient.service vboxservice.service
-%service_add_post vboxclient.service
-%service_add_post vboxservice.service
 
 %post websrv
 %service_add_post vboxweb-service.service
@@ -770,60 +746,33 @@ EXTPACK="%{_datadir}/virtualbox/extensions/VNC-%{version}.vbox-extpack"
 ACCEPT="$(tar --to-stdout -xf "${EXTPACK}" ./ExtPack-license.txt | sha256sum | head --bytes=64)"
 VBoxManage extpack install --replace "${EXTPACK}" --accept-license="${ACCEPT}" > /dev/null
 
-#######################################################
-# scriptlets preun
-#######################################################
-
 %preun
-%stop_on_removal vboxautostart-service
+%service_del_preun vboxautostart-service.service vboxdrv.service
-%stop_on_removal vboxdrv
-%service_del_preun vboxautostart-service.service
-%service_del_preun vboxdrv.service
-exit 0
 
 %preun guest-tools
-%stop_on_removal vboxadd-service
 %stop_on_removal vboxadd
 %service_del_preun vboxadd-service.service
-%systemd_preun vboxclient.service
+%systemd_preun vboxclient.service vboxservice.service
-%systemd_preun vboxservice.service
-exit 0
 
 %preun websrv
 %stop_on_removal vboxweb-service
 %service_del_preun vboxweb-service.service
-exit 0
-
-#######################################################
-# scriptlets postun
-#######################################################
 
 %postun
 /sbin/ldconfig
-%restart_on_update vboxdrv
-%restart_on_update vboxautostart-service
 # immediately restarting virtualbox may not work. As such wait for the next reboot to restart
 %if ! %{defined service_del_postun_without_restart}
 export DISABLE_RESTART_ON_UPDATE=yes
-%service_del_postun vboxautostart-service.service
+%service_del_postun vboxautostart-service.service vboxdrv.service
-%service_del_postun vboxdrv.service
 %else
-%service_del_postun_without_restart vboxautostart-service.service
+%service_del_postun_without_restart vboxautostart-service.service vboxdrv.service
-%service_del_postun_without_restart vboxdrv.service
 %endif
 
 %postun guest-tools
-%restart_on_update vboxadd
+%service_del_postun vboxadd-service.service vboxclient.service vboxservice.service
-%restart_on_update vboxadd-service
-%service_del_postun vboxadd-service.service
-%service_del_postun vboxclient.service
-%service_del_postun vboxservice.service
 
 %postun websrv
-%restart_on_update vboxweb-service
 %service_del_postun vboxweb-service.service
-#
-#######################################################
 
 %files
 %doc README.autostart UserManual.pdf README.build
@@ -857,7 +806,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %{_vbox_instdir}/VBoxEFI*.fd
 %{_vbox_instdir}/VBoxManage
 %{_vbox_instdir}/VBoxSVC
-%{_vbox_instdir}/VBoxXPCOMIPCD
+%{_vbox_instdir}/VBoxXPCOMIPCD.so
 %{_vbox_instdir}/VBoxExtPackHelperApp
 %{_vbox_instdir}/vboximg-mount
 %{_vbox_instdir}/DbgPlugInDiggers.so
@@ -869,6 +818,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %{_vbox_instdir}/VBoxDxVk.so
 %{_vbox_instdir}/UICommon.so
 %{_vbox_instdir}/VBoxHostChannel.so
+%{_vbox_instdir}/VBoxTraceLogDecoders.so
 %dir %{_vbox_instdir}/components
 %{_vbox_instdir}/components/*.so
 %{_vbox_instdir}/components/*.xpt
@@ -879,6 +829,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %dir %{_unitdir}/multi-user.target.wants
 %{_prefix}/lib/virtualbox/vboxdrv.sh
 %{_prefix}/lib/virtualbox/vboxautostart-service.sh
+%{_modprobedir}/
 %{_unitdir}/vboxdrv.service
 %{_unitdir}/vboxautostart-service.service
 %{_unitdir}/multi-user.target.wants/vboxweb-service.service
@@ -907,15 +858,13 @@ export DISABLE_RESTART_ON_UPDATE=yes
 %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxPermissionMessage
 %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSUIDMessage
 %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxUSB_DevRules
-%attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBox6
+%attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBoxQt
 %verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM
 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL
 %{_vbox_instdir}/VirtualBox
 #wrapper script is in bindir
 %attr(0755,root,root) %{_bindir}/VirtualBox
 %attr(0755,root,root) %{_bindir}/update-extpack.sh
-#ldd shows libQt* dependency
-%{_vbox_instdir}/VBoxTestOGL
 #qm's translations
 %{_datadir}/virtualbox/nls
 %{_vbox_instdir}/VBoxSVGA3D.so
@@ -1063,7 +1012,6 @@ done
 
 %install
 export INSTALL_MOD_PATH=%{buildroot}
-export INSTALL_MOD_DIR=extra
 #to install modules we use here similar steps like in build phase, go through all the modules :
 for module_name in vbox{drv,netflt,netadp,guest,sf,video}
 do