Merge branch 'master' into curlfixes

1 files changed, 38 insertions, 6 deletions

diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 90ad4aa..267f069 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -1,8 +1,8 @@
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2023 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This file is distributed in the hope that it will be useful,
@@ -11,7 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+# along with this file.  If not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License,
 # this file may be distributed as part of a program that
@@ -27,13 +27,45 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname environ floorf fsusage getaddrinfo gethostname getloadavg getopt-gnu gettext idpriv-droptemp mountlist regex setenv strcase strcasestr strsep timegm unsetenv vasprintf vsnprintf
+# gnulib-tool --import \
+#  --lib=libgnu \
+#  --source-base=gl \
+#  --m4-base=gl/m4 \
+#  --doc-base=doc \
+#  --tests-base=tests \
+#  --aux-dir=build-aux \
+#  --no-conditional-dependencies \
+#  --no-libtool \
+#  --macro-prefix=gl \
+#  --no-vc-files \
+#  base64 \
+#  crypto/sha256 \
+#  dirname \
+#  environ \
+#  floorf \
+#  fsusage \
+#  getaddrinfo \
+#  gethostname \
+#  getloadavg \
+#  getopt-gnu \
+#  gettext-h \
+#  idpriv-droptemp \
+#  mountlist \
+#  regex \
+#  setenv \
+#  strcase \
+#  strcasestr \
+#  strsep \
+#  timegm \
+#  unsetenv \
+#  vasprintf \
+#  vsnprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
 gl_MODULES([
   base64
-  crypto/sha1
+  crypto/sha256
   dirname
   environ
   floorf
@@ -42,7 +74,7 @@ gl_MODULES([
   gethostname
   getloadavg
   getopt-gnu
-  gettext
+  gettext-h
   idpriv-droptemp
   mountlist
   regex