gentoo resync : 25.01.2018

9 files changed, 98 insertions, 12 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 97ba556edaa9..ac8dd4216367 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index f807dc7e0925..8b6d695b91bb 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -6,8 +6,8 @@ AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6
 DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2e51b25a91a8e1fcf9d29bba90fe58e40bf0197793a76fc1e83d8b6d677228cdc5e5333253b1a3 SHA512 930775a5837bc7f97a26817ea028782d555e0e71ba06b04c39941f4c01bbc3ca0a5dc63bcf19dc694e0e746b3a382f22daf6a6373a3443c5afd7398cbaaef6ea
 DIST openvpn-2.4.3.tar.gz 1422692 BLAKE2B 0058689b94de8ad651b20ed7f8aa2924ea8c114ba3f7efa70ff3dd29908fa5ca25d9e97cc4168750b0fe26bd982ccbbed80dc1c680a2814cf036deb5083b33c8 SHA512 1d1f9afa6d0858fa32f73b2a51ed7652beac52ef974b104b51b521e6d8e872b8f5659c55ec1ef442fed3b6c6b058627b0af73e765a1261871b1cd96c8acd657e
 DIST openvpn-2.4.4.tar.gz 1390194 BLAKE2B 52aa5b9d301b4b5a14acf685f4d4c520d5ec1aa06755262a8504a4c3bb5ee1b8435f68eb4278f25b900f9ae182f31688ef36e4e839ec7a211ad6aba0f76a897a SHA512 3c3cb77397569e21c5af52b065b081714ce53e2dd0b890c881de8e57220dc23d97cd61eaf5a6bf8e5e89186414c4c93da22a3ab65f4b61f80b04d862b4116e76
-EBUILD openvpn-2.4.3-r1.ebuild 4689 BLAKE2B 6094beb7de92bf226daaeeb485e65d49e644a320d56af12cb0b2c955498fab790768a7c2f7651b99c4d49f1f4e3a636c662ffdfb1198c6fc6d94aeadea7f58b2 SHA512 fb0d83acce76eb3602332df7a618c5073765055819341d1372ed034d4f31b93abbca0615767ae50c2064e3210c9e5d6fa51ca727328b403cab63fa2c9792b83e
-EBUILD openvpn-2.4.3.ebuild 4611 BLAKE2B afaf6797a6005ce9598160a177dd9c683000b3df978e8e8ddf6236dad12a7bf0f1237e1a9f711da65e465c1568963798adc58e69aedd353953a8fd391d6180e7 SHA512 3a7b7c93df95922eb9d6deb383a63521a5daea9490e90285dc5bd419af0afa484b55c836a41d528462b7301698d7c6c2cfe63b3eea7bfffcf990b7308dd43d17
-EBUILD openvpn-2.4.4.ebuild 4681 BLAKE2B 04d479269faa2fc3152315c2e74647f7c43000194927cb9ed12cf2659f6fa36d093a1e1bf2a176e926b5ae30918495f59f598c4290ddf0d5b4f12dd589ebf1f7 SHA512 c084b89de2eb760483079ae39c922641640df5b2e5f9951881f587ff9d8e3ceb903fd52d9a06a5b7bb79aa701d229b2f065459ec6ea5d3ae3ce5a90c890c1be7
+EBUILD openvpn-2.4.3-r1.ebuild 4677 BLAKE2B 5d18623acfc7c4076371ddbcf72e1ed83a17239bbc05593c1b6b02f013ded3bdb2429a39791de5927f00541b6fd55a18f652b004df73ead18687f37aa4bef948 SHA512 fbd405bfb0fae6785e4af11f3b0132d29975f1abd5cdcf94bc97a231cd27996b9392db2193940c84f0abcadc2f4ab65b5cf665209bcce08565ef625b2f3fa061
+EBUILD openvpn-2.4.3.ebuild 4599 BLAKE2B d0ebc1e3fa064cd21b3379099439626ea9a5a709591ca5cfd1e03e75150447903553d6b0b9abaf05a4bc9208ab04aa45b6907451b6a445a12cf464a95e1f2764 SHA512 7ce11cffb482c4be3f1f5db401449884e62a30b3d02be0dcf0964625f3c6f4dbc2668c00470f4e859d5044df3ab51b3824f9f629e6a0d4aa2e58e1e0697594bc
+EBUILD openvpn-2.4.4.ebuild 4669 BLAKE2B a76f11fb5271cee7dedeb624dd47d74cb53b52b4867738a9bb0d304001c84017c7c0f1cd119b4cb1eb8b870195267605bf4a5a8db66ac97d9b886bae3bd9f474 SHA512 d3a7b1362d77855d111eea2ca5922b3f43b3d6a0e2b169e4d8c518e6bb047b9329125766dc485d9967e7a5c72fc37888de69a0f37675085aed43e22f56f7df09
 EBUILD openvpn-9999.ebuild 4473 BLAKE2B f26cdcc07aee889c11213b91e7e35d34933195b4ec9523ca20ed9f711f3f939785f769e5c8ea94ac6bc58e6ec6b894ec2037f3153a8fd9cc906fc176d6ad6b8e SHA512 700392c91522915cb00d9282eb7f53f237b40d78c3d5702dfccd6255e86b7b1a86355fdc45902fcba572cbcbf5ee87239b0b4197557934413884b633b7fdc4fa
 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec
