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.

diff --git a/ChangeLog b/ChangeLog
index 317862e1ec626526f934feffd9c6f05540794b77..a5be14e7fa69e57101a311a0a8d583cf87cd9f72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2025-06-28  Collin Funk  <collin.funk1@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  <eggert@cs.ucla.edu>
 
        _Noreturn: pacify gcc -std=gnu99 -Wpedantic

diff --git a/build-aux/gnupload b/build-aux/gnupload
index 6eac75c1637cf4aded07e70c6e770db394d27045..d93feab71e2f821ba7cca0adb85b04aeca703ad8 100755 (executable)
--- 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
         ;;