commit:     d26864c099176f6d54375a4cd95234c2400651d9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 30 12:18:40 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 30 12:21:16 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d26864c0

app-crypt/gnupg: add 2.5.16

Bug: https://bugs.gentoo.org/968171
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-crypt/gnupg/Manifest            |   2 +
 app-crypt/gnupg/gnupg-2.5.16.ebuild | 224 ++++++++++++++++++++++++++++++++++++
 2 files changed, 226 insertions(+)

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 79e30d294c3c..058070bd88f0 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -4,3 +4,5 @@ DIST gnupg-2.4.8.tar.bz2 8017685 BLAKE2B 
ab7126aac6c7bf323075c68084c963f75d93c72
 DIST gnupg-2.4.8.tar.bz2.sig 119 BLAKE2B 
4f94b2abc40b17cfab44f28fc2a2ae5246f8356141a3932a92b5adb78002c7064bb132a6529079bc14900036f90d9d318d7d01818999150e2c875b88a3fca265
 SHA512 
9fb54be4e99ecee6c7b649d6f0ef24a25e81c0af57e07ccdd512a1ea2ebf7558dd25518b7b78347e4a216167849e6285bb91ec23d0968966aba0784d45f02a06
 DIST gnupg-2.5.14.tar.bz2 8259582 BLAKE2B 
167efad48b08f824c8c19c3aaedce4dc0c409f3f8d001659c1f1183e885db86f4cedddf8fd0e1adc04e1c6fde30a9496b653d3e0c5ef0d4f1dab3102b72edb0e
 SHA512 
514c78d75848d98360425dc3ccb16eeac829c9010ddc4f362b9a7728734fa7b0391a8872501300df12125a4a5d698252200621cc1680aefd25d47ec2799f95d1
 DIST gnupg-2.5.14.tar.bz2.sig 119 BLAKE2B 
55dc1a1375bd0c52ea985ec7e86414eef81af078c77647a5b758a9db855fb47d6b11bcae75e49db4e92be54100db66ae55fda1f3c5379a3f0f3d44a8acb64c3d
 SHA512 
4ba112b07045d2adb02704a39c4f0d10132c810a6d546252962d74f0c4ccfbd3d9b9f35366f4ef0380c366256451855d3ee4e61ba98255e9ad265ecd99f75979
+DIST gnupg-2.5.16.tar.bz2 8304335 BLAKE2B 
722c90ac88b2eeacb150dc6fa5f4d83b5577d0285871cd7d336463d25aabd1087cdca103a23b251b2067de6c3046615d9fcb552721ceef4826f4dd3e96c5525a
 SHA512 
0a48628e9e7f8050022e5204bf9febd1f2db6ee9d55b573207884fc2ef2825d814015851141ba6851bd4466f0cc0827123e5f474003c054f3af55f4bd1440bf7
+DIST gnupg-2.5.16.tar.bz2.sig 119 BLAKE2B 
5ef9b298b49049cd5cdb1bcc03cd09ad96015cd34060249fccff6d3ab4a0b950a545d631c05818484c52166ae89825f6def928787051f3eed010e8300945160e
 SHA512 
295d37ecf4c1f5fc4531cd0a0901ecbacd521a744991b086e14573e1b5198e55476367767bc708b4eec38aac32a30c03265d13c0c5bd9c79c8254e408ef58aec