diff --git a/net-vpn/openvpn/openvpn-2.4.3-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.3-r1.ebuild
index 798c6c354ac3..7143fb14c098 100644
--- a/net-vpn/openvpn/openvpn-2.4.3-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-vpn/openvpn/openvpn-2.4.3.ebuild b/net-vpn/openvpn/openvpn-2.4.3.ebuild
index a15364807f9f..48c5aaf18135 100644
--- a/net-vpn/openvpn/openvpn-2.4.3.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-vpn/openvpn/openvpn-2.4.4.ebuild b/net-vpn/openvpn/openvpn-2.4.4.ebuild
index c959b3f1fa11..886ed244e119 100644
--- a/net-vpn/openvpn/openvpn-2.4.4.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
 
 IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
 IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index aa056db586a2..944628f03b6e 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -2,6 +2,6 @@ AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf
 DIST strongswan-5.5.3.tar.bz2 4768820 BLAKE2B 9f9da6c2ef27cec7f6a07f1cd5a7ecc8a92576fad2a5c6379b93d8a2e9d3b0804fe26dc0bc7b303754ef499ee938549c7cafbdf9a3f8f818d14cf88f613fe0fd SHA512 0b0b25d2102c98cda54300dc8c3c3a49a55e64f7c695dda65a24f2194f19bce0b7aab9e4f7486c243b552f9d1a94867d6a8782ee504aad1c9973809706d599ac
 DIST strongswan-5.6.0.tar.bz2 4850722 BLAKE2B edb9f2b277cd8bccf886a824e4b3fb3c06af7510d9e21283fcb8d8ba9cf234f38182fcd1ca0c350b4039945ab10888406986d9a0b8edac24fe09faf0b8967fb2 SHA512 9362069a01c3642e62864d88fdb409a3c7514bf7c92cbe36e552c6a80915119cf5bb91c39592aab2d15b562684a0628a764e4fa7636d3b5fd2ebaf165c0ce649
 EBUILD strongswan-5.5.3.ebuild 9280 BLAKE2B b6c402f593f7f7d7b15c5d0fe9dcf05aaddd4a86152e788cfdf62f7a26a93ae98a2f947b3ae5de554aa008fdc369ef4cdf1f9fb73532b2d1ab05becf6526ffc3 SHA512 0131f9d5a852379941bfae1259b3962eb6e1676510e798215b4859277deedc9c6adbce7c6aafc5e07cfc5546663cf036394c27c6a166b8cc098bb9afddc51bbf
-EBUILD strongswan-5.6.0-r1.ebuild 9318 BLAKE2B 5bb221af5a2c6de6a36e2002acb2facab66ab85b6a5b46fb670ef30017db4373b88a1faf8679625be91b3d9880798ea6fc50e7111254ea81f572e3067f8100e7 SHA512 86d45c54b2cd5284466f43806bee421389eea5e93f9b241ee6ff90680feb179005f6ab6af733dd97fd830fb5a0822fca8616e6b53982debf8fc7c2080fa0dfa9
+EBUILD strongswan-5.6.0-r1.ebuild 9317 BLAKE2B 10940b5090de8855717a7a54e63b8252848b3361e39f7eee1e12945438b846e67af0d1eea185c490bbaef94d49ddd80329f9db50fed5456f766f996be75388d3 SHA512 dbe3b2a87579f77d943fb674d8f4f60b4dc2d928af26649cc56b4d408aed13aa683279788c261d57234cc9bfcb5823674bac28c7b105e4409a024332056126e4
 EBUILD strongswan-5.6.0.ebuild 9284 BLAKE2B 3f4da75ec2607a58c1e163010c2be07d71433392d741ab2d9b045df8873d2965936dec7f457615aadc00085809dba08c3a1fd339275e9d1d4f3a3346fe5662eb SHA512 c3f51e481bd8df4fd5f573a54214a1cd5a9098c5432c8e5926ad371d6bd9105391d2c658d61237ecf651f356dc5dd5f46d6fb91af0e347419c66e9ac48ab4494
 MISC metadata.xml 3660 BLAKE2B 3d25016e6a4f70aa3f8e5bc1081dd535220084529326af8f69a58906d3c4b9b0b8b4a56f17abd1315adbcdfb515c4dd63395bf1884939fab75f1ad2fcf09e434 SHA512 ec594568c35dc645d790b9582413dc5ca54a8d5ea73059299920854cb1053c22f232bd87d0044ff85108021c3fd4c0fc7ed6c7070fa438a159ad4e8e98048478
