gentoo resync : 05.02.2020

6 files changed, 204 insertions, 20 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 417e4d227efd..bf92421ace86 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,10 +6,14 @@ AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
-DIST tor-0.4.0.5.tar.gz 7203877 BLAKE2B e03710038615a5b9baf327933917c369bb3fabd4df6dd9f16053a0b72bcf20219e956e74258d0e39ae297d406035a89fab017d2e28c795f5d713c3933ad7cd29 SHA512 f6bccc52aaa436a501077b0891ecd3a9779f288b3b15fd76fa2c612e60aba04763b5951f55b2357e6271797b2f924bee9a6d2c1ee20419daa02d9d38ec68510b
 DIST tor-0.4.1.7.tar.gz 7512661 BLAKE2B 34c1c8e40c6a2a2aeb19e1161b3b32d1683da246c5839c9fc4375471d8e7c46bb1277bcf8fc700898580a6b15d8f401ee61f422ecd7a88c783cffb1157150fc5 SHA512 f6ead1412d23516a16f31e1157b4538071752ae09a421d9dceaa7cf76599c01490f9bfcb8e26f1a75e888359adf6adcd029ca64cf48e3b45b07e2d62482c9541
+DIST tor-0.4.1.8.tar.gz 7513612 BLAKE2B bd9e126d04111aa1232107b3de3f59a258754454deba8bbbb7f34f7245b915e336f999dce4544f6e211b29702d28898938f2816a6ae9550884348f6628304461 SHA512 0118012ec723379316d5ee684eb4fdd98f64f538abf6db95071015eb5e0079d155a93cc5c4a9dbeaa7a3f56cfbcc8741fcd0c94c5101aa44fb11000ec27715c1
 DIST tor-0.4.2.5.tar.gz 7596836 BLAKE2B 0c7fa5d427f9d0683846c1023a4539ae4042c0d26f1c5afff20037f0681f6ea0dfb735e9c0e9d14bd7dddbfd5a0023064dc6e6cf6e6629402a6a13248129e6c5 SHA512 e63157713caa3590324f652f17c5c5634bab015dcde5c7832eb725351c3a91c1051dd8a95650502703e9c3dd5daefc2867ff3d20530dfec17310bb3dd4bb5b7d
-EBUILD tor-0.4.0.5.ebuild 2260 BLAKE2B ff4a22c81179b1fee52c812fb672daf85222b686774ce3654cd0a7cd8efc5657c19fdd67f0a0367f224c21467dd05ae298abbc2c6e9b2963e49398bd841da32c SHA512 8ec4875689f48aecab48074764c67423720cf1beacf30727753ac9d79b7ad2fd0a7dd29c02e9372b19ed1030d5fe0f853055e2605f5226540b898930fda62713
+DIST tor-0.4.2.6.tar.gz 7600081 BLAKE2B c0ae5972a096e7f442b39d9dcfc5d5f13146243690a10cf6bf96ffed698c0b8bc8b4fe39d13ce40714e8aacf98ca30be6c6e8e75dc38d7799642247122a46152 SHA512 0e757cd6f48ca3ed5737978e8f63f1f267d2223479bfc7a431b71a6912040a4a9bc63cc97a73356ff998e03123b0a6a4519486c41359d1ef1f0fe30aa1fa168f
+DIST tor-0.4.3.1-alpha.tar.gz 7716850 BLAKE2B a03d0a1ad172ac9e5fd511ad772b4dbb4f2c75f42bb30636d5928bad819b984ac36bc11894d2aa75f0cca57591385a8cda5186c64c54aad222cd233268bfe8c9 SHA512 fb51b368927fd292de7f257e31bd882168a04bf7ffc108a1fff2bf555118d71732213ef6d2b5adb93f9178b5410307025c4a0494858fb457913655a0b705466b
 EBUILD tor-0.4.1.7.ebuild 2228 BLAKE2B 8fb5b646f254fa5cc654c6c9f7eb7d0210e149575fdbc3bcf15e0d687b04cf7d34c37540192ea83dcd8e7f47e8d0f4f3d1ab9134b6a8c5f5846c409d1046b39c SHA512 25629021a44ac69d65c4d385de128c87aa749d6d8c996420f580e16049c9ee7afaf7b756c7818323b546e581b15ba09106e038e36b858649ca51e02a78f42d21
