[gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     c36bb47f838568daf9abd84d9b108edb7cb22e16
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 16:21:32 2022 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 16:21:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c36bb47f

net-vpn/tor: version bump to 0.4.7.4_alpha

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 net-vpn/tor/Manifest                                  |  5 +++--
 ...-0.4.7.3_alpha.ebuild => tor-0.4.7.4_alpha.ebuild} | 19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index a0223969a30d..e972d0dc3a2d 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -7,5 +7,6 @@ DIST tor-0.4.6.8.tar.gz 7796485 BLAKE2B 3475597c9f46c83c736bf5f3db2a4f44a38c4f4c
 DIST tor-0.4.6.8.tar.gz.asc 833 BLAKE2B 6f1825e3f5e2d70c5078d27990633137c7551fa80f5d202e56cfcb2a88d6b5b653ec6c349c7dc152f6c7313e6330182ce22a42be3f7aa63aced0586ee673addf SHA512 5000c111688d76d357c371532f7edbb01280273e5dc9bc18fa524517fcb1efda1403071536f06d61b8b8a73e26505d6e74cd84bd611f63f2a56e4b944f76b2e9
 DIST tor-0.4.6.9.tar.gz 7797677 BLAKE2B 7d6add30867a3b18471bece559acbf6782b516229b8ab2c764f4a581fcbe3c2fa748f2708c60bf0f8a1165bc1fdd930fe00adaf7c1f546e6a7e98bdc0f1abb21 SHA512 67b3c0c0515d4150dd91db6dd4efe19b15a2e8ddac2a34069d61dfaf79d90585f3ca4071483362619719a7cbc6198d67d1ff73acdefa8cc8462bc1e2a7ba264f
 DIST tor-0.4.6.9.tar.gz.asc 833 BLAKE2B 1028464261cd02502408fff7354b92c68f51ce4ec27a16c190f4d16ec4164fb2f81d8018a6c400b22691dda8a29aa5af41b7e8fc9c72f551c8a1e85976ab1223 SHA512 1a34ae6f3b2d58a1a3d71b7a953cb1f8b0ef30430f016d67978a9323f7da42132a7cc2540245e115311951d524bbb67287d1af5c456a72564a4b49971962116f
-DIST tor-0.4.7.3-alpha.tar.gz 7818590 BLAKE2B 3570d52774fa9a14a96e4d7e3a8d0e9e9d2364a9325589d4f23ab0e08ea0933e8cdd6ca1af93b7fabe7745bcd48fad6fbceac34eff6f64253581f9b6dce39bea SHA512 400c8b2c0937734fe9cc934cff9f396bdb4a5073bddfcd91f74bbe8a7d52214467aaeac4200ee6c9a234bf0552929ab9b0fc9727d425c27b6fbdfd81ea8fcc18
-DIST tor-0.4.7.3-alpha.tar.gz.asc 833 BLAKE2B 5c12e159882c4845f48e86708a30f524c62486ba675080ad7799fbf8b15558cadc4133d271d751e39c44274072defcedf653ba8159a495e090fcd393d75a01a7 SHA512 b98f4fb0b0ff92d9d3a427505e28be34f04e18e78fa6c3f8ce408f2d64904321ef289175c7dad57e761ce711a9e686f3cb96f532304f9d46cd77ce1c57951687
+DIST tor-0.4.7.4-alpha.tar.gz 7855828 BLAKE2B c30f131254a55e0fcea82361b491730ec4cae2de9bba33bd4f2d68a71b658478ab2344727096c34a7216a13617ea70b7288b8c1f1e80ffcaeb03aba6b462c0ec SHA512 8956424cec7d9ec223ea974e2d13e1f50e3003a9a7535bff109504ce3a9cb8e62add4dd5b716990b8e8fe258fd9854fe5ae00a914dfa7c7e2f79b3d703363db0
+DIST tor-0.4.7.4-alpha.tar.gz.sha256sum 91 BLAKE2B d3e9416c33e286225b3f41f57bb4cb01ba724a4142b301d3a9fde61c6191c83252a3f1ea7100d26cffc6a0eb4466517b61a167a9f19627679ff5299434dd07e3 SHA512 08d06eb70f2894117b83a934a4df334cd2c7db2f4a51a10233e9e71f94a8aba4a0262476e20480444e232116cd184635d53ec5f4a81f8de78cd1bfd75158eecd
+DIST tor-0.4.7.4-alpha.tar.gz.sha256sum.asc 716 BLAKE2B f65ea8b99a957cb2bfea6a5da664864df68a521268f0c15dee02a738498af7ccc8c0b7299bfe413ee16011f3ea414b694482e8c45c691c1e6585648621cd02a6 SHA512 f8353d9c1d3b9a14767fff8c795acf8914c5970a3b146b0b05010b6a6a01901faa27098a18f08119c0256be43c9e5d43dfe12b36ac2d00d8e2506349884317db

diff --git a/net-vpn/tor/tor-0.4.7.3_alpha.ebuild b/net-vpn/tor/tor-0.4.7.4_alpha.ebuild
similarity index 85%
rename from net-vpn/tor/tor-0.4.7.3_alpha.ebuild
rename to net-vpn/tor/tor-0.4.7.4_alpha.ebuild
index dd28011f8b1e..a117b5a80dea 100644
--- a/net-vpn/tor/tor-0.4.7.3_alpha.ebuild
+++ b/net-vpn/tor/tor-0.4.7.4_alpha.ebuild
@@ -12,7 +12,10 @@ 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"
@@ -23,7 +26,7 @@ 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
@@ -60,6 +63,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)