diff --git a/app-crypt/gnupg/gnupg-2.5.16.ebuild 
b/app-crypt/gnupg/gnupg-2.5.16.ebuild
new file mode 100644
index 000000000000..12415fb9ce81
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.5.16.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+# in-source builds are not supported: https://dev.gnupg.org/T6313#166339
+inherit flag-o-matic out-of-source multiprocessing 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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="+alternatives 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-3.0.0-r1:=
+       >=dev-libs/libgcrypt-1.11.0:=
+       >=dev-libs/libgpg-error-1.56
+       >=dev-libs/libksba-1.6.3
+       >=dev-libs/npth-1.2
+       virtual/zlib:=
+       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.2:0= )
+"
+RDEPEND="
+       ${DEPEND}
+       nls? ( virtual/libintl )
+       selinux? ( sec-policy/selinux-gpg )
+       wks-server? ( virtual/mta )
+"
+PDEPEND="
+       app-crypt/pinentry
+       alternatives? (
+               app-alternatives/gpg[-freepg(-)]
+       )
+"
+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
+
+       GNUPG_SYSTEMD_UNITS=(
+               dirmngr.service
+               dirmngr.socket
+               gpg-agent-browser.socket
+               gpg-agent-extra.socket
+               gpg-agent.service
+               gpg-agent.socket
+               gpg-agent-ssh.socket
+       )
+
+       cp "${GNUPG_SYSTEMD_UNITS[@]/#/${FILESDIR}/}" "${T}" || die
+
+       # 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 "${T}"/gpg-agent-ssh.socket || die
+
+       # Since 2.5.3, --supervised is called --deprecated-supervised.  See
+       # https://dev.gnupg.org/rGa019a0fcd8dfb9d1eae5bc991fdd54b7cf55641e
+       sed -i "s/--supervised/--deprecated-supervised/g" "${T}"/*.service || 
die
+}
+
+my_src_configure() {
+       # Upstream don't support LTO, bug #854222.
+       filter-lto
+
+       local myconf=(
+               $(use_enable bzip2)
+               $(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)
+               $(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)
+
+               # 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.
+               --with-mailprog=/usr/libexec/sendmail
+
+               --disable-ntbtls
+               --enable-gpgsm
+               --enable-large-secmem
+
+               CC_FOR_BUILD="$(tc-getBUILD_CC)"
+               GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
+
+               $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+       )
+
+       if use prefix && use usb; then
+               # bug #649598
+               append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
+       fi
+
+       if [[ ${CHOST} == *-solaris* ]] ; then
+               # these somehow are treated as fatal, but Solaris has different
+               # types for getpeername with socket_t
+               append-flags -Wno-incompatible-pointer-types
+               append-flags -Wno-unused-label
+       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
+       tc-is-clang && export 
gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
+
+       econf "${myconf[@]}"
+}
+
+my_src_compile() {
+       default
+
+       use doc && emake -C doc html
+}
+
+my_src_test() {
+       export TESTFLAGS="--parallel=$(makeopts_jobs)"
+
+       default
+}
+
+my_src_install() {
+       emake DESTDIR="${D}" install
+
+       use tools && dobin tools/{gpgconf,gpgsplit,gpg-check-pattern} 
tools/make-dns-cert
+
+       if use alternatives; then
+               # rename for app-alternatives/gpg
+               mv "${ED}"/usr/bin/gpg{,-reference} || die
+               mv "${ED}"/usr/bin/gpgv{,-reference} || die
+               mv "${ED}"/usr/share/man/man1/gpg{,-reference}.1 || die
+               mv "${ED}"/usr/share/man/man1/gpgv{,-reference}.1 || die
+       else
+               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
+       fi
+
+       dodir /etc/env.d
+       echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> 
"${ED}"/etc/env.d/30gnupg || die
+
+       use doc && dodoc doc/gnupg.html/*
+}
+
+my_src_install_all() {
+       einstalldocs
+
+       use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
+       use doc && dodoc doc/*.png
+
+       # Dropped upstream in 
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=eae28f1bd4a5632e8f8e85b7248d1c4d4a10a5ed.
+       dodoc "${FILESDIR}"/README-systemd
+       systemd_douserunit "${GNUPG_SYSTEMD_UNITS[@]/#/${T}/}"
+}
+
+pkg_postinst() {
+       # If /usr/bin/gpg and /usr/bin/gpgv do not exist, provide them.
+       if [[ ! -e ${EROOT}/usr/bin/gpg ]]; then
+               ln -sf -- gpg-reference "${EROOT}"/usr/bin/gpg || die
+       fi
+
+       if [[ ! -e ${EROOT}/usr/bin/gpgv ]]; then
+               ln -sf -- gpgv-reference "${EROOT}"/usr/bin/gpgv || die
+       fi
+}

Reply via email to