commit 170c197138d3f6e8ba44938471f76d3d43e52908 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed Oct 18 13:18:08 2023 +0100 Update to 7.0.12 VirtualBox-kmod.spec | 11 ++++++----- kernel-6.4.10.patch | 11 ----------- kernel-6.5.patch | 42 +++++++++++++++++++++--------------------- update_vbox.sh | 6 +++--- 4 files changed, 30 insertions(+), 40 deletions(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index cecc049..37cc3f4 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -39,8 +39,8 @@ # https://bugzilla.rpmfusion.org/show_bug.cgi?id=6519 Name: VirtualBox-kmod -Version: 7.0.10 -Release: 3%{?dist} +Version: 7.0.12 +Release: 1%{?dist} #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Summary: Kernel module for VirtualBox @@ -49,7 +49,6 @@ 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: fix_7.0.6_locking_problems.patch -Patch2: kernel-6.4.10.patch Patch3: kernel-6.5.patch @@ -73,9 +72,8 @@ Kernel module for VirtualBox tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz pushd %{name}-%{version} %patch -P 1 -p1 -%patch -P 2 -p1 -popd %patch -P 3 -p1 +popd # error out if there was something wrong with kmodtool %{?kmodtool_check} @@ -137,6 +135,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) [ $MODS = $DIRS ] || [ $MODS = 0 ] %changelog +* Wed Oct 18 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 7.0.12-1 +- Update to 7.0.12 + * Sun Sep 10 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 7.0.10-3 - Fixes for kernel-6.5 copied from OpenSuse diff --git a/kernel-6.5.patch b/kernel-6.5.patch index 2b55196..254b6a8 100644 --- a/kernel-6.5.patch +++ b/kernel-6.5.patch @@ -1,7 +1,7 @@ Only in VirtualBox-kmod-7.0.10: vboxnetadp -diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxdrv/include/iprt/cdefs.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxdrv/include/iprt/cdefs.h ---- VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxdrv/include/iprt/cdefs.h 2023-07-12 17:25:21.000000000 +0100 -+++ VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxdrv/include/iprt/cdefs.h 2023-09-10 22:13:17.207356435 +0100 +diff -urp VirtualBox-kmod-7.0.10/vboxdrv/include/iprt/cdefs.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxdrv/include/iprt/cdefs.h +--- VirtualBox-kmod-7.0.10/vboxdrv/include/iprt/cdefs.h 2023-07-12 17:25:21.000000000 +0100 ++++ VirtualBox-kmod-7.0.10/vboxdrv/include/iprt/cdefs.h 2023-09-10 22:13:17.207356435 +0100 @@ -38,8 +38,9 @@ #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once @@ -80,9 +80,9 @@ diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxdrv/include/ipr /** @def RT_UNION_NM Only in VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxdrv/include/iprt: cdefs.h.orig -diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxguest/include/iprt/cdefs.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxguest/include/iprt/cdefs.h ---- VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxguest/include/iprt/cdefs.h 2023-07-12 17:25:21.000000000 +0100 -+++ VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxguest/include/iprt/cdefs.h 2023-09-10 22:12:41.853471376 +0100 +diff -urp VirtualBox-kmod-7.0.10/vboxguest/include/iprt/cdefs.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxguest/include/iprt/cdefs.h +--- VirtualBox-kmod-7.0.10/vboxguest/include/iprt/cdefs.h 2023-07-12 17:25:21.000000000 +0100 ++++ VirtualBox-kmod-7.0.10/vboxguest/include/iprt/cdefs.h 2023-09-10 22:12:41.853471376 +0100 @@ -38,8 +38,9 @@ #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once @@ -161,9 +161,9 @@ diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxguest/include/i /** @def RT_UNION_NM Only in VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxguest/include/iprt: cdefs.h.orig -diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxguest/include/VBox/VBoxGuest.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxguest/include/VBox/VBoxGuest.h ---- VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxguest/include/VBox/VBoxGuest.h 2023-07-12 17:25:14.000000000 +0100 -+++ VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxguest/include/VBox/VBoxGuest.h 2023-09-10 22:15:25.028940841 +0100 +diff -urp VirtualBox-kmod-7.0.10/vboxguest/include/VBox/VBoxGuest.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxguest/include/VBox/VBoxGuest.h +--- VirtualBox-kmod-7.0.10/vboxguest/include/VBox/VBoxGuest.h 2023-07-12 17:25:14.000000000 +0100 ++++ VirtualBox-kmod-7.0.10/vboxguest/include/VBox/VBoxGuest.h 2023-09-10 22:15:25.028940841 +0100 @@ -458,8 +458,12 @@ typedef struct VBGLIOCLOG { /** The log message. @@ -179,9 +179,9 @@ diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxguest/include/V } u; } VBGLIOCLOG, RT_FAR *PVBGLIOCLOG; /** @} */ -diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxnetadp/include/iprt/cdefs.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxnetadp/include/iprt/cdefs.h ---- VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxnetadp/include/iprt/cdefs.h 2023-07-12 17:25:21.000000000 +0100 -+++ VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxnetadp/include/iprt/cdefs.h 2023-09-10 22:12:28.116516034 +0100 +diff -urp VirtualBox-kmod-7.0.10/vboxnetadp/include/iprt/cdefs.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxnetadp/include/iprt/cdefs.h +--- VirtualBox-kmod-7.0.10/vboxnetadp/include/iprt/cdefs.h 2023-07-12 17:25:21.000000000 +0100 ++++ VirtualBox-kmod-7.0.10/vboxnetadp/include/iprt/cdefs.h 2023-09-10 22:12:28.116516034 +0100 @@ -38,8 +38,9 @@ #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once @@ -260,9 +260,9 @@ diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxnetadp/include/ /** @def RT_UNION_NM Only in VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxnetadp/include/iprt: cdefs.h.orig -diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxnetflt/include/iprt/cdefs.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxnetflt/include/iprt/cdefs.h ---- VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxnetflt/include/iprt/cdefs.h 2023-07-12 17:25:21.000000000 +0100 -+++ VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxnetflt/include/iprt/cdefs.h 2023-09-10 22:13:08.768383873 +0100 +diff -urp VirtualBox-kmod-7.0.10/vboxnetflt/include/iprt/cdefs.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxnetflt/include/iprt/cdefs.h +--- VirtualBox-kmod-7.0.10/vboxnetflt/include/iprt/cdefs.h 2023-07-12 17:25:21.000000000 +0100 ++++ VirtualBox-kmod-7.0.10/vboxnetflt/include/iprt/cdefs.h 2023-09-10 22:13:08.768383873 +0100 @@ -38,8 +38,9 @@ #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once @@ -341,9 +341,9 @@ diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxnetflt/include/ /** @def RT_UNION_NM Only in VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxnetflt/include/iprt: cdefs.h.orig -diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxsf/include/iprt/cdefs.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxsf/include/iprt/cdefs.h ---- VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxsf/include/iprt/cdefs.h 2023-07-12 17:25:21.000000000 +0100 -+++ VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxsf/include/iprt/cdefs.h 2023-09-10 22:13:26.540326093 +0100 +diff -urp VirtualBox-kmod-7.0.10/vboxsf/include/iprt/cdefs.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxsf/include/iprt/cdefs.h +--- VirtualBox-kmod-7.0.10/vboxsf/include/iprt/cdefs.h 2023-07-12 17:25:21.000000000 +0100 ++++ VirtualBox-kmod-7.0.10/vboxsf/include/iprt/cdefs.h 2023-09-10 22:13:26.540326093 +0100 @@ -38,8 +38,9 @@ #ifndef RT_WITHOUT_PRAGMA_ONCE # pragma once @@ -421,9 +421,9 @@ diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxsf/include/iprt #endif /** @def RT_UNION_NM -diff -urp VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxsf/include/VBox/VBoxGuest.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxsf/include/VBox/VBoxGuest.h ---- VirtualBox-kmod-7.0.10.orig/VirtualBox-kmod-7.0.10/vboxsf/include/VBox/VBoxGuest.h 2023-07-12 17:25:14.000000000 +0100 -+++ VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxsf/include/VBox/VBoxGuest.h 2023-09-10 22:15:34.166911131 +0100 +diff -urp VirtualBox-kmod-7.0.10/vboxsf/include/VBox/VBoxGuest.h VirtualBox-kmod-7.0.10/VirtualBox-kmod-7.0.10/vboxsf/include/VBox/VBoxGuest.h +--- VirtualBox-kmod-7.0.10/vboxsf/include/VBox/VBoxGuest.h 2023-07-12 17:25:14.000000000 +0100 ++++ VirtualBox-kmod-7.0.10/vboxsf/include/VBox/VBoxGuest.h 2023-09-10 22:15:34.166911131 +0100 @@ -458,8 +458,12 @@ typedef struct VBGLIOCLOG { /** The log message. diff --git a/update_vbox.sh b/update_vbox.sh index 04b1bb7..f8ab5aa 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,7 +1,7 @@ -VERSION=7.0.10 +VERSION=7.0.12 REL=1 -RAWHIDE=39 -REPOS="f38 f37 el9 el8" +RAWHIDE=40 +REPOS="f39 f38 f37 el9 el8" if [ -z "$1" ] then