gentoo resync : 07.01.2022

3 files changed, 115 insertions, 4 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index cc6a78fa72fc..a325d8705363 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -8,9 +8,12 @@ DIST tor-0.4.6.7.tar.gz 7790727 BLAKE2B da6b0fe0de6a334713cf881dece6ef5a932b0f43
 DIST tor-0.4.6.7.tar.gz.asc 833 BLAKE2B 2054c094cc8ce28bfc8822fa6b0ac5a028b41c96160d135da53112c4fcb7ae048e8d48b58f164dd33c6c7dd851aaa71173b2aa36f70411fc7cc2b67d346ce00b SHA512 d45caaa4795d05f1f1a558192c5eedff608c74be0ef933e0ff7a4f68123a109e38e7fe26222c66dfc8966a07f458eeadf77d7f4731d88389595b59413140e9a3
 DIST tor-0.4.6.8.tar.gz 7796485 BLAKE2B 3475597c9f46c83c736bf5f3db2a4f44a38c4f4c4998903d1fe89fc75a7090f4eaa8faafbbd44d728d5e8915f195eb3e284141925b16fca9bf6001844f52863d SHA512 ff008ddf10c2a4c9e0d0da28558c7a97a6d42615c8bcad25a74567e3aafaba49df1699e379fd674f93305d222748d16b2f21d0da9a8fd3444b659747e1f1d07b
 DIST tor-0.4.6.8.tar.gz.asc 833 BLAKE2B 6f1825e3f5e2d70c5078d27990633137c7551fa80f5d202e56cfcb2a88d6b5b653ec6c349c7dc152f6c7313e6330182ce22a42be3f7aa63aced0586ee673addf SHA512 5000c111688d76d357c371532f7edbb01280273e5dc9bc18fa524517fcb1efda1403071536f06d61b8b8a73e26505d6e74cd84bd611f63f2a56e4b944f76b2e9
-DIST tor-0.4.7.2-alpha.tar.gz 7821412 BLAKE2B 04c4b8ed6378580a10d30738e8b85765e3daa7942c2bea0de9fe0103df47989477a41cb98e548a2a5392aefeab3667164a834b41d4d6025b3fcac0e03739bdf1 SHA512 b2f94f267f2fdab37211dbd1e00427532909bf9859d64abcebf45b28ed39cb781468445c48fc774f9028eb8551ca083d80ee407d9132f645765a9b4337215335
-DIST tor-0.4.7.2-alpha.tar.gz.asc 833 BLAKE2B cabd93d394e98a9013dbc2af983214effe89dd4dd7702dd17f1065c75d7da84bad6d493141e2c00576f8d9d119bbc4bb96ae6038139d72c3818e4ba79fe80f5a SHA512 00a32d0e8ee580d769a09a660f3c80674b6f70366bf426329a1c17a807a7dcd09b5f00aef1643f54d6a203bc928bd36d88793f2684665ac22841285d13c8bee5
+DIST tor-0.4.6.9.tar.gz 7797677 BLAKE2B 7d6add30867a3b18471bece559acbf6782b516229b8ab2c764f4a581fcbe3c2fa748f2708c60bf0f8a1165bc1fdd930fe00adaf7c1f546e6a7e98bdc0f1abb21 SHA512 67b3c0c0515d4150dd91db6dd4efe19b15a2e8ddac2a34069d61dfaf79d90585f3ca4071483362619719a7cbc6198d67d1ff73acdefa8cc8462bc1e2a7ba264f
+DIST tor-0.4.6.9.tar.gz.asc 833 BLAKE2B 1028464261cd02502408fff7354b92c68f51ce4ec27a16c190f4d16ec4164fb2f81d8018a6c400b22691dda8a29aa5af41b7e8fc9c72f551c8a1e85976ab1223 SHA512 1a34ae6f3b2d58a1a3d71b7a953cb1f8b0ef30430f016d67978a9323f7da42132a7cc2540245e115311951d524bbb67287d1af5c456a72564a4b49971962116f
+DIST tor-0.4.7.3-alpha.tar.gz 7818590 BLAKE2B 3570d52774fa9a14a96e4d7e3a8d0e9e9d2364a9325589d4f23ab0e08ea0933e8cdd6ca1af93b7fabe7745bcd48fad6fbceac34eff6f64253581f9b6dce39bea SHA512 400c8b2c0937734fe9cc934cff9f396bdb4a5073bddfcd91f74bbe8a7d52214467aaeac4200ee6c9a234bf0552929ab9b0fc9727d425c27b6fbdfd81ea8fcc18
+DIST tor-0.4.7.3-alpha.tar.gz.asc 833 BLAKE2B 5c12e159882c4845f48e86708a30f524c62486ba675080ad7799fbf8b15558cadc4133d271d751e39c44274072defcedf653ba8159a495e090fcd393d75a01a7 SHA512 b98f4fb0b0ff92d9d3a427505e28be34f04e18e78fa6c3f8ce408f2d64904321ef289175c7dad57e761ce711a9e686f3cb96f532304f9d46cd77ce1c57951687
 EBUILD tor-0.4.6.7.ebuild 2741 BLAKE2B 8eb904dcb68d1e65d025f5a212c98ecd94f0cc9ddcd73b2efc80bf70aa44a967c600fd17c7ad909e5818263226fc0d82635b2fb4a1add8b0745dfa642140c479 SHA512 38a62d9b70588301762806663fa680c6fb5bddbe50504ed1aba0dc54b64c2d124780cccdc254d9140626e646eb10200741c85e7f6b6caa03c3c722b507c0532c
 EBUILD tor-0.4.6.8.ebuild 2747 BLAKE2B a7aca64064eadc60687b1595eb61e3a4fe7472eb74bb206d795bc7996742455302f5f1b3be3fae7aa2e229cda1ccbfd90abe903fcae4b44e1058c4aed5aa8784 SHA512 78dc27be6f1c05a53605e1e95c46cd96d9dd5c550878157ba48a7b50b7381c7c41d710b3e3d787f85e3e2f891dc80bdf054eec6d2c36df303a7cdcc663e38de0
