diff options
Diffstat (limited to 'app-crypt/gnupg')
-rw-r--r-- | app-crypt/gnupg/Manifest | 12 | ||||
-rw-r--r-- | app-crypt/gnupg/gnupg-2.2.33-r1.ebuild | 4 | ||||
-rw-r--r-- | app-crypt/gnupg/gnupg-2.2.34.ebuild (renamed from app-crypt/gnupg/gnupg-2.3.4.ebuild) | 29 | ||||
-rw-r--r-- | app-crypt/gnupg/gnupg-2.3.4-r1.ebuild (renamed from app-crypt/gnupg/gnupg-2.3.3-r1.ebuild) | 13 | ||||
-rw-r--r-- | app-crypt/gnupg/metadata.xml | 7 |
5 files changed, 35 insertions, 30 deletions
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index 67bb0cf0887e..6202fa6a19d3 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -1,10 +1,12 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce DIST gnupg-2.2.32.tar.bz2 7212625 BLAKE2B 8e1feba83a0d8fa1c154c814e26b41aa252cef4af53937e4e8954860249c180c1d6910356b0c46dfefde094846b02bd5375f17c8b6fdcc9138281d0daa292d42 SHA512 76b75d3688561ce65a8014812656aa87c9722c898d7e186fdb1331dee6af32f886a6b0a4806975c348a22ad6dda60f956ece56076d00153b9706aad4c934c6a1 DIST gnupg-2.2.33.tar.bz2 7238439 BLAKE2B 9655ab8733f79c56c706502ddeeb41a2841467146753965898528d53a95ba77c51bcaf7fb93c51fb1c36953253ef993e67ce3c9ec756c9eece1042dcd17aa455 SHA512 0e6382ebb78425dc81b280a3b453111fb4a764b3fb0565ac09ac24cec2ecd571079617e263d9fce077ba6ce8d202fb43425b51c26f9ec6e8c61706a1ca5f8c78 -DIST gnupg-2.3.3.tar.bz2 7590874 BLAKE2B a80a84b4f6691815550de6125f4f24aa9c901b8ca8eeb6bc91c90ccd3d285a5ddb15688c7ab870aa6a6c418eb98b969e7b958120c3976b5aaea55188f39b67b0 SHA512 12d500e6b45910d5f7bfd4916bcee37ac988a58a35563fcf425a65b88c0cf92c2af2e94d3e31e9e5e19094c8beb5ec3779cf90bfe43d1555c4196f69eee2f102 +DIST gnupg-2.2.34.tar.bz2 7252882 BLAKE2B f42fd8c4019a051c9f087ae1806ce61c831e0aa552baf7372fd26f2e81d612b919590b698e512343644b68ba220f8f4f751cb66a7f4966df5ba7819563d5351a SHA512 2232e2df58a8470f152d5d91816e14017bcc702bf56c7ae6210f8f42069b2117172b9eabc8fcc1d1174aa7a1068ff444c98335f6c503c2e17137c76fe2602b8b +DIST gnupg-2.2.34.tar.bz2.sig 119 BLAKE2B 38d384f215f02bb45ab7c77bb7ad434d9038d8ed19610210ebf84e43e1548c2e938f1f45a1047a9c161c3a88308b83c21fb2bc254a77e68fcf00c7f0cf72e5f9 SHA512 220436aa2387376d4af41ee84dbac9a9e4fda2904024d81da9af6f8c704700c5c6f9da98cfa7e4a9f188ad2739189b905473cfd88747978300829ec382771745 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 EBUILD gnupg-2.2.32-r1.ebuild 4786 BLAKE2B 6e81532e958f0454d6ef5f56f381c794ba75378a136a396660ed32722842fa4b14017c74df05f6e8098db2a8ad57701309e36a4704088bc1109125a063e96b70 SHA512 71ea3bebf26b75f77abb79e4285f2d40bd021db819a975c5e29cb620eb95d801b62c0bad8ccf5726948eef3d0fb00b3aa8a31da7a036d50dcfb0496eff4e07c6 -EBUILD gnupg-2.2.33-r1.ebuild 4794 BLAKE2B 67398864ea884a87548d1bb5fb69899567a831f3ad0db749a7815bac2a34e6573da0eb60b755a25beac86e00639f0ce26de032e88b84e0e1f567aa562fb64027 SHA512 e3929982e9ae323839cb11d5acfe170f9f4b99fc28cc56f5aaac1825536de84f22e6638b0e6b05e3a749386f849c22caaac1cd9cd34396a2e177c36a167daad9 -EBUILD gnupg-2.3.3-r1.ebuild 4892 BLAKE2B 096437f8c9b84cbccda57b577171fe9c4c4d185f2f42b2bd90e7e31ff43603820061711895a63850be5584304f14e77faba8b25b0cd02de6b4d40e9a60f1d373 SHA512 a8607182c3a2e645207258cd5770a5797997d1888ba67d98fec7d0363e6071262b06f9fbb9855b1e0044861daa27f4d7058cf516e786e6306267a7018410e39f -EBUILD gnupg-2.3.4.ebuild 4892 BLAKE2B 096437f8c9b84cbccda57b577171fe9c4c4d185f2f42b2bd90e7e31ff43603820061711895a63850be5584304f14e77faba8b25b0cd02de6b4d40e9a60f1d373 SHA512 a8607182c3a2e645207258cd5770a5797997d1888ba67d98fec7d0363e6071262b06f9fbb9855b1e0044861daa27f4d7058cf516e786e6306267a7018410e39f -MISC metadata.xml 1307 BLAKE2B 3c9f597e695e8dc4a1aebb7a42186fbdc47c7836f837429c8e341b8e991ea18f82171476d8b8f95adbc1e0d92dba5941b2af1d1f44c6efcf9a67d39caaf43187 SHA512 d1a72ac876af1678cfb01da22ace33c87c79266fe7d25ff722d61950ce81a05431e529672db019abe3566084b5fa36649b882a7edabc1d9796a670c12406fa74 +EBUILD gnupg-2.2.33-r1.ebuild 4786 BLAKE2B 48921a772a483c2335bb22dc75612ddafd22c1ec312cc7a9f928721149b8ebe7ad64cb11cc161b2e3e9fcc3a49142d67151a05b4cee7f2cc2cf173096f497878 SHA512 04a7e068a9a08391ee90180dd2d8933dcee99e5b43379463d69988aa3dee9698c68acdf926322f34aab599bca21d5a7dfdadbb72b8e90e8f1c47b99f08cd5c43 +EBUILD gnupg-2.2.34.ebuild 4980 BLAKE2B 164a46c1ba36ddab25e9ddeb3f66f72685168566c2dd3ca8efa8db8f3aab00911aa8cdca61cafbc6d3152699fa1d518c40fe425458d4098d90ad6b14d43b8eae SHA512 b4e71302bc1131388029d931d859002f542878273a2b4f6c530256d130f1719e4963bba484be3da4f09cb7fa74acbbc1bf69e60c8cf7e249ce8b4c375bcdb25b +EBUILD gnupg-2.3.4-r1.ebuild 5178 BLAKE2B b615134041bde1f91e504fdd6d348192770d81148dd5c2a7c222a49bd1d24960dc6aab93f3000bfc45c256a9fc56c6e4c72ede67884affb0918471ad63b75d0f SHA512 22ed8562991971fc276893d2d44f517e411864e2f448c782903d6d8684edd89c913cc5ffdede420f9ef8c0bf79f18077ef382411c67bbf1bf441b4f1d2a756de +MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de diff --git a/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild index fb9711a1074b..eee1b3922bec 100644 --- a/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild +++ b/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" 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" +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 tofu tools usb user-socket wks-server" # Existence of executables is checked during configuration. diff --git a/app-crypt/gnupg/gnupg-2.3.4.ebuild b/app-crypt/gnupg/gnupg-2.2.34.ebuild index dc083b09c42e..e1a5ef3e6383 100644 --- a/app-crypt/gnupg/gnupg-2.3.4.ebuild +++ b/app-crypt/gnupg/gnupg-2.2.34.ebuild @@ -1,40 +1,39 @@ -# 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" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( tofu )" +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 tofu tools usb user-socket wks-server" # Existence of executables is checked during configuration. # Note: On each bump, update dep bounds on each version from configure.ac! DEPEND=">=dev-libs/libassuan-2.5.0 - >=dev-libs/libgcrypt-1.9.1:= - >=dev-libs/libgpg-error-1.41 - >=dev-libs/libksba-1.3.4 + >=dev-libs/libgcrypt-1.8.0:= + >=dev-libs/libgpg-error-1.29 + >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) - tofu? ( >=dev-db/sqlite-3.27 ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib -" + tofu? ( >=dev-db/sqlite-3.7 )" RDEPEND="${DEPEND} app-crypt/pinentry @@ -44,7 +43,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 @@ -75,8 +75,6 @@ src_configure() { $(use_enable smartcard scdaemon) $(use_enable ssl gnutls) $(use_enable tofu) - $(use_enable tofu keyboxd) - $(use_enable tofu sqlite) $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') $(use_enable wks-server wks-tools) $(use_with ldap) @@ -84,6 +82,7 @@ src_configure() { --with-mailprog=/usr/libexec/sendmail --disable-ntbtls --enable-all-tests + --enable-gpg --enable-gpgsm --enable-large-secmem CC_FOR_BUILD="$(tc-getBUILD_CC)" @@ -139,7 +138,7 @@ src_install() { use tools && dobin \ tools/{convert-from-106,gpg-check-pattern} \ - tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ + tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ tools/make-dns-cert dosym gpg /usr/bin/gpg2 diff --git a/app-crypt/gnupg/gnupg-2.3.3-r1.ebuild b/app-crypt/gnupg/gnupg-2.3.4-r1.ebuild index dc083b09c42e..48bc251e6c0f 100644 --- a/app-crypt/gnupg/gnupg-2.3.3-r1.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..9704490d3e88 100644 --- a/app-crypt/gnupg/metadata.xml +++ b/app-crypt/gnupg/metadata.xml @@ -5,10 +5,6 @@ <email>zlogene@gentoo.org</email> <name>Mikle Kolyada</name> </maintainer> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> <maintainer type="project"> <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> @@ -31,6 +27,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> |