diff options
Diffstat (limited to 'app-crypt/gnupg')
-rw-r--r-- | app-crypt/gnupg/Manifest | 7 | ||||
-rw-r--r-- | app-crypt/gnupg/gnupg-2.2.34-r1.ebuild | 155 | ||||
-rw-r--r-- | app-crypt/gnupg/gnupg-2.2.35.ebuild | 20 | ||||
-rw-r--r-- | app-crypt/gnupg/gnupg-2.3.6.ebuild | 17 |
4 files changed, 24 insertions, 175 deletions
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index 0e26d3f11b87..ab8826d8913b 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -1,11 +1,8 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce -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.2.35.tar.bz2 7262687 BLAKE2B 18b5965151ded3b3f28d139824e14d7a6f1673c5192ec5f5a80366a6d5f2e04ed7fa035e2bff105e1752753584f992626ccc9ea8840c2bfa39ffe7ca39b81f7f SHA512 ad9f8d10890b7fafb15a7422e2cebaf0f85ce7cf5f880f4edd8d1dec46aa73c01f9096e601f6edd665f8684d1f5892634991a400e00b3185e6b201f549004d3e DIST gnupg-2.2.35.tar.bz2.sig 119 BLAKE2B d95323703c12c9474b21fa91ddb70d4d4d464c794223e21f6ae5d4de955f07a5cabde50612e977168ea6071c4b12be3262cbafe9bcaa8e9a0b009318c0ff6718 SHA512 9043894730520e974e7bc17e0f95419c319fbcd514f102faf644e2f5580e238719cecb8b5e778ecf20f9212ee2554206eb0686e8b5fce7f8c556146657660fe2 DIST gnupg-2.3.6.tar.bz2 7604761 BLAKE2B 6cbc749156c50b6633c126cde621271c6c9682a04efea51fbc5a2e92ee56493e8348814391ee0c337adcb4de4dd23293b9592db78998626905038c859ac4af6e SHA512 4540e8d2be836b491918f4987ba301a73fcdc4539b1f9abf6112a74c2d39c0e5dc3f17511212bac1dd7fd0594feecd91f95ecf78d4b2c1e70e818342a1802b85 DIST gnupg-2.3.6.tar.bz2.sig 119 BLAKE2B c7d4cdc81580b8b1e56c7bc83236d65c9d2c1bab2d210d14a0d3c58f635d656c9b449ef9596b9601027cb891bd437cc8f2a63eb3c17742c288531511984fba7f SHA512 85d155f9809c8d0f38723d8622c085e421531c016d19fcce2ae34dc9a4aeac0bc1895f7a094ee9cdf69a15b426fb0d72ee53319fe0a05665c92caa0e950c1797 -EBUILD gnupg-2.2.34-r1.ebuild 4981 BLAKE2B e5b17c8ba84a9d809fb1554bfdf70c08dbe90c75a2a04108f17c51cb9ba72c29249320a99ddae50896a2b51bbb0369047ec3155a1f9b90fdf89f3e9760bcc776 SHA512 5a4cd0c8340f2d5bef91c607a36e00879da1ff7f5793644c0d1e1a1b2392b070afc20cbfc135f8e86360b39754560a9a47b0de8d6963e2a222c42576f17a9b15 -EBUILD gnupg-2.2.35.ebuild 4989 BLAKE2B 6251ec00e3e78f3b0e686c7995b50e884b2202cc8245a3dbd1a9ef8cf089b956e91abf69c21f3e66fdac3595c978564019bbbbaa94e0a3bf8de6c966f968fc85 SHA512 ecb052f9f1beb977ea1a427feb511317d81dc646305d7667e1ce4430a67b46882a6bed637f7df1e6f8e15f16c1314f625d0e317194d083ee641558cf823a9c9b -EBUILD gnupg-2.3.6.ebuild 5189 BLAKE2B b1ba9b8414bb52c6e217d0a313eba6090a12fb5dc974585bf9b2aa94e11d3ce58d7f84eadf20479d195113ab9a74b6183de515ea5c11db225f2dc360289db69d SHA512 37b1b81b92b9f3476a49513271c9059655e759e57cbc564294c42f7a0d5a173f6d3e65d71f7e6ee83601c55e02346e262d170abde5a4a46eccb81145d94b3111 +EBUILD gnupg-2.2.35.ebuild 5055 BLAKE2B b5be9e19cafb6e6a65aa219df93d818e0d298da4bcb961ca45edb5208df23cdac21cd8b11da22ba822ea31f4ac66157a32ddc7fb65a1cc82e2ebbd488d7be38c SHA512 25099e0c5880d46d1b89bb387a28cef5f70311ca89c7b78a155cc08dc9ef4107ba70de87d49d26a3dea1a9b67f6dcdae7a8dd7478d250277389c9520e77a3fc7 +EBUILD gnupg-2.3.6.ebuild 5232 BLAKE2B 0d5a372da5867eef0a78cb46050281e7d1ed5385b6bdfd0a4df9ba5cefabf92f5cd7c363b1f5bebe7919e0114b258833be39a41f3c8b0f6b370239123d0ae3f2 SHA512 eb8b033a34b9cb2509213cb03f1c1c47a823e3009ff334ec294037fd7236ccc0a90eb035849ba7e03feb7c562997c12edf805d83be08d93616c299953009e93f MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de diff --git a/app-crypt/gnupg/gnupg-2.2.34-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.34-r1.ebuild deleted file mode 100644 index e264a9edb6b3..000000000000 --- a/app-crypt/gnupg/gnupg-2.2.34-r1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 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.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 ) ) - ssl? ( >=net-libs/gnutls-3.0:0= ) - sys-libs/zlib - tofu? ( >=dev-db/sqlite-3.7 )" - -RDEPEND="${DEPEND} - app-crypt/pinentry - nls? ( virtual/libintl ) - selinux? ( sec-policy/selinux-gpg ) - wks-server? ( virtual/mta )" - -BDEPEND="virtual/pkgconfig - doc? ( sys-apps/texinfo ) - nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-gnupg )" - -DOCS=( - ChangeLog NEWS README THANKS TODO VERSION - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER -) - -PATCHES=( - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" -) - -src_prepare() { - default - - # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode, - # idea borrowed from libdbus, see - # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6 - # - # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl', - # which in turn requires discovery in Autoconf, something that upstream deeply resents. - sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \ - -i doc/examples/systemd-user/gpg-agent-ssh.socket || die -} - -src_configure() { - local myconf=( - $(use_enable bzip2) - $(use_enable nls) - $(use_enable smartcard scdaemon) - $(use_enable ssl gnutls) - $(use_enable tofu) - $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') - $(use_enable wks-server wks-tools) - $(use_with ldap) - $(use_with readline) - --with-mailprog=/usr/libexec/sendmail - --disable-ntbtls - --enable-all-tests - --enable-gpg - --enable-gpgsm - --enable-large-secmem - CC_FOR_BUILD="$(tc-getBUILD_CC)" - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" - KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config" - LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" - LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" - NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config" - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - - if use prefix && use usb; then - # bug #649598 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0" - fi - - #bug 663142 - if use user-socket; then - myconf+=( --enable-run-gnupg-user-socket ) - fi - - # glib fails and picks up clang's internal stdint.h causing weird errors - [[ ${CC} == *clang ]] && \ - export gl_cv_absolute_stdint_h=/usr/include/stdint.h - - # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist. - # As of GnuPG 2.3, the mailprog substitution is used for the binary called - # by wks-client & wks-server; and if it's autodetected but not not exist at - # build time, then then 'gpg-wks-client --send' functionality will not - # work. This has an unwanted side-effect in stage3 builds: there was a - # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating - # the build where the install guide previously make the user chose the - # logger & mta early in the install. - - econf "${myconf[@]}" -} - -src_compile() { - default - - use doc && emake -C doc html -} - -src_test() { - #Bug: 638574 - use tofu && export TESTFLAGS=--parallel - default -} - -src_install() { - default - - use tools && - dobin \ - tools/{convert-from-106,gpg-check-pattern} \ - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ - tools/make-dns-cert - - dosym gpg /usr/bin/gpg2 - dosym gpgv /usr/bin/gpgv2 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die - - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die - - use doc && dodoc doc/gnupg.html/* doc/*.png - - systemd_douserunit doc/examples/systemd-user/*.{service,socket} -} diff --git a/app-crypt/gnupg/gnupg-2.2.35.ebuild b/app-crypt/gnupg/gnupg-2.2.35.ebuild index ee9470ef9e05..eb852eeed2d9 100644 --- a/app-crypt/gnupg/gnupg-2.2.35.ebuild +++ b/app-crypt/gnupg/gnupg-2.2.35.ebuild @@ -16,8 +16,9 @@ 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 tofu tools usb user-socket wks-server" +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 )" # Existence of executables is checked during configuration. # Note: On each bump, update dep bounds on each version from configure.ac! @@ -27,12 +28,12 @@ DEPEND=">=dev-libs/libassuan-2.5.0 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 + sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) - sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 )" RDEPEND="${DEPEND} @@ -74,6 +75,8 @@ src_configure() { $(use_enable nls) $(use_enable smartcard scdaemon) $(use_enable ssl gnutls) + $(use_enable test all-tests) + $(use_enable test tests) $(use_enable tofu) $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') $(use_enable wks-server wks-tools) @@ -81,16 +84,17 @@ src_configure() { $(use_with readline) --with-mailprog=/usr/libexec/sendmail --disable-ntbtls - --enable-all-tests --enable-gpg --enable-gpgsm --enable-large-secmem + CC_FOR_BUILD="$(tc-getBUILD_CC)" GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config" LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config" + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') ) @@ -99,14 +103,13 @@ src_configure() { append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0" fi - #bug 663142 + # bug #663142 if use user-socket; then myconf+=( --enable-run-gnupg-user-socket ) fi # glib fails and picks up clang's internal stdint.h causing weird errors - [[ ${CC} == *clang ]] && \ - export gl_cv_absolute_stdint_h=/usr/include/stdint.h + tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist. # As of GnuPG 2.3, the mailprog substitution is used for the binary called @@ -127,8 +130,9 @@ src_compile() { } src_test() { - #Bug: 638574 + # bug #638574 use tofu && export TESTFLAGS=--parallel + default } diff --git a/app-crypt/gnupg/gnupg-2.3.6.ebuild b/app-crypt/gnupg/gnupg-2.3.6.ebuild index e3e7a5c34b64..f75d3200b5f5 100644 --- a/app-crypt/gnupg/gnupg-2.3.6.ebuild +++ b/app-crypt/gnupg/gnupg-2.3.6.ebuild @@ -29,6 +29,7 @@ DEPEND=">=dev-libs/libassuan-2.5.0 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 + sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) @@ -36,7 +37,6 @@ DEPEND=">=dev-libs/libassuan-2.5.0 tofu? ( >=dev-db/sqlite-3.27 ) tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) ssl? ( >=net-libs/gnutls-3.0:0= ) - sys-libs/zlib " RDEPEND="${DEPEND} @@ -78,6 +78,8 @@ src_configure() { $(use_enable nls) $(use_enable smartcard scdaemon) $(use_enable ssl gnutls) + $(use_enable test all-tests) + $(use_enable test tests) $(use_enable tofu) $(use_enable tofu keyboxd) $(use_enable tofu sqlite) @@ -88,31 +90,31 @@ src_configure() { $(use_with readline) --with-mailprog=/usr/libexec/sendmail --disable-ntbtls - --enable-all-tests --enable-gpgsm --enable-large-secmem + CC_FOR_BUILD="$(tc-getBUILD_CC)" GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config" LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config" + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') ) if use prefix && use usb; then # bug #649598 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0" + append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0" fi - #bug 663142 + # bug #663142 if use user-socket; then myconf+=( --enable-run-gnupg-user-socket ) fi # glib fails and picks up clang's internal stdint.h causing weird errors - [[ ${CC} == *clang ]] && \ - export gl_cv_absolute_stdint_h=/usr/include/stdint.h + tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist. # As of GnuPG 2.3, the mailprog substitution is used for the binary called @@ -133,8 +135,9 @@ src_compile() { } src_test() { - #Bug: 638574 + # bug #638574 use tofu && export TESTFLAGS=--parallel + default } |