[arch-commits] Commit in wireguard/trunk (PKGBUILD kernel-5.4.5.patch)

Jan Steffens heftig at archlinux.org
Wed Dec 18 20:45:55 UTC 2019


    Date: Wednesday, December 18, 2019 @ 20:45:55
  Author: heftig
Revision: 538182

0.0.20191212-2: fix build with linux 5.4.5

Added:
  wireguard/trunk/kernel-5.4.5.patch
Modified:
  wireguard/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   10 +++++++---
 kernel-5.4.5.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-18 20:45:54 UTC (rev 538181)
+++ PKGBUILD	2019-12-18 20:45:55 UTC (rev 538182)
@@ -4,7 +4,7 @@
 pkgbase=wireguard
 pkgname=(wireguard-dkms wireguard-tools)
 pkgver=0.0.20191212
-pkgrel=1
+pkgrel=2
 pkgdesc='next generation secure network tunnel'
 arch=('x86_64')
 url='http://www.wireguard.com/'
@@ -11,13 +11,17 @@
 license=('GPL')
 makedepends=('git' 'libmnl')
 validpgpkeys=('AB9942E6D4A4CFC3412620A749FC7012A5DE03AE') # Jason A. Donenfeld <Jason at zx2c4.com>
-source=("https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${pkgver}.tar"{.xz,.asc})
+source=("https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${pkgver}.tar"{.xz,.asc}
+        kernel-5.4.5.patch)
 sha256sums=('b0d718380f7a8822b2f12d75e462fa4eafa3a77871002981f367cd4fe2a1b071'
-            'SKIP')
+            'SKIP'
+            '603e53fb70ef0b40601924f699c3629c65c879e03c57b3e628e5fea47ac710ba')
 
 prepare() {
 	cd WireGuard-${pkgver}/
 
+	patch -Np1 -i ../kernel-5.4.5.patch
+
 	find contrib/examples/ -name '.gitignore' -delete
 }
 

Added: kernel-5.4.5.patch
===================================================================
--- kernel-5.4.5.patch	                        (rev 0)
+++ kernel-5.4.5.patch	2019-12-18 20:45:55 UTC (rev 538182)
@@ -0,0 +1,12 @@
+diff -u -r WireGuard-0.0.20191212/src/compat/compat.h WireGuard-0.0.20191212-linux-5.4.5/src/compat/compat.h
+--- WireGuard-0.0.20191212/src/compat/compat.h	2019-12-12 11:24:51.000000000 +0000
++++ WireGuard-0.0.20191212-linux-5.4.5/src/compat/compat.h	2019-12-18 20:40:30.831102200 +0000
+@@ -861,7 +861,7 @@
+ })
+ #endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 5)
+ #define ipv6_dst_lookup_flow(a, b, c, d) ipv6_dst_lookup(a, b, &dst, c) + (void *)0 ?: dst
+ #endif
+ 



More information about the arch-commits mailing list