[automake-commit] branch master updated: maint: Update files from upstream with 'make fetch'.

[Karl Berry]

This is an automated email from the git hooks/post-receive script.

karl pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=248edc441c6adb579b86eb25a77ea32309043a31

The following commit(s) were added to refs/heads/master by this push:
     new 248edc441 maint: Update files from upstream with 'make fetch'.
248edc441 is described below

commit 248edc441c6adb579b86eb25a77ea32309043a31
Author: Karl Berry <karl@freefriends.org>
AuthorDate: Wed Jan 24 15:47:59 2024 -0800

    maint: Update files from upstream with 'make fetch'.
    
    * lib/INSTALL: update with make fetch.
    * lib/config.guess: likewise.
    * lib/config.sub: likewise.
    * lib/gitlog-to-changelog: likewise.
    * lib/update-copyright: likewise.
---
 lib/INSTALL             |   2 +-
 lib/config.guess        |  11 +++-
 lib/config.sub          |  29 ++++++---
 lib/gitlog-to-changelog |   2 +-
 lib/update-copyright    | 160 ++++++++++++++++++++++++------------------------
 5 files changed, 110 insertions(+), 94 deletions(-)

diff --git a/lib/INSTALL b/lib/INSTALL
index 94b917d3c..d3b6e4ec4 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -356,7 +356,7 @@ more details.
 Copyright notice
 ================
 
-   Copyright © 1994–1996, 1999–2002, 2004–2017, 2020–2023 Free Software
+   Copyright © 1994–1996, 1999–2002, 2004–2017, 2020–2024 Free Software
 Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
diff --git a/lib/config.guess b/lib/config.guess
index cdfc43920..f6d217a49 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2023 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-08-22'
+timestamp='2024-01-01'
 
 # 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
@@ -60,7 +60,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2023 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -165,6 +165,8 @@ Linux|GNU|GNU/*)
        LIBC=dietlibc
        #elif defined(__GLIBC__)
        LIBC=gnu
+       #elif defined(__LLVM_LIBC__)
+       LIBC=llvm
        #else
        #include <stdarg.h>
        /* First heuristic to detect musl libc.  */
@@ -1593,6 +1595,9 @@ EOF
     *:Unleashed:*:*)
        GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
        ;;
+    *:Ironclad:*:*)
+       GUESS=$UNAME_MACHINE-unknown-ironclad
+       ;;
 esac
 
 # Do we have a guess based on uname results?
diff --git a/lib/config.sub b/lib/config.sub
index defe52c0c..2c6a07ab3 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2023 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-09-19'
+timestamp='2024-01-01'
 
 # 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
@@ -76,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2023 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1222,6 +1222,7 @@ case $cpu-$vendor in
                        | moxie \
                        | mt \
                        | msp430 \
+                       | nanomips* \
                        | nds32 | nds32le | nds32be \
                        | nfp \
                        | nios | nios2 | nios2eb | nios2el \
@@ -1253,6 +1254,7 @@ case $cpu-$vendor in
                        | ubicom32 \
                        | v70 | v850 | v850e | v850e1 | v850es | v850e2 | 
v850e2v3 \
                        | vax \
+                       | vc4 \
                        | visium \
                        | w65 \
                        | wasm32 | wasm64 \
@@ -1597,7 +1599,7 @@ case $cpu-$vendor in
                os=
                obj=elf
                ;;
-       mips*-*)
+       mips*-*|nanomips*-*)
                os=
                obj=elf
                ;;
@@ -1721,7 +1723,7 @@ fi
 
 case $os in
        # Sometimes we do "kernel-libc", so those need to count as OSes.
-       musl* | newlib* | relibc* | uclibc*)
+       llvm* | musl* | newlib* | relibc* | uclibc*)
                ;;
        # Likewise for "kernel-abi"
        eabi* | gnueabi*)
@@ -1766,12 +1768,19 @@ case $os in
             | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
             | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
             | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-            | fiwix* | mlibc* | cos* | mbr* )
+            | fiwix* | mlibc* | cos* | mbr* | ironclad* )
                ;;
        # This one is extra strict with allowed versions
        sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
                # Don't forget version if it is 3.2v4 or newer.
                ;;
+       # This refers to builds using the UEFI calling convention
+       # (which depends on the architecture) and PE file format.
+       # Note that this is both a different calling convention and
+       # different file format than that of GNU-EFI
+       # (x86_64-w64-mingw32).
+       uefi)
+               ;;
        none)
                ;;
        kernel* | msvc* )
@@ -1818,8 +1827,9 @@ esac
 # As a final step for OS-related things, validate the OS-kernel combination
 # (given a valid OS), if there is a kernel.
 case $kernel-$os-$obj in
