From 4a0919df7f15c4322b983a913a429dc7d52b0bdc Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 19 Jan 2026 10:40:06 -0800
Subject: [PATCH] Update from Gnulib by running admin/merge-gnulib

---
 build-aux/config.guess  |  4 +-
 build-aux/config.sub    |  4 +-
 doc/misc/texinfo.tex    |  2 +-
 lib/alloca.in.h         |  4 +-
 lib/binary-io.h         |  3 +-
 lib/c-ctype.h           |  3 +-
 lib/c-strcasecmp.c      |  3 +-
 lib/c-strncasecmp.c     |  3 +-
 lib/careadlinkat.c      |  4 +-
 lib/cloexec.c           |  3 +-
 lib/close-stream.c      |  3 +-
 lib/diffseq.h           |  4 +-
 lib/dup2.c              |  3 +-
 lib/filemode.h          |  4 +-
 lib/fpending.c          |  4 +-
 lib/fpending.h          |  4 +-
 lib/fsusage.c           |  4 +-
 lib/getdelim.c          | 94 +++++++++++++++++++++--------------------
 lib/getgroups.c         |  3 +-
 lib/getloadavg.c        |  4 +-
 lib/gettime.c           |  3 +-
 lib/gettimeofday.c      |  3 +-
 lib/gnulib.mk.in        |  2 +
 lib/group-member.c      |  4 +-
 lib/malloc.c            |  3 +-
 lib/md5-stream.c        |  4 +-
 lib/md5.c               |  4 +-
 lib/md5.h               |  4 +-
 lib/memmem.c            |  4 +-
 lib/memrchr.c           |  4 +-
 lib/nanosleep.c         |  3 +-
 lib/nproc.c             |  2 +-
 lib/save-cwd.h          |  4 +-
 lib/sha1.c              |  3 +-
 lib/sig2str.c           |  3 +-
 lib/stdckdint.in.h      |  2 +-
 lib/stdlib.in.h         |  8 +++-
 lib/strftime.c          |  2 +-
 lib/strtoimax.c         |  4 +-
 lib/strtol.c            |  4 +-
 lib/strtoll.c           |  4 +-
 lib/time_r.c            |  3 +-
 m4/alloca.m4            |  4 +-
 m4/codeset.m4           |  4 +-
 m4/d-type.m4            |  4 +-
 m4/dup2.m4              |  3 +-
 m4/filemode.m4          |  3 +-
 m4/fsusage.m4           |  4 +-
 m4/getgroups.m4         |  4 +-
 m4/getline.m4           |  4 +-
 m4/gettime.m4           |  3 +-
 m4/gettimeofday.m4      |  4 +-
 m4/group-member.m4      |  4 +-
 m4/locale-en.m4         |  2 +-
 m4/manywarnings.m4      | 24 +++++++----
 m4/mempcpy.m4           |  4 +-
 m4/memrchr.m4           |  4 +-
 m4/mktime.m4            |  4 +-
 m4/nstrftime.m4         |  4 +-
 m4/pathmax.m4           |  4 +-
 m4/selinux-selinux-h.m4 |  7 ++-
 m4/sig2str.m4           |  3 +-
 m4/ssize_t.m4           |  3 +-
 m4/stat-time.m4         |  4 +-
 m4/stdlib_h.m4          |  3 +-
 m4/strnlen.m4           |  4 +-
 m4/strtoimax.m4         |  3 +-
 m4/strtoll.m4           |  3 +-
 m4/time_h.m4            |  4 +-
 m4/timespec.m4          |  4 +-
 70 files changed, 179 insertions(+), 183 deletions(-)

diff --git a/build-aux/config.guess b/build-aux/config.guess
index f4a333427ca..a9d01fde461 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2026 Free Software Foundation, Inc.
+#   Copyright 1992-2025 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
@@ -60,7 +60,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2026 Free Software Foundation, Inc.
+Copyright 1992-2025 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."
diff --git a/build-aux/config.sub b/build-aux/config.sub
index b764eb80841..3d35cde174d 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2026 Free Software Foundation, Inc.
+#   Copyright 1992-2025 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale
 
