gentoo resync : 21.09.2018

4 files changed, 56 insertions, 4 deletions

diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index dc19f1dd05b2..0d5092123ac7 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,9 +1,11 @@
 AUX libreswan-3.23-modern-kernels.patch 525 BLAKE2B 5c1353932dddd0febf60ae0b8c03e81e1c1397e6ea93619e5d02f60c4a735a0b63c8c1dfc6a3a79c55addf4af20e3e3f2b82b3f369b2c61d62c51c3c57f3d241 SHA512 e2a798d1bc8b089056a400bc0918b1037420a268e49e0183db99c565da9c8bce344e5fa9c3cdcc246a066450aceeec1af333f8b4c931e4e9414d6485db03bd13
 AUX libreswan-3.25-no-curl.patch 706 BLAKE2B 2d1f74b6b1d65f2e3ddad8646e2e5ea8a4aa98b4eee617521255c7bec35f53f1cde6254cd82f731e6ad5701f16cceaba907653e1c490ef97b2648f9d066e0328 SHA512 e03b17bc647f0d817cacfee2c96c37c50615d8ad53fdfb0be7095bf79fe3317d66092f006aeaf1ea4d67841ccdba29ab4a6e1ce181459b41d16dedcee5cb73d3
+AUX libreswan-3.26-nss-link.patch 719 BLAKE2B 80a98e3e4b4773245ebdb005535603879df9b54ed7f8cec8864059af0fed51379c6311f1f7f52a99467e989a9f56c6d80b8919f2e72ade32fab52d9dd241b861 SHA512 1b55612b634fdd48829854e0c7a4eba5b19080dc75d1f5b8e1c59c4988bd45cb043ef6669172bf0d8dd4ba914fd924d47ff3bb5712cde4c09fea5141933e01b3
+AUX libreswan-3.26-nss.patch 853 BLAKE2B 487afd48208223030aa5a4fc434f1bc5d817d9ed78392399ef98db09f22a2d975510134a9ae55875b7e15c0fef221393d6648fb00cd208b4aab140aa0c142318 SHA512 118609fd2ed7e9c35333106b6896ce3a9c463cd3dda7f0bce31e2cccf91f88080f34ec39f8f3b5f3453eedea520f2e1b031b6771502d8c74831e20883a162d6e
 DIST libreswan-3.22.tar.gz 6910418 BLAKE2B c06134fa2d1096231797f1ea93de8ed61121472b10ae30ee9a843250dce4ef9f21e7d3bf63f38daf53fbfd8d1e435cfdc704743d0fdcbde8ecac137d9becac48 SHA512 93868327394527750590e1297443d3eb1c9a528d680348098fd2913123dac52c9fecd73b855ee00586c2516b8aa00f7f0d158d8e9b19d7487b5fb26432b86aff
-DIST libreswan-3.23.tar.gz 3836073 BLAKE2B ffb27ed75618afcf39c36b7326bb1e4b70ea8337bb4b13951bef95dc13989613c226fe83e031eeba080f55f98262df432b776c3ac5b7b4fb740506f918172ed3 SHA512 3645af522ea9ac868c55bfadfd2cf27dc5acb247543f43290cbe677a90cd00316be6520ca2128b9aaecce2b0293710ae6a2bd710a7d93198b8cb81e32276ced8
 DIST libreswan-3.25.tar.gz 3988630 BLAKE2B 8479b5b0d7d49055b7dcefa6c3b2f469b0aa60005e05446d5c1c6f73a32c904835422248c6ead2a1c2dc83b63794fd50f7461fd22c4206414b5890c01b99b722 SHA512 246649cb5bef1d0690217d1080f3f6f175a0d7a5f27e5a7affdf291b2f418a11937e96b64716a33e6312530409a2c1b10b90e2fa5ec339a27c94c990d86ed517
+DIST libreswan-3.26.tar.gz 3706205 BLAKE2B e54e6d3a0163f0b6812c53400e7f57e01319d7cf64a5d9e84d5002bbab24d5de1b6461c6bba02d60630017a50c23ecb1a095f3da1a36a4e6fc64e90cf08fd798 SHA512 10965a23197ef5d21a66dc0838066ceb620b2653f64471553284e0043fbc993584e497742b498e0be410427aeed3d8ce5bfdc6dfab59b8a1a1ba9a363473c4a4
 EBUILD libreswan-3.22.ebuild 2814 BLAKE2B 566683ee612fd84a0fe4cf49cd90bb2c8f67e9aa151461c0c0e68a9179ce5741203764ac520f9f434d8f02d0a30129d3e39059329ca5f991bed74437be4c117a SHA512 e337d3895fd3fe3a803b7e137407dff4ee5e6c4e9928c157715c1f87a6c877f2be4498d884254379c03d63b95f75e71df01a2d839535bb75bcbee7c770956654