-       linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \
-                  | linux-musl*- | linux-relibc*- | linux-uclibc*- | 
linux-mlibc*- )
+       linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
+                   | linux-mlibc*- | linux-musl*- | linux-newlib*- \
+                   | linux-relibc*- | linux-uclibc*- )
                ;;
        uclinux-uclibc*- )
                ;;
@@ -1827,7 +1837,8 @@ case $kernel-$os-$obj in
                ;;
        windows*-msvc*-)
                ;;
-       -dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- )
+       -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
+                   | -uclibc*- )
                # These are just libc implementations, not actual OSes, and thus
                # require a kernel.
                echo "Invalid configuration '$1': libc '$os' needs explicit 
kernel." 1>&2
diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index 90e81731a..16a9405a7 100755
--- a/lib/gitlog-to-changelog
+++ b/lib/gitlog-to-changelog
@@ -20,7 +20,7 @@
 #
 # Written by Jim Meyering
 
-# This is a prologue that allows to run a perl script as an executable
+# This is a prologue that allows running a perl script as an executable
 # on systems that are compliant to a POSIX version before POSIX:2017.
 # On such systems, the usual invocation of an executable through execlp()
 # or execvp() fails with ENOEXEC if it is a script that does not start
diff --git a/lib/update-copyright b/lib/update-copyright
index efda75486..ea3e46fe6 100755
--- a/lib/update-copyright
+++ b/lib/update-copyright
@@ -123,7 +123,7 @@
 #   5. Set UPDATE_COPYRIGHT_HOLDER if the copyright holder is other
 #      than "Free Software Foundation, Inc.".
 
-# This is a prologue that allows to run a perl script as an executable
+# This is a prologue that allows running a perl script as an executable
 # on systems that are compliant to a POSIX version before POSIX:2017.
 # On such systems, the usual invocation of an executable through execlp()
 # or execvp() fails with ENOEXEC if it is a script that does not start
@@ -138,7 +138,7 @@
 eval 'exec perl -wSx -0777 -pi "$0" "$@"'
      if 0;
 
-my $VERSION = '2023-10-03.12:14'; # UTC
+my $VERSION = '2024-01-15.18:30'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -170,14 +170,13 @@ if (!$this_year || $this_year !~ m/^\d{4}$/)
 # Unless the file consistently uses "\r\n" as the EOL, use "\n" instead.
 my $eol = /(?:^|[^\r])\n/ ? "\n" : "\r\n";
 
-my $leading;
-my $prefix;
-my $ws_re;
 my $stmt_re;
-while (/(^|\n)(.{0,$prefix_max})$copyright_re/g)
+my $found;
+while (/(^|\n)(.{0,$prefix_max})$copyright_re/cg)
   {
-    $leading = "$1$2";
-    $prefix = $2;
+    my $pos=pos();
+    my $leading = "$1$2";
+    my $prefix = $2;
     if ($prefix =~ /^(\s*\/)\*(\s*)$/)
       {
         $prefix =~ s,/, ,;
@@ -188,7 +187,7 @@ while (/(^|\n)(.{0,$prefix_max})$copyright_re/g)
             $prefix = $prefix_ws;
           }
       }
-    $ws_re = '[ \t\r\f]'; # \s without \n
+    my $ws_re = '[ \t\r\f]'; # \s without \n
     $ws_re =
       "(?:$ws_re*(?:$ws_re|\\n" . quotemeta($prefix) . ")$ws_re*)";
     my $holder_re = $holder;
@@ -199,96 +198,97 @@ while (/(^|\n)(.{0,$prefix_max})$copyright_re/g)
       . "((?:\\d\\d)?\\d\\d)$ws_re$holder_re";
     if (/\G$stmt_remainder_re/)
       {
+        $found = 1;
         $stmt_re =
           quotemeta($leading) . "($copyright_re$stmt_remainder_re)";
-        last;
-      }
-  }
-if (defined $stmt_re)
-  {
-    /$stmt_re/ or die; # Should never die.
-    my $stmt = $1;
-    my $final_year_orig = $2;
 
-    # Handle two-digit year numbers like "98" and "99".
-    my $final_year = $final_year_orig;
-    $final_year <= 99
-      and $final_year += 1900;
+        /$stmt_re/ or die; # Should never die.
+        my $stmt = $1;
+        my $final_year_orig = $2;
 
-    if ($final_year != $this_year)
-      {
-        # Update the year.
-        $stmt =~ s/(^|[^\d])$final_year_orig\b/$1$final_year, $this_year/;
-      }
-    if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'})
-      {
-        # Normalize all whitespace including newline-prefix sequences.
-        $stmt =~ s/$ws_re/ /g;
+        # Handle two-digit year numbers like "98" and "99".
+        my $final_year = $final_year_orig;
+        $final_year <= 99
+          and $final_year += 1900;
 
-        # Put spaces after commas.
-        $stmt =~ s/, ?/, /g;
-
-        # Convert 2-digit to 4-digit years.
-        $stmt =~ s/(\b\d\d\b)/19$1/g;
-
-        # Make the use of intervals consistent.
-        if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS})
+        if ($final_year != $this_year)
           {
-            $stmt =~ s/(\d{4})$ndash_re(\d{4})/join(', ', $1..$2)/eg;
+            # Update the year.
+            $stmt =~ s/(^|[^\d])$final_year_orig\b/$1$final_year, $this_year/;
           }
