From 556d2525fc9b119afc2f36e04837b78737139d05 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 17 Dec 2021 23:16:22 +0100 Subject: Move {app-crypt → sec-keys}/openpgp-keys-tor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- app-crypt/openpgp-keys-tor/Manifest | 2 -- app-crypt/openpgp-keys-tor/metadata.xml | 8 -------- .../openpgp-keys-tor-20210425.ebuild | 21 --------------------- net-vpn/tor/tor-0.4.6.7.ebuild | 2 +- net-vpn/tor/tor-0.4.6.8.ebuild | 2 +- net-vpn/tor/tor-0.4.7.2_alpha.ebuild | 2 +- profiles/updates/4Q-2021 | 1 + sec-keys/openpgp-keys-tor/Manifest | 2 ++ sec-keys/openpgp-keys-tor/metadata.xml | 8 ++++++++ .../openpgp-keys-tor-20210425.ebuild | 21 +++++++++++++++++++++ 10 files changed, 35 insertions(+), 34 deletions(-) delete mode 100644 app-crypt/openpgp-keys-tor/Manifest delete mode 100644 app-crypt/openpgp-keys-tor/metadata.xml delete mode 100644 app-crypt/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild create mode 100644 sec-keys/openpgp-keys-tor/Manifest create mode 100644 sec-keys/openpgp-keys-tor/metadata.xml create mode 100644 sec-keys/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild diff --git a/app-crypt/openpgp-keys-tor/Manifest b/app-crypt/openpgp-keys-tor/Manifest deleted file mode 100644 index 1ca61f0acddc..000000000000 --- a/app-crypt/openpgp-keys-tor/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST 7A02B3521DC75C542BA015456AFEE6D49E92B601.asc 21639 BLAKE2B 6aa893ed68a06ec546bb6c09202f1fa72a1f9437f683fed9adbdd46d93439465d13e5f8b78b79de1e3b0de33333be8940b8e285b67e34efc4df39e9879c8900c SHA512 e8512c35861caea88148cc16bf8f0df95d9526b1025e263e17dca53f5a9957913f4b3248c00dd61d12b7f823ee9782accc3faf98ac8008473fa74ab7c01d91f2 -DIST EF6E286DDA85EA2A4BA7DE684E2C6E8793298290.asc 21351 BLAKE2B b2225df2f0c345d113d5c138b3e8d5d87ba6019616fd03e7609faeab0df497acfeb7de589ef8ef13d781d10ab9e0d335cb00646ca5c92e98419b610808c8721d SHA512 40bc1add049a3bb02bd1ee7644161f0b60fb2fbe5172998b9e0a14e6fd7ee116905ee4a64c9f23f8f9bdde7b96b7716d4afd9016ae6a28dd761325c556eb92e8 diff --git a/app-crypt/openpgp-keys-tor/metadata.xml b/app-crypt/openpgp-keys-tor/metadata.xml deleted file mode 100644 index 1d130d2aa585..000000000000 --- a/app-crypt/openpgp-keys-tor/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - blueness@gentoo.org - - - diff --git a/app-crypt/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild b/app-crypt/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild deleted file mode 100644 index 82f183c49de6..000000000000 --- a/app-crypt/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="OpenPGP keys used by the Tor project" -HOMEPAGE="https://www.torproject.org/" -SRC_URI="https://keys.openpgp.org/vks/v1/by-fingerprint/EF6E286DDA85EA2A4BA7DE684E2C6E8793298290 -> EF6E286DDA85EA2A4BA7DE684E2C6E8793298290.asc - https://keys.openpgp.org/vks/v1/by-fingerprint/7A02B3521DC75C542BA015456AFEE6D49E92B601 -> 7A02B3521DC75C542BA015456AFEE6D49E92B601.asc" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -S="${WORKDIR}" - -src_install() { - local files=( ${A} ) - insinto /usr/share/openpgp-keys - newins - torproject.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die) -} diff --git a/net-vpn/tor/tor-0.4.6.7.ebuild b/net-vpn/tor/tor-0.4.6.7.ebuild index 2a8eecb56134..919dc32f7fa3 100644 --- a/net-vpn/tor/tor-0.4.6.7.ebuild +++ b/net-vpn/tor/tor-0.4.6.7.ebuild @@ -23,7 +23,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? ( app-crypt/openpgp-keys-tor )" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tor )" DEPEND=" dev-libs/libevent:=[ssl] sys-libs/zlib diff --git a/net-vpn/tor/tor-0.4.6.8.ebuild b/net-vpn/tor/tor-0.4.6.8.ebuild index a02b230e9c79..7eb05f3e6404 100644 --- a/net-vpn/tor/tor-0.4.6.8.ebuild +++ b/net-vpn/tor/tor-0.4.6.8.ebuild @@ -23,7 +23,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? ( app-crypt/openpgp-keys-tor )" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tor )" DEPEND=" dev-libs/libevent:=[ssl] sys-libs/zlib diff --git a/net-vpn/tor/tor-0.4.7.2_alpha.ebuild b/net-vpn/tor/tor-0.4.7.2_alpha.ebuild index 85681b689bd8..44410e9bac9e 100644 --- a/net-vpn/tor/tor-0.4.7.2_alpha.ebuild +++ b/net-vpn/tor/tor-0.4.7.2_alpha.ebuild @@ -23,7 +23,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? ( app-crypt/openpgp-keys-tor )" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tor )" DEPEND=" dev-libs/libevent:=[ssl] sys-libs/zlib diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021 index 993b8d863307..ff47b349ba35 100644 --- a/profiles/updates/4Q-2021 +++ b/profiles/updates/4Q-2021 @@ -28,3 +28,4 @@ move app-crypt/openpgp-keys-rust sec-keys/openpgp-keys-rust move app-crypt/openpgp-keys-tcpdump sec-keys/openpgp-keys-tcpdump move app-crypt/openpgp-keys-teemutoivola sec-keys/openpgp-keys-teemutoivola move app-crypt/openpgp-keys-terminator sec-keys/openpgp-keys-terminator +move app-crypt/openpgp-keys-tor sec-keys/openpgp-keys-tor diff --git a/sec-keys/openpgp-keys-tor/Manifest b/sec-keys/openpgp-keys-tor/Manifest new file mode 100644 index 000000000000..1ca61f0acddc --- /dev/null +++ b/sec-keys/openpgp-keys-tor/Manifest @@ -0,0 +1,2 @@ +DIST 7A02B3521DC75C542BA015456AFEE6D49E92B601.asc 21639 BLAKE2B 6aa893ed68a06ec546bb6c09202f1fa72a1f9437f683fed9adbdd46d93439465d13e5f8b78b79de1e3b0de33333be8940b8e285b67e34efc4df39e9879c8900c SHA512 e8512c35861caea88148cc16bf8f0df95d9526b1025e263e17dca53f5a9957913f4b3248c00dd61d12b7f823ee9782accc3faf98ac8008473fa74ab7c01d91f2 +DIST EF6E286DDA85EA2A4BA7DE684E2C6E8793298290.asc 21351 BLAKE2B b2225df2f0c345d113d5c138b3e8d5d87ba6019616fd03e7609faeab0df497acfeb7de589ef8ef13d781d10ab9e0d335cb00646ca5c92e98419b610808c8721d SHA512 40bc1add049a3bb02bd1ee7644161f0b60fb2fbe5172998b9e0a14e6fd7ee116905ee4a64c9f23f8f9bdde7b96b7716d4afd9016ae6a28dd761325c556eb92e8 diff --git a/sec-keys/openpgp-keys-tor/metadata.xml b/sec-keys/openpgp-keys-tor/metadata.xml new file mode 100644 index 000000000000..1d130d2aa585 --- /dev/null +++ b/sec-keys/openpgp-keys-tor/metadata.xml @@ -0,0 +1,8 @@ + + + + + blueness@gentoo.org + + + diff --git a/sec-keys/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild b/sec-keys/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild new file mode 100644 index 000000000000..82f183c49de6 --- /dev/null +++ b/sec-keys/openpgp-keys-tor/openpgp-keys-tor-20210425.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="OpenPGP keys used by the Tor project" +HOMEPAGE="https://www.torproject.org/" +SRC_URI="https://keys.openpgp.org/vks/v1/by-fingerprint/EF6E286DDA85EA2A4BA7DE684E2C6E8793298290 -> EF6E286DDA85EA2A4BA7DE684E2C6E8793298290.asc + https://keys.openpgp.org/vks/v1/by-fingerprint/7A02B3521DC75C542BA015456AFEE6D49E92B601 -> 7A02B3521DC75C542BA015456AFEE6D49E92B601.asc" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +S="${WORKDIR}" + +src_install() { + local files=( ${A} ) + insinto /usr/share/openpgp-keys + newins - torproject.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die) +} -- cgit v1.2.3-65-gdbad