9 files changed, 147 insertions, 6 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index c30fe756a941..d743bce8b00d 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
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
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 1f5f5b589626..08e5a936d1a2 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -7,7 +7,9 @@ AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a
 DIST tor-0.3.1.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2e31d52a8eb6d837cebc45ad6e64f3364e368f72d59bb8f51f652d4029a3e237a26efe580551811f5812e8dac4 SHA512 92af34a96bea2a99ab51d766d932da697409e404da4318ba6b3360ff0c2e9369b9afa652445a1651940f5a0502f4137141cc87cff14eba180539ea81be0c21a3
 DIST tor-0.3.4.7-rc.tar.gz 6668322 BLAKE2B 863d24d04ba7919d08b3c69bca2edf3ee46af6aa074812f76067199670b17bb8538233c7631cb17e1cada4b2b4527b0db4b3b7a7b945ae7ca7a03e52685fce00 SHA512 664211ffd6adcdb325cf669fed9fb7c70b1416da3df046c35622b5104a4b63d9a3123eb40744bc070d29ff97472adf31b1aaecea5b91c07059d0cdad79569b58
 DIST tor-0.3.4.8.tar.gz 6679385 BLAKE2B 9cb65442effd1cfceb34f3483a0e96de5e59e9ce1bd2241533dd8eb62e4428a6c0f9decd816dda49515fc92acd8c77e69f7d39133a67fb5053a858dc78464791 SHA512 bfedc29253cb8fdbe1864ea5992ad33184577d88ab806a249a544f3b3142a7bc1453892955df335185aff72508095fb2a2a07ac6b96c99668e5e8d593d7aea6d
+DIST tor-0.3.5.1-alpha.tar.gz 6689501 BLAKE2B aff3669f2183b384a8c52fe91646b90ea95d80ac1d104d1f9f437fa7707bb546d0ccb183e908d325efdf66e73117b9ed7c5f31f4aae678989619d85d96ff5d2a SHA512 4b5d54cf00521f4a89e768f5ef5f42e9ff7aceba76fb7b1d60757de81d9ccf9c126514b1efbcb257501c160abf28e5e035d0f8d0c6d2358ca34ca9b02a4f1d65
 EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
 EBUILD tor-0.3.4.7_rc.ebuild 2233 BLAKE2B ddebd2fb89e2af106e1c2dcf66cb3f15f870eccab4258425e056b609f7baa0d82c1813c71c60f8f811e89bc0920e384d513707d374961b2e27cbe74f5e82e6e2 SHA512 2614bd244399582f59558e82ba53465d8215eb8dbb1b7e9ccd58a77bff0256b3a957c86261585e9dc87d8e1c36cb18f75b762607b70663daf7261b26e652cec0
 EBUILD tor-0.3.4.8.ebuild 2237 BLAKE2B 2d21116f6249afbc98dc16881219fe689fec38c392e253d0b9661edf28d0fffb357c10c04fcf259368b66d0a25b7e2e558134cee404040b3bab78104985afad0 SHA512 64ed20c1dcd0486883729a8f90f89e80e9be5b499f17d3309313ea5aeaf29027ea82db0aa4ae00c107c3af123d4f1de5af003fbbee25cd188c2ea7cae398cb80
+EBUILD tor-0.3.5.1_alpha.ebuild 2215 BLAKE2B 33b04c74ef81f1ed3d18c84a0a5bf52db92d42037444d432f181cb36eef2b0cf056f79f642e9023758b6e2706253c122c43fe8e065e38865f555fc6d51263bc6 SHA512 bb2c831146afe5a57e4607c0cdaacc57b0b57667d514e63b31ba3d3468916b98836a96fffdf251ae41d9d52c92352174ece6c4e4eb069dafb9a677fa8fa7943f
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.5.1_alpha.ebuild b/net-vpn/tor/tor-0.3.5.1_alpha.ebuild
new file mode 100644
index 000000000000..eec218e6109b
--- /dev/null
+++ b/net-vpn/tor/tor-0.3.5.1_alpha.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic readme.gentoo-r1 systemd versionator user
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd"
+
+DEPEND="
+	app-text/asciidoc
+	dev-libs/libevent[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	lzma? ( app-arch/xz-utils )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd )
+	zstd? ( app-arch/zstd )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tor )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
+)
+
+DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_configure() {
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-system-torrc \
+		--enable-asciidoc \
+		--disable-android \
+		--disable-libfuzzer \
+		--disable-module-dirauth \
+		--enable-pic \
+		--disable-rust \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
+		$(use_enable lzma) \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable systemd) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage) \
+		$(use_enable zstd)
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r8 tor
+	systemd_dounit contrib/dist/tor.service
+
+	keepdir /var/lib/tor
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index e4742a5f9d0c..68c6f7aa53bc 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20180910.tar.xz 271596 BLAKE2B b9da34caed7d5b01ebd9796aeed509becafa5006e53a852e8ff2e391607ef8abf6fd2b2b6e7e147a5d2e6f8d401d09319188b80d15dd1ebe2478602ee77b831c SHA512 644d617d9d53f688c93cafb438d46075b642805b4ddfc328a8c1046a4a2baef3048a5a5af7f71986d753868ad8da8546ea7063572ef56c50bfcd07f3c147899f
-EBUILD wireguard-0.0.20180910.ebuild 5145 BLAKE2B af179f6e992bc0df635ac391fed3d0178395bb9f3de8b7180d24c990140ba2ae5c4fbed0eb673443ab2e7e8de2d4477af26ea0819c9cf07ef532804ad4b4c7b3 SHA512 beff711ea1ec42806f780144b48f53fb02d1fb001f84f484c6d5bdf11384e78fe1bf77cdf07b0c971c4163927cac3b68c4f70211c5aa2b352009c6ab866c1fb9
+DIST WireGuard-0.0.20180918.tar.xz 282204 BLAKE2B 3a39bf16d8701f564075dcad575294e7e800d7a5e706bcd50fcd181c720eac18cfdccc70c88d1469667b7e5f00ccce4bc8393008774bedf1d92b9b342d39c7cf SHA512 8e9cf26303d7bcc8b8becc8b2a174c54ac46a32d4eb0bda357aef5b71f50e3e860de3b7db955698c88965f1c7f680097463e20e49ec6dff5bf140e789a85ac56
+EBUILD wireguard-0.0.20180918.ebuild 5145 BLAKE2B af179f6e992bc0df635ac391fed3d0178395bb9f3de8b7180d24c990140ba2ae5c4fbed0eb673443ab2e7e8de2d4477af26ea0819c9cf07ef532804ad4b4c7b3 SHA512 beff711ea1ec42806f780144b48f53fb02d1fb001f84f484c6d5bdf11384e78fe1bf77cdf07b0c971c4163927cac3b68c4f70211c5aa2b352009c6ab866c1fb9
 EBUILD wireguard-9999.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
 MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20180910.ebuild b/net-vpn/wireguard/wireguard-0.0.20180918.ebuild
index 332e52b44d29..332e52b44d29 100644
--- a/net-vpn/wireguard/wireguard-0.0.20180910.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20180918.ebuild