From dc50ce612ba7a32ca77479875798989da2885437 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 3 Feb 2023 15:10:30 +0000 Subject: gentoo auto-resync : 03:02:2023 - 15:10:30 --- net-vpn/tor/Manifest | 2 +- net-vpn/tor/tor-0.4.7.13.ebuild | 93 +++++++++++++++++++++++------------------ 2 files changed, 53 insertions(+), 42 deletions(-) (limited to 'net-vpn/tor') diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest index e387a12660ac..4638639b7a53 100644 --- a/net-vpn/tor/Manifest +++ b/net-vpn/tor/Manifest @@ -7,5 +7,5 @@ AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9 DIST tor-0.4.7.13.tar.gz 8031948 BLAKE2B 338a0a541423f27f594a091307b5edeafc9826bb651c2bd050f3282c9355d9d43d1ef4791f3c98a37dc4c0f64bc40925ea1c1e32cbdff78b1a7308df501f279a SHA512 0900416887afbb24f7b72e6ef181b7b01308d1bb35c37736f3b13e06810a07febf9f47fadd9ff6c0e73204d93b49545e4e2516906eb3ba74398ad2b299f530be DIST tor-0.4.7.13.tar.gz.sha256sum 86 BLAKE2B 339db9869bfe485cbd328fe942cc23e60c08ad67fc2d9e7927ed3c9f3b606192e5efac34013c5bf0b0e8b26e957dcf8b586e1cc0a0c27756b8b3d823af37fdee SHA512 ec1d19fa662255df5dd575ba943f4ccb30d9dfa49ff656cdfa73df2d24248b52a3bfd715f4d3efe11d8129968b0e06e3c75e8d82416e1807020ebf65f65401a0 DIST tor-0.4.7.13.tar.gz.sha256sum.asc 716 BLAKE2B 968a3852293ab9bcadac626862c9dc360b17de5afd00af7c46358fa2adfc03b55c02dfe029e9427efba999f553489a04388b395e8fb8fe16325e0895663c2deb SHA512 eb78e8369941d8de833e3616a9a1c1e59b0d3dde918353e2f4fa5eb5da09f038238c46f5e180844bd3cba1211a9daa6d60e9ddb5690998e27a6b7d1616aa20cc -EBUILD tor-0.4.7.13.ebuild 3182 BLAKE2B 8eb79b7b7e93f2de8abf11dc9183af08d4ec3c3e4adb62822164cc3e60cd3c6cf9b3e3aa631af56dd28f213d5e9d13235961260e460d20174cbc839baf46c242 SHA512 7c3a35a5cc34c03c1221272088e82d1004f4917a19de4fcbf1169a07c53dd58f21f0b2eadd44fdf6b1757d3f8f11fd5de6635780e7af085e8fa2fd6821a7cfd0 +EBUILD tor-0.4.7.13.ebuild 3285 BLAKE2B 314c03e9e04f1bed521a1a3e845f06608881e3ef59d9c99bab6c9a3ed4d061749e9f26232b74b83d0d2ed1779b83589fb2890eba675802bc8bb816bacc29eb11 SHA512 aac4ef8a388f2531c48c2f8b6bd43600c1c70c4b965ffad98aca96f98d6c62732afae18d31f4c03af770451fb64c7a38ff1cc00efaf98b90fd729f314b5a56d7 MISC metadata.xml 645 BLAKE2B a7f450c6cfb9a605f7021cbe533ec64ff0926c9877bef7aace8ce1770a8ec552255b5c54ac80035646c3515d7d0b778100573897068d0905a56f7b860c8de21b SHA512 e5724033912b73ab8abe1b47e74578c8fe4bf6e341b8e7d7434d69071508cd1f35d97f4c7ade9787ae0ded6660cf0a5477d3c7462ed13832693bfd6205f0f0f1 diff --git a/net-vpn/tor/tor-0.4.7.13.ebuild b/net-vpn/tor/tor-0.4.7.13.ebuild index 5f40c3f7c6e0..7ac5744f3d9f 100644 --- a/net-vpn/tor/tor-0.4.7.13.ebuild +++ b/net-vpn/tor/tor-0.4.7.13.ebuild @@ -1,21 +1,24 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/torproject.org.asc inherit 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 +HOMEPAGE="https://www.torproject.org/ https://gitlab.torproject.org/tpo/core/tor/" +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}" LICENSE="BSD GPL-2" @@ -26,32 +29,31 @@ fi IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd" RESTRICT="!test? ( test )" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc - -BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20221213 )" DEPEND=" dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) - dev-libs/openssl:0=[-bindist(-)] + 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 )" + zstd? ( app-arch/zstd ) +" RDEPEND=" acct-user/tor acct-group/tor ${DEPEND} - selinux? ( sec-policy/selinux-tor )" - -# bug #764260 + selinux? ( sec-policy/selinux-tor ) +" DEPEND+=" test? ( ${DEPEND} ${PYTHON_DEPS} - )" + ) +" +BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20221213 )" DOCS=() @@ -59,10 +61,6 @@ PATCHES=( "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch ) -# EAPI 8 tries to append it but it doesn't exist here -# bug #831311 etc -QA_CONFIGURE_OPTIONS="--disable-static" - pkg_setup() { use test && python-any-r1_pkg_setup } @@ -79,33 +77,46 @@ src_unpack() { default } +src_prepare() { + default + + # Running shellcheck automagically isn't useful for ebuild testing. + echo "exit 0" > scripts/maint/checkShellScripts.sh || die +} + src_configure() { use doc && DOCS+=( README.md 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-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) \ + 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 + --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 zstd) + ) + + econf "${myeconfargs[@]}" } src_install() { -- cgit v1.2.3