-EBUILD tor-0.4.2.5.ebuild 2289 BLAKE2B e2d53844303c811a9b4a515418afbe3bc83e93a558afbe6231f8a5860757d2685bdb875968494250a023c146412ec58cde66bd87dbc8b3918b5f889917fe1e34 SHA512 a6acfde2cfbf4e608a5c2c8be80371e6b4c889d4872c627fe2d3264f375044080f18f52bd0123e02e796fcc5c36188a9be25c0c27791763fbc7e48b2529d31e3
-MISC metadata.xml 502 BLAKE2B 62cfa9bebca4f57461228105fc7433ba9d56494197768549f6dc62ec048654918bfc04958c321239b5f223c5d263415b346168ab30c6ea3cc78a5b0bef93f08f SHA512 70b258fd1bab0a13d24e20ccff51ba8b0b1f3a526986a0140c5d2344c781f257ff0f7b60cb6a193b6727faf21d7a4ce96071b9b09373fd9636ed2f01ee1f2000
+EBUILD tor-0.4.1.8.ebuild 2233 BLAKE2B 17d2ab238c4dbe4236e7e15e62c83c9501c77d2fabd257b624082a3489358d6097c9fc51928ac7762dc47a1b01c185ddfe46828b157ae141189075218553dba4 SHA512 50edd4dec8c8ac7fb5469b00b37eda65581dbb8cb3a249142581372321f7dc64b08a003f9bc8b55bfe70d2ab7e6b6cbe81aa70d36a3d3283f36a1b7c4d4bf0f6
+EBUILD tor-0.4.2.5.ebuild 2283 BLAKE2B e2547b9385b612a2a9405ef0e8a8dc02cbedf5de346065d409b6506e38a12fef904d1708c7b7cb10908ba8a2856aa6723c4a2d05113fe22980ebf54f7c63314d SHA512 cb795e34f97314c998e086e200024eef6d3b0daa43f75e26d649ca0a1f6a39e80e08bdcc14094f3965ca6a28c22fe0890a4651bc9eafd4d36bd6b942b4b6b6d7
+EBUILD tor-0.4.2.6.ebuild 2289 BLAKE2B bc21fdc051673426bc0166c00fff0b01280c53b8cd12e3cb704629d884e1b1abb72e8a376b8cfc22817b1e223475108e1be2daf6ee490eb66320d180a207e51e SHA512 7601ee64b664e0b17317bf139d3c6b72a80a51f3f617f68359f1a0719665f85ce8b951940c3c0469fc31862a171b48a16e6837816e2c45eb0babcbb15dc2a5d6
+EBUILD tor-0.4.3.1_alpha.ebuild 2369 BLAKE2B d9a1a3739242f704bb202937f37f6c81e2f4a6354098a60baf07767d50124a09acccf7770c4ae730881f7848fdb7e555671d03cb60ba2fceb1881b2755c1531e SHA512 a57fcf96fec12ebe15c963835eeceea9841d781faa894f06af874c670e397ffd2b9eff52a3ebb53c540fde737af58fad3373add0b57b8b8290ae495e4acb60ec
+MISC metadata.xml 603 BLAKE2B ec373768719960730196a7c66d762b8fb1d4b215d98ff963bb610f4eb2ccb5dde4134306bf467af9463de4640d1da50364dbeee31ac1b3facba0c484519d1f86 SHA512 c7877f120e63daf302fe3cf0b153a6a3488dffab7c05cb254a9a0c95a8b578bc72623bf12ed32790ef8abc02c692b445c068645bd1fb45b8478e6daa4e0a4542
diff --git a/net-vpn/tor/metadata.xml b/net-vpn/tor/metadata.xml
index 121fa511c906..5d6719bc9a3e 100644
--- a/net-vpn/tor/metadata.xml
+++ b/net-vpn/tor/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="man">Build and install man pages</flag>
 		<flag name="scrypt">Use <pkg>app-crypt/libscrypt</pkg> for the scrypt algorithm</flag>
+		<flag name="server">Enable tor's relay module so it can operate as a relay/bridge/authority</flag>
 		<flag name="tor-hardening">Compile tor with hardening on vanilla compilers/linkers</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-vpn/tor/tor-0.4.0.5.ebuild b/net-vpn/tor/tor-0.4.1.8.ebuild