-EBUILD libreswan-3.23-r1.ebuild 2869 BLAKE2B 4b1f18568296d62d907b1f1b2cfdc46d7e9ef98ec14718f1a6783828456b8248a1b879c261f8fff25f28176bf5600de8d5b70d6630ba111b00b1a38b31384625 SHA512 1967acab4b4c72135e7346d6a5bea67a2e62a13164463889e6e66bd646fc61fa61a9100331022f65b003da8071d541e30319c34a6c4fb35b8d464d9a0c2d59e8
 EBUILD libreswan-3.25.ebuild 2856 BLAKE2B 0e2573d71d4f96d6cf271e6d71ad7efffd336877ede43f5ed2f7e35103d8cd67194df195c7bab7d9be513c2ee85c869af8778a8f9fefaf2087e0114b4d052a90 SHA512 be841c666376e6b410b9bd5f15d84c23f3bfa5848ea382b29108ce104cdb22627af145bdaa9b5d5447560705859cc5726643562a109b8b9d126967251c8e0db8
+EBUILD libreswan-3.26.ebuild 2896 BLAKE2B 6887a7656d51395835ad41605b4ed9e9d915e0996cc2c6612a48abdc4c7a6071f3de69089bbc96212c39bcfba8076e2d857042aef1c7d172a0b29a06eb4afbe5 SHA512 cd803735a9b396205ba3e382befbd63b40cf7e8532de299ee8a1736208b7c2ca079fa4e083b272115fb53ecd8e1194003675110a50dc9313b4f06b45a101d844
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch b/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch
new file mode 100644
index 000000000000..267aa2120dbd
--- /dev/null
+++ b/net-vpn/libreswan/files/libreswan-3.26-nss-link.patch
@@ -0,0 +1,22 @@
+From b3199806cc66de4888917ddc85b511b433e43d63 Mon Sep 17 00:00:00 2001
+From: Paul Wouters <pwouters@redhat.com>
+Date: Mon, 17 Sep 2018 11:23:11 -0400
+Subject: [PATCH] building: -lfreebl is no longer needed
+
+---
+ mk/config.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mk/config.mk b/mk/config.mk
+index 3bd2527497..d8497c2104 100644
+--- a/mk/config.mk
++++ b/mk/config.mk
+@@ -234,7 +234,7 @@ BISONOSFLAGS?=
+ NSSFLAGS?=$(shell pkg-config --cflags nss)
+ # We don't want to link against every library pkg-config --libs nss
+ # returns
+-NSS_LDFLAGS ?= -lnss3 -lfreebl -lnssutil3
++NSS_LDFLAGS ?= -lnss3 -lnssutil3
+ NSS_SMIME_LDFLAGS ?= -lsmime3
+ NSS_UTIL_LDFLAGS ?= -lnssutil3
+ NSPR_LDFLAGS ?= -lnspr4
diff --git a/net-vpn/libreswan/files/libreswan-3.26-nss.patch b/net-vpn/libreswan/files/libreswan-3.26-nss.patch
new file mode 100644
index 000000000000..89a6436a2a26
--- /dev/null
+++ b/net-vpn/libreswan/files/libreswan-3.26-nss.patch
@@ -0,0 +1,27 @@
+From 910f69119b491c6d7abcc85cf8911d2fa012a135 Mon Sep 17 00:00:00 2001
+From: Andrew Cagney <cagney@gnu.org>
+Date: Mon, 17 Sep 2018 11:56:56 -0400
+Subject: [PATCH] ecdsa: don't include NSS's "blapi.h", no longer needed and
+ not on debian
+
+(not to be confused with "lbapit.h", which also looks suspect)
+
+Follow-up b3199806cc66de4888917ddc85b511b433e43d63 and
+2d093c9fb83c8104604e4b40defa4e41129577ea.  The latter
+relaced the call to ECDSA_VerifyDigest() with PK11_Verify().
+---
+ programs/pluto/keys.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/programs/pluto/keys.c b/programs/pluto/keys.c
+index b3df5802cf..bd9d8d8c6c 100644
+--- a/programs/pluto/keys.c
++++ b/programs/pluto/keys.c
+@@ -72,7 +72,6 @@
+ #include <secerr.h>
+ #include <secport.h>
+ #include <time.h>
+-#include <blapi.h>
+ #include "lswconf.h"
+ #include "lswnss.h"
+ #include "secrets.h"
diff --git a/net-vpn/libreswan/libreswan-3.23-r1.ebuild b/net-vpn/libreswan/libreswan-3.26.ebuild
index ccb0c700a84e..7c3de3ac0b86 100644
--- a/net-vpn/libreswan/libreswan-3.23-r1.ebuild
+++ b/net-vpn/libreswan/libreswan-3.26.ebuild
@@ -45,13 +45,14 @@ RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-ipsec )
 "
 
-PATCHES=( "${FILESDIR}/${P}-modern-kernels.patch" )
-
 usetf() {
 	usex "$1" true false
 }
 
 src_prepare() {
+	eapply "${FILESDIR}/${P}-nss.patch"
+	eapply "${FILESDIR}/${P}-nss-link.patch"
+
 	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
 	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
 	default