commit: fc1d86a05f728c7338e42f6cfaa288b50181cae2 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Feb 10 11:16:26 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Feb 10 11:36:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1d86a0
app-crypt/gnupg: fix automagic dependency on app-crypt/tpm2-tss Only affects 2.3.x. Closes: https://bugs.gentoo.org/832783 Signed-off-by: Sam James <sam <AT> gentoo.org> app-crypt/gnupg/Manifest | 1 + .../gnupg/{gnupg-2.3.4.ebuild => gnupg-2.3.4-r1.ebuild} | 13 +++++++++---- app-crypt/gnupg/metadata.xml | 3 +++ profiles/arch/alpha/package.use.mask | 4 ++++ profiles/arch/hppa/package.use.mask | 4 ++++ profiles/arch/ia64/package.use.mask | 4 ++++ profiles/arch/powerpc/ppc32/package.use.mask | 4 ++++ profiles/arch/sparc/package.use.mask | 4 ++++ 8 files changed, 33 insertions(+), 4 deletions(-) diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index c11d72b17087..92e512fefc43 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -4,3 +4,4 @@ DIST gnupg-2.2.34.tar.bz2 7252882 BLAKE2B f42fd8c4019a051c9f087ae1806ce61c831e0a DIST gnupg-2.2.34.tar.bz2.sig 119 BLAKE2B 38d384f215f02bb45ab7c77bb7ad434d9038d8ed19610210ebf84e43e1548c2e938f1f45a1047a9c161c3a88308b83c21fb2bc254a77e68fcf00c7f0cf72e5f9 SHA512 220436aa2387376d4af41ee84dbac9a9e4fda2904024d81da9af6f8c704700c5c6f9da98cfa7e4a9f188ad2739189b905473cfd88747978300829ec382771745 DIST gnupg-2.3.3.tar.bz2 7590874 BLAKE2B a80a84b4f6691815550de6125f4f24aa9c901b8ca8eeb6bc91c90ccd3d285a5ddb15688c7ab870aa6a6c418eb98b969e7b958120c3976b5aaea55188f39b67b0 SHA512 12d500e6b45910d5f7bfd4916bcee37ac988a58a35563fcf425a65b88c0cf92c2af2e94d3e31e9e5e19094c8beb5ec3779cf90bfe43d1555c4196f69eee2f102 DIST gnupg-2.3.4.tar.bz2 7589561 BLAKE2B 6e04a90a5ffac7d4701202e35071a48530ba86d8c64cab3ed1617df23358f4d564ddf6cdbc6c861890725344a19619e0f6791ccabd97b18b28dc4e6e01f7837b SHA512 a3cf1c759512ec561c6f01cec72d533fc099dccf8c03b3a3e4a930862ae4c6815ecb856edd41884a65f058b65553cb69519e53e134d652353a7a76144bd99758 +DIST gnupg-2.3.4.tar.bz2.sig 238 BLAKE2B e384c1528d015b4470eabfeffbe59db82cfc6522d739d6017f72f60a55959ded9cf031fec7b9b286f8020cdd429b2d07780205633d6fb459521ba96374fb3b3f SHA512 be43535068b1ad33458ad320e3ec37fad49341ebfb0846a2b21d2b87fd55696567df91abcea0b83e70ad1322832635279a4d0bf1f736ae6dd70e255c951bf0b3 diff --git a/app-crypt/gnupg/gnupg-2.3.4.ebuild b/app-crypt/gnupg/gnupg-2.3.4-r1.ebuild similarity index 91% rename from app-crypt/gnupg/gnupg-2.3.4.ebuild rename to app-crypt/gnupg/gnupg-2.3.4-r1.ebuild index dc083b09c42e..48bc251e6c0f 100644 --- a/app-crypt/gnupg/gnupg-2.3.4.ebuild +++ b/app-crypt/gnupg/gnupg-2.3.4-r1.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic systemd toolchain-funcs +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc +inherit flag-o-matic systemd toolchain-funcs verify-sig MY_P="${P/_/-}" DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" HOMEPAGE="https://gnupg.org/"; SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )" S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tools usb user-socket wks-server" +IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( tofu )" @@ -32,6 +34,7 @@ DEPEND=">=dev-libs/libassuan-2.5.0 readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) tofu? ( >=dev-db/sqlite-3.27 ) + tpm? ( >=app-crypt/tpm2-tss-2.4.0 ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib " @@ -44,7 +47,8 @@ RDEPEND="${DEPEND} BDEPEND="virtual/pkgconfig doc? ( sys-apps/texinfo ) - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-gnupg )" DOCS=( ChangeLog NEWS README THANKS TODO VERSION @@ -77,6 +81,7 @@ src_configure() { $(use_enable tofu) $(use_enable tofu keyboxd) $(use_enable tofu sqlite) + $(usex tpm '--with-tss=intel' '--disable-tpm2d') $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') $(use_enable wks-server wks-tools) $(use_with ldap) diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml index b8002cbca7e5..9d98eae0625f 100644 --- a/app-crypt/gnupg/metadata.xml +++ b/app-crypt/gnupg/metadata.xml @@ -31,6 +31,9 @@ <flag name="tools"> Install extra tools (including gpgsplit and gpg-zip). </flag> + <flag name="tpm"> + Enable TPM support via <pkg>app-crypt/tpm2-tss</pkg> and build tpm2d. + </flag> <flag name="wks-server"> Install the wks-server </flag> diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask index 5d43e7afc115..9630d6cff97c 100644 --- a/profiles/arch/alpha/package.use.mask +++ b/profiles/arch/alpha/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James <[email protected]> (2022-02-10) +# app-crypt/tpm2-tss is not keyworded here +app-crypt/gnupg tpm + # Sam James <[email protected]> (2022-01-29) # app-text/ronn-ng not keyworded here, bug #801103 app-accessibility/espeak-ng man diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask index 359c15fb777b..583e322554f8 100644 --- a/profiles/arch/hppa/package.use.mask +++ b/profiles/arch/hppa/package.use.mask @@ -4,6 +4,10 @@ # NOTE: When masking a USE flag due to missing keywords, please file a keyword # request bug for the hppa arch. +# Sam James <[email protected]> (2022-02-10) +# app-crypt/tpm2-tss is not keyworded here +app-crypt/gnupg tpm + # Arthur Zamarin <[email protected]> (2022-02-08) # bash becomes corrupted and system breaks, bug #832946 app-shells/bash mem-scramble diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index cb46912d793e..baab7de6d528 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James <[email protected]> (2022-02-10) +# app-crypt/tpm2-tss is not keyworded here +app-crypt/gnupg tpm + # Sam James <[email protected]> (2022-01-29) # app-text/ronn-ng not keyworded here, bug #801103 app-accessibility/espeak-ng man diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask index d1d4ea8a027a..654a3a4b1012 100644 --- a/profiles/arch/powerpc/ppc32/package.use.mask +++ b/profiles/arch/powerpc/ppc32/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James <[email protected]> (2022-02-10) +# app-crypt/tpm2-tss is not keyworded here +app-crypt/gnupg tpm + # Joonas Niilola <[email protected]> (2022-01-04) # Dependency not keyworded on this arch. dev-libs/efl heif diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index c1bd472c3c68..2c3aa82237ae 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James <[email protected]> (2022-02-10) +# app-crypt/tpm2-tss is not keyworded here +app-crypt/gnupg tpm + # Vadim Misbakh-Soloviov <[email protected]> (2021-12-09) # ts-cli requires rust to be built, and rust is unavailable here ATM. dev-libs/tree-sitter ts-cli
