[arch-commits] Commit in wireguard-dkms/trunk (PKGBUILD lts.diff)

[Jan Steffens]

    Date: Tuesday, November 10, 2020 @ 15:14:39
  Author: heftig
Revision: 400068

1.0.20200908-2: fix build against linux-lts 5.4.76

Added:
  wireguard-dkms/trunk/lts.diff
Modified:
  wireguard-dkms/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++++++---
 lts.diff |   12 ++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-10 15:01:28 UTC (rev 400067)
+++ PKGBUILD	2020-11-10 15:14:39 UTC (rev 400068)
@@ -3,7 +3,7 @@
 
 pkgname=wireguard-dkms
 pkgver=1.0.20200908
-pkgrel=1
+pkgrel=2
 pkgdesc='next generation secure network tunnel - module sources'
 arch=('x86_64')
 url='https://www.wireguard.com/'
@@ -11,10 +11,19 @@
 depends=('dkms')
 provides=('WIREGUARD-MODULE')
 validpgpkeys=('AB9942E6D4A4CFC3412620A749FC7012A5DE03AE') # Jason A. Donenfeld <Jason at zx2c4.com>
-source=("https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${pkgver}.tar"{.xz,.asc})
+source=("https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${pkgver}.tar"{.xz,.asc}
+        lts.diff)
 sha256sums=('ad33b2d2267a37e0f65c97e65e7d4d926d5aef7d530c251b63fbf919048eead9'
-            'SKIP')
+            'SKIP'
+            '40512118e30e26486b94026caac3d4a35dd55cbd244472ec1adb91878f4c12b3')
 
+prepare() {
+	cd wireguard-linux-compat-${pkgver}/
+
+	# Fix build against linux-lts 5.4.76
+	patch -Np1 -i ../lts.diff
+}
+
 package() {
 	cd wireguard-linux-compat-${pkgver}/
 
@@ -23,3 +32,5 @@
 		DKMSDIR="/usr/src/wireguard-${pkgver}/" \
 		dkms-install
 }
+
+# vim:set noet sw=0:

Added: lts.diff
===================================================================
--- lts.diff	                        (rev 0)
+++ lts.diff	2020-11-10 15:14:39 UTC (rev 400068)
@@ -0,0 +1,12 @@
+diff -u -r wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h
+--- wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h	2020-09-08 16:22:40.000000000 +0000
++++ wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h	2020-11-10 15:05:43.720093522 +0000
+@@ -40,7 +40,7 @@
+ #undef pull
+ #endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76)
+ #define SYM_FUNC_START ENTRY
+ #define SYM_FUNC_END ENDPROC
+ #endif