[wireguard-kmod] Drop support for < 4.4 kernel
by Leigh Scott
commit 14bf1d90ce5e2553876cdbdb644ec86e10699bc2
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Sep 4 10:14:50 2019 +0100
Drop support for < 4.4 kernel
wireguard-kmod.spec | 3 ++-
wireguard-rhel.patch | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index af69113..79e7fa9 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -11,6 +11,7 @@ License: GPLv2
URL: https://www.wireguard.com/
Source0: https://git.zx2c4.com/WireGuard/snapshot/WireGuard-%{version}.tar.xz
+Patch0: wireguard-rhel.patch
BuildRequires: kmodtool
BuildRequires: elfutils-libelf-devel
@@ -37,7 +38,7 @@ This package contains the kmod module for WireGuard.
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
-%autosetup -c -T -a 0
+%autosetup -c -T -a 0 -p 1
for kernel_version in %{?kernel_versions} ; do
cp -a WireGuard-%{version} _kmod_build_${kernel_version%%___*}
diff --git a/wireguard-rhel.patch b/wireguard-rhel.patch
new file mode 100644
index 0000000..b351f8e
--- /dev/null
+++ b/wireguard-rhel.patch
@@ -0,0 +1,22 @@
+--- a/WireGuard-0.0.20190702/src/compat/compat.h
++++ b/WireGuard-0.0.20190702/src/compat/compat.h
+@@ -79,18 +79,6 @@
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) && !defined(ISRHEL7)
+ #define ipv6_dst_lookup(a, b, c, d) ipv6_dst_lookup(b, c, d)
+-#endif
+-
+-#if (LINUX_VERSION_CODE == KERNEL_VERSION(4, 4, 0) || \
+- (LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 5) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)) || \
+- (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 17) && LINUX_VERSION_CODE > KERNEL_VERSION(3, 19, 0)) || \
+- (LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 27) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) || \
+- (LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 8) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)) || \
+- (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 40) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)) || \
+- (LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 54))) && !defined(ISUBUNTU1404)
+-#include <linux/if.h>
+-#include <net/ip_tunnels.h>
+-#define IP6_ECN_set_ce(a, b) IP6_ECN_set_ce(b)
+ #endif
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && IS_ENABLED(CONFIG_IPV6) && !defined(ISRHEL7)
+
4 years, 7 months
[wireguard-kmod/el7: 2/2] Merge branch 'master' into el7
by Leigh Scott
commit 24057e6de74db883128d16fe23a827a506154eb5
Merge: d04a675 b5dc72d
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Sep 4 09:31:36 2019 +0100
Merge branch 'master' into el7
wireguard-kmod.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
4 years, 7 months
[wireguard-kmod] fix changelog
by Leigh Scott
commit b5dc72d3398b5056ebaa2460dd6d6ac9ebff67df
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Sep 4 09:30:16 2019 +0100
fix changelog
wireguard-kmod.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index 3ff8bff..af69113 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -66,16 +66,16 @@ done
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.0.20190702-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-* Fri Jul 05 19:32:04 CEST 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-1
+* Fri Jul 05 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-1
- Release 0.0.20190702
-* Fri May 31 20:14:05 CEST 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190531-1
+* Fri May 31 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190531-1
- Release 0.0.20190531
-* Sat Apr 06 13:32:03 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190406-1
+* Sat Apr 06 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190406-1
- Release 0.0.20190406
-* Thu Apr 04 19:27:39 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190227-3
+* Thu Apr 04 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190227-3
- Rebuilt for akmods-ostree-post scriptlet
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.0.20190227-2
4 years, 7 months
[wireguard-kmod/el7: 17/18] rebase spec
by Leigh Scott
commit b2edd5903d97b9e9e72b36529013c77bbb307b82
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Sep 4 08:30:58 2019 +0100
rebase spec
wireguard-kmod.spec | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index fa02858..3ff8bff 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -1,10 +1,12 @@
+%if 0%{?fedora}
%global buildforkernels akmod
%global debug_package %{nil}
+%endif
Name: wireguard-kmod
Summary: Kernel module (kmod) for Wireguard
Version: 0.0.20190702
-Release: 1%{?dist}
+Release: 3%{?dist}
License: GPLv2
URL: https://www.wireguard.com/
@@ -58,15 +60,27 @@ done
%changelog
-* Fri Jul 05 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-1
+* Wed Sep 04 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.0.20190702-3
+- Rebuild for new el7 kernel and generate kmod package
+
+* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.0.20190702-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Jul 05 19:32:04 CEST 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-1
- Release 0.0.20190702
-* Fri May 31 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190531-1
+* Fri May 31 20:14:05 CEST 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190531-1
- Release 0.0.20190531
-* Sat Apr 06 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190406-1
+* Sat Apr 06 13:32:03 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190406-1
- Release 0.0.20190406
+* Thu Apr 04 19:27:39 CET 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190227-3
+- Rebuilt for akmods-ostree-post scriptlet
+
+* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.0.20190227-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Thu Feb 28 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190227-1
- Release 0.0.20190227
@@ -89,6 +103,9 @@ done
* Sun Oct 07 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20181007-1
- Release 0.0.20181007
+* Sat Oct 06 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20181006-1
+- Release 0.0.20181006
+
* Tue Sep 25 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20180925-1
- Release 0.0.20180925
4 years, 7 months
[wireguard-kmod/el7] (18 commits) ...Merge branch 'master' into el7
by Leigh Scott
Summary of changes:
50ea5b8... Release 0.0.20180925 (*)
62bbd54... Release 0.0.20181006 (*)
0b05eef... Release 0.0.20181007 (*)
b4e9bc2... Release 0.0.20181018 (*)
77fc260... Release 0.0.20181115 (*)
d778e80... Release 0.0.20181119 (*)
217075a... Release 0.0.20181218 Use make modules instead of make modul (*)
2f8f9c3... Release 0.0.20190123 (*)
a164e9a... Release 0.0.20190227 (*)
ed320f5... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*)
d06feea... Rebuilt for akmods-ostree-post scriptlet (*)
04f3744... Release 0.0.20190406 (*)
5bf0bf2... Release 0.0.20190531 (*)
10fdc7f... Release 0.0.20190702 (*)
648a48a... - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass (*)
a1168d5... Rebuild for new el7 kernel and generate kmod package (*)
b2edd59... rebase spec
d04a675... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
[wireguard-kmod] Rebuild for new el7 kernel and generate kmod package
by Leigh Scott
commit a1168d508d99aa581c0f3d48117466733b58c7c2
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Sep 4 08:26:47 2019 +0100
Rebuild for new el7 kernel and generate kmod package
wireguard-kmod.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index a2367cf..3ff8bff 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -1,10 +1,12 @@
+%if 0%{?fedora}
%global buildforkernels akmod
%global debug_package %{nil}
+%endif
Name: wireguard-kmod
Summary: Kernel module (kmod) for Wireguard
Version: 0.0.20190702
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
URL: https://www.wireguard.com/
@@ -58,6 +60,9 @@ done
%changelog
+* Wed Sep 04 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.0.20190702-3
+- Rebuild for new el7 kernel and generate kmod package
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.0.20190702-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
4 years, 7 months
[xtables-addons-kmod/el7] Rebuild for new el7 kernel
by Leigh Scott
commit 18345a773c08f85877c0de80c5477d3109cf48af
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Sep 3 22:57:47 2019 +0100
Rebuild for new el7 kernel
xtables-addons-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xtables-addons-kmod.spec b/xtables-addons-kmod.spec
index 1ad7f63..360ab20 100644
--- a/xtables-addons-kmod.spec
+++ b/xtables-addons-kmod.spec
@@ -11,7 +11,7 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -66,6 +66,9 @@ done
rm -rf %{buildroot}
%changelog
+* Tue Sep 03 2019 Leigh Scott <leigh123linux(a)gmail.com> - 2.13-2
+- Rebuild for new el7 kernel
+
* Mon Jul 03 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2.13-1
- Update to 2.13
- Avoid xt_TARPIT on rhel kernel
4 years, 7 months