From 1efc713ae3e25e7b0f86bf23e6d35d96f8527968 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Wed, 21 Aug 2019 11:09:06 +0200
Subject: [PATCH] Bump wireguard to 0.0.20190702 - 4.19.52

---
 apk/wireguard-tools/APKBUILD | 17 ++++++++---------
 apk/wireguard/APKBUILD       | 16 ++++------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/apk/wireguard-tools/APKBUILD b/apk/wireguard-tools/APKBUILD
index d70554c..1be21c0 100644
--- a/apk/wireguard-tools/APKBUILD
+++ b/apk/wireguard-tools/APKBUILD
@@ -1,14 +1,15 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
-
-# NOTE: pkgrel must match _toolsrel in wireguard-vanilla
 pkgname=wireguard-tools
-pkgver=0.0.20190601
+pkgver=0.0.20190702
 pkgrel=0
 pkgdesc="Next generation secure network tunnel: userspace tools"
-arch='all'
-url='https://www.wireguard.com'
-license="GPL-2.0"
+arch="all"
+url="https://www.wireguard.com"
+# SPDX identifier headers tells us 'GPL-2.0' but considering it
+# is a kernel project i think it is safe to assume it is GPL-2.0-only just
+# like the kernel.
+license="GPL-2.0-only"
 makedepends="libmnl-dev"
 depends="$pkgname-wg $pkgname-wg-quick"
 subpackages="
@@ -24,12 +25,10 @@ source="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$pkgver.tar.xz
 builddir="$srcdir"/WireGuard-$pkgver
 
 build() {
-	cd "$builddir"
 	make -C src/tools
 }
 
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir/usr/share/doc/$pkgname"
 
 	make -C src/tools \
@@ -62,5 +61,5 @@ bashcomp() {
 	mv "$pkgdir"/usr/share "$subpkgdir"/usr
 }
 
-sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3  WireGuard-0.0.20190601.tar.xz
+sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501  WireGuard-0.0.20190702.tar.xz
 4577574333f023217ae6e0945807e1ccd2dec7caa87e329b1d5b44569f6b5969663ad74f8154b85d3dc7063dd762649e3fa87c7667e238ffb77c0e5df9245a5e  alpine-compat.patch"
diff --git a/apk/wireguard/APKBUILD b/apk/wireguard/APKBUILD
index a32133a..5481bb6 100644
--- a/apk/wireguard/APKBUILD
+++ b/apk/wireguard/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 
 # wireguard version
-_ver=0.0.20190601
+_ver=0.0.20190702
 _rel=0
 
 # kernel version
-_kver=4.19.41
+_kver=4.19.52
 _krel=0
 
 _kpkgver="$_kver-r$_krel"
@@ -25,8 +25,7 @@ _kpkg=linux-$_flavor
 
 pkgname=wireguard-$_flavor
 pkgver=$_kver
-pkgrel=2
-pkgrel=$(($pkgrel + $_krel))
+pkgrel=$(( $_rel + $_krel))
 
 pkgdesc="Next generation secure network tunnel: kernel modules for $_flavor"
 arch="all"
@@ -57,13 +56,6 @@ prepare() {
 			return 0
 		)
 	fi
-	if [ -z "$FLAVOR" ]; then
-		(	. "$startdir"/../../community/wireguard-tools/APKBUILD
-			[ "$_ver" != "$pkgver" ] && die "please update _ver to $pkgver"
-			[ "$_rel" != "$pkgrel" ] && die "please update _rel to $pkgrel"
-			return 0
-		)
-	fi
 	local flavor=
 	for flavor in $_flavor $_extra_flavors; do
 		cp -r "$builddir" "$srcdir"/$flavor
@@ -96,4 +88,4 @@ _extra() {
 		"$subpkgdir/lib/modules/$kabi/extra/wireguard.ko"
 }
 
-sha512sums="d667e42b90fbda85b005ae2966689dadc9975c1a53ca5ddfff44214ed55ad7d55d451008c225a4619c834bd7af598af1f127d76a8a3a86cf2e6d886ea0638cf3  WireGuard-0.0.20190601.tar.xz"
+sha512sums="8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501  WireGuard-0.0.20190702.tar.xz"