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

[Christian Hesse]

    Date: Sunday, October 7, 2018 @ 09:15:17
  Author: eworm
Revision: 390977

archrelease: copy trunk to community-x86_64

Added:
  wireguard/repos/community-x86_64/0001-dkms.patch
    (from rev 390976, wireguard/trunk/0001-dkms.patch)
  wireguard/repos/community-x86_64/PKGBUILD
    (from rev 390976, wireguard/trunk/PKGBUILD)
Deleted:
  wireguard/repos/community-x86_64/PKGBUILD

-----------------+
 0001-dkms.patch |   13 +++++
 PKGBUILD        |  120 +++++++++++++++++++++++++++---------------------------
 2 files changed, 75 insertions(+), 58 deletions(-)

Copied: wireguard/repos/community-x86_64/0001-dkms.patch (from rev 390976, wireguard/trunk/0001-dkms.patch)
===================================================================
--- 0001-dkms.patch	                        (rev 0)
+++ 0001-dkms.patch	2018-10-07 09:15:17 UTC (rev 390977)
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index 8543b99..b65ca0a 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -52,7 +52,7 @@ install:
+ 	@$(MAKE) -C tools install
+ 
+ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
+-DKMS_SOURCES := version.h Makefile Kbuild Kconfig dkms.conf $(filter-out version.h wireguard.mod.c,$(wildcard *.c *.h selftest/*.h uapi/*.h)) $(call rwildcard,crypto/,*.c *.h *.S *.include) $(call rwildcard,compat/,*.c *.h *.include)
++DKMS_SOURCES := version.h Makefile Kbuild Kconfig dkms.conf $(filter-out version.h wireguard.mod.c,$(wildcard *.c *.h selftest/*.c uapi/*.h)) $(call rwildcard,crypto/,*.c *.h *.S *.include) $(call rwildcard,compat/,*.c *.h *.include)
+ dkms-install: $(DKMS_SOURCES)
+ 	@$(foreach f,$(DKMS_SOURCES),install -v -m0644 -D $(f) $(DESTDIR)$(DKMSDIR)/$(f);)
+ 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-07 09:15:07 UTC (rev 390976)
+++ PKGBUILD	2018-10-07 09:15:17 UTC (rev 390977)
@@ -1,58 +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.20181006
-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=('9fe7cd5767eda65647463ec29ed707f917f4a77babaaf247adc4be7acaab4665'
-            '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' 'WIREGUARD-MODULE')
-	optdepends=('openresolv: for DNS functionality')
-
-	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 390976, wireguard/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-10-07 09:15:17 UTC (rev 390977)
@@ -0,0 +1,62 @@
+# 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.20181006
+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}
+        '0001-dkms.patch')
+sha256sums=('9fe7cd5767eda65647463ec29ed707f917f4a77babaaf247adc4be7acaab4665'
+            'SKIP'
+            'b91dc3dc7ea6260f07401a24786568e28f85bdf4a4550047a4e9c23faa789bd5')
+
+prepare() {
+	cd WireGuard-${pkgver}/
+
+	patch -Np1 < ../0001-dkms.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' 'WIREGUARD-MODULE')
+	optdepends=('openresolv: for DNS functionality')
+
+	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}/
+}
+