commit: 7738f291029719cfebc7722331e3edeebbd73d4d Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Thu Nov 10 17:13:29 2022 +0000 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> CommitDate: Sun Nov 13 14:47:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=7738f291
net-vpn/tor: Add 0.4.7.10-r1 Removes 0.4.6.10. Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/libressl/pull/469 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> net-vpn/tor/Manifest | 6 +- .../tor-0.4.7.10-strict-prototypes-clang16.patch | 75 ++++++++++++++++++++++ ...{tor-0.4.6.10.ebuild => tor-0.4.7.10-r1.ebuild} | 18 ++++-- 3 files changed, 89 insertions(+), 10 deletions(-) diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest index 2a8643b..3eb2a3a 100644 --- a/net-vpn/tor/Manifest +++ b/net-vpn/tor/Manifest @@ -1,6 +1,6 @@ -DIST tor-0.4.6.10.tar.gz 7811644 BLAKE2B 4bdf8ab8ac992866ffc18711de0ad9e19b496398dfdace4d3902273822666dcfda3acd825ee22251cd8d671ff563702c6f24fe8670719a2c75d144cfe9219f68 SHA512 7d3ca14f260f8d18c020f629fee93a9e941962f99d7b6106d81b1f302152e4be14f5f719c06a34257c2bedf1612c53da21c26750b2608034bd6c6cf0c82192a9 -DIST tor-0.4.6.10.tar.gz.sha256sum 85 BLAKE2B 1c51a80a0bdc34c31725ba6d632ae16ddec1c4aadd4c5ce8ff5ccd4dc9b051f76ddebbe1f1dc2c6f86194bf6badc95222ae14be100bbc24b75bc53f525cb8378 SHA512 97b49664f9f998b00fdd80f956bd5ab9588cd75d09041a0b946fdabd9f10c471eb49aa4bbb4d19bde45a554c1f2ef60d76ff58aa1dc74d4e7d930df77ac68262 -DIST tor-0.4.6.10.tar.gz.sha256sum.asc 488 BLAKE2B 4f17ba1b555eeaa0aadad9348420979c1c83d3ce3cc4fa7e1cc6f453e75ae0bb43db19b883efcc329de5b52b91cda0f740ed949674f64e8cbfc0eb343ca2819b SHA512 3d814c0b3533cf2b2ff421dc92f254596f2af7206bbefdc15a71a906c667dd3606b2c37ada3d36df6011fd0b4d5fe78860f8845fae9e19bd9e3ba5745f45130b +DIST tor-0.4.7.10.tar.gz 7933376 BLAKE2B 46a9d932e7451bcc683e18d296d7a26bb4b544767cf4622910ebf90d82715718451ec3e0d6cd215eff5fe2cc3ae8441b8e6065c5877d7fc92c2f26ab5c7fa0cb SHA512 e82877807d9e73fe12ab424830641e52b9b45034ca06f07e37648f50a3c1c10cd1b07081d8646b8e92c58658bdff5f6e9670e5104e9d05a531b1d85d0851a606 +DIST tor-0.4.7.10.tar.gz.sha256sum 86 BLAKE2B 4b372b3508ffee497ecc9adab4a4d3d2b548100bb7dd54e1036c71004503d96148899096bbae807f2d626a5e26d0a947f7546df0a708a78b59b4d39bed3e849c SHA512 518b6e617702386df7a84155d528f1a904a45221c946402da3fc3d40170dcdac117bff38c92a2e58ef4dd8d422433950f3904d27da66a99d808204432732cc9b +DIST tor-0.4.7.10.tar.gz.sha256sum.asc 1321 BLAKE2B fc7fd43115992e5d434cc1bf2808eeb971ead532935be7493b4eef7804a65cad3cf4f9fd18158a0c8f3e19bb9e55c5fe7487ded9adb6782cbc1583e1159aaf7c SHA512 789923b465e72a1a77b1b1951cd0f66c266c10119a480ce8b622f1f4aa07381b7403c27aca3badf51381da0b41498c9b0d42b2c5cedd6c54a617df9dc138689e DIST tor-0.4.7.8.tar.gz 7910081 BLAKE2B 40f6eab453d95a09e4531ce7cdb59715a21b84e1d0b1045d107add6a443fb7563a5747734b23e0e1dfda6490a5a7659f912e38c11cdb5fa635535dcff6169eeb SHA512 2daeb4ef9144772b4e0793ccd00990b7eda58c533f9616670940931d6d12770e9a7d48b33b5626d330f62bb71fbc6e1f559881f062d16bc15fbb162e29fa91f4 DIST tor-0.4.7.8.tar.gz.sha256sum 85 BLAKE2B 0fa1e094af83c74f46f87d0569a623bd3061b416f272d19326faf08ab6e9e926b14c2d46c99fba80d68f22188aa74c73e68477015e1c37382e4acb115d10a5a2 SHA512 8d8ef020e8028a0d481cbf6e50809212ebfb493b11c3937f1f732be48ca139a991e68b799342a17374f6faf77f0a7113d15c5220a5bf94d110d11582a078a013 DIST tor-0.4.7.8.tar.gz.sha256sum.asc 1321 BLAKE2B b70d64db73c45f50bac4ef07f12d755eaf02b676d929bd6f3a9b5b593326e1cce4a3bc8466f2ccce003ab044084fa812ce6ea4cbf32f5a4c0321199dcd291bee SHA512 5c58745abb4db4a9d53c4c4df209cab96689494704d661439efa705f143267aac648ed23240aedc802e9689223f79d2d1c7eba865d2d5b3296590f8b93e03c37 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 new file mode 100644 index 0000000..9317b6b --- /dev/null +++ b/net-vpn/tor/files/tor-0.4.7.10-strict-prototypes-clang16.patch @@ -0,0 +1,75 @@ +https://gitlab.torproject.org/tpo/core/tor/-/commit/ee38514cc4372bfb7d01ee96a1110d600a30e061 + +From ee38514cc4372bfb7d01ee96a1110d600a30e061 Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +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 <[email protected]> +--- 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.6.10.ebuild b/net-vpn/tor/tor-0.4.7.10-r1.ebuild similarity index 91% rename from net-vpn/tor/tor-0.4.6.10.ebuild rename to net-vpn/tor/tor-0.4.7.10-r1.ebuild index 993bccb..b904340 100644 --- a/net-vpn/tor/tor-0.4.6.10.ebuild +++ b/net-vpn/tor/tor-0.4.7.10-r1.ebuild @@ -3,7 +3,7 @@ EAPI="8" -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-any-r1 readme.gentoo-r1 systemd verify-sig MY_PV="$(ver_rs 4 -)" @@ -24,6 +24,8 @@ 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 )" @@ -51,14 +53,17 @@ DEPEND+=" ${PYTHON_DEPS} )" +DOCS=() + PATCHES=( - "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch "${FILESDIR}"/${PN}-0.4.6.7-libressl.patch + "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch + "${FILESDIR}"/${P}-strict-prototypes-clang16.patch ) -DOCS=() - -RESTRICT="!test? ( test )" +# 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 @@ -77,7 +82,7 @@ src_unpack() { } src_configure() { - use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING ) + use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING ) export ac_cv_lib_cap_cap_init=$(usex caps) econf \ --localstatedir="${EPREFIX}/var" \ @@ -89,7 +94,6 @@ src_configure() { --enable-missing-doc-warnings \ --disable-module-dirauth \ --enable-pic \ - --disable-rust \ --disable-restart-debugging \ --disable-zstd-advanced-apis \ $(use_enable man asciidoc) \