-EBUILD tor-0.4.7.2_alpha.ebuild 2728 BLAKE2B 064fb06b75cc6c6f9457e207f3d3daf056f16927566c2f8f0e816db315c0f726ceb73ebc644e5b5258bdefb5eae527a765813a2ed23f186071e639434d05ab42 SHA512 d7ab11a79ff0b8213d53d88f3bead21af3f3c3310118a5741583d236c21c8cc76bbcfc16e5b048369d72049b78dcd1d154f1ff8b780fdff3adca746e88a1dc74
+EBUILD tor-0.4.6.9.ebuild 2747 BLAKE2B bbc1ad0aa3f3ea611601359886bb4e05c5faa96c669e00e2221113937b05714b297df32d5102d1c0646e91f4cebcdc5560ab6ce0bdabee198b173ad75fc8e04e SHA512 2a09174c05b81b470d5fe2df4a99b7c9cc22255175d94eaaf0ccb426b16912485aba01ddf85b98f139022d2d05c7e7be2d52551b0e12afb08a1e05bfe91a9cab
+EBUILD tor-0.4.7.3_alpha.ebuild 2728 BLAKE2B 552a75f3db275b28802577445f9231c42f6a7fc42e72995c59ec922db098732af6fbab9d2a2107ec5e5d806731dfe617a0ec592466b973a9bfeba41dbb56ed97 SHA512 fbbbec160b99ae9cc9a3b9893ff7bde923dbd62b7a63f66684825a6a4e848664daf8647a798dca36f9fe8373bd1e6ebd90e3dd2b0625334805d57a4bd82655a8
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.6.9.ebuild b/net-vpn/tor/tor-0.4.6.9.ebuild
new file mode 100644
index 000000000000..d102418e073e
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.6.9.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
+
+MY_PV="$(ver_rs 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="https://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
+	verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+fi
+IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tor )"
+DEPEND="
+	dev-libs/libevent:=[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	man? ( app-text/asciidoc )
+	dev-libs/openssl:0=[-bindist(-)]
+	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 )"
+
+# bug #764260
+DEPEND+="
+	test? (
+		${DEPEND}
+		${PYTHON_DEPS}
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+)
+
+DOCS=()
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--disable-all-bugs-are-fatal \
+		--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 "${FILESDIR}"/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.7.2_alpha.ebuild b/net-vpn/tor/tor-0.4.7.3_alpha.ebuild
index 44410e9bac9e..dd28011f8b1e 100644
--- a/net-vpn/tor/tor-0.4.7.2_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.7.3_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"