gentoo auto-resync : 26:09:2023 - 05:27:14

2 files changed, 181 insertions, 0 deletions

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index e31d72dd34d1..cd668d33ee82 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -17,9 +17,13 @@ DIST tor-0.4.7.15.tar.gz.sha256sum.asc 716 BLAKE2B dfb488fe30ac57b1db93f534cee4c
 DIST tor-0.4.8.6.tar.gz 8246788 BLAKE2B e26b802d42be24361362bd74dd24b54a336516b58cd717c08864c9a5db54bb591849145156693f4968a8b671be23421d957cd814834a2605b8ae8e46b3264eb4 SHA512 dcaed1ce0df62b02fd3feb991c890d36ca89b7ab66301b170d1ffc6ae7835102c11266a674434b8a75d235777da67c9acb1c1127f27fd8a1b3890b0256750ba0
 DIST tor-0.4.8.6.tar.gz.sha256sum 85 BLAKE2B 0baac2f492c9046273a18161e3d2f102c2d94764cb3a57d6c8ed78562fe33a411e869cb631526ffa13f33fe74d15d835c636f9836f7cc210df8eca74384e1905 SHA512 68a15a12ae75d9cdf2c05431af5d9801510e64da59600b874e0e64fe405e0c986427892800d234affcd7978d5c8ab6bdad73de59d456eb15c776669951e2cf59
 DIST tor-0.4.8.6.tar.gz.sha256sum.asc 716 BLAKE2B 9a26c070f23d3e89467105ed195bc7cbe9fd7e2b55961066905312bd620dae509c1900ef8f7a04154739442a6430393151ef034214211feec8e50c7ab5754ae1 SHA512 65e96f899e20c0619944044438564398a8d17157206a5406b3c41776950d062f34ab98df45bbfcda48a86489945fb5077d16a97f815ff1b9892df252af8b5431
+DIST tor-0.4.8.7.tar.gz 8322562 BLAKE2B 4d0cde752a729c64e380663e4438398fe768a8657e9aa3246bdf0ec9a4b4e01e277cb594ae0cb44cc66ea8c6080f2e58c6daf1bf01dc51b678d228e8e38fc971 SHA512 49f2abc495bf5594eee52aff11926094ef14c519cacb87787067657d0a230603208b9fe2f5758c1dab52b71cab45712ebe758deb1ebf217805074e445be380c5
+DIST tor-0.4.8.7.tar.gz.sha256sum 85 BLAKE2B d52ba96072b94775ce6d5cb3e31590af5d78cb63aa5c9097ebe526addd850aae54cdd21a49822e41444144b0cb0d7709492f7c42f53873706a4b09d844ad92ce SHA512 84fac135d0df1b5534bb0a93d91cb6696c27fe5e2932e52e0766257d60ae3898b0a5d333247d3f2ba54d9bc3861f1746782cb39569bbb581c6ecb07360eda9a5
+DIST tor-0.4.8.7.tar.gz.sha256sum.asc 716 BLAKE2B 90f80d3f07de27a6a08899a71d838add4b8ca00356080d9fd140d7cb420bb6b08dc50576b16c846306cf126c87c4e2ca2e2ca6321774a4ea2275544edb9302f2 SHA512 7ac05ee67ea4b60e0e2cfe7c47278a1928d8694675ec485e5baa8ba1dbb6ea9398e7b848921ee14dc13b1e6b7d429070c71e0ee04b557ab1c45ac28239112c84
 EBUILD tor-0.4.7.13-r1.ebuild 3764 BLAKE2B 38a705151f0f395e90ac20c43bb9d5c88c780fdf16386346a439df7c1077696e693d6974129dce65240b07a874ab2b4388c6b7c5533f7df5be9efeea7d584daf SHA512 eb1c1f7ad067f4136c2748d47e4defd6f162fdeae8027b15fa254faf7bafabfb10743f90a48605c4e602b36a5ada7fb8dd9b1b0f493ac8f209e32610869a1e6d
 EBUILD tor-0.4.7.14.ebuild 3923 BLAKE2B 9d26095be0d9627f1a81375d2f5d9a4e0d3569866e17501a1073589e7c40a65b662f1c64cf7997b3c8d64a6c8d406c03b7987c83d36c38c2f72089f8b5aa9468 SHA512 5d987c83c5021f3d692d4b7d4f799164b12a04e7388fc9b9936ccdff7b409cd8f3497b909bf8a09fad8638ec0a8a7c6bac5a6386ff1cb806f5633551d096784e
 EBUILD tor-0.4.7.15.ebuild 3861 BLAKE2B cc4787f3d9544e299b6872af775a6ae1f78d99d645687d5294d2e914d8a0343b874fa611ed8b911230c92ffa483533437b3dad8cd49b21ca878f903f993494dc SHA512 2aa9134ae3eb219a43e22d039450228e37554517f420ba0594b3173d15cb0d267310fcaf3fbe009420f3128f562554a2d4a56b81a0449e3b38a8d50502d4f845
 EBUILD tor-0.4.8.6.ebuild 4311 BLAKE2B c2f04c8ced2ec8aa9aef3f17176e0870fdc53e9eaac70f11e5e7282a59055430320c6b42b48cff0ee349ca413da44f598a6abdeefe2931549ea1c01fc01d8834 SHA512 03199dea31209f118865a59b94d957ea9cd091ec8a8e1be57882829013653e867b93852eab88154ef6292985fc913c2d26dd9bd918c2307976e4969b4a7ea3d3
