[arch-commits] Commit in wireguard/trunk (2 files)

[Christian Hesse]

    Date: Thursday, July 6, 2017 @ 13:06:50
  Author: eworm
Revision: 242546

upgpkg: wireguard 0.0.20170629-2

fix build with linux 4.11.9

Added:
  wireguard/trunk/0001-compat-priv_destructor-got-backported.patch
Modified:
  wireguard/trunk/PKGBUILD

--------------------------------------------------+
 0001-compat-priv_destructor-got-backported.patch |   53 +++++++++++++++++++++
 PKGBUILD                                         |   10 ++-
 2 files changed, 60 insertions(+), 3 deletions(-)

Added: 0001-compat-priv_destructor-got-backported.patch
===================================================================
--- 0001-compat-priv_destructor-got-backported.patch	                        (rev 0)
+++ 0001-compat-priv_destructor-got-backported.patch	2017-07-06 13:06:50 UTC (rev 242546)
@@ -0,0 +1,53 @@
+From a421219ea718761ed235b501da6e322fc2a05ee0 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason at zx2c4.com>
+Date: Thu, 6 Jul 2017 13:26:18 +0200
+Subject: [PATCH 1/1] compat: priv_destructor got backported
+---
+ src/device.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/device.c b/src/device.c
+index c299d19..fb5f148 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -240,7 +240,7 @@ static void destruct(struct net_device *dev)
+ 	put_net(wg->creating_net);
+ 
+ 	pr_debug("%s: Interface deleted\n", dev->name);
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 9)
+ 	free_netdev(dev);
+ #endif
+ }
+@@ -251,7 +251,7 @@ static void setup(struct net_device *dev)
+ 	enum { WG_NETDEV_FEATURES = NETIF_F_HW_CSUM | NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_GSO | NETIF_F_GSO_SOFTWARE | NETIF_F_HIGHDMA };
+ 
+ 	dev->netdev_ops = &netdev_ops;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 9)
+ 	dev->destructor = destruct;
+ #else
+ 	dev->priv_destructor = destruct;
+@@ -337,17 +337,19 @@ static int newlink(struct net *src_net, struct net_device *dev, struct nlattr *t
+ 	if (ret < 0)
+ 		goto error_8;
+ 
++	list_add(&wg->device_list, &device_list);
++
+ 	ret = register_netdevice(dev);
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 9)
+ 	if (ret < 0)
+ 		goto error_9;
+ #endif
+-	list_add(&wg->device_list, &device_list);
+ 	pr_debug("%s: Interface created\n", dev->name);
+ 	return ret;
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 9)
+ error_9:
++	list_del(&wg->device_list);
+ 	ratelimiter_uninit();
+ #endif
+ error_8:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-06 11:46:30 UTC (rev 242545)
+++ PKGBUILD	2017-07-06 13:06:50 UTC (rev 242546)
@@ -5,18 +5,22 @@
 pkgbase=wireguard
 pkgname=(wireguard-dkms wireguard-tools)
 pkgver=0.0.20170629
-pkgrel=1
+pkgrel=2
 pkgdesc='next generation secure network tunnel'
 arch=('x86_64' 'i686')
 url='http://www.wireguard.io/'
 license=('GPL')
 makedepends=('git' 'libmnl')
-source=("${pkgbase}-${pkgver}.tar.xz::https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${pkgver}.tar.xz")
-sha256sums=('51c44624f20eaff96780845214f85491c0c7330598633cd180bb2a6547e5d2b2')
+source=("${pkgbase}-${pkgver}.tar.xz::https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${pkgver}.tar.xz"
+        '0001-compat-priv_destructor-got-backported.patch')
+sha256sums=('51c44624f20eaff96780845214f85491c0c7330598633cd180bb2a6547e5d2b2'
+            'b6d177aa7ad7f0168b2fb70edf4dd0912d3b9ef13f6c7f88eb13e296a57ec549')
 
 prepare() {
 	cd WireGuard-${pkgver}/
 
+	patch -Np1 < "${srcdir}"/0001-compat-priv_destructor-got-backported.patch
+
 	find contrib/examples/ -name '.gitignore' -delete
 }