[gentoo-commits] repo/proj/libressl:master commit in: net-vpn/tor/, net-vpn/tor/files/

[Quentin Retornaz]

commit:     fd1eabf8af9a0979fa6b6eb9623460a30dc8e4d7
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed Apr 27 18:31:10 2022 +0000
Commit:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Thu Apr 28 23:40:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=fd1eabf8

net-vpn/tor: Updated for version 0.4.6.10.

Signed-off-by: orbea <orbea <AT> riseup.net>
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>

 net-vpn/tor/Manifest                               |  3 +++
 ...7-libressl.patch => tor-0.4.6.7-libressl.patch} |  0
 .../{tor-0.4.6.7.ebuild => tor-0.4.6.10.ebuild}    | 29 ++++++++++++++++------
 net-vpn/tor/tor-0.4.6.7.ebuild                     |  2 +-
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index e10ad5e..3d99c78 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,2 +1,5 @@
+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.6.7.tar.gz 7790727 BLAKE2B da6b0fe0de6a334713cf881dece6ef5a932b0f4374a7dde1e1cb78b4b43944fd6156d84bd98c8be734a7cf81b99cb36187544028c3e4800d38d11d7286d19e12 SHA512 e5f9e235fc4b96f5e63e0bfa4ca412d0d11299a31cb77cae1c199b276d0dfbf3656657ddf910b22625dd49eb726d487666e80e8889db78c9edebbab0d80d9e03
 DIST tor-0.4.6.7.tar.gz.asc 833 BLAKE2B 2054c094cc8ce28bfc8822fa6b0ac5a028b41c96160d135da53112c4fcb7ae048e8d48b58f164dd33c6c7dd851aaa71173b2aa36f70411fc7cc2b67d346ce00b SHA512 d45caaa4795d05f1f1a558192c5eedff608c74be0ef933e0ff7a4f68123a109e38e7fe26222c66dfc8966a07f458eeadf77d7f4731d88389595b59413140e9a3

diff --git a/net-vpn/tor/files/0.4.6.7-libressl.patch b/net-vpn/tor/files/tor-0.4.6.7-libressl.patch
similarity index 100%
rename from net-vpn/tor/files/0.4.6.7-libressl.patch
rename to net-vpn/tor/files/tor-0.4.6.7-libressl.patch

diff --git a/net-vpn/tor/tor-0.4.6.7.ebuild b/net-vpn/tor/tor-0.4.6.10.ebuild
similarity index 78%
copy from net-vpn/tor/tor-0.4.6.7.ebuild
copy to net-vpn/tor/tor-0.4.6.10.ebuild
index e29cdd7..993bccb 100644
--- a/net-vpn/tor/tor-0.4.6.7.ebuild
+++ b/net-vpn/tor/tor-0.4.6.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PYTHON_COMPAT=( python3_{8,9} )
-inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
+inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
 
 MY_PV="$(ver_rs 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -12,18 +12,21 @@ 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.asc )"
+	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 ~mips ppc ppc64 ~riscv x86 ~ppc-macos"
+	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"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
 
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tor )"
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 )"
 DEPEND="
 	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
@@ -50,7 +53,7 @@ DEPEND+="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${PV}-libressl.patch
+	"${FILESDIR}"/${PN}-0.4.6.7-libressl.patch
 )
 
 DOCS=()
@@ -61,6 +64,18 @@ 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 ChangeLog ReleaseNotes doc/HACKING )
 	export ac_cv_lib_cap_cap_init=$(usex caps)

diff --git a/net-vpn/tor/tor-0.4.6.7.ebuild b/net-vpn/tor/tor-0.4.6.7.ebuild
index e29cdd7..17eea49 100644
--- a/net-vpn/tor/tor-0.4.6.7.ebuild
+++ b/net-vpn/tor/tor-0.4.6.7.ebuild
@@ -50,7 +50,7 @@ DEPEND+="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${PV}-libressl.patch
+	"${FILESDIR}"/${P}-libressl.patch
 )
 
 DOCS=()