index 6d72e96669df..84c4db15e794 100644
--- a/net-vpn/tor/tor-0.4.0.5.ebuild
+++ b/net-vpn/tor/tor-0.4.1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit flag-o-matic readme.gentoo-r1 systemd user
+inherit flag-o-matic readme.gentoo-r1 systemd
 
 MY_PV="$(ver_rs 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -15,11 +15,11 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
 IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
 
 DEPEND="
-	dev-libs/libevent[ssl]
+	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
 	caps? ( sys-libs/libcap )
 	man? ( app-text/asciidoc )
@@ -27,10 +27,13 @@ DEPEND="
 	libressl? ( dev-libs/libressl:0= )
 	lzma? ( app-arch/xz-utils )
 	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( sys-libs/libseccomp )
+	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
 	systemd? ( sys-apps/systemd )
 	zstd? ( app-arch/zstd )"
-RDEPEND="${DEPEND}
+RDEPEND="
+	acct-user/tor
+	acct-group/tor
+	${DEPEND}
 	selinux? ( sec-policy/selinux-tor )"
 
 PATCHES=(
@@ -42,11 +45,6 @@ DOCS=()
 
 RESTRICT="!test? ( test )"
 
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
 src_configure() {
 	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
 	export ac_cv_lib_cap_cap_init=$(usex caps)
@@ -77,7 +75,7 @@ src_install() {
 	readme.gentoo_create_doc
 
 	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r8 tor
+	newinitd "${FILESDIR}"/tor.initd-r9 tor
 	systemd_dounit contrib/dist/tor.service
 
 	keepdir /var/lib/tor
@@ -86,6 +84,5 @@ src_install() {
 	fowners tor:tor /var/lib/tor
 
 	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-
+	newins "${FILESDIR}"/torrc-r2 torrc
 }
diff --git a/net-vpn/tor/tor-0.4.2.5.ebuild b/net-vpn/tor/tor-0.4.2.5.ebuild
index 641ea99a213a..2724b9555171 100644
--- a/net-vpn/tor/tor-0.4.2.5.ebuild
+++ b/net-vpn/tor/tor-0.4.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86 ~ppc-macos"
 IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
 
 DEPEND="
diff --git a/net-vpn/tor/tor-0.4.2.6.ebuild b/net-vpn/tor/tor-0.4.2.6.ebuild
new file mode 100644
index 000000000000..f03b2707ab6e
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.2.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic readme.gentoo-r1 systemd
+
+MY_PV="$(ver_rs 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 ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
+
+DEPEND="
+	dev-libs/libevent:=[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	man? ( app-text/asciidoc )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	lzma? ( app-arch/xz-utils )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
+	systemd? ( sys-apps/systemd )
+	zstd? ( app-arch/zstd )"
+RDEPEND="
+	acct-user/tor
+	acct-group/tor
+	${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=()
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-system-torrc \
+		--disable-android \
+		--disable-html-manual \
+		--disable-libfuzzer \
+		--disable-module-dirauth \
+		--enable-pic \
+		--disable-rust \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
+		$(use_enable man asciidoc) \
+		$(use_enable man manpage) \
+		$(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-r9 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-r2 torrc
+}
diff --git a/net-vpn/tor/tor-0.4.3.1_alpha.ebuild b/net-vpn/tor/tor-0.4.3.1_alpha.ebuild
new file mode 100644
index 000000000000..36757c1c3d73
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.3.1_alpha.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic readme.gentoo-r1 systemd
+
+MY_PV="$(ver_rs 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 ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="caps doc libressl lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+
+DEPEND="
+	dev-libs/libevent:=[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	man? ( app-text/asciidoc )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	lzma? ( app-arch/xz-utils )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
+	systemd? ( sys-apps/systemd )
+	zstd? ( app-arch/zstd )"
+RDEPEND="
+	acct-user/tor
+	acct-group/tor
+	${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=()
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-system-torrc \
+		--disable-android \
+		--disable-html-manual \
+		--disable-libfuzzer \
+		--enable-missing-doc-warnings \
+		--disable-module-dirauth \
+		--enable-pic \
+		--disable-rust \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
+		$(use_enable man asciidoc) \
+		$(use_enable man manpage) \
+		$(use_enable lzma) \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable server module-relay) \
+		$(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-r9 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-r2 torrc
+}