1 |
commit: eae80f7e0beb8630ed88f1aa24aabdd8ac8fec9c |
2 |
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 11 03:40:54 2017 +0000 |
4 |
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 11 03:41:21 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eae80f7e |
7 |
|
8 |
net-vpn/wireguard: bump |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
11 |
|
12 |
net-vpn/wireguard/Manifest | 2 +- |
13 |
.../files/wireguard-0.0.20171101-funcfix.patch | 40 ---------------------- |
14 |
...171101.ebuild => wireguard-0.0.20171111.ebuild} | 2 -- |
15 |
3 files changed, 1 insertion(+), 43 deletions(-) |
16 |
|
17 |
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest |
18 |
index e491b077f64..56ec1e0032e 100644 |
19 |
--- a/net-vpn/wireguard/Manifest |
20 |
+++ b/net-vpn/wireguard/Manifest |
21 |
@@ -1 +1 @@ |
22 |
-DIST WireGuard-0.0.20171101.tar.xz 173952 SHA256 096b6482a65e566c7bf8c059f5ee6aadb2de565b04b6d810c685f1c377540325 SHA512 c3a394256cf3cc2dce75dcb299f54969f74d4076a351b61972f10fb3e69191756c0c32552a5acc7e0cd5919c248f12035e6a33f15e43fdad64c6cf1230511ee3 WHIRLPOOL 0166c6e2c03a979719798332c8f6f0bae9f9586368d7d0f8cc9c3ee2ae7d6b15133caff1f665d1e99ab7e568a41dc1c64f94887f1461a1660a3c87b0d8a1f4a5 |
23 |
+DIST WireGuard-0.0.20171111.tar.xz 174184 SHA256 d9347786a9406ac276d86321ca64aadb1f0639cb0582c6e0519c634cf6e81157 SHA512 2424c3923555d72a0b5910fc86071b2554934267d4c6521bc40076770984173b2cef55f4276dd4b5a446ea62f7c52424cd89b046f205314cff2919ff7de30e6b WHIRLPOOL d484d92a76382bb52f71d4a589887bfb73d8a27f313a775da3ba2f0bd406f95cda80894c574ad1f0a9e73d3fe220f67393158f33b7cc86947882ec2eb4fe6533 |
24 |
|
25 |
diff --git a/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch b/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch |
26 |
deleted file mode 100644 |
27 |
index fe74e48b5dd..00000000000 |
28 |
--- a/net-vpn/wireguard/files/wireguard-0.0.20171101-funcfix.patch |
29 |
+++ /dev/null |
30 |
@@ -1,40 +0,0 @@ |
31 |
-From cc310a5dd1899417971e993d61d1230b14fe4f87 Mon Sep 17 00:00:00 2001 |
32 |
-From: "Jason A. Donenfeld" <Jason@×××××.com> |
33 |
-Date: Thu, 2 Nov 2017 16:07:26 +0100 |
34 |
-Subject: global: revert checkpatch.pl changes |
35 |
- |
36 |
-These changes were suggested by checkpatch.pl, but actually cause big |
37 |
-problems depending on the options. Revert. |
38 |
---- |
39 |
- src/noise.c | 2 +- |
40 |
- src/peer.c | 2 +- |
41 |
- 2 files changed, 2 insertions(+), 2 deletions(-) |
42 |
- |
43 |
-diff --git a/src/noise.c b/src/noise.c |
44 |
-index a0bea29..6ce9b78 100644 |
45 |
---- a/src/noise.c |
46 |
-+++ b/src/noise.c |
47 |
-@@ -118,7 +118,7 @@ void noise_keypair_put(struct noise_keypair *keypair) |
48 |
- |
49 |
- struct noise_keypair *noise_keypair_get(struct noise_keypair *keypair) |
50 |
- { |
51 |
-- RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Calling " __func__ " without holding the RCU BH read lock"); |
52 |
-+ RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Taking noise keypair reference without holding the RCU BH read lock"); |
53 |
- if (unlikely(!keypair || !kref_get_unless_zero(&keypair->refcount))) |
54 |
- return NULL; |
55 |
- return keypair; |
56 |
-diff --git a/src/peer.c b/src/peer.c |
57 |
-index 1580262..81b71d4 100644 |
58 |
---- a/src/peer.c |
59 |
-+++ b/src/peer.c |
60 |
-@@ -58,7 +58,7 @@ struct wireguard_peer *peer_create(struct wireguard_device *wg, const u8 public_ |
61 |
- |
62 |
- struct wireguard_peer *peer_get(struct wireguard_peer *peer) |
63 |
- { |
64 |
-- RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Calling " __func__ " without holding the RCU read lock"); |
65 |
-+ RCU_LOCKDEP_WARN(!rcu_read_lock_bh_held(), "Taking peer reference without holding the RCU read lock"); |
66 |
- if (unlikely(!peer || !kref_get_unless_zero(&peer->refcount))) |
67 |
- return NULL; |
68 |
- return peer; |
69 |
--- |
70 |
-cgit v1.1-33-gc3c0 |
71 |
|
72 |
diff --git a/net-vpn/wireguard/wireguard-0.0.20171101.ebuild b/net-vpn/wireguard/wireguard-0.0.20171111.ebuild |
73 |
similarity index 99% |
74 |
rename from net-vpn/wireguard/wireguard-0.0.20171101.ebuild |
75 |
rename to net-vpn/wireguard/wireguard-0.0.20171111.ebuild |
76 |
index 579c9736f07..fdc71975143 100644 |
77 |
--- a/net-vpn/wireguard/wireguard-0.0.20171101.ebuild |
78 |
+++ b/net-vpn/wireguard/wireguard-0.0.20171111.ebuild |
79 |
@@ -30,8 +30,6 @@ MODULE_NAMES="wireguard(kernel/drivers/net:src)" |
80 |
BUILD_TARGETS="module" |
81 |
CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER" |
82 |
|
83 |
-PATCHES=( "${FILESDIR}/${P}-funcfix.patch" ) |
84 |
- |
85 |
pkg_setup() { |
86 |
if use module; then |
87 |
linux-mod_pkg_setup |