commit:     cadc0fb0a1beac0890f9fdf28c70fb43a3a5ecca
Author:     Saki Xi <space_raccoon <AT> riseup <DOT> net>
AuthorDate: Tue Dec 13 21:29:29 2022 +0000
Commit:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Tue Dec 13 22:16:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=cadc0fb0

net-vpn/tor: bump version to match upstream

Signed-off-by: Saki Xi <space_raccoon <AT> riseup.net>
Closes: https://github.com/gentoo/libressl/pull/481
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>

 net-vpn/tor/Manifest            |   6 ++
 net-vpn/tor/tor-0.4.7.11.ebuild | 127 ++++++++++++++++++++++++++++++++++++++++
 net-vpn/tor/tor-0.4.7.12.ebuild | 127 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 260 insertions(+)

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 3eb2a3a..bc1dc82 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,6 +1,12 @@
 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.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.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/tor-0.4.7.11.ebuild b/net-vpn/tor/tor-0.4.7.11.ebuild
new file mode 100644
index 0000000..1ecb7d8
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.7.11.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..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
new file mode 100644
index 0000000..2205869
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.7.12.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..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
+}

Reply via email to