commit: e6d5dc95e4eb2e7282b0faeb7908569cb2103134 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Apr 25 16:05:50 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 25 16:05:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6d5dc95
app-crypt/gnupg: drop 2.3.4-r3, 2.3.5-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> app-crypt/gnupg/Manifest | 2 - .../files/gnupg-2.3.5-fix-buffering-hang.patch | 52 ------- app-crypt/gnupg/gnupg-2.3.4-r3.ebuild | 161 --------------------- app-crypt/gnupg/gnupg-2.3.5-r1.ebuild | 161 --------------------- 4 files changed, 376 deletions(-) diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index da135ab95714..27fdcf84a943 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -1,7 +1,5 @@ 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 DIST gnupg-2.3.5.tar.bz2 7601772 BLAKE2B b1044d8a62636be1fe870fe73213ffdefefc4b4f99b4cb1abcbc85679fda8ec855c1ac11296e2a37c7aef9bf0eec401bd3aafe68154a22df780512deb5ed77f8 SHA512 dcaf6a72179cbc21263f27c994100fbd45687daaa63e3a9a9668e26c25f331516e8c7b656cdce6c646e5fe29f0ad2e20b72ac364f242524fb3ead4e96e89520d DIST gnupg-2.3.5.tar.bz2.sig 119 BLAKE2B 5377908e2ad968db06e870d17116827c9a332bd159aba2ff737131805b9f81d7ff44352ffb9af0006ec2d48934fcfc7af54965d948a8a043fe3a59b3600f8745 SHA512 f12e799274833a657317e997e85958cc450d57bb6a3a39a613d41de50953ab1363e0a38a4f4948f81f7da08dd00ccb2e141d6b2eb7f131ed2905d3c1666f7da2 DIST gnupg-2.3.6.tar.bz2 7604761 BLAKE2B 6cbc749156c50b6633c126cde621271c6c9682a04efea51fbc5a2e92ee56493e8348814391ee0c337adcb4de4dd23293b9592db78998626905038c859ac4af6e SHA512 4540e8d2be836b491918f4987ba301a73fcdc4539b1f9abf6112a74c2d39c0e5dc3f17511212bac1dd7fd0594feecd91f95ecf78d4b2c1e70e818342a1802b85 diff --git a/app-crypt/gnupg/files/gnupg-2.3.5-fix-buffering-hang.patch b/app-crypt/gnupg/files/gnupg-2.3.5-fix-buffering-hang.patch deleted file mode 100644 index 3ff8d2afcf6f..000000000000 --- a/app-crypt/gnupg/files/gnupg-2.3.5-fix-buffering-hang.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=2fc91e15c6bebb203162cc8445e68ee4ff934885;hp=2848fe4c84e5ee20ccd90f0ef4c9f78c6801e1f6 -https://bugs.gentoo.org/840746 - -From: NIIBE Yutaka <gni...@fsij.org> -Date: Mon, 25 Apr 2022 17:37:32 +0900 -Subject: [PATCH 1/1] common:iobuf: Exclude cases with - IOBUF_INPUT_TEMP/IOBUF_OUTPUT_TEMP. - -* common/iobuf.c (iobuf_read): Handle a case with IOBUF_INPUT_TEMP. -(iobuf_write): Handle a case with IOBUF_OUTPUT_TEMP. - --- - -GnuPG-bug-id: 5941 -Signed-off-by: NIIBE Yutaka <gni...@fsij.org> ---- a/common/iobuf.c -+++ b/common/iobuf.c -@@ -2177,7 +2177,8 @@ iobuf_read (iobuf_t a, void *buffer, unsigned int buflen) - a->e_d.len = 0; - - /* Hint for how full to fill iobuf internal drain buffer. */ -- a->e_d.preferred = (buf && buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE); -+ a->e_d.preferred = (a->use != IOBUF_INPUT_TEMP) -+ && (buf && buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE); - - n = 0; - do -@@ -2200,7 +2201,7 @@ iobuf_read (iobuf_t a, void *buffer, unsigned int buflen) - underflow to read more data into the filter's internal - buffer. */ - { -- if (buf && n < buflen) -+ if (a->use != IOBUF_INPUT_TEMP && buf && n < buflen) - { - /* Setup external drain buffer for faster moving of data - * (avoid memcpy). */ -@@ -2328,11 +2329,13 @@ iobuf_write (iobuf_t a, const void *buffer, unsigned int buflen) - a->e_d.len = 0; - - /* Hint for how full to fill iobuf internal drain buffer. */ -- a->e_d.preferred = (buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE); -+ a->e_d.preferred = (a->use != IOBUF_OUTPUT_TEMP) -+ && (buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE); - - do - { -- if (a->d.len == 0 && buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE) -+ if ((a->use != IOBUF_OUTPUT_TEMP) -+ && a->d.len == 0 && buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE) - { - /* Setup external drain buffer for faster moving of data - * (avoid memcpy). */ diff --git a/app-crypt/gnupg/gnupg-2.3.4-r3.ebuild b/app-crypt/gnupg/gnupg-2.3.4-r3.ebuild deleted file mode 100644 index 0a3104b6851c..000000000000 --- a/app-crypt/gnupg/gnupg-2.3.4-r3.ebuild +++ /dev/null @@ -1,161 +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 test +tofu tpm tools usb user-socket wks-server" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( tofu )" - -# 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/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 ) - tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) - ssl? ( >=net-libs/gnutls-3.0:0= ) - sys-libs/zlib -" - -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_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) - $(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" - 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/{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.3.5-r1.ebuild b/app-crypt/gnupg/gnupg-2.3.5-r1.ebuild deleted file mode 100644 index 0a3104b6851c..000000000000 --- a/app-crypt/gnupg/gnupg-2.3.5-r1.ebuild +++ /dev/null @@ -1,161 +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 test +tofu tpm tools usb user-socket wks-server" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( tofu )" - -# 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/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 ) - tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) - ssl? ( >=net-libs/gnutls-3.0:0= ) - sys-libs/zlib -" - -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_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) - $(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" - 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/{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} -}
