gentoo resync : 12.11.2017

3 files changed, 2 insertions, 45 deletions

diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 9ca306449162..3c602345dcef 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,6 +1,5 @@
-AUX wireguard-0.0.20171101-funcfix.patch 1588 SHA256 a42d55bac43531240177eec8bbc723f1f41f9d65584c8149815da86e74b27c1b SHA512 dbf2a6cdd6c0e847b163f8ebbb73e6b5918a818d2e409588bd9661b01412fd5c14bc1d8eb29e12f0a825526435727b54c20ae6ff4891dbceefe224b8dc152a91 WHIRLPOOL 7a2a9bb28d9e9ef12e97f986ba7220ac0de77dd375077b9362731a0fef129610a81e7fbc49df7eb75adba67c19f1aaf6fb9592172b7d3e4103e2377d91395560
 AUX wireguard-openrc.sh 915 SHA256 f425a60ef4ec42df025df182a474e4ce7157f9fa400ac22a813b33f8421c4d23 SHA512 dd21d8558b4c5ff0fb02a35b6996f1f89ea0e59c885523b9443aafdebcfb23cab3e60f248594d416245a5829b36103566a7a59f41183a9990451c35aa6933dcb WHIRLPOOL a7889f5429a658674a28b913bd1d629024403539fa9ba7742e5c4feaccf3878aaba9f5a062281ceaace163c51abd841edacc104f080cc481b41917135df19b06
-DIST WireGuard-0.0.20171101.tar.xz 173952 SHA256 096b6482a65e566c7bf8c059f5ee6aadb2de565b04b6d810c685f1c377540325 SHA512 c3a394256cf3cc2dce75dcb299f54969f74d4076a351b61972f10fb3e69191756c0c32552a5acc7e0cd5919c248f12035e6a33f15e43fdad64c6cf1230511ee3 WHIRLPOOL 0166c6e2c03a979719798332c8f6f0bae9f9586368d7d0f8cc9c3ee2ae7d6b15133caff1f665d1e99ab7e568a41dc1c64f94887f1461a1660a3c87b0d8a1f4a5
-EBUILD wireguard-0.0.20171101.ebuild 4825 SHA256 5530b5b4e936a636b83503cb4bfe42f25f952d9b65a4ae791380bb6c0933743f SHA512 46d70e262fadee21fd00dbec765f911f0c24d9959e337d1318c2bed59c27ce212b5d41532c6a31a33735e0fe4749bc6e66abde120e39ddc2350d0833ac8d6cc4 WHIRLPOOL 8536df2c08c0c4e448301a1eadd8fd8569ccf74103d8f5bfa6363cdaea49b9dc41d9da8dff74389d7e863159dec9c2658c83bf28214922cc373d182f1ffa7f3e
+DIST WireGuard-0.0.20171111.tar.xz 174184 SHA256 d9347786a9406ac276d86321ca64aadb1f0639cb0582c6e0519c634cf6e81157 SHA512 2424c3923555d72a0b5910fc86071b2554934267d4c6521bc40076770984173b2cef55f4276dd4b5a446ea62f7c52424cd89b046f205314cff2919ff7de30e6b WHIRLPOOL d484d92a76382bb52f71d4a589887bfb73d8a27f313a775da3ba2f0bd406f95cda80894c574ad1f0a9e73d3fe220f67393158f33b7cc86947882ec2eb4fe6533
+EBUILD wireguard-0.0.20171111.ebuild 4779 SHA256 09ec1cc8c1b84396038b34b81ebd935d088c2119e04f417ae4d782bc7d9b7cec SHA512 4f64c13d75ddaa611c545b1a65b1b3d5aa61298ffbf32de436287b1c898b77e807ffb4da3949d3a1a073c38d9e2609df885954f9a2d57388e86babab85c9b80f WHIRLPOOL 69fbaff57cc11b87c321f07b49a817314bb778afc6e1edfd36310d768faa8503a8c2bd1404a3b322201cf3748ac9f04a538be3021ec397e2cbd995c9717f1475
 EBUILD wireguard-9999.ebuild 4779 SHA256 09ec1cc8c1b84396038b34b81ebd935d088c2119e04f417ae4d782bc7d9b7cec SHA512 4f64c13d75ddaa611c545b1a65b1b3d5aa61298ffbf32de436287b1c898b77e807ffb4da3949d3a1a073c38d9e2609df885954f9a2d57388e86babab85c9b80f WHIRLPOOL 69fbaff57cc11b87c321f07b49a817314bb778afc6e1edfd36310d768faa8503a8c2bd1404a3b322201cf3748ac9f04a538be3021ec397e2cbd995c9717f1475
 MISC metadata.xml 765 SHA256 b39a60fb08df46968b7200955f3568c1437afa566283c2962c7bb03e155392bf SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805 WHIRLPOOL fd59215f63552e46f26cb7d7545f2ef3ee270433afe764e6408acd5dfc5f1bf88269cd02ea1fcd8bcf8b6857d83ae7558119cf6fa5c48dca00c48d11a63c78c7
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 fe74e48b5dd4..000000000000
--- 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 579c9736f073..fdc71975143a 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