[xtables-addons-kmod/el9: 8/8] Merge branch 'master' into el9
by Nicolas Chauvet
commit 395d7665cf1743d330801086b6d59fdeb5a1645b
Merge: bb3a3f9 7937236
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 24 18:15:17 2023 +0100
Merge branch 'master' into el9
el8_fix.patch | 8 ++++----
el9_fix.patch | 12 ++++++++++++
sources | 2 +-
xtables-addons-kmod.spec | 31 ++++++++++++++++++++-----------
4 files changed, 37 insertions(+), 16 deletions(-)
---
5 months, 3 weeks
[xtables-addons-kmod] Update for el9
by Nicolas Chauvet
commit 7937236a82f03e51d065c0f33754169f09489ea4
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 24 18:15:04 2023 +0100
Update for el9
xtables-addons-kmod.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/xtables-addons-kmod.spec b/xtables-addons-kmod.spec
index ef1667e..0d84fc1 100644
--- a/xtables-addons-kmod.spec
+++ b/xtables-addons-kmod.spec
@@ -11,11 +11,12 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 3.25
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
URL: https://inai.de/projects/xtables-addons/
Source0: https://inai.de/files/xtables-addons/xtables-addons-%{version}.tar.xz
Patch0: el8_fix.patch
+Patch1: el9_fix.patch
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: gcc, elfutils-libelf-devel, buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -62,6 +63,9 @@ done
%{?akmod_install}
%changelog
+* Fri Nov 24 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 3.25-2
+- Update for el9
+
* Tue Nov 21 2023 Leigh Scott <leigh123linux(a)gmail.com> - 3.25-1
- Release 3.25
5 months, 3 weeks
[xtables-addons-kmod] Add el9_fix
by Nicolas Chauvet
commit ed44cffde7da2def3efe72b941ec73148eae3a7d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 24 18:14:38 2023 +0100
Add el9_fix
el9_fix.patch | 12 ++++++++++++
1 file changed, 12 insertions(+)
---
diff --git a/el9_fix.patch b/el9_fix.patch
new file mode 100644
index 0000000..9ebd622
--- /dev/null
+++ b/el9_fix.patch
@@ -0,0 +1,12 @@
+diff -up xtables-addons-3.25/extensions/compat_xtables.h.orig xtables-addons-3.25/extensions/compat_xtables.h
+--- xtables-addons-3.25/extensions/compat_xtables.h.orig 2023-11-24 14:41:38.305047788 +0100
++++ xtables-addons-3.25/extensions/compat_xtables.h 2023-11-24 16:30:53.525902208 +0100
+@@ -26,7 +26,7 @@
+ # define ip_route_me_harder(xnet, xsk, xskb, xaddrtype) ip_route_me_harder((xnet), (xskb), (xaddrtype))
+ # define ip6_route_me_harder(xnet, xsk, xskb) ip6_route_me_harder((xnet), (xskb))
+ #endif
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)
+ # define pde_data(inode) PDE_DATA(inode)
+ #endif
+
5 months, 3 weeks
[v4l2loopback-kmod] Rebuilt
by Nicolas Chauvet
commit 45c9ae260df1c5fb09b46e3b4790ee91a1020837
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 24 18:01:52 2023 +0100
Rebuilt
v4l2loopback-kmod.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/v4l2loopback-kmod.spec b/v4l2loopback-kmod.spec
index 7c79779..764e08b 100644
--- a/v4l2loopback-kmod.spec
+++ b/v4l2loopback-kmod.spec
@@ -18,7 +18,7 @@
Name: %{prjname}-kmod
Summary: Kernel module (kmod) for %{prjname}
Version: 0.12.7^%{commitdate}g%{shortcommit}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL: https://github.com/umlaeute/v4l2loopback
@@ -52,7 +52,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{prjname} %{?buil
%setup -q -c
(cd v4l2loopback-%{commit}
-%patch0 -p1
+%patch -P 0 -p1
)
for kernel_version in %{?kernel_versions} ; do
@@ -76,6 +76,9 @@ done
%changelog
+* Fri Nov 24 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 0.12.7^20230503g2c9b670-3
+- Rebuilt
+
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.12.7^20230503g2c9b670-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
5 months, 3 weeks