@@ -76,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2026 Free Software Foundation, Inc.
+Copyright 1992-2025 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."
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 1682f6cf5f1..260bf4a9f80 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -5,7 +5,7 @@
 %
 \def\texinfoversion{2025-12-23.13}
 %
-% Copyright 1985--1986, 1988, 1990--2026 Free Software Foundation, Inc.
+% Copyright 1985, 1986, 1988, 1990-2025 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
diff --git a/lib/alloca.in.h b/lib/alloca.in.h
index 06d585d8d9a..bb2cb881619 100644
--- a/lib/alloca.in.h
+++ b/lib/alloca.in.h
@@ -1,7 +1,7 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2026 Free Software Foundation,
+   Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/binary-io.h b/lib/binary-io.h
index 78f38127382..37eb3c4bb18 100644
--- a/lib/binary-io.h
+++ b/lib/binary-io.h
@@ -1,6 +1,5 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003, 2005, 2008-2026 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001, 2003, 2005, 2008-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/c-ctype.h b/lib/c-ctype.h
index 1d9fba13fc5..e3448a4376b 100644
--- a/lib/c-ctype.h
+++ b/lib/c-ctype.h
@@ -5,8 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2026 Free Software Foundation,
-   Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c
index e534f8e87a9..2e7f5405252 100644
--- a/lib/c-strcasecmp.c
+++ b/lib/c-strcasecmp.c
@@ -1,6 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c
index e16d33441fa..0fe570ae476 100644
--- a/lib/c-strncasecmp.c
+++ b/lib/c-strncasecmp.c
@@ -1,6 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/careadlinkat.c b/lib/careadlinkat.c
index 1e2ee8a52e1..fa19e09986c 100644
--- a/lib/careadlinkat.c
+++ b/lib/careadlinkat.c
@@ -1,7 +1,7 @@
 /* Read symbolic links into a buffer without size limitation, relative to fd.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2026 Free Software Foundation,
+   Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/cloexec.c b/lib/cloexec.c
index c546da0e715..3d4f916b0f4 100644
--- a/lib/cloexec.c
+++ b/lib/cloexec.c
@@ -1,7 +1,6 @@
 /* cloexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 1991, 2004-2006, 2009-2026 Free Software Foundation,
-   Inc.
+   Copyright (C) 1991, 2004-2006, 2009-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/close-stream.c b/lib/close-stream.c
index 3c19ba63849..0dc79569029 100644
--- a/lib/close-stream.c
+++ b/lib/close-stream.c
@@ -1,7 +1,6 @@
 /* Close a stream, with nicer error checking than fclose's.
 
-   Copyright (C) 1998-2002, 2004, 2006-2026 Free Software Foundation,
-   Inc.
+   Copyright (C) 1998-2002, 2004, 2006-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/diffseq.h b/lib/diffseq.h
index a5ae7a46af0..cf710a316f8 100644
--- a/lib/diffseq.h
+++ b/lib/diffseq.h
@@ -1,7 +1,7 @@
 /* Analyze differences between two vectors.
 
-   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2026 Free
-   Software Foundation, Inc.
+   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2026 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/dup2.c b/lib/dup2.c
index 6d46f322b5c..b9a55263be4 100644
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -1,7 +1,6 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
 
-   Copyright (C) 1999, 2004-2007, 2009-2026 Free Software Foundation,
-   Inc.
+   Copyright (C) 1999, 2004-2007, 2009-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/filemode.h b/lib/filemode.h
index 36111daf6b0..22fe84b92be 100644
--- a/lib/filemode.h
+++ b/lib/filemode.h
@@ -1,7 +1,7 @@
 /* Make a string describing file modes.
 
-   Copyright (C) 1998-1999, 2003, 2006, 2009-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998-1999, 2003, 2006, 2009-2026 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/fpending.c b/lib/fpending.c
index ce16f92841d..58c32d499af 100644
--- a/lib/fpending.c
+++ b/lib/fpending.c
@@ -1,6 +1,6 @@
 /* fpending.c -- return the number of pending output bytes on a stream
-   Copyright (C) 2000, 2004, 2006-2007, 2009-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006-2007, 2009-2026 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/fpending.h b/lib/fpending.h
index 4163d34f66c..aeb1d9310d8 100644
--- a/lib/fpending.h
+++ b/lib/fpending.h
@@ -1,7 +1,7 @@
 /* Declare __fpending.
 
-   Copyright (C) 2000, 2003, 2005-2006, 2009-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000, 2003, 2005-2006, 2009-2026 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/fsusage.c b/lib/fsusage.c
index 73916d7e74c..1700a19c996 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -1,7 +1,7 @@
 /* fsusage.c -- return space usage of mounted file systems
 
-   Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2026 Free
-   Software Foundation, Inc.
+   Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2026 Free Software
+   Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/getdelim.c b/lib/getdelim.c
index e16acf8c64b..21f3abc294c 100644
--- a/lib/getdelim.c
+++ b/lib/getdelim.c
@@ -92,54 +92,56 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
       *lineptr = new_lineptr;
     }
 
-  size_t cur_len = 0;
-  for (;;)
-    {
-      int i;
+  {
+    size_t cur_len = 0;
+    for (;;)
+      {
+        int i;
 
-      i = getc_maybe_unlocked (fp);
-      if (i == EOF)
-        {
-          result = -1;
+        i = getc_maybe_unlocked (fp);
+        if (i == EOF)
+          {
+            result = -1;
+            break;
+          }
+
+        /* Make enough space for len+1 (for final NUL) bytes.  */
+        if (cur_len + 1 >= *n)
+          {
+            size_t needed_max =
+              SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
+            size_t needed = 2 * *n + 1;   /* Be generous. */
+
+            if (needed_max < needed)
+              needed = needed_max;
+            if (cur_len + 1 >= needed)
+              {
+                result = -1;
+                errno = EOVERFLOW;
+                goto unlock_return;
+              }
+
+            char *new_lineptr = (char *) realloc (*lineptr, needed);
+            if (new_lineptr == NULL)
+              {
+                alloc_failed ();
+                result = -1;
+                goto unlock_return;
+              }
+
+            *lineptr = new_lineptr;
+            *n = needed;
+          }
+
+        (*lineptr)[cur_len] = i;
+        cur_len++;
+
+        if (i == delimiter)
           break;
