[wireguard-kmod/f30: 15/16] Merge branch 'master' into el7
by Leigh Scott
commit 71dd438a4a835257203a733a4a87825b2eb1e3c9
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Sep 15 12:28:47 2019 +0100
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
wireguard-kmod.spec | 8 +++++---
wireguard-rhel.patch | 22 ----------------------
4 files changed, 7 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da2575a..7cc97ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/WireGuard-0.0.20190406.tar.xz
/WireGuard-0.0.20190531.tar.xz
/WireGuard-0.0.20190702.tar.xz
+/WireGuard-0.0.20190913.tar.xz
diff --git a/sources b/sources
index b79940d..d5f9605 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7410a52bacc5eb85e1634a20c07d3bed WireGuard-0.0.20190702.tar.xz
+ec2345dfc8ffc61ccd7529d5d19b2602 WireGuard-0.0.20190913.tar.xz
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index 79e7fa9..0296ec8 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -5,13 +5,12 @@
Name: wireguard-kmod
Summary: Kernel module (kmod) for Wireguard
-Version: 0.0.20190702
-Release: 3%{?dist}
+Version: 0.0.20190913
+Release: 1%{?dist}
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
@@ -61,6 +60,9 @@ done
%changelog
+* Sun Sep 15 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.0.20190913-1
+- Release 0.0.20190913
+
* Wed Sep 04 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.0.20190702-3
- Rebuild for new el7 kernel and generate kmod package
5 years
[wireguard-kmod/f30: 14/16] Drop support for < 4.4 kernel
by Leigh Scott
commit fdee14093d073aeefa410a3088eb80074c2876b6
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)
+
5 years
[wireguard-kmod/f30: 13/16] Rebuild for new el7 kernel and generate kmod package
by Leigh Scott
commit 65ebbe33227a17dc63e88181ff0ab3f55a8d2fbf
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 ef72ba9..af69113 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
5 years
[wireguard-kmod/f30: 12/16] fix changelog
by Leigh Scott
commit 9ca6278b77a25d8a80e5a02db68d461d905d9f90
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 a2367cf..ef72ba9 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -61,16 +61,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
5 years
[wireguard-kmod/f30] (16 commits) ...Merge branch 'master' into f30
by Leigh Scott
Summary of changes:
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 (*)
b5dc72d... fix changelog (*)
14bf1d9... Drop support for < 4.4 kernel (*)
e17743d... Release 0.0.20190913 (*)
400d9f9... Add source (*)
7653fc1... - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass
9ca6278... fix changelog
65ebbe3... Rebuild for new el7 kernel and generate kmod package
fdee140... Drop support for < 4.4 kernel
71dd438... Merge branch 'master' into el7
7c9acd0... Merge branch 'master' into f30
(*) This commit already existed in another branch; no separate mail sent
5 years
[wireguard-kmod/f31] (5 commits) ...Add source
by Leigh Scott
Summary of changes:
a1168d5... Rebuild for new el7 kernel and generate kmod package (*)
b5dc72d... fix changelog (*)
14bf1d9... Drop support for < 4.4 kernel (*)
e17743d... Release 0.0.20190913 (*)
400d9f9... Add source (*)
(*) This commit already existed in another branch; no separate mail sent
5 years
[wireguard/f29] Release 0.0.20190913
by Leigh Scott
commit cc053a6c684cdf675841641ed71bcb5730df3415
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Sep 15 12:08:56 2019 +0100
Release 0.0.20190913
.gitignore | 1 +
sources | 2 +-
wireguard.spec | 15 +++++++++------
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da2575a..7cc97ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/WireGuard-0.0.20190406.tar.xz
/WireGuard-0.0.20190531.tar.xz
/WireGuard-0.0.20190702.tar.xz
+/WireGuard-0.0.20190913.tar.xz
diff --git a/sources b/sources
index b79940d..d5f9605 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7410a52bacc5eb85e1634a20c07d3bed WireGuard-0.0.20190702.tar.xz
+ec2345dfc8ffc61ccd7529d5d19b2602 WireGuard-0.0.20190913.tar.xz
diff --git a/wireguard.spec b/wireguard.spec
index 427a698..c2efd43 100644
--- a/wireguard.spec
+++ b/wireguard.spec
@@ -1,7 +1,7 @@
Name: wireguard
Summary: Fast, modern, secure VPN tunnel
-Version: 0.0.20190702
-Release: 2%{?dist}
+Version: 0.0.20190913
+Release: 1%{?dist}
License: GPLv2
URL: https://www.wireguard.com/
@@ -75,16 +75,19 @@ sed -i 's(a)network-online.target nss-lookup.target(a)network-online.target nss-look
%changelog
-* Tue Aug 06 23:01:56 CEST 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-2
+* Sun Sep 15 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.0.20190913-1
+- Release 0.0.20190913
+
+* Tue Aug 06 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-2
- Patch unit file to depend on systemd-resolved.service (#5325)
-* Fri Jul 05 19:32:04 CEST 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-2
+* Fri Jul 05 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-2
- 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:29:56 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 Mar 07 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190227-2
5 years
[wireguard/f30] Release 0.0.20190913
by Leigh Scott
commit 1e2e86f28588bf1e877b44e640bb0b33f79e5f0d
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Sep 15 12:08:56 2019 +0100
Release 0.0.20190913
.gitignore | 1 +
sources | 2 +-
wireguard.spec | 15 +++++++++------
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da2575a..7cc97ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/WireGuard-0.0.20190406.tar.xz
/WireGuard-0.0.20190531.tar.xz
/WireGuard-0.0.20190702.tar.xz
+/WireGuard-0.0.20190913.tar.xz
diff --git a/sources b/sources
index b79940d..d5f9605 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7410a52bacc5eb85e1634a20c07d3bed WireGuard-0.0.20190702.tar.xz
+ec2345dfc8ffc61ccd7529d5d19b2602 WireGuard-0.0.20190913.tar.xz
diff --git a/wireguard.spec b/wireguard.spec
index f63178a..78ed32a 100644
--- a/wireguard.spec
+++ b/wireguard.spec
@@ -1,7 +1,7 @@
Name: wireguard
Summary: Fast, modern, secure VPN tunnel
-Version: 0.0.20190702
-Release: 2%{?dist}
+Version: 0.0.20190913
+Release: 1%{?dist}
License: GPLv2
URL: https://www.wireguard.com/
@@ -75,16 +75,19 @@ sed -i 's(a)network-online.target nss-lookup.target(a)network-online.target nss-look
%changelog
-* Tue Aug 06 23:01:56 CEST 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-2
+* Sun Sep 15 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.0.20190913-1
+- Release 0.0.20190913
+
+* Tue Aug 06 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-2
- Patch unit file to depend on systemd-resolved.service (#5325)
-* Fri Jul 05 19:32:04 CEST 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-2
+* Fri Jul 05 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190702-2
- 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:29:56 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 Mar 07 2019 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.20190227-3
5 years