From 56140e1f2a27a5817bd92825d3cfa8add4e728ea Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 17:54:51 +0100
Subject: [PATCH] added patch to fix build of vbovideo with kernel 5.10
 [release 6.1.18-2mamba;Thu Apr 15 2021]

---
 VirtualBox-6.1.18-kernel-5.10.patch | 13 +++++++++++++
 VirtualBox.spec                     | 17 +++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 VirtualBox-6.1.18-kernel-5.10.patch

diff --git a/VirtualBox-6.1.18-kernel-5.10.patch b/VirtualBox-6.1.18-kernel-5.10.patch
new file mode 100644
index 0000000..36f57a8
--- /dev/null
+++ b/VirtualBox-6.1.18-kernel-5.10.patch
@@ -0,0 +1,13 @@
+--- VirtualBox-6.1.18/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp.orig	2021-04-15 15:20:45.932726596 +0200
++++ VirtualBox-6.1.18/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp	2021-04-15 15:22:18.820418821 +0200
+@@ -1479,6 +1479,10 @@
+ # if   defined(RT_ARCH_AMD64)
+ __asm__(" \
+             movq    g_pfnSupdrvProbeFireKernel(%rip), %rax                  \n\
++999:\n\
++            .pushsection .discard.retpoline_safe\n\
++            .quad 999b\n\
++            .popsection\n\
+             jmp     *%rax \n\
+ ");
+ # elif defined(RT_ARCH_X86)
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 5e0646e..de34cc7 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -18,7 +18,7 @@
 
 Name:          VirtualBox
 Version:       6.1.18
-Release:       1mamba
+Release:       2mamba
 Summary:       A general-purpose full virtualizer for x86 hardware
 Group:         Graphical Desktop/Applications/Utilities
 Vendor:        openmamba
@@ -48,6 +48,7 @@ Patch9:        VirtualBox-5.2.2-no-vboxvideo.patch
 Patch10:       VirtualBox-5.2.30-x86-conflicting_type_ptrdiff_t.patch
 Patch11:       VirtualBox-6.0.14-vbox-cpuhotplug-build.patch
 Patch12:       VirtualBox-6.1.10-vboxweb-gsoap.patch
+Patch13:       VirtualBox-6.1.18-kernel-5.10.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -98,12 +99,12 @@ BuildRequires: java-openjdk8
 #BuildRequires: java-jaxws
 #BuildRequires: java-jws-api
 Provides:      kernelvboxdrv
-Obsoletes:     kernelvboxdrv
+Obsoletes:     kernelvboxdrv < 6.1.18
 Requires(post):kernelheaders
 Requires(post):dkms
 Requires(post):libelf-devel
 Provides:      virtualbox
-Obsoletes:     virtualbox
+Obsoletes:     virtualbox < 6.1.18
 
 %description
 VirtualBox is a general-purpose full virtualizer for x86 hardware.
@@ -136,7 +137,7 @@ VirtualBox Guest additions.
 Summary:       VirtualBox Guest additions ISO image
 Group:         Applications/Emulators
 Provides:      virtualbox-additions-VBoxGuest
-Obsoletes:     virtualbox-additions-VBoxGuest
+Obsoletes:     virtualbox-additions-VBoxGuest < 6.1.18
 
 %description additions-VBoxGuest
 VirtualBox Guest additions ISO image.
@@ -149,9 +150,9 @@ Provides:      xorgdrvvideo
 Requires:      xorg-server >= %{xorg_ver}
 Requires:      xorg-server <= %{xorg_ver}.255
 Provides:      VirtualBox-vboxguest
-Obsoletes:     VirtualBox-vboxguest
+Obsoletes:     VirtualBox-vboxguest < 6.1.18
 Provides:      kernelvboxvideo
-Obsoletes:     kernelvboxvideo
+Obsoletes:     kernelvboxvideo < 6.1.18
 
 %description -n xorg-drv-video-vboxvideo
 X.org video driver for VirtualBox guest machine-
@@ -191,6 +192,7 @@ X.org mouse driver for VirtualBox guest machine.
 %patch10 -p1
 %endif
 #%patch12 -p1
+%patch13 -p1
 
 %ifarch %{ix86}
 sed -i "s|VBOX_SUPPORTED_HOST_ARCHS := amd64|VBOX_SUPPORTED_HOST_ARCHS := x86|" Config.kmk
@@ -697,6 +699,9 @@ fi
 #%{_prefix}/src/vboxvideo-%{version}/*
 
 %changelog
+* Thu Apr 15 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 6.1.18-2mamba
+- added patch to fix build of vbovideo with kernel 5.10
+
 * Sun Feb 28 2021 Automatic Build System <autodist@mambasoft.it> 6.1.18-1mamba
 - automatic version update by autodist