-        }
-
-      /* Make enough space for len+1 (for final NUL) bytes.  */
-      if (cur_len + 1 >= *n)
-        {
-          size_t needed_max =
-            SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
-          size_t needed = 2 * *n + 1;   /* Be generous. */
-
-          if (needed_max < needed)
-            needed = needed_max;
-          if (cur_len + 1 >= needed)
-            {
-              result = -1;
-              errno = EOVERFLOW;
-              goto unlock_return;
-            }
-
-          char *new_lineptr = (char *) realloc (*lineptr, needed);
-          if (new_lineptr == NULL)
-            {
-              alloc_failed ();
-              result = -1;
-              goto unlock_return;
-            }
-
-          *lineptr = new_lineptr;
-          *n = needed;
-        }
-
-      (*lineptr)[cur_len] = i;
-      cur_len++;
-
-      if (i == delimiter)
-        break;
-    }
-  (*lineptr)[cur_len] = '\0';
-  result = cur_len ? cur_len : result;
+      }
+    (*lineptr)[cur_len] = '\0';
+    result = cur_len ? cur_len : result;
+  }
 
  unlock_return:
   funlockfile (fp); /* doesn't set errno */
diff --git a/lib/getgroups.c b/lib/getgroups.c
index 77494be91e2..ec20b1a8456 100644
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -1,7 +1,6 @@
 /* provide consistent interface to getgroups for systems that don't allow N==0
 
-   Copyright (C) 1996, 1999, 2003, 2006-2026 Free Software Foundation,
-   Inc.
+   Copyright (C) 1996, 1999, 2003, 2006-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index 6ec41dd8cb2..73b2ee28f36 100644
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -1,7 +1,7 @@
 /* Get the system load averages.
 
-   Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2026 Free
-   Software Foundation, Inc.
+   Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2026 Free Software
+   Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
    Bugs can be reported to bug-gnulib@gnu.org.
diff --git a/lib/gettime.c b/lib/gettime.c
index 14049fce8b9..edd1cdb02b5 100644
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -1,7 +1,6 @@
 /* gettime -- get the system clock
 
-   Copyright (C) 2002, 2004-2007, 2009-2026 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2004-2007, 2009-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index 43493198df4..f236c427fd1 100644
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -1,7 +1,6 @@
 /* Provide gettimeofday for systems that don't have it or for which it's broken.
 
-   Copyright (C) 2001-2003, 2005-2007, 2009-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 28158e521f4..33d8d5ad367 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -951,6 +951,7 @@ HAVE_SYS_ENDIAN_H = @HAVE_SYS_ENDIAN_H@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
+HAVE_SYS_PROCESS_H = @HAVE_SYS_PROCESS_H@
 HAVE_SYS_RANDOM_H = @HAVE_SYS_RANDOM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
@@ -3644,6 +3645,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
 	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
 	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
+	      -e 's|@''HAVE_SYS_PROCESS_H''@|$(HAVE_SYS_PROCESS_H)|g' \
 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
 	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
 	      < $@-t1 > $@-t2
diff --git a/lib/group-member.c b/lib/group-member.c
index 67dd420b196..b9942c3882a 100644
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -1,7 +1,7 @@
 /* group-member.c -- determine whether group id is in calling user's group list
 
-   Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2026 Free
-   Software Foundation, Inc.
+   Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2026 Free Software
+   Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/malloc.c b/lib/malloc.c
index 0948f5a50f5..f7d11921aeb 100644
--- a/lib/malloc.c
+++ b/lib/malloc.c
@@ -1,7 +1,6 @@
 /* malloc() function that is glibc compatible.
 
-   Copyright (C) 1997-1998, 2006-2007, 2009-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/md5-stream.c b/lib/md5-stream.c
index c4c1fc2f53d..96b92374c1d 100644
--- a/lib/md5-stream.c
+++ b/lib/md5-stream.c
@@ -1,7 +1,7 @@
 /* Functions to compute MD5 message digest of files or memory blocks.
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2026 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2026 Free Software
+   Foundation, Inc.
    This file is part of the GNU C Library.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/lib/md5.c b/lib/md5.c
index 4aa3e756b0c..4b0bc59acf7 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -1,7 +1,7 @@
 /* Functions to compute MD5 message digest of files or memory blocks.
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2026 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2026 Free Software
+   Foundation, Inc.
    This file is part of the GNU C Library.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/lib/md5.h b/lib/md5.h
index 29a4c735d87..16c6684b61b 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -1,7 +1,7 @@
 /* Declaration of functions and data types used for MD5 sum computing
    library functions.
-   Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2026 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2026 Free Software
+   Foundation, Inc.
    This file is part of the GNU C Library.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/lib/memmem.c b/lib/memmem.c
index 1ae62a666fa..6c57a5450db 100644
--- a/lib/memmem.c
+++ b/lib/memmem.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2026 Free
-   Software Foundation, Inc.
+/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2026 Free Software
+   Foundation, Inc.
    This file is part of the GNU C Library.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/lib/memrchr.c b/lib/memrchr.c
index 4f585b53590..a7683c9aea1 100644
--- a/lib/memrchr.c
+++ b/lib/memrchr.c
@@ -1,7 +1,7 @@
 /* memrchr -- find the last occurrence of a byte in a memory block
 
-   Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2026 Free
-   Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2026 Free Software
+   Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
    with help from Dan Sahlin (dan@sics.se) and
diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index dc22e8ecdc6..a7abb530588 100644
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -1,7 +1,6 @@
 /* Provide a replacement for the POSIX nanosleep function.
 
-   Copyright (C) 1999-2000, 2002, 2004-2026 Free Software Foundation,
-   Inc.
+   Copyright (C) 1999-2000, 2002, 2004-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/nproc.c b/lib/nproc.c
index 58e45e4e385..b0c9514115b 100644
--- a/lib/nproc.c
+++ b/lib/nproc.c
@@ -405,7 +405,7 @@ get_cgroup2_cpu_quota (void)
   if (! fp)
     return cpu_quota;
 
-  /* Get our cgroupv2 (unififed) hierarchy.  */
+  /* Get our cgroupv2 (unified) hierarchy.  */
   char *cgroup = NULL;
   char *cgroup_str = NULL;
   size_t cgroup_size = 0;
