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

[Christian Hesse]

    Date: Wednesday, April 1, 2020 @ 19:32:23
  Author: eworm
Revision: 379044

archrelease: copy trunk to extra-x86_64

Added:
  wireguard-dkms/repos/extra-x86_64/PKGBUILD
    (from rev 379043, wireguard-dkms/trunk/PKGBUILD)
Deleted:
  wireguard-dkms/repos/extra-x86_64/0001-queueing-skb_reset_redirect-change-has-been-backport.patch
  wireguard-dkms/repos/extra-x86_64/PKGBUILD

-----------------------------------------------------------------+
 0001-queueing-skb_reset_redirect-change-has-been-backport.patch |   30 -----
 PKGBUILD                                                        |   58 ++++------
 2 files changed, 25 insertions(+), 63 deletions(-)

Deleted: 0001-queueing-skb_reset_redirect-change-has-been-backport.patch
===================================================================
--- 0001-queueing-skb_reset_redirect-change-has-been-backport.patch	2020-04-01 19:32:17 UTC (rev 379043)
+++ 0001-queueing-skb_reset_redirect-change-has-been-backport.patch	2020-04-01 19:32:23 UTC (rev 379044)
@@ -1,30 +0,0 @@
-From 6dc327ae77fb02af2b23584776c843753947a911 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Wed, 1 Apr 2020 18:28:54 +0200
-Subject: [PATCH 1/1] queueing: skb_reset_redirect change has been backported
- to 5.[45]
-
-This is a follow up to 2d4fa2a6e7903ec3340f1b075456cbd84ba6a744.
-
-Upstream commit 2c64605b590edadb3fb46d1ec6badb49e940b479 has been backported
-to 5.4.29 and 5.5.14.
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- src/compat/compat.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/compat/compat.h b/src/compat/compat.h
-index fe2d07e..7f16332 100644
---- a/src/compat/compat.h
-+++ b/src/compat/compat.h
-@@ -1024,7 +1024,8 @@ out:
- #define COMPAT_CANNOT_USE_MAX_MTU
- #endif
- 
--#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29) || \
-+    (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 14)))
- #include <linux/skbuff.h>
- static inline void skb_reset_redirect(struct sk_buff *skb)
- {

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-01 19:32:17 UTC (rev 379043)
+++ PKGBUILD	2020-04-01 19:32:23 UTC (rev 379044)
@@ -1,33 +0,0 @@
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Contributor: Jason A. Donenfeld <Jason at zx2c4.com>
-
-pkgname=wireguard-dkms
-pkgver=1.0.20200330
-pkgrel=2
-pkgdesc='next generation secure network tunnel - module sources'
-arch=('x86_64')
-url='https://www.wireguard.com/'
-license=('GPL')
-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}
-        '0001-queueing-skb_reset_redirect-change-has-been-backport.patch')
-sha256sums=('2d57b239605be2ee0e4c2da935ff1a23e9ed8bb3ee692e10ae032ae50f280bef'
-            'SKIP'
-            '64206515571285962d5fe8378c8dd3a8527561fe2f8807410f4117d3e19cbe6a')
-
-prepare() {
-	cd wireguard-linux-compat-${pkgver}/
-
-	patch -Np1 < ../0001-queueing-skb_reset_redirect-change-has-been-backport.patch
-}
-
-package() {
-	cd wireguard-linux-compat-${pkgver}/
-
-	make -C src/ \
-		DESTDIR="${pkgdir}/" \
-		DKMSDIR="/usr/src/wireguard-${pkgver}/" \
-		dkms-install
-}

Copied: wireguard-dkms/repos/extra-x86_64/PKGBUILD (from rev 379043, wireguard-dkms/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-01 19:32:23 UTC (rev 379044)
@@ -0,0 +1,25 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Jason A. Donenfeld <Jason at zx2c4.com>
+
+pkgname=wireguard-dkms
+pkgver=1.0.20200401
+pkgrel=1
+pkgdesc='next generation secure network tunnel - module sources'
+arch=('x86_64')
+url='https://www.wireguard.com/'
+license=('GPL')
+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})
+sha256sums=('7dfb4a8315e1d6ae406ff32d01c496175df558dd65968a19e5222d02c7cfb77a'
+            'SKIP')
+
+package() {
+	cd wireguard-linux-compat-${pkgver}/
+
+	make -C src/ \
+		DESTDIR="${pkgdir}/" \
+		DKMSDIR="/usr/src/wireguard-${pkgver}/" \
+		dkms-install
+}