commit: f331c6b0f0c15d59775b26695e7ba27660cca511 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Fri Feb 17 16:31:43 2023 +0000 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> CommitDate: Tue Feb 21 23:51:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=f331c6b0
dev-vpn/tor: Remove old versions Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/libressl/pull/497 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> net-vpn/tor/Manifest | 6 - .../tor-0.4.7.10-strict-prototypes-clang16.patch | 75 ------------ net-vpn/tor/tor-0.4.7.11.ebuild | 127 --------------------- net-vpn/tor/tor-0.4.7.12.ebuild | 127 --------------------- 4 files changed, 335 deletions(-) diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest index 363a4f3..05ebc39 100644 --- a/net-vpn/tor/Manifest +++ b/net-vpn/tor/Manifest @@ -1,9 +1,3 @@ -DIST tor-0.4.7.11.tar.gz 7983705 BLAKE2B 2d743e7d0aea63e76f6e24aa235792af8691fde419f56bbdf8c6ee865250a09ec06454ec84abac8ba47e3d61a363c937fc050376172d3ec6b0815998d1c8679e SHA512 318377916880310438aa9804d1ea0154c5416d6b13988c4ff7f2e65fd38c94e2cd6c53252fd76a4dcb488f452837468e19197bf5feee4020e3c1927a76ed2937 -DIST tor-0.4.7.11.tar.gz.sha256sum 86 BLAKE2B 1e49ba88ae21af6589a9815603ee375cc0dc85fcd8dd5a5f52cd44659438874ae9d10b09b7f15cadd2c30d2e8012a27be4233dcb19195d4627f19a59ccf68d0b SHA512 cfdae54a70dc0d8eb0eaf8b8c9902a7dd8bc8d597a678d5a0bf431c3e09a8b56206b70b6f9207e3c06e1ba11913b25b81d7c269e49cde5f297ff7b165a3348a9 -DIST tor-0.4.7.11.tar.gz.sha256sum.asc 716 BLAKE2B 2336ff3869b3a759626cd68c0c931dbdb6cf5b13e7a99e2dcc1c784e3832ba2f0314c1c2f3a9e5ccaba3f20d7aab9b9c918373194290769e358cbb5411323012 SHA512 b5e3c82378bc18268d6d4523787e12ece39246cc0f035fd1aedc50c2182d1ba3d2a8f8817a3dada2cd60acabb78f604f06ab347b92c6f42a82f260cc49285c2c -DIST tor-0.4.7.12.tar.gz 8009573 BLAKE2B 13e9a796d9e5b024aa01b9aaab389b580df41641013721e4c2821cfee4edc6fb562d997be70ecc3908ac5e43187978b1be63f78ac72c73e8ea3617d6b5cf1ea9 SHA512 b97a6cc3fd3353cc1cdbb47df6d8895d0f730967083171795be56ffab4660c9a0f8f73ce83a98eff1fbd0793bae28c987d53c29f57fc5e0f26dddc30c197abb2 -DIST tor-0.4.7.12.tar.gz.sha256sum 86 BLAKE2B 0402bdf641c8142f91df7a80ad726ce3a1eeb3265f385b5b818440e6c25a5424db467714baee0dfaaf61edf482814a1de5c4d53fd4d61a26c194037a71928580 SHA512 c9a197bb563b05632cc5bfe4dfe5d2dd02427591816997726e2fbc9ec94b17d52295f33c946bea51ac6a2ef76d94a14b9e96daf951eeab57a8ee0d7d513c62c1 -DIST tor-0.4.7.12.tar.gz.sha256sum.asc 716 BLAKE2B c148062a35e232d08cd1e0971e467cddee7836932984f778ab923ff38e717c2a8f3985ff63591002b179eaeb12e04b066366a2a3ed76e00d436a76f0eacaea67 SHA512 afa1208758f0b385cea36660db4739353237b5a4608c374db9115e3584ba96bdabe18ea811752a847eb3e5012919c9f3ed06129f1ec40465d18dc27de4b961fc 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 diff --git a/net-vpn/tor/files/tor-0.4.7.10-strict-prototypes-clang16.patch b/net-vpn/tor/files/tor-0.4.7.10-strict-prototypes-clang16.patch deleted file mode 100644 index 9317b6b..0000000 --- a/net-vpn/tor/files/tor-0.4.7.10-strict-prototypes-clang16.patch +++ /dev/null @@ -1,75 +0,0 @@ -https://gitlab.torproject.org/tpo/core/tor/-/commit/ee38514cc4372bfb7d01ee96a1110d600a30e061 - -From ee38514cc4372bfb7d01ee96a1110d600a30e061 Mon Sep 17 00:00:00 2001 -From: Sam James <s...@gentoo.org> -Date: Tue, 8 Nov 2022 06:42:59 +0000 -Subject: [PATCH] build: fix -Wstrict-prototypes (Clang 16) - -Clang 16 warns on -Wstrict-prototypes in preparation for C23 which can -among other things, lead to some configure tests silently failing/returning the wrong result. - -Fixes this error: -``` --ignoreme: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes] -+ignoreme: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] - main () -``` - -For more information, see LWN.net [0] or LLVM's Discourse [1], gentoo-dev@ [2], -or the (new) c-std-porting mailing list [3]. - -[0] https://lwn.net/Articles/913505/ -[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 -[2] https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240 -[3] hosted at lists.linux.dev. - -Bug: https://bugs.gentoo.org/879747 -Signed-off-by: Sam James <s...@gentoo.org> ---- a/configure.ac -+++ b/configure.ac -@@ -1982,7 +1982,7 @@ AC_CACHE_CHECK([whether memset(0) sets pointers to NULL], tor_cv_null_is_zero, - #ifdef HAVE_STDDEF_H - #include <stddef.h> - #endif --int main () { char *p1,*p2; p1=NULL; memset(&p2,0,sizeof(p2)); -+int main (void) { char *p1,*p2; p1=NULL; memset(&p2,0,sizeof(p2)); - return memcmp(&p1,&p2,sizeof(char*))?1:0; }]])], - [tor_cv_null_is_zero=yes], - [tor_cv_null_is_zero=no], -@@ -2006,7 +2006,7 @@ AC_CACHE_CHECK([whether memset(0) sets doubles to 0.0], tor_cv_dbl0_is_zero, - #ifdef HAVE_STDDEF_H - #include <stddef.h> - #endif --int main () { double d1,d2; d1=0; memset(&d2,0,sizeof(d2)); -+int main (void) { double d1,d2; d1=0; memset(&d2,0,sizeof(d2)); - return memcmp(&d1,&d2,sizeof(d1))?1:0; }]])], - [tor_cv_dbl0_is_zero=yes], - [tor_cv_dbl0_is_zero=no], -@@ -2031,7 +2031,7 @@ AC_CACHE_CHECK([whether we can malloc(0) safely.], tor_cv_malloc_zero_works, - #ifdef HAVE_STDDEF_H - #include <stddef.h> - #endif --int main () { return malloc(0)?0:1; }]])], -+int main (void) { return malloc(0)?0:1; }]])], - [tor_cv_malloc_zero_works=yes], - [tor_cv_malloc_zero_works=no], - [tor_cv_malloc_zero_works=cross])]) -@@ -2049,7 +2049,7 @@ fi - # whether we seem to be in a 2s-complement world. - AC_CACHE_CHECK([whether we are using 2s-complement arithmetic], tor_cv_twos_complement, - [AC_RUN_IFELSE([AC_LANG_SOURCE( --[[int main () { int problem = ((-99) != (~99)+1); -+[[int main (void) { int problem = ((-99) != (~99)+1); - return problem ? 1 : 0; }]])], - [tor_cv_twos_complement=yes], - [tor_cv_twos_complement=no], -@@ -2069,7 +2069,7 @@ fi - # What does shifting a negative value do? - AC_CACHE_CHECK([whether right-shift on negative values does sign-extension], tor_cv_sign_extend, - [AC_RUN_IFELSE([AC_LANG_SOURCE( --[[int main () { int okay = (-60 >> 8) == -1; return okay ? 0 : 1; }]])], -+[[int main (void) { int okay = (-60 >> 8) == -1; return okay ? 0 : 1; }]])], - [tor_cv_sign_extend=yes], - [tor_cv_sign_extend=no], - [tor_cv_sign_extend=cross])]) -GitLab diff --git a/net-vpn/tor/tor-0.4.7.11.ebuild b/net-vpn/tor/tor-0.4.7.11.ebuild deleted file mode 100644 index 3f4a558..0000000 --- a/net-vpn/tor/tor-0.4.7.11.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{9..10} ) -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 - 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" -SLOT="0" -if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos" -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-20220216 )" -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} - )" - -DOCS=() - -PATCHES=( - "${FILESDIR}"/${PN}-0.4.6.7-libressl.patch - "${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 -} - -src_unpack() { - 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 -} - -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) \ - $(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.12.ebuild b/net-vpn/tor/tor-0.4.7.12.ebuild deleted file mode 100644 index 0c8b16e..0000000 --- a/net-vpn/tor/tor-0.4.7.12.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{9..10} ) -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 - 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" -SLOT="0" -if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos" -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(-)] - 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} - )" - -DOCS=() - -PATCHES=( - "${FILESDIR}"/${PN}-0.4.6.7-libressl.patch - "${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 -} - -src_unpack() { - 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 -} - -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) \ - $(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 -}
