summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <zx2c4@gentoo.org>2017-11-11 12:40:54 +0900
committerJason A. Donenfeld <zx2c4@gentoo.org>2017-11-11 12:41:21 +0900
commiteae80f7e0beb8630ed88f1aa24aabdd8ac8fec9c (patch)
tree4dc9a7b34467e791edd027daa9869ffc053bcb8f /net-vpn/wireguard
parentnet-analyzer/hping: Old. (diff)
downloadgentoo-eae80f7e0beb8630ed88f1aa24aabdd8ac8fec9c.tar.gz
gentoo-eae80f7e0beb8630ed88f1aa24aabdd8ac8fec9c.tar.bz2
gentoo-eae80f7e0beb8630ed88f1aa24aabdd8ac8fec9c.zip
net-vpn/wireguard: bump
Package-Manager: Portage-2.3.13, Repoman-2.3.4
Diffstat (limited to 'net-vpn/wireguard')
-rw-r--r--net-vpn/wireguard/Manifest2
-rw-r--r--net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch40
-rw-r--r--net-vpn/wireguard/wireguard-0.0.20171111.ebuild (renamed from net-vpn/wireguard/wireguard-0.0.20171101.ebuild)2
3 files changed, 1 insertions, 43 deletions
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index e491b077f64..56ec1e0032e 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1 +1 @@
-DIST WireGuard-0.0.20171101.tar.xz 173952 SHA256 096b6482a65e566c7bf8c059f5ee6aadb2de565b04b6d810c685f1c377540325 SHA512 c3a394256cf3cc2dce75dcb299f54969f74d4076a351b61972f10fb3e69191756c0c32552a5acc7e0cd5919c248f12035e6a33f15e43fdad64c6cf1230511ee3 WHIRLPOOL 0166c6e2c03a979719798332c8f6f0bae9f9586368d7d0f8cc9c3ee2ae7d6b15133caff1f665d1e99ab7e568a41dc1c64f94887f1461a1660a3c87b0d8a1f4a5
+DIST WireGuard-0.0.20171111.tar.xz 174184 SHA256 d9347786a9406ac276d86321ca64aadb1f0639cb0582c6e0519c634cf6e81157 SHA512 2424c3923555d72a0b5910fc86071b2554934267d4c6521bc40076770984173b2cef55f4276dd4b5a446ea62f7c52424cd89b046f205314cff2919ff7de30e6b WHIRLPOOL d484d92a76382bb52f71d4a589887bfb73d8a27f313a775da3ba2f0bd406f95cda80894c574ad1f0a9e73d3fe220f67393158f33b7cc86947882ec2eb4fe6533
diff --git a/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch b/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch
deleted file mode 100644
index fe74e48b5dd..00000000000
--- a/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From cc310a5dd1899417971e993d61d1230b14fe4f87 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Thu, 2 Nov 2017 16:07:26 +0100
-Subject: global: revert checkpatch.pl changes
-
-These changes were suggested by checkpatch.pl, but actually cause big
-problems depending on the options. Revert.
----
- src/noise.c | 2 +-
- src/peer.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/noise.c b/src/noise.c
-index a0bea29..6ce9b78 100644
---- a/src/noise.c
-+++ b/src/noise.c
-@@ -118,7 +118,7 @@ void noise_keypair_put(struct noise_keypair *keypair)
-
- struct noise_keypair *noise_keypair_get(struct noise_keypair *keypair)
- {
-- RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Calling " __func__ " without holding the RCU BH read lock");
-+ RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Taking noise keypair reference without holding the RCU BH read lock");
- if (unlikely(!keypair || !kref_get_unless_zero(&keypair->refcount)))
- return NULL;
- return keypair;
-diff --git a/src/peer.c b/src/peer.c
-index 1580262..81b71d4 100644
---- a/src/peer.c
-+++ b/src/peer.c
-@@ -58,7 +58,7 @@ struct wireguard_peer *peer_create(struct wireguard_device *wg, const u8 public_
-
- struct wireguard_peer *peer_get(struct wireguard_peer *peer)
- {
-- RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Calling " __func__ " without holding the RCU read lock");
-+ RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Taking peer reference without holding the RCU read lock");
- if (unlikely(!peer || !kref_get_unless_zero(&peer->refcount)))
- return NULL;
- return peer;
---
-cgit v1.1-33-gc3c0
diff --git a/net-vpn/wireguard/wireguard-0.0.20171101.ebuild b/net-vpn/wireguard/wireguard-0.0.20171111.ebuild
index 579c9736f07..fdc71975143 100644
--- a/net-vpn/wireguard/wireguard-0.0.20171101.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20171111.ebuild
@@ -30,8 +30,6 @@ MODULE_NAMES="wireguard(kernel/drivers/net:src)"
BUILD_TARGETS="module"
CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER"
-PATCHES=( "${FILESDIR}/${P}-funcfix.patch" )
-
pkg_setup() {
if use module; then
linux-mod_pkg_setup