- fix building on kernel 5.4.29+

- rel 2

diff --git a/WireGuard.spec b/WireGuard.spec
index b48216d4f7562128c0e0832667752f8ce5ad35ac..7035ef3964c09a8fee514cd4d377b2c6862bc36a 100644 (file)
--- a/WireGuard.spec
+++ b/WireGuard.spec
@@ -12,16 +12,17 @@ exit 1
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     1
+%define                rel     2
 %define                pname   WireGuard
+Summary:       WireGuard is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 Version:       0.0.20191219
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
-Source0:       https://git.zx2c4.com/WireGuard/snapshot/%{pname}-%{version}.tar.xz
-# Source0-md5: 5175ca88850993dc88a4c9d924ee79d4
-Summary:       WireGuard is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography
 License:       GPL v2
 Group:         Networking/Daemons
+Source0:       https://git.zx2c4.com/WireGuard/snapshot/%{pname}-%{version}.tar.xz
+# Source0-md5: 5175ca88850993dc88a4c9d924ee79d4
+Patch0:                kernel-5.4.29.patch
 URL:           https://www.wireguard.com/
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:3.10}}
 BuildRequires: libmnl-devel
@@ -72,6 +73,7 @@ WireGuard kernel module.\
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 %build
 %{?with_kernel:%{expand:%build_kernel_packages}}

diff --git a/kernel-5.4.29.patch b/kernel-5.4.29.patch
new file mode 100644 (file)
index 0000000..a3c7d4f
--- /dev/null
+++ b/kernel-5.4.29.patch
@@ -0,0 +1,14 @@
+--- WireGuard-0.0.20191219/src/queueing.h~     2019-12-19 01:12:35.000000000 +0100
++++ WireGuard-0.0.20191219/src/queueing.h      2020-04-05 10:52:10.887319410 +0200
+@@ -97,7 +97,11 @@
+       skb->dev = NULL;
+ #ifdef CONFIG_NET_SCHED
+       skb->tc_index = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29)
+       skb_reset_tc(skb);
++#else
++      skb_reset_redirect(skb);
++#endif
+ #endif
+       skb->hdr_len = skb_headroom(skb);
+       skb_reset_mac_header(skb);