From 27dfd272ae3be15b1017f733682211afa1c7c0f0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 2 Nov 2017 21:07:25 +0000 Subject: gentoo resync : 02.11.2017 --- .../wireguard-0.0.20171017-blake-headers.patch | 25 -------------- .../files/wireguard-0.0.20171101-funcfix.patch | 40 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 25 deletions(-) delete mode 100644 net-vpn/wireguard/files/wireguard-0.0.20171017-blake-headers.patch create mode 100644 net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch (limited to 'net-vpn/wireguard/files') diff --git a/net-vpn/wireguard/files/wireguard-0.0.20171017-blake-headers.patch b/net-vpn/wireguard/files/wireguard-0.0.20171017-blake-headers.patch deleted file mode 100644 index d083a80fb5b8..000000000000 --- a/net-vpn/wireguard/files/wireguard-0.0.20171017-blake-headers.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cf21875fe39d21bff2028a78921e03d96dc56e5a Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Sat, 21 Oct 2017 01:30:45 +0200 -Subject: blake2: include headers for macros - ---- - src/crypto/blake2s.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/crypto/blake2s.h b/src/crypto/blake2s.h -index 615010f..99de9f9 100644 ---- a/src/crypto/blake2s.h -+++ b/src/crypto/blake2s.h -@@ -4,6 +4,8 @@ - #define _WG_BLAKE2S_H - - #include -+#include -+#include - - enum blake2s_lengths { - BLAKE2S_BLOCKBYTES = 64, --- -cgit v1.1-31-g4243 - diff --git a/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch b/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch new file mode 100644 index 000000000000..fe74e48b5dd4 --- /dev/null +++ b/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch @@ -0,0 +1,40 @@ +From cc310a5dd1899417971e993d61d1230b14fe4f87 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +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 -- cgit v1.2.3