-        else
+        if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'})
           {
-            my $ndash = ($ARGV =~ /\.tex(i(nfo)?)?$/ ? "--"
-                         : $ARGV =~ /\.(\d[a-z]*|man)$/ ? "\\(en"
-                         : "-");
+            # Normalize all whitespace including newline-prefix sequences.
+            $stmt =~ s/$ws_re/ /g;
 
-            $stmt =~
-              s/
-                (\d{4})
-                (?:
-                  (,\ |$ndash_re)
-                  ((??{
-                    if   ($2 ne ', ') { '\d{4}'; }
-                    elsif (!$3)       { $1 + 1;  }
-                    else              { $3 + 1;  }
-                  }))
-                )+
-              /$1$ndash$3/gx;
+            # Put spaces after commas.
+            $stmt =~ s/, ?/, /g;
 
-            # When it's 2, emit a single range encompassing all year numbers.
-            $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2
-              and $stmt =~ 
s/(^|[^\d])(\d{4})\b.*(?:[^\d])(\d{4})\b/$1$2$ndash$3/;
-          }
+            # Convert 2-digit to 4-digit years.
+            $stmt =~ s/(\b\d\d\b)/19$1/g;
 
-        # Format within margin.
-        my $stmt_wrapped;
-        my $text_margin = $margin - length($prefix);
-        if ($prefix =~ /^(\t+)/)
-          {
-            $text_margin -= length($1) * ($tab_width - 1);
-          }
-        while (length $stmt)
-          {
-            if (($stmt =~ s/^(.{1,$text_margin})(?: |$)//)
-                || ($stmt =~ s/^([\S]+)(?: |$)//))
+            # Make the use of intervals consistent.
+            if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS})
               {
-                my $line = $1;
-                $stmt_wrapped .= $stmt_wrapped ? "$eol$prefix" : $leading;
-                $stmt_wrapped .= $line;
+                $stmt =~ s/(\d{4})$ndash_re(\d{4})/join(', ', $1..$2)/eg;
               }
             else
               {
-                # Should be unreachable, but we don't want an infinite
-                # loop if it can be reached.
-                die;
+                my $ndash = ($ARGV =~ /\.tex(i(nfo)?)?$/ ? "--"
+                             : $ARGV =~ /\.(\d[a-z]*|man)$/ ? "\\(en"
+                             : "-");
+
+                $stmt =~
+                  s/
+                    (\d{4})
+                    (?:
+                      (,\ |$ndash_re)
+                      ((??{
+                        if   ($2 ne ', ') { '\d{4}'; }
+                        elsif (!$3)       { $1 + 1;  }
+                        else              { $3 + 1;  }
+                      }))
+                    )+
+                  /$1$ndash$3/gx;
+
+                # When it's 2, emit a single range encompassing all year 
numbers.
+                $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2
+                  and $stmt =~ 
s/(^|[^\d])(\d{4})\b.*(?:[^\d])(\d{4})\b/$1$2$ndash$3/;
               }
-          }
 
-        # Replace the old copyright statement.
-        s/$stmt_re/$stmt_wrapped/g;
+            # Format within margin.
+            my $stmt_wrapped;
+            my $text_margin = $margin - length($prefix);
+            if ($prefix =~ /^(\t+)/)
+              {
+                $text_margin -= length($1) * ($tab_width - 1);
+              }
+            while (length $stmt)
+              {
+                if (($stmt =~ s/^(.{1,$text_margin})(?: |$)//)
+                    || ($stmt =~ s/^([\S]+)(?: |$)//))
+                  {
+                    my $line = $1;
+                    $stmt_wrapped .= $stmt_wrapped ? "$eol$prefix" : $leading;
+                    $stmt_wrapped .= $line;
+                  }
+                else
+                  {
+                    # Should be unreachable, but we don't want an infinite
+                    # loop if it can be reached.
+                    die;
+                  }
+              }
+
+            # Replace the old copyright statement.
+            my $p = pos();
+            s/$stmt_re/$stmt_wrapped/g;
+            pos() = $p;
+          }
       }
   }
-else
+
+if (!$found)
   {
     print STDERR "$ARGV: warning: copyright statement not found\n";
   }