commit 816e096fd0790cb6f70bf4ef454f5251de996e16 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sat Jun 18 17:39:25 2022 +0100 Add cs9.patch rfbz#(6328) VirtualBox-kmod.spec | 8 +++++-- cs9.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index a959fd6..013ce97 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -34,7 +34,7 @@ Name: VirtualBox-kmod Version: 6.1.34 -Release: 3%{?dist} +Release: 4%{?dist} #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Summary: Kernel module for VirtualBox @@ -42,6 +42,7 @@ License: GPLv2 or CDDL URL: http://www.virtualbox.org/wiki/VirtualBox # This filters out the XEN kernel, since we don't run on XEN Source1: excludekernel-filter.txt +Patch1: cs9.patch %global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc >= %{version}%{vboxreltag} xz time elfutils-libelf-devel gcc @@ -63,7 +64,7 @@ Kernel module for VirtualBox %setup -T -c tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz pushd %{name}-%{version} -#patch1 -p1 +%patch1 -p1 popd # error out if there was something wrong with kmodtool @@ -127,6 +128,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* Sat Jun 18 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.34-4 +- Add cs9.patch rfbz#(6328) + * Thu Jun 02 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.34-3 - we have updates in VirtualBox-kmodsrc diff --git a/cs9.patch b/cs9.patch new file mode 100644 index 0000000..3feb1c0 --- /dev/null +++ b/cs9.patch @@ -0,0 +1,60 @@ +diff -rup VirtualBox-kmod-6.1.34.orig/vboxdrv/include/iprt/stdarg.h VirtualBox-kmod-6.1.34/vboxdrv/include/iprt/stdarg.h +--- VirtualBox-kmod-6.1.34.orig/vboxdrv/include/iprt/stdarg.h 2022-03-22 23:34:50.000000000 +0000 ++++ VirtualBox-kmod-6.1.34/vboxdrv/include/iprt/stdarg.h 2022-06-18 17:30:37.554594319 +0100 +@@ -45,7 +45,7 @@ + # endif + # elif defined(RT_OS_LINUX) && defined(IN_RING0) + # include "linux/version.h" +-# if RTLNX_VER_MIN(5,15,0) ++# if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_MAJ_PREREQ(9,1) + # include <linux/stdarg.h> + # else + # include <stdarg.h> +diff -rup VirtualBox-kmod-6.1.34.orig/vboxguest/include/iprt/stdarg.h VirtualBox-kmod-6.1.34/vboxguest/include/iprt/stdarg.h +--- VirtualBox-kmod-6.1.34.orig/vboxguest/include/iprt/stdarg.h 2022-03-22 23:34:50.000000000 +0000 ++++ VirtualBox-kmod-6.1.34/vboxguest/include/iprt/stdarg.h 2022-06-18 17:30:37.554594319 +0100 +@@ -45,7 +45,7 @@ + # endif + # elif defined(RT_OS_LINUX) && defined(IN_RING0) + # include "linux/version.h" +-# if RTLNX_VER_MIN(5,15,0) ++# if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_MAJ_PREREQ(9,1) + # include <linux/stdarg.h> + # else + # include <stdarg.h> +diff -rup VirtualBox-kmod-6.1.34.orig/vboxnetadp/include/iprt/stdarg.h VirtualBox-kmod-6.1.34/vboxnetadp/include/iprt/stdarg.h +--- VirtualBox-kmod-6.1.34.orig/vboxnetadp/include/iprt/stdarg.h 2022-03-22 23:34:50.000000000 +0000 ++++ VirtualBox-kmod-6.1.34/vboxnetadp/include/iprt/stdarg.h 2022-06-18 17:30:37.554594319 +0100 +@@ -45,7 +45,7 @@ + # endif + # elif defined(RT_OS_LINUX) && defined(IN_RING0) + # include "linux/version.h" +-# if RTLNX_VER_MIN(5,15,0) ++# if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_MAJ_PREREQ(9,1) + # include <linux/stdarg.h> + # else + # include <stdarg.h> +diff -rup VirtualBox-kmod-6.1.34.orig/vboxnetflt/include/iprt/stdarg.h VirtualBox-kmod-6.1.34/vboxnetflt/include/iprt/stdarg.h +--- VirtualBox-kmod-6.1.34.orig/vboxnetflt/include/iprt/stdarg.h 2022-03-22 23:34:50.000000000 +0000 ++++ VirtualBox-kmod-6.1.34/vboxnetflt/include/iprt/stdarg.h 2022-06-18 17:30:37.554594319 +0100 +@@ -45,7 +45,7 @@ + # endif + # elif defined(RT_OS_LINUX) && defined(IN_RING0) + # include "linux/version.h" +-# if RTLNX_VER_MIN(5,15,0) ++# if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_MAJ_PREREQ(9,1) + # include <linux/stdarg.h> + # else + # include <stdarg.h> +diff -rup VirtualBox-kmod-6.1.34.orig/vboxsf/include/iprt/stdarg.h VirtualBox-kmod-6.1.34/vboxsf/include/iprt/stdarg.h +--- VirtualBox-kmod-6.1.34.orig/vboxsf/include/iprt/stdarg.h 2022-03-22 23:34:50.000000000 +0000 ++++ VirtualBox-kmod-6.1.34/vboxsf/include/iprt/stdarg.h 2022-06-18 17:30:37.554594319 +0100 +@@ -45,7 +45,7 @@ + # endif + # elif defined(RT_OS_LINUX) && defined(IN_RING0) + # include "linux/version.h" +-# if RTLNX_VER_MIN(5,15,0) ++# if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_MAJ_PREREQ(9,1) + # include <linux/stdarg.h> + # else + # include <stdarg.h>