Date: Thu, 18 Jun 2026 02:40:26 -0400 From: "Jason E. Hale" <jhale@freebsd.org> To: Adriaan de Groot <adridg@freebsd.org> Cc: Cy Schubert <cy@freebsd.org>, novel@freebsd.org, Sunpoet Hsieh <sunpoet@freebsd.org>, dev-commits-ports-main <dev-commits-ports-main@freebsd.org>, dev-commits-ports-all <dev-commits-ports-all@freebsd.org>, ports-committers <ports-committers@freebsd.org> Subject: Re: git: bf8eb67d8744 - main - devel/gnupg: update to 2.5.20, latest upstream Message-ID: <CAJE75NH14wapogmY202ZwwVi68SB-S4ZBSqx_Y=h8nQKA_V--A@mail.gmail.com> In-Reply-To: <6a31512b.32f61.73aa4f20@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
On Tue, Jun 16, 2026 at 9:35 AM Adriaan de Groot <adridg@freebsd.org> wrote: > > The branch main has been updated by adridg: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=bf8eb67d87449d5eaed4c4f743efe766a94d8fb9 > > commit bf8eb67d87449d5eaed4c4f743efe766a94d8fb9 > Author: Adriaan de Groot <adridg@FreeBSD.org> > AuthorDate: 2026-06-16 13:04:03 +0000 > Commit: Adriaan de Groot <adridg@FreeBSD.org> > CommitDate: 2026-06-16 13:35:31 +0000 > > devel/gnupg: update to 2.5.20, latest upstream > > The stable branch of GnuPG is the 2.5 series. The 2.4 series is > end-of-life. Release announcement at > > https://lists.gnupg.org/pipermail/gnupg-announce/2026q2/000504.html (2.5.19) > https://lists.gnupg.org/pipermail/gnupg-announce/2026q2/000505.html (2.5.20) > > Co-installability with security/gnupg1 is removed. FreeBSD ports > include compatibility symlinks gpg2 and gpgsplit2 for compatibility > with the 2.4 series which used the gpg-is-gpg2 configuration. > > Note that the manpage says "2.6", even though this is version 2.5. > gpg --version does report the correct version. > --- > security/gnupg/Makefile | 18 +++++------------- > security/gnupg/distinfo | 6 +++--- > security/gnupg/files/patch-doc_Makefile.in | 19 ------------------- > security/gnupg/pkg-plist | 29 ++++++++++++++++++----------- > 4 files changed, 26 insertions(+), 46 deletions(-) > > diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile > index 8f082f59e2f5..c1e6f05567e3 100644 > --- a/security/gnupg/Makefile > +++ b/security/gnupg/Makefile > @@ -1,5 +1,6 @@ > PORTNAME= gnupg > -DISTVERSION= 2.4.9 > +DISTVERSION= 2.5.20 > +PORTREVISION= 1 > CATEGORIES= security > MASTER_SITES= GNUPG > > @@ -24,18 +25,14 @@ USES= compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite \ > > CPE_VENDOR= gnupg > > -# Odd minor-versions are the development branch; in particular 2.5 is > -# close to being a new 2.6, but we don't want portscout informing about it. > -PORTSCOUT= limitw:1,even > - > GNU_CONFIGURE= yes > -CONFIGURE_ARGS= --disable-ntbtls \ > - --enable-gpg-is-gpg2 > +CONFIGURE_ARGS= --disable-ntbtls > > TEST_ARGS= TESTARGS=--parallel > TEST_TARGET= check > > -CONFLICTS= dirmngr > +CONFLICTS= dirmngr > +CONFLICTS_INSTALL= gnupg1-* > > INFO= gnupg > > @@ -80,11 +77,6 @@ pre-build: > ${TOUCH} ${WRKSRC}/doc/*.texi > > post-install: > - ${MV} ${STAGEDIR}${PREFIX}/bin/gpgsplit ${STAGEDIR}${PREFIX}/bin/gpgsplit2 > ${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR} > > -# Necessary because of --enable-gpg-is-gpg2 > -pre-test: > - ${LN} -s gpg ${WRKSRC}/bin/gpg2 > - > .include <bsd.port.mk> > diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo > index 5340ebf6627d..55389fbb5d85 100644 > --- a/security/gnupg/distinfo > +++ b/security/gnupg/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1767649009 > -SHA256 (gnupg-2.4.9.tar.bz2) = dd17ab2e9a04fd79d39d853f599cbc852062ddb9ab52a4ddeb4176fd8b302964 > -SIZE (gnupg-2.4.9.tar.bz2) = 8086407 > +TIMESTAMP = 1781474478 > +SHA256 (gnupg-2.5.20.tar.bz2) = 6461266e99c308419a379abe6c356d54c214136c4589bd65951091138989ffc6 > +SIZE (gnupg-2.5.20.tar.bz2) = 8327674 > diff --git a/security/gnupg/files/patch-doc_Makefile.in b/security/gnupg/files/patch-doc_Makefile.in > deleted file mode 100644 > index fb06450df233..000000000000 > --- a/security/gnupg/files/patch-doc_Makefile.in > +++ /dev/null > @@ -1,19 +0,0 @@ > ---- doc/Makefile.in.orig 2025-05-14 12:51:22 UTC > -+++ doc/Makefile.in > -@@ -519,14 +519,14 @@ myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-ag > - dirmngr.texi scdaemon.texi tools.texi wks.texi \ > - gpg-card.texi > - > --myman_pages = gpg.1 gpgv.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \ > -+myman_pages = gpg2.1 gpgv2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \ > - watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \ > - gpg-connect-agent.1 gpgparsemail.1 gpgtar.1 gpg-mail-tube.1 \ > - applygnupgdefaults.8 gpg-wks-client.1 gpg-wks-server.1 \ > - dirmngr-client.1 gpg-card.1 gpg-check-pattern.1 > - > - myhtmlman_pages = \ > -- gpg.1.html gpgv.1.html gpgsm.1.html \ > -+ gpg2.1.html gpgv2.1.html gpgsm.1.html \ > - gpg-agent.1.html dirmngr.8.html scdaemon.1.html \ > - watchgnupg.1.html gpgconf.1.html addgnupghome.8.html \ > - gpg-preset-passphrase.1.html \ > diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist > index 5560942bc330..734ae56bbf2c 100644 > --- a/security/gnupg/pkg-plist > +++ b/security/gnupg/pkg-plist > @@ -1,20 +1,21 @@ > %%GNUTLS%%bin/dirmngr > %%GNUTLS%%bin/dirmngr-client > bin/gpg-agent > +bin/gpg-authcode-sign.sh > bin/gpg-card > bin/gpg-connect-agent > bin/gpg-mail-tube > bin/gpg-wks-client > %%WKS_SERVER%%bin/gpg-wks-server > -%%SUID_GPG%%@(,,4555) bin/gpg2 > -%%NO_SUID_GPG%%bin/gpg2 > +%%SUID_GPG%%@(,,4555) bin/gpg > +%%NO_SUID_GPG%%bin/gpg > bin/gpgconf > bin/gpgparsemail > bin/gpgscm > bin/gpgsm > -bin/gpgsplit2 > +bin/gpgsplit > bin/gpgtar > -bin/gpgv2 > +bin/gpgv > bin/kbxutil > bin/watchgnupg > %%DIRMNGRLDAP%%libexec/dirmngr_ldap > @@ -35,12 +36,12 @@ share/man/man1/gpg-mail-tube.1.gz > share/man/man1/gpg-preset-passphrase.1.gz > share/man/man1/gpg-wks-client.1.gz > %%WKS_SERVER%%share/man/man1/gpg-wks-server.1.gz > -share/man/man1/gpg2.1.gz > +share/man/man1/gpg.1.gz > share/man/man1/gpgconf.1.gz > share/man/man1/gpgparsemail.1.gz > share/man/man1/gpgsm.1.gz > share/man/man1/gpgtar.1.gz > -share/man/man1/gpgv2.1.gz > +share/man/man1/gpgv.1.gz > share/man/man1/scdaemon.1.gz > share/man/man1/watchgnupg.1.gz > share/man/man7/gnupg.7.gz > @@ -94,7 +95,10 @@ sbin/applygnupgdefaults > %%PORTDOCS%%%%DOCSDIR%%/help.zh_CN.txt > %%PORTDOCS%%%%DOCSDIR%%/help.zh_TW.txt > %%DATADIR%%/distsigkey.gpg > -%%GNUTLS%%%%DATADIR%%/sks-keyservers.netCA.pem > +%%DATADIR%%/mail-tube.de.txt > +%%DATADIR%%/mail-tube.txt > +%%DATADIR%%/wks-utils.de.txt > +%%DATADIR%%/wks-utils.txt > %%NLS%%share/locale/ca/LC_MESSAGES/gnupg2.mo > %%NLS%%share/locale/cs/LC_MESSAGES/gnupg2.mo > %%NLS%%share/locale/da/LC_MESSAGES/gnupg2.mo > @@ -112,6 +116,7 @@ sbin/applygnupgdefaults > %%NLS%%share/locale/id/LC_MESSAGES/gnupg2.mo > %%NLS%%share/locale/it/LC_MESSAGES/gnupg2.mo > %%NLS%%share/locale/ja/LC_MESSAGES/gnupg2.mo > +%%NLS%%share/locale/ka/LC_MESSAGES/gnupg2.mo > %%NLS%%share/locale/nb/LC_MESSAGES/gnupg2.mo > %%NLS%%share/locale/nl/LC_MESSAGES/gnupg2.mo > %%NLS%%share/locale/pl/LC_MESSAGES/gnupg2.mo > @@ -124,7 +129,9 @@ sbin/applygnupgdefaults > %%NLS%%share/locale/uk/LC_MESSAGES/gnupg2.mo > %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg2.mo > %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg2.mo > -@postexec [ -e %D/bin/gpg ] || ln -sf gpg2 %D/bin/gpg > -@postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg > -@postexec [ -e %D/share/man/man1/gpg.1.gz ] || ln -sf gpg2.1.gz %D/share/man/man1/gpg.1.gz > -@postunexec [ -e %D/share/man/man1/gpg.1.gz ] || rm -f %D/share/man/man1/gpg.1.gz > +@postexec [ -e %D/bin/gpg2 ] || ln -sf gpg %D/bin/gpg2 > +@postunexec [ -e %D/bin/gpg2 ] || rm -f %D/bin/gpg2 > +@postexec [ -e %D/bin/gpgsplit2 ] || ln -sf gpg %D/bin/gpgsplit2 > +@postunexec [ -e %D/bin/gpgsplit2 ] || rm -f %D/bin/gpgsplit2 > +@postexec [ -e %D/share/man/man1/gpg2.1.gz ] || ln -sf gpg.1.gz %D/share/man/man1/gpg2.1.gz > +@postunexec [ -e %D/share/man/man1/gpg2.1.gz ] || rm -f %D/share/man/man1/gpg2.1.gz > This a big change with upsteam dropping the "--enable-gpg-is-gpg2" option, but we still have sysutils/gnupg1 in the ports tree. Let's get rid of it since upstream doesn't care for maintaining it anymore. I can fix securtiy/gpa which uses gpgv2 as a binary dep that pkg-fallout is now complaining about after this change, but there are others: b news/inn/Makefile:# Although pgpverify needs gpgv/gpgv2, <--- Underlying logic seems suspect. security/gtkpasman/Makefile:RUN_DEPENDS+= gpgv2:security/gnupg security/sequoia-chameleon-gnupg/Makefile: REAL_GPGV_BIN=${LOCALBASE}/bin/gpgv2 shells/bash-completion/pkg-plist:%%DATADIR%%/completions/gpgv2 sysutils/debootstrap/Makefile: gpgv2:security/gnupg \ sysutils/debootstrap/files/patch-debootstrap:+ if ! in_path sopv && ! in_path sqv && ! in_path gpgv2; then sysutils/debootstrap/files/patch-debootstrap:+ error 1 NEEDPGPV "none of sopv, sqv or gpgv2 are installed, but required for Release verification" sysutils/debootstrap/files/patch-functions:+ if in_path gpgv2; then sysutils/debootstrap/files/patch-functions:+ (gpgv2 --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \ sysutils/debootstrap/files/patch-functions:+ error 1 NEEDPGPV "none of sopv, sqv or gpgv2 are installed, but required for Release verification" sysutils/debootstrap/files/patch-functions:+ error 1 SIGCHECK "Error executing gpgv2 to check Release signature" Over the years, you've maintained the main event "security/gnupg" and I have maintained a large portion of the gnupg stack (pinentry, libassuan, gpgme, gpa), but novel@ maintains security/libgpg-error, cy@ maintains security/libgcrypt, and sunpoet@ maintains security/libksba. We don't have an official gnupg team, but can we coordinate together at least for major changes? Maybe form an alliance to touch each other's gnupg ports implicitly when things are breaking down? - Jasonhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJE75NH14wapogmY202ZwwVi68SB-S4ZBSqx_Y=h8nQKA_V--A>