[arch-commits] Commit in wireguard/repos/community-x86_64 (3 files)

[Jan Steffens]

    Date: Wednesday, December 18, 2019 @ 20:46:32
  Author: heftig
Revision: 538185

archrelease: copy trunk to community-x86_64

Added:
  wireguard/repos/community-x86_64/PKGBUILD
    (from rev 538183, wireguard/trunk/PKGBUILD)
  wireguard/repos/community-x86_64/kernel-5.4.5.patch
    (from rev 538183, wireguard/trunk/kernel-5.4.5.patch)
Deleted:
  wireguard/repos/community-x86_64/PKGBUILD

--------------------+
 PKGBUILD           |  126 ++++++++++++++++++++++++++-------------------------
 kernel-5.4.5.patch |   12 ++++
 2 files changed, 77 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-18 20:46:32 UTC (rev 538184)
+++ PKGBUILD	2019-12-18 20:46:32 UTC (rev 538185)
@@ -1,61 +0,0 @@
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Contributor: Jason A. Donenfeld <Jason at zx2c4.com>
-
-pkgbase=wireguard
-pkgname=(wireguard-dkms wireguard-tools)
-pkgver=0.0.20191212
-pkgrel=1
-pkgdesc='next generation secure network tunnel'
-arch=('x86_64')
-url='http://www.wireguard.com/'
-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})
-sha256sums=('b0d718380f7a8822b2f12d75e462fa4eafa3a77871002981f367cd4fe2a1b071'
-            'SKIP')
-
-prepare() {
-	cd WireGuard-${pkgver}/
-
-	find contrib/examples/ -name '.gitignore' -delete
-}
-
-build() {
-	cd WireGuard-${pkgver}/
-
-	make -C src/tools/
-}
-
-package_wireguard-dkms() {
-	depends=('dkms')
-	provides=('WIREGUARD-MODULE')
-
-	cd WireGuard-${pkgver}/
-
-	make -C src/ \
-		DESTDIR="${pkgdir}/" \
-		DKMSDIR="/usr/src/wireguard-${pkgver}/" \
-		dkms-install
-}
-
-package_wireguard-tools() {
-	depends=('libmnl')
-	optdepends=('openresolv: for DNS functionality'
-	            'wireguard-dkms: wireguard module, built by dkms'
-	            'wireguard-arch: wireguard module for linux'
-	            'wireguard-lts: wireguard module for linux-lts')
-
-	cd WireGuard-${pkgver}/
-
-	make -C src/tools/ \
-		DESTDIR="${pkgdir}/" \
-		WITH_BASHCOMPLETION=yes \
-                WITH_WGQUICK=yes \
-                WITH_SYSTEMDUNITS=yes \
-                install
-
-	install -d -m0755 "${pkgdir}"/usr/share/${pkgbase}/
-	cp -r contrib/examples/ "${pkgdir}"/usr/share/${pkgbase}/
-}
-

Copied: wireguard/repos/community-x86_64/PKGBUILD (from rev 538183, wireguard/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-18 20:46:32 UTC (rev 538185)
@@ -0,0 +1,65 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Jason A. Donenfeld <Jason at zx2c4.com>
+
+pkgbase=wireguard
+pkgname=(wireguard-dkms wireguard-tools)
+pkgver=0.0.20191212
+pkgrel=2
+pkgdesc='next generation secure network tunnel'
+arch=('x86_64')
+url='http://www.wireguard.com/'
+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}
+        kernel-5.4.5.patch)
+sha256sums=('b0d718380f7a8822b2f12d75e462fa4eafa3a77871002981f367cd4fe2a1b071'
+            'SKIP'
+            '603e53fb70ef0b40601924f699c3629c65c879e03c57b3e628e5fea47ac710ba')
+
+prepare() {
+	cd WireGuard-${pkgver}/
+
+	patch -Np1 -i ../kernel-5.4.5.patch
+
+	find contrib/examples/ -name '.gitignore' -delete
+}
+
+build() {
+	cd WireGuard-${pkgver}/
+
+	make -C src/tools/
+}
+
+package_wireguard-dkms() {
+	depends=('dkms')
+	provides=('WIREGUARD-MODULE')
+
+	cd WireGuard-${pkgver}/
+
+	make -C src/ \
+		DESTDIR="${pkgdir}/" \
+		DKMSDIR="/usr/src/wireguard-${pkgver}/" \
+		dkms-install
+}
+
+package_wireguard-tools() {
+	depends=('libmnl')
+	optdepends=('openresolv: for DNS functionality'
+	            'wireguard-dkms: wireguard module, built by dkms'
+	            'wireguard-arch: wireguard module for linux'
+	            'wireguard-lts: wireguard module for linux-lts')
+
+	cd WireGuard-${pkgver}/
+
+	make -C src/tools/ \
+		DESTDIR="${pkgdir}/" \
+		WITH_BASHCOMPLETION=yes \
+                WITH_WGQUICK=yes \
+                WITH_SYSTEMDUNITS=yes \
+                install
+
+	install -d -m0755 "${pkgdir}"/usr/share/${pkgbase}/
+	cp -r contrib/examples/ "${pkgdir}"/usr/share/${pkgbase}/
+}
+

Copied: wireguard/repos/community-x86_64/kernel-5.4.5.patch (from rev 538183, wireguard/trunk/kernel-5.4.5.patch)
===================================================================
--- kernel-5.4.5.patch	                        (rev 0)
+++ kernel-5.4.5.patch	2019-12-18 20:46:32 UTC (rev 538185)
@@ -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
+