diff --git a/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild b/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
index dc0518eb40a7..f6c8a771da54 100644
--- a/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
+++ b/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index d4b1078c57b5..6a218fda8cae 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,7 +6,9 @@ AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a
 DIST tor-0.3.1.7.tar.gz 6058284 BLAKE2B f2d825c82342cf1ca9354f051d532ef31e1d183be28f0f5b49f14c0d88176910292b6727b8cf0f066bae276e3a431851714cdb385219516d0a7519c5ed02b203 SHA512 a835526984187fad88cffc39ea8f6a4b61d5f8d2579b5a66425612607a22ff82e0f9da96e029e134e04d25ae0f59a1b4f771e9e8c19ebb563e1a0f5b3a3849e4
 DIST tor-0.3.1.9.tar.gz 6092702 BLAKE2B c009567b5866ff50159fbcbab05462a860c3e66c15599d11d40495d8a1a18fbad610f8ea94492519f2c8b6adfce7f4a54ad3bd2aee2b902ffae7215f35a3d4d5 SHA512 c22557251272595c65b2fade485020d76de16f5bb826d4a47d7bd093b7336dad42e8e2b8a3e0c56d9a10e62f0a5b1596c4b10cd578bf6da17f058f3d4e356f66
 DIST tor-0.3.2.9.tar.gz 6250442 BLAKE2B 34f6436d94f105bc0e68fa89bd6b671c84c9a6389010b5741b2da339caaea2e4d549f799aa8c6867eddc90818195c73a4d13cdf7f7003d578779f7e2d9964cfb SHA512 60b8d93eee8d0b04b49a8fa941ea3489e8cd9b3f3923d9da39865caa1f5bce6666c1db06594520aa3726151a54c9c0c30bb8d9b25fb38d7172ffb15a011d6c8c
+DIST tor-0.3.3.1-alpha.tar.gz 6317585 BLAKE2B bba9f5c78c5a66c0232c5f2c982349d800ab7ed6245cf69583fc85ba97b5b0a5d974a667cb2a3204255b72f7c446f242581c9bfeef5437463fb97ab1ec2df897 SHA512 796deb6c31d78e3424aed72d3c9a0958c77a28fc883da77e724e94bb92376858ae094c73acf166a5415587186667d4ea3e87c0578e42f4a59b8397365d782314
 EBUILD tor-0.3.1.7.ebuild 2037 BLAKE2B 013b5168cebd2c35948c68e75811ac543b6f156ce4ed5c8fd7cb55231e40b575ee987419a8242095c90ce3f56ded0017e99bc01fd4568c1eb67da6a73e418db2 SHA512 efcb53f76c91cf9cd2403025a3290b170f58f0f03cb62fb2dc82a0e0ec55d263d9757b4cf80a825690b6276a01223091d7f6bc2f4d358ad778a82dac987ac56c
 EBUILD tor-0.3.1.9-r1.ebuild 2020 BLAKE2B c2054caa10f4bd9e7cea92c1f99a944bfd2d9dc2456dccbc54b9715c38c3f641c31c5ee2ec81b4a7307c2465b020e085f75cb946823961aff8119745f690825b SHA512 b512c5d0c5cb51bd89b4cdca0eed158ead35785fd2d3896647b99447e88266e1719423538ce4a4a51d3da35ea780b098a499f4fcdca78a6a232ed11a992ee7b6
 EBUILD tor-0.3.2.9.ebuild 2088 BLAKE2B 5e238b5f899f3f899eef005466e79f2db41ee0c5b49d57182124e3e8ac8c8a59c55ef1c8b9a2072a9221e365af9004dcd3759c4ba5767fd69b7eb7adf3396723 SHA512 464962ecf54e706489cc2bc0c902f86db648a15854949865d8ce5e14187893499354de64d4458b2bef82b510fe1de97e676417706e45a16485305ed3beac8905
+EBUILD tor-0.3.3.1_alpha.ebuild 2142 BLAKE2B 3482c9f988da8b2fe8cf7dbcd53a2c2dfe86b960240422aa927522e3c57a0eccfdd5abca4d56724f36399c9f6c07a043e7d72bd5ae45b2832b33594b4a811ab7 SHA512 e2653dcdeec3339effb79164c991cde78e691749866abb9ee4f8813ef7eb6abd51ce8eab846b9027b1784236b6c3be0a316bb2730de72777bc031b6d2396ec5f
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.3.1_alpha.ebuild b/net-vpn/tor/tor-0.3.3.1_alpha.ebuild
new file mode 100644
index 000000000000..fc9664985e63
--- /dev/null
+++ b/net-vpn/tor/tor-0.3.3.1_alpha.ebuild
@@ -0,0 +1,84 @@
+# 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"
+# We need to keyword app-arch/zstd
+#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
+
+DEPEND="
+	app-text/asciidoc
+	dev-libs/libevent[ssl]
+	sys-libs/zlib
+	!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
+)
+
+DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-system-torrc \
+		--enable-asciidoc \
+		--disable-android \
+		--disable-libfuzzer \
+		--disable-rust \
+		--disable-restart-debugging \
+		$(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 web tor2web-mode) \
+		$(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
+}