+EBUILD tor-0.4.8.7.ebuild 4311 BLAKE2B c2f04c8ced2ec8aa9aef3f17176e0870fdc53e9eaac70f11e5e7282a59055430320c6b42b48cff0ee349ca413da44f598a6abdeefe2931549ea1c01fc01d8834 SHA512 03199dea31209f118865a59b94d957ea9cd091ec8a8e1be57882829013653e867b93852eab88154ef6292985fc913c2d26dd9bd918c2307976e4969b4a7ea3d3
 EBUILD tor-9999.ebuild 4311 BLAKE2B c2f04c8ced2ec8aa9aef3f17176e0870fdc53e9eaac70f11e5e7282a59055430320c6b42b48cff0ee349ca413da44f598a6abdeefe2931549ea1c01fc01d8834 SHA512 03199dea31209f118865a59b94d957ea9cd091ec8a8e1be57882829013653e867b93852eab88154ef6292985fc913c2d26dd9bd918c2307976e4969b4a7ea3d3
 MISC metadata.xml 645 BLAKE2B a7f450c6cfb9a605f7021cbe533ec64ff0926c9877bef7aace8ce1770a8ec552255b5c54ac80035646c3515d7d0b778100573897068d0905a56f7b860c8de21b SHA512 e5724033912b73ab8abe1b47e74578c8fe4bf6e341b8e7d7434d69071508cd1f35d97f4c7ade9787ae0ded6660cf0a5477d3c7462ed13832693bfd6205f0f0f1
diff --git a/net-vpn/tor/tor-0.4.8.7.ebuild b/net-vpn/tor/tor-0.4.8.7.ebuild
new file mode 100644
index 000000000000..f63f5411e924
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.8.7.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/torproject.org.asc
+inherit edo 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/ https://gitlab.torproject.org/tpo/core/tor/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.torproject.org/tpo/core/tor"
+	inherit autotools git-r3
+else
+	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.sha256sum
+			https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc
+		)
+	"
+
+	S="${WORKDIR}/${MY_PF}"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+	fi
+
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20230727 )"
+fi
+
+# BSD in general, but for PoW, needs --enable-gpl (GPL-3 per --version)
+# We also already had GPL-2 listed here for the init script, but obviously
+# that's different from the actual binary.
+LICENSE="BSD GPL-2 GPL-3"
+SLOT="0"
+IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/libevent-2.1.12-r1:=[ssl]
+	dev-libs/openssl:=[-bindist(-)]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	man? ( app-text/asciidoc )
+	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 )
+"
+DEPEND+="
+	test? (
+		${DEPEND}
+		${PYTHON_DEPS}
+	)
+"
+
+DOCS=()
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig; then
+			cd "${DISTDIR}" || die
+			verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
+			verify-sig_verify_unsigned_checksums \
+				${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
+			cd "${WORKDIR}" || die
+		fi
+
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Running shellcheck automagically isn't useful for ebuild testing.
+	echo "exit 0" > scripts/maint/checkShellScripts.sh || die
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
+
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	export tor_cv_PYTHON="${EPYTHON}"
+
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var"
+		--disable-all-bugs-are-fatal
+		--enable-system-torrc
+		--disable-android
+		--disable-coverage
+		--disable-html-manual
+		--disable-libfuzzer
+		--enable-missing-doc-warnings
+		--disable-module-dirauth
+		--enable-pic
+		--disable-restart-debugging
+
+		# Unless someone asks & has a compelling reason, just always
+		# build in GPL mode for pow, given we don't want yet another USE
+		# flag combination to have to test just for the sake of it.
+		# (PoW requires GPL.)
+		--enable-gpl
+		--enable-module-pow
+
+		$(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 zstd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local skip_tests=(
+		# Fails in sandbox
+		:sandbox/open_filename
+		:sandbox/openat_filename
+	)
+
+	# The makefile runs these by parallel by chunking them with a script
+	# but that means we lose verbosity and can't skip individual tests easily
+	# either.
+	edo ./src/test/test --verbose "${skip_tests[@]}"
+}
+
+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
+}