From 66d92fc8569d87a09ac014780528dcad2a12b6c6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Sep 2023 11:08:38 +0100 Subject: gentoo auto-resync : 19:09:2023 - 11:08:38 --- net-vpn/Manifest.gz | Bin 7231 -> 7231 bytes net-vpn/tor/Manifest | 6 +- net-vpn/tor/tor-0.4.8.6.ebuild | 177 +++++++++++++++++++++++++++++++++++++++++ net-vpn/tor/tor-9999.ebuild | 10 +-- 4 files changed, 183 insertions(+), 10 deletions(-) create mode 100644 net-vpn/tor/tor-0.4.8.6.ebuild (limited to 'net-vpn') diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz index 6ab115119c26..cf554e6f1b5a 100644 Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest index ab8d31ff4182..2fadb6761ec9 100644 --- a/net-vpn/tor/Manifest +++ b/net-vpn/tor/Manifest @@ -17,9 +17,13 @@ DIST tor-0.4.8.4.tar.gz.sha256sum.asc 1321 BLAKE2B 6771028385a9d13ff00314ac98b6b DIST tor-0.4.8.5.tar.gz 8237202 BLAKE2B 71a4807284ecefc4a18d6bc15ce798844304f860338b786590779fb171f851d630e8af3114dbc84fe854561e0085dcb147b4dd87787988a8fb6c3628bfcc8175 SHA512 37be85e4e707682c5234ec471cb18775b3681eae2293df9c1d1192157147e4f3a08f00c33b2fc9574bbfc4f8d3fa3f4063413bbfbc536832df4a258076632be1 DIST tor-0.4.8.5.tar.gz.sha256sum 85 BLAKE2B eddb6cf660e9e5b0eef20477d4536a0063bf8dcd0da75238514e620a9f6046431d656d4492f3765f14ff99175525dc4ae5c66f7f5ed0e1f7efe69e8f3b2a9583 SHA512 bda3ebb7ae915519e3ef4f3465045abb14e1cc3322ce2c9813c1189bcc33ef45f9aeecfd59bfb13cbb07e5dfd56fc7794f6fcaf18b752c8207d0e70934cc1e11 DIST tor-0.4.8.5.tar.gz.sha256sum.asc 716 BLAKE2B 5748744112694c1d7cd2b6e622f9469308595422cd44a1142985880e32b3a5cadfe7410b2c1b5bc59a001fb3d086246a76074314b53eb0ae38e37ea4736f66c5 SHA512 55cf2c7fc92d33afc4f569a0c27fb187d757d441b706e2562a3da6eb6032498e24450199927bcddcfaa697f7e2273dd2f4a047ef35ea3e53287ae4208432bdf9 +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 EBUILD tor-0.4.7.13-r1.ebuild 3764 BLAKE2B 38a705151f0f395e90ac20c43bb9d5c88c780fdf16386346a439df7c1077696e693d6974129dce65240b07a874ab2b4388c6b7c5533f7df5be9efeea7d584daf SHA512 eb1c1f7ad067f4136c2748d47e4defd6f162fdeae8027b15fa254faf7bafabfb10743f90a48605c4e602b36a5ada7fb8dd9b1b0f493ac8f209e32610869a1e6d EBUILD tor-0.4.7.14.ebuild 3924 BLAKE2B 5be2d12ac1a836390543f9a8179715aaca0aa3aed4cf2cc9a645c48e94cfc695b12299d01b9f84c4efb2d241602fde397d36e3dccfc658e3170d392ffa93def8 SHA512 9582d0a41dc355c13a6c16c18588b710f96b0e1650ee4ca29192c347567f7a6477c54f626ad3dbe1d63da0002c47387dcd526d4673793f47add171e5ab9f86a5 EBUILD tor-0.4.8.4.ebuild 4700 BLAKE2B 8fb98b2761b5878b144d33547d535b6d46f3322c3178e21ef60adab9798360b77c6cdcf67f6e71205aec490ec37c729a5ac740687157294cf04ace30383abef0 SHA512 a58bdb81fb41d1ca87f173f5dc29a5abf18cdd3fc5ebf37412172158eb456c6088ce56467b5905314fccbdbee604c3a18c34e5cf134d43b800e08825e9fdb3fc EBUILD tor-0.4.8.5.ebuild 4700 BLAKE2B 8fb98b2761b5878b144d33547d535b6d46f3322c3178e21ef60adab9798360b77c6cdcf67f6e71205aec490ec37c729a5ac740687157294cf04ace30383abef0 SHA512 a58bdb81fb41d1ca87f173f5dc29a5abf18cdd3fc5ebf37412172158eb456c6088ce56467b5905314fccbdbee604c3a18c34e5cf134d43b800e08825e9fdb3fc -EBUILD tor-9999.ebuild 4700 BLAKE2B 8fb98b2761b5878b144d33547d535b6d46f3322c3178e21ef60adab9798360b77c6cdcf67f6e71205aec490ec37c729a5ac740687157294cf04ace30383abef0 SHA512 a58bdb81fb41d1ca87f173f5dc29a5abf18cdd3fc5ebf37412172158eb456c6088ce56467b5905314fccbdbee604c3a18c34e5cf134d43b800e08825e9fdb3fc +EBUILD tor-0.4.8.6.ebuild 4309 BLAKE2B 5cbeec728322c9f41e7fdf71ca4d605106bf87b91eadc3f919bccf07c21f00dd6e47ff40319cbe57fe817d9cf72514fe00195354eb23be6959464776a0040677 SHA512 10a1d38ef16cd46e63891219bfd8759fa5ca3fa34d903eb4d3a702d53d41c039bacc19d81e9f25ac3a2e77a8b2a64f36bbbc9d0b1f80f2029db15ad4e0070f7d +EBUILD tor-9999.ebuild 4309 BLAKE2B 5cbeec728322c9f41e7fdf71ca4d605106bf87b91eadc3f919bccf07c21f00dd6e47ff40319cbe57fe817d9cf72514fe00195354eb23be6959464776a0040677 SHA512 10a1d38ef16cd46e63891219bfd8759fa5ca3fa34d903eb4d3a702d53d41c039bacc19d81e9f25ac3a2e77a8b2a64f36bbbc9d0b1f80f2029db15ad4e0070f7d MISC metadata.xml 645 BLAKE2B a7f450c6cfb9a605f7021cbe533ec64ff0926c9877bef7aace8ce1770a8ec552255b5c54ac80035646c3515d7d0b778100573897068d0905a56f7b860c8de21b SHA512 e5724033912b73ab8abe1b47e74578c8fe4bf6e341b8e7d7434d69071508cd1f35d97f4c7ade9787ae0ded6660cf0a5477d3c7462ed13832693bfd6205f0f0f1 diff --git a/net-vpn/tor/tor-0.4.8.6.ebuild b/net-vpn/tor/tor-0.4.8.6.ebuild new file mode 100644 index 000000000000..558f330e7a58 --- /dev/null +++ b/net-vpn/tor/tor-0.4.8.6.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] + sys-libs/zlib + caps? ( sys-libs/libcap ) + man? ( app-text/asciidoc ) + dev-libs/openssl:=[-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 ) +" +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 +} diff --git a/net-vpn/tor/tor-9999.ebuild b/net-vpn/tor/tor-9999.ebuild index 8c577a42be89..558f330e7a58 100644 --- a/net-vpn/tor/tor-9999.ebuild +++ b/net-vpn/tor/tor-9999.ebuild @@ -52,7 +52,7 @@ DEPEND=" scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) - zstd? ( app-arch/zstd ) + zstd? ( app-arch/zstd:= ) " RDEPEND=" acct-user/tor @@ -130,14 +130,6 @@ src_configure() { --enable-gpl --enable-module-pow - # This option is enabled by default upstream w/ zstd, surprisingly. - # zstd upstream says this shouldn't be relied upon and it may - # break API & ABI at any point, so Tor tries to fake static-linking - # to make it work, but then requires a rebuild on any new zstd version - # even when its standard ABI hasn't changed. - # See bug #727406 and bug #905708. - --disable-zstd-advanced-apis - $(use_enable man asciidoc) $(use_enable man manpage) $(use_enable lzma) -- cgit v1.2.3