diff --git a/lib/save-cwd.h b/lib/save-cwd.h
index 7ad4f9e8b9f..2084c68328a 100644
--- a/lib/save-cwd.h
+++ b/lib/save-cwd.h
@@ -1,7 +1,7 @@
 /* Save and restore current working directory.
 
-   Copyright (C) 1995, 1997-1998, 2003, 2009-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995, 1997-1998, 2003, 2009-2026 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/sha1.c b/lib/sha1.c
index 1057642a178..f41bda875db 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -1,8 +1,7 @@
 /* sha1.c - Functions to compute SHA1 message digest of files or
    memory blocks according to the NIST specification FIPS-180-1.
 
-   Copyright (C) 2000-2001, 2003-2006, 2008-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000-2001, 2003-2006, 2008-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/sig2str.c b/lib/sig2str.c
index 5bc7eae54d2..da54234ac48 100644
--- a/lib/sig2str.c
+++ b/lib/sig2str.c
@@ -1,7 +1,6 @@
 /* sig2str.c -- convert between signal names and numbers
 
-   Copyright (C) 2002, 2004, 2006, 2009-2026 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2004, 2006, 2009-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/stdckdint.in.h b/lib/stdckdint.in.h
index ac12fd6c7ff..1989f7b8319 100644
--- a/lib/stdckdint.in.h
+++ b/lib/stdckdint.in.h
@@ -47,7 +47,7 @@
 
    These are like the standard macros introduced in C23, except that
    arguments should not have side effects.  The C++26 standard is
-   expected to add this header and it's macros.  */
+   expected to add this header and its macros.  */
 
 #  define ckd_add(r, a, b) ((bool) _GL_INT_ADD_WRAPV (a, b, r))
 #  define ckd_sub(r, a, b) ((bool) _GL_INT_SUBTRACT_WRAPV (a, b, r))
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index 4f4de503bec..95237f2a5cb 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -1,7 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2026 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -71,6 +70,11 @@
 # include <sys/loadavg.h>
 #endif
 
+/* QNX declares getprogname() in <sys/process.h>.  */
+#if (@GNULIB_GETPROGNAME@ || defined GNULIB_POSIXCHECK) && @HAVE_SYS_PROCESS_H@
+# include <sys/process.h>
+#endif
+
 /* Native Windows platforms declare _mktemp() in <io.h>.  */
 #if defined _WIN32 && !defined __CYGWIN__
 # include <io.h>
diff --git a/lib/strftime.c b/lib/strftime.c
index a3909a36c89..8d32023729c 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -316,7 +316,7 @@ typedef sbyte_count_t retval_t;
          else if (to_uppcase)                                                 \
            for (byte_count_t _i = 0; _i < _n; _i++)                           \
              FPUTC (TOUPPER ((UCHAR_T) _s[_i], loc), p);                      \
-         else if (fwrite (_s, _n, 1, p) == 0)                                 \
+         else if (_n && fwrite (_s, _n, 1, p) == 0)                           \
            return FAILURE;                                                    \
        }                                                                      \
      while (0)                                                                \
diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index b651d72dfa9..d130e4afa9f 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -1,7 +1,7 @@
 /* Convert string representation of a number into an intmax_t value.
 
-   Copyright (C) 1999, 2001-2004, 2006, 2009-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 1999, 2001-2004, 2006, 2009-2026 Free Software Foundation,
+   Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/lib/strtol.c b/lib/strtol.c
index 244fe9b5e3c..12a64b1c5a7 100644
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -1,7 +1,7 @@
 /* Convert string representation of a number into an integer value.
 
-   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2026 Free
-   Software Foundation, Inc.
+   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2026 Free Software
+   Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@gnu.org.
diff --git a/lib/strtoll.c b/lib/strtoll.c
index 2b030c9bf66..e8876f98152 100644
--- a/lib/strtoll.c
+++ b/lib/strtoll.c
@@ -1,6 +1,6 @@
 /* Function to parse a 'long long int' from text.
-   Copyright (C) 1995-1997, 1999, 2001, 2009-2026 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995-1997, 1999, 2001, 2009-2026 Free Software Foundation,
+   Inc.
    This file is part of the GNU C Library.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/lib/time_r.c b/lib/time_r.c
index b350d70a3cf..dfc427f6679 100644
--- a/lib/time_r.c
+++ b/lib/time_r.c
@@ -1,7 +1,6 @@
 /* Reentrant time functions like localtime_r.
 
-   Copyright (C) 2003, 2006-2007, 2010-2026 Free Software Foundation,
-   Inc.
+   Copyright (C) 2003, 2006-2007, 2010-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/m4/alloca.m4 b/m4/alloca.m4
index 7e29940e713..ff0c59dd415 100644
--- a/m4/alloca.m4
+++ b/m4/alloca.m4
@@ -1,7 +1,7 @@
 # alloca.m4
 # serial 21
-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index 301e8524870..4ab542f4291 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,7 +1,7 @@
 # codeset.m4
 # serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2026 Free
-dnl Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2026 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/d-type.m4 b/m4/d-type.m4
index 3888f5c2904..0c335f8b1df 100644
--- a/m4/d-type.m4
+++ b/m4/d-type.m4
@@ -1,7 +1,7 @@
 # d-type.m4
 # serial 12
-dnl Copyright (C) 1997, 1999-2004, 2006, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1997, 1999-2004, 2006, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/dup2.m4 b/m4/dup2.m4
index a94fef03f9f..e1d518983b5 100644
--- a/m4/dup2.m4
+++ b/m4/dup2.m4
@@ -1,7 +1,6 @@
 # dup2.m4
 # serial 28
-dnl Copyright (C) 2002, 2005, 2007, 2009-2026 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2002, 2005, 2007, 2009-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/filemode.m4 b/m4/filemode.m4
index c434d8e35d5..9bf319abf54 100644
--- a/m4/filemode.m4
+++ b/m4/filemode.m4
@@ -1,7 +1,6 @@
 # filemode.m4
 # serial 9
-dnl Copyright (C) 2002, 2005-2006, 2009-2026 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index 2806e1a702c..db6e0e3b636 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -1,7 +1,7 @@
 # fsusage.m4
 # serial 37
-dnl Copyright (C) 1997-1998, 2000-2001, 2003-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1997-1998, 2000-2001, 2003-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index e9e067df688..34ac3a6300e 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -1,7 +1,7 @@
 # getgroups.m4
 # serial 25
-dnl Copyright (C) 1996-1997, 1999-2004, 2008-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1996-1997, 1999-2004, 2008-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/getline.m4 b/m4/getline.m4
index cb9e839fdd9..ed32fa10bfb 100644
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,8 +1,8 @@
 # getline.m4
 # serial 35
 
-dnl Copyright (C) 1998-2003, 2005-2007, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1998-2003, 2005-2007, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/m4/gettime.m4 b/m4/gettime.m4
index 66d2d6c939f..0afe2aab169 100644
--- a/m4/gettime.m4
+++ b/m4/gettime.m4
@@ -1,7 +1,6 @@
 # gettime.m4
 # serial 15
-dnl Copyright (C) 2002, 2004-2006, 2009-2026 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2002, 2004-2006, 2009-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
index b72864271ff..3728c13e999 100644
--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -1,7 +1,7 @@
 # gettimeofday.m4
 # serial 30
-dnl Copyright (C) 2001-2003, 2005, 2007, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2005, 2007, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/group-member.m4 b/m4/group-member.m4
index bb185977b13..5e5c3709c39 100644
--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,7 +1,7 @@
 # group-member.m4
 # serial 14
-dnl Copyright (C) 1999-2001, 2003-2007, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1999-2001, 2003-2007, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/locale-en.m4 b/m4/locale-en.m4
index cc54a15fac4..f5e035f3675 100644
--- a/m4/locale-en.m4
+++ b/m4/locale-en.m4
@@ -19,7 +19,7 @@ AC_DEFUN_ONCE([gt_LOCALE_EN_UTF8],
       *-musl* | midipix*)
         dnl On musl libc, all kinds of ll_CC.UTF-8 locales exist, even without
         dnl any locale file on disk. But they are effectively equivalent to the
-        dnl C.UTF-8 locale, except for locale categories (such as LC_MESSSAGES)
+        dnl C.UTF-8 locale, except for locale categories (such as LC_MESSAGES)
         dnl for which localizations (.mo files) have been installed.
         gt_cv_locale_en_utf8=en_US.UTF-8
         ;;
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
index ca35e69eecc..0824226fa71 100644
--- a/m4/manywarnings.m4
+++ b/m4/manywarnings.m4
@@ -1,5 +1,5 @@
 # manywarnings.m4
-# serial 29
+# serial 32
 dnl Copyright (C) 2008-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -110,8 +110,8 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)],
     -Wduplicated-branches \
     -Wduplicated-cond \
     -Wextra \
-    -Wformat-signedness \
     -Wflex-array-member-not-at-end \
+    -Wformat-signedness \
     -Winit-self \
     -Winline \
     -Winvalid-pch \
@@ -138,8 +138,6 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)],
     -Wsuggest-attribute=malloc \
     -Wsuggest-attribute=noreturn \
     -Wsuggest-attribute=pure \
-    -Wsuggest-final-methods \
-    -Wsuggest-final-types \
     -Wsync-nand \
     -Wtrampolines \
     -Wuninitialized \
@@ -150,7 +148,6 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)],
     -Wvector-operation-performance \
     -Wvla \
     -Wwrite-strings \
-    \
     ; do
     AS_VAR_APPEND([$1], [" $gl_manywarn_item"])
   done
@@ -169,20 +166,29 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)],
   AS_VAR_APPEND([$1], [' -Wunused-const-variable=2'])
   AS_VAR_APPEND([$1], [' -Wvla-larger-than=4031'])
 
-  # These are needed for older GCC versions.
+  # These depend on the GCC version.
   if test -n "$GCC" && gl_gcc_version=`($CC --version) 2>/dev/null`; then
     case $gl_gcc_version in
-      'gcc (GCC) '[[0-3]].* | \
-      'gcc (GCC) '4.[[0-7]].*)
+      gcc*' ('*') '[[0-3]].* | \
+      gcc*' ('*') '4.[[0-7]].*)
         AS_VAR_APPEND([$1], [' -fdiagnostics-show-option'])
         AS_VAR_APPEND([$1], [' -funit-at-a-time'])
           ;;
     esac
     case $gl_gcc_version in
-      'gcc (GCC) '[[0-9]].*)
+      gcc*' ('*') '[[0-9]].*)
         AS_VAR_APPEND([$1], [' -fno-common'])
           ;;
     esac
+    case $gl_gcc_version in
+      gcc*' ('*') '?.* | gcc*' ('*') '1[[0-4]].*)
+          # In GCC < 15 the option either does not exist,
+          # or is accepted but always warns.
+          ;;
+      *)
+          AS_VAR_APPEND([$1], [' -Wzero-as-null-pointer-constant'])
+          ;;
+    esac
   fi
 
   # These options are not supported by gcc, but are useful with clang.
diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4
index d6b5b8f0b4a..eda1b31c44d 100644
--- a/m4/mempcpy.m4
+++ b/m4/mempcpy.m4
@@ -1,7 +1,7 @@
 # mempcpy.m4
 # serial 14
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/memrchr.m4 b/m4/memrchr.m4
index 59fda84cf61..7e4e39f2ec1 100644
--- a/m4/memrchr.m4
+++ b/m4/memrchr.m4
@@ -1,7 +1,7 @@
 # memrchr.m4
 # serial 11
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index a186def45d5..fa32d138402 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,7 +1,7 @@
 # mktime.m4
 # serial 43
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/nstrftime.m4 b/m4/nstrftime.m4
index 5c5cc1289d5..f9d699174e4 100644
--- a/m4/nstrftime.m4
+++ b/m4/nstrftime.m4
@@ -1,7 +1,7 @@
 # nstrftime.m4
 # serial 40
-dnl Copyright (C) 1996-1997, 1999-2007, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1996-1997, 1999-2007, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/pathmax.m4 b/m4/pathmax.m4
index 4d45922846e..d6bdf43e9ef 100644
--- a/m4/pathmax.m4
+++ b/m4/pathmax.m4
@@ -1,7 +1,7 @@
 # pathmax.m4
 # serial 11
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4
index 5b934461623..b3fcd2102e2 100644
--- a/m4/selinux-selinux-h.m4
+++ b/m4/selinux-selinux-h.m4
@@ -88,10 +88,13 @@ AC_DEFUN([gl_LIBSELINUX],
 
   # Warn if SELinux is found but libselinux is absent;
   if test "$ac_cv_search_setfilecon" = no; then
-    if test "$host" = "$build" && test -d /selinux; then
+    if test "$host" = "$build" \
+       && { test -d /sys/fs/selinux || test -d /selinux; }; then
       AC_MSG_WARN([This system supports SELinux but libselinux is missing.])
       AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.])
     fi
-    with_selinux=no
+    if test "$with_selinux" = maybe; then
+      with_selinux=no
+    fi
   fi
 ])
diff --git a/m4/sig2str.m4 b/m4/sig2str.m4
index 709dd958f97..d2e37ad9e6c 100644
--- a/m4/sig2str.m4
+++ b/m4/sig2str.m4
@@ -1,7 +1,6 @@
 # sig2str.m4
 # serial 9
-dnl Copyright (C) 2002, 2005-2006, 2009-2026 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4
index 5ff06768677..8710cb7233e 100644
--- a/m4/ssize_t.m4
+++ b/m4/ssize_t.m4
@@ -1,7 +1,6 @@
 # ssize_t.m4
 # serial 6
-dnl Copyright (C) 2001-2003, 2006, 2010-2026 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stat-time.m4 b/m4/stat-time.m4
index d3bc20b6a4e..10eb1dfa2d4 100644
--- a/m4/stat-time.m4
+++ b/m4/stat-time.m4
@@ -1,7 +1,7 @@
 # stat-time.m4
 # serial 1
-dnl Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2026 Free
-dnl Software Foundation, Inc.
+dnl Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2026 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index bef82c9688b..f35d661125d 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,5 +1,5 @@
 # stdlib_h.m4
-# serial 85
+# serial 86
 dnl Copyright (C) 2007-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -223,6 +223,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_STRTOULL=1;           AC_SUBST([HAVE_STRTOULL])
   HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA])
   HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
+  HAVE_SYS_PROCESS_H=0;      AC_SUBST([HAVE_SYS_PROCESS_H])
   HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
   HAVE_DECL_UNSETENV=1;      AC_SUBST([HAVE_DECL_UNSETENV])
   REPLACE__EXIT=0;           AC_SUBST([REPLACE__EXIT])
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4
index 764a84dc497..a712df9deaa 100644
--- a/m4/strnlen.m4
+++ b/m4/strnlen.m4
@@ -1,7 +1,7 @@
 # strnlen.m4
 # serial 15
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index cf628673bad..c6280d02ff8 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,7 +1,6 @@
 # strtoimax.m4
 # serial 17
-dnl Copyright (C) 2002-2004, 2006, 2009-2026 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2002-2004, 2006, 2009-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/strtoll.m4 b/m4/strtoll.m4
index fa5adc54cb5..4ee81fbcc4a 100644
--- a/m4/strtoll.m4
+++ b/m4/strtoll.m4
@@ -1,7 +1,6 @@
 # strtoll.m4
 # serial 12
-dnl Copyright (C) 2002, 2004, 2006, 2008-2026 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2008-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/time_h.m4 b/m4/time_h.m4
index 1cfc168b912..8d896ea526d 100644
--- a/m4/time_h.m4
+++ b/m4/time_h.m4
@@ -1,7 +1,7 @@
 # time_h.m4
 # serial 27
-dnl Copyright (C) 2000-2001, 2003-2007, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 2000-2001, 2003-2007, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/timespec.m4 b/m4/timespec.m4
index 8317cb29868..101f94a371d 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,7 +1,7 @@
 # timespec.m4
 # serial 15
-dnl Copyright (C) 2000-2001, 2003-2007, 2009-2026 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 2000-2001, 2003-2007, 2009-2026 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.