Bruno Haible <br...@clisp.org> writes: > I checked a few recent VMs that I happen to have installed, and while many > (Debian 12, Fedora 42, Ubuntu 25.10, Solaris OpenIndiana 2025) have GnuPG > version 2.x under the name /usr/bin/gpg, that's not the case everywhere: > On Slackware 15, which is not that old [1]: > $ gpg --version => 1.4.23 > $ gpg2 --version => 2.2.33 > > So, I would say, the right course of action is to keep the code in place > and only update the comments to mention Slackware instead of Ubuntu. > > The code has no drawbacks, right?
Yep, it has no drawbacks. But I thought it was not relevant anymore. Thanks for checking! I pushed the attach patch to s/Ubuntu/Slackware/ and remove a misleading date from the FIXME. Collin
>From 827464ed05129232a525fb82bc276d74e4c91978 Mon Sep 17 00:00:00 2001 Message-ID: <827464ed05129232a525fb82bc276d74e4c91978.1751137817.git.collin.fu...@gmail.com> From: Collin Funk <collin.fu...@gmail.com> Date: Sat, 28 Jun 2025 12:04:50 -0700 Subject: [PATCH] gnupload: adjust commentary regarding gnupg versions Suggested by Bruno Haible in: <https://lists.gnu.org/archive/html/bug-gnulib/2025-06/msg00310.html>. * build-aux/gnupload: Remove misleading year comment. Mention that Slackware requires 'gpg2' instead of 'gpg' instead of Ubuntu where they are now the same. --- ChangeLog | 9 +++++++++ build-aux/gnupload | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 317862e1ec..a5be14e7fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2025-06-28 Collin Funk <collin.fu...@gmail.com> + + gnupload: adjust commentary regarding gnupg versions + Suggested by Bruno Haible in: + <https://lists.gnu.org/archive/html/bug-gnulib/2025-06/msg00310.html>. + * build-aux/gnupload: Remove misleading year comment. Mention that + Slackware requires 'gpg2' instead of 'gpg' instead of Ubuntu where they + are now the same. + 2025-06-27 Paul Eggert <egg...@cs.ucla.edu> _Noreturn: pacify gcc -std=gnu99 -Wpedantic diff --git a/build-aux/gnupload b/build-aux/gnupload index 6eac75c163..d93feab71e 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -1,7 +1,7 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2025-06-10.02; # UTC +scriptversion=2025-06-28.18; # UTC # Copyright (C) 2004-2025 Free Software Foundation, Inc. # @@ -28,7 +28,7 @@ GPG=gpg # Choose the proper version of gpg, so as to avoid a # "gpg-agent is not available in this session" error # when gpg-agent is version 2 but gpg is still version 1. -# FIXME-2020: remove, once all major distros ship gpg version 2 as /usr/bin/gpg +# FIXME: remove, once all major distros ship gpg version 2 as /usr/bin/gpg gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'` case "$gpg_agent_version" in 2.*) @@ -39,7 +39,7 @@ case "$gpg_agent_version" in # gpg2 is present. GPG=gpg2 else - # gpg2 is missing. Ubuntu users should install the package 'gnupg2'. + # gpg2 is missing. Slackware users should install the package 'gnupg2'. echo "WARNING: Using 'gpg', which is too old. You should install 'gpg2'." 1>&2 fi ;; -- 2.50.0
