Update from Gnulib by running admin/merge-gnulib

38 files changed, 125 insertions, 123 deletions

diff --git a/lib/alloca.in.h b/lib/alloca.in.h
index 9eb5ff87c9c..afb00caf8f1 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2025 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 e6bc762ed89..20b9b5d8976 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-2025 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001, 2003, 2005, 2008-2025 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 76a1fc5452f..390631420f1 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-2025 Free Software Foundation,
-   Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2025 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 79e0dd1d96d..2d963c30e98 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2025 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 b14a3314230..6da59d09b32 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2025 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 13575af52a8..9ec3ca33224 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2025 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 a73b4dca087..8ab5591f5e9 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-2025 Free Software Foundation,
-   Inc.
+   Copyright (C) 1991, 2004-2006, 2009-2025 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 4ee8d77216b..5dbb19c6ce9 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-2025 Free Software Foundation,
-   Inc.
+   Copyright (C) 1998-2002, 2004, 2006-2025 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 9ce6e7c275e..8a823f98ea0 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-2025 Free
-   Software Foundation, Inc.
+   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2025 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 ef3d4e77780..69b37196dee 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-2025 Free Software Foundation,
-   Inc.
+   Copyright (C) 1999, 2004-2007, 2009-2025 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/endian.in.h b/lib/endian.in.h
index 30fd8aff128..e81aa7da8ce 100644
--- a/lib/endian.in.h
+++ b/lib/endian.in.h
@@ -29,6 +29,10 @@
 /* The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_ENDIAN_H@
 
+#elif @HAVE_SYS_ENDIAN_H@
+
+# include <sys/endian.h>
+
 #endif
 
 
@@ -69,7 +73,7 @@ _GL_INLINE_HEADER_BEGIN
 # define BYTE_ORDER LITTLE_ENDIAN
 #endif
 
-#if @HAVE_ENDIAN_H@
+#if @HAVE_ENDIAN_H@ || @HAVE_SYS_ENDIAN_H@
 
 /* Make sure we don't have any system definitions.  */
 # undef be16toh
diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
index c64280c2a0f..35dcc19f169 100644
--- a/lib/file-has-acl.c
+++ b/lib/file-has-acl.c
@@ -55,6 +55,12 @@ static char const UNKNOWN_SECURITY_CONTEXT[] = "?";
 # include <arpa/inet.h>
 # include <sys/xattr.h>
 # include <linux/xattr.h>
+# ifndef XATTR_NAME_SMACK
+#  define XATTR_NAME_SMACK "security.SMACK64"
+# endif
+# ifndef XATTR_NAME_SELINUX
+#  define XATTR_NAME_SELINUX "security.selinux"
+# endif
 # ifndef XATTR_NAME_NFSV4_ACL
 #  define XATTR_NAME_NFSV4_ACL "system.nfs4_acl"
 # endif
diff --git a/lib/filemode.h b/lib/filemode.h
index 633c618c9ca..288b3619a2f 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998-1999, 2003, 2006, 2009-2025 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 7786fd98945..7614b607832 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000, 2004, 2006-2007, 2009-2025 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 f2a94655872..423a6fa2116 100644
--- a/lib/fpending.h
+++ b/lib/fpending.h
@@ -1,7 +1,7 @@
 /* Declare __fpending.
 
-   Copyright (C) 2000, 2003, 2005-2006, 2009-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000, 2003, 2005-2006, 2009-2025 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 1ddf18a280d..e26bda88aa6 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-2025 Free
-   Software Foundation, Inc.
+   Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2025 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/getgroups.c b/lib/getgroups.c
index fe165f66abb..402206bf886 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-2025 Free Software Foundation,
-   Inc.
+   Copyright (C) 1996, 1999, 2003, 2006-2025 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 b777af3d875..a7966462c73 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-2025 Free
-   Software Foundation, Inc.
+   Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2025 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 f1c2f18c6bb..b124614a060 100644
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -1,7 +1,6 @@
 /* gettime -- get the system clock
 
-   Copyright (C) 2002, 2004-2007, 2009-2025 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2004-2007, 2009-2025 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 cb10bff8d76..304e23b23c7 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2025 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 2c569b394eb..a42e77e99b8 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -47,7 +47,7 @@
 #  --avoid=iswctype \
 #  --avoid=iswdigit \
 #  --avoid=iswxdigit \
-#  --avoid=langinfo \
+#  --avoid=langinfo-h \
 #  --avoid=libgmp-mpq \
 #  --avoid=localename-unsafe-limited \
 #  --avoid=lock \
@@ -67,19 +67,20 @@
 #  --avoid=setenv \
 #  --avoid=sigprocmask \
 #  --avoid=stat \
-#  --avoid=stdarg \
+#  --avoid=stdarg-h \
 #  --avoid=threadlib \
 #  --avoid=tzset \
 #  --avoid=unsetenv \
 #  --avoid=utime \
 #  --avoid=utime-h \
-#  --avoid=wchar \
+#  --avoid=wchar-h \
 #  --avoid=wcrtomb \
 #  --avoid=wctype \
 #  --avoid=wctype-h \
 #  alignasof \
 #  alloca-opt \
 #  binary-io \
+#  bool \
 #  boot-time \
 #  builtin-expect \
 #  byteswap \
@@ -155,19 +156,18 @@
 #  socklen \
 #  stat-time \
 #  std-gnu11 \
-#  stdbool \
 #  stdc_bit_width \
 #  stdc_count_ones \
 #  stdc_trailing_zeros \
-#  stdckdint \
-#  stddef \
-#  stdio \
+#  stdckdint-h \
+#  stddef-h \
+#  stdio-h \
 #  stpcpy \
 #  strnlen \
 #  strtoimax \
 #  symlink \
-#  sys_stat \
-#  sys_time \
+#  sys_stat-h \
+#  sys_time-h \
 #  tempname \
 #  time-h \
 #  time_r \
@@ -927,6 +927,7 @@ HAVE_SYMLINK = @HAVE_SYMLINK@
 HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
 HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
 HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@
+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@
@@ -1037,6 +1038,7 @@ LIB_WSOCK32 = @LIB_WSOCK32@
 LIB_XATTR = @LIB_XATTR@
 LIMITS_H = @LIMITS_H@
 LN_S_FILEONLY = @LN_S_FILEONLY@
+LOCALE_EN_UTF8 = @LOCALE_EN_UTF8@
 LTLIBGMP = @LTLIBGMP@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -1823,8 +1825,8 @@ libgnu_a_SOURCES += diffseq.h
 endif
 ## end   gnulib module diffseq
 
-## begin gnulib module dirent
-ifeq (,$(OMIT_GNULIB_MODULE_dirent))
+## begin gnulib module dirent-h
+ifeq (,$(OMIT_GNULIB_MODULE_dirent-h))
 
 BUILT_SOURCES += dirent.h
 
@@ -1872,7 +1874,7 @@ MOSTLYCLEANFILES += dirent.h dirent.h-t
 EXTRA_DIST += dirent.in.h
 
 endif
-## end   gnulib module dirent
+## end   gnulib module dirent-h
 
 ## begin gnulib module dirfd
 ifeq (,$(OMIT_GNULIB_MODULE_dirfd))
@@ -1946,6 +1948,7 @@ endian.h: endian.in.h $(top_builddir)/config.status
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''HAVE_ENDIAN_H''@|$(HAVE_ENDIAN_H)|g' \
 	      -e 's|@''NEXT_ENDIAN_H''@|$(NEXT_ENDIAN_H)|g' \
+	      -e 's|@''HAVE_SYS_ENDIAN_H''@|$(HAVE_SYS_ENDIAN_H)|g' \
 	      -e 's|@''ENDIAN_H_JUST_MISSING_STDINT''@|$(ENDIAN_H_JUST_MISSING_STDINT)|g' \
 	$(srcdir)/endian.in.h > $@-t
 	$(AM_V_at)mv $@-t $@
@@ -1962,8 +1965,8 @@ EXTRA_DIST += endian.in.h
 endif
 ## end   gnulib module endian
 
-## begin gnulib module errno
-ifeq (,$(OMIT_GNULIB_MODULE_errno))
+## begin gnulib module errno-h
+ifeq (,$(OMIT_GNULIB_MODULE_errno-h))
 
 BUILT_SOURCES += $(ERRNO_H)
 
@@ -1994,7 +1997,7 @@ MOSTLYCLEANFILES += errno.h errno.h-t
 EXTRA_DIST += errno.in.h
 
 endif
-## end   gnulib module errno
+## end   gnulib module errno-h
 
 ## begin gnulib module euidaccess
 ifeq (,$(OMIT_GNULIB_MODULE_euidaccess))
@@ -2534,8 +2537,8 @@ EXTRA_DIST += intprops-internal.h intprops.h
 endif
 ## end   gnulib module intprops
 
-## begin gnulib module inttypes-incomplete
-ifeq (,$(OMIT_GNULIB_MODULE_inttypes-incomplete))
+## begin gnulib module inttypes-h-incomplete
+ifeq (,$(OMIT_GNULIB_MODULE_inttypes-h-incomplete))
 
 BUILT_SOURCES += inttypes.h
 
@@ -2577,7 +2580,7 @@ MOSTLYCLEANFILES += inttypes.h inttypes.h-t
 EXTRA_DIST += inttypes.in.h
 
 endif
-## end   gnulib module inttypes-incomplete
+## end   gnulib module inttypes-h-incomplete
 
 ## begin gnulib module lchmod
 ifeq (,$(OMIT_GNULIB_MODULE_lchmod))
@@ -3169,8 +3172,8 @@ endif
 endif
 ## end   gnulib module stdc_trailing_zeros
 
-## begin gnulib module stdckdint
-ifeq (,$(OMIT_GNULIB_MODULE_stdckdint))
+## begin gnulib module stdckdint-h
+ifeq (,$(OMIT_GNULIB_MODULE_stdckdint-h))
 
 BUILT_SOURCES += $(STDCKDINT_H)
 
@@ -3190,10 +3193,10 @@ MOSTLYCLEANFILES += stdckdint.h stdckdint.h-t
 EXTRA_DIST += intprops-internal.h stdckdint.in.h
 
 endif
-## end   gnulib module stdckdint
+## end   gnulib module stdckdint-h
 
-## begin gnulib module stddef
-ifeq (,$(OMIT_GNULIB_MODULE_stddef))
+## begin gnulib module stddef-h
+ifeq (,$(OMIT_GNULIB_MODULE_stddef-h))
 
 BUILT_SOURCES += $(STDDEF_H)
 
@@ -3222,10 +3225,10 @@ MOSTLYCLEANFILES += stddef.h stddef.h-t
 EXTRA_DIST += stddef.in.h
 
 endif
-## end   gnulib module stddef
+## end   gnulib module stddef-h
 
-## begin gnulib module stdint
-ifeq (,$(OMIT_GNULIB_MODULE_stdint))
+## begin gnulib module stdint-h
+ifeq (,$(OMIT_GNULIB_MODULE_stdint-h))
 
 BUILT_SOURCES += $(STDINT_H)
 
@@ -3272,10 +3275,10 @@ MOSTLYCLEANFILES += stdint.h stdint.h-t
 EXTRA_DIST += stdint.in.h
 
 endif
-## end   gnulib module stdint
+## end   gnulib module stdint-h
 
-## begin gnulib module stdio
-ifeq (,$(OMIT_GNULIB_MODULE_stdio))
+## begin gnulib module stdio-h
+ifeq (,$(OMIT_GNULIB_MODULE_stdio-h))
 
 BUILT_SOURCES += stdio.h
 
@@ -3435,10 +3438,10 @@ endif
 EXTRA_DIST += stdio.in.h
 
 endif
-## end   gnulib module stdio
+## end   gnulib module stdio-h
 
-## begin gnulib module stdlib
-ifeq (,$(OMIT_GNULIB_MODULE_stdlib))
+## begin gnulib module stdlib-h
+ifeq (,$(OMIT_GNULIB_MODULE_stdlib-h))
 
 BUILT_SOURCES += stdlib.h
 libgnu_a_SOURCES += stdlib.c
@@ -3609,7 +3612,7 @@ MOSTLYCLEANFILES += stdlib.h stdlib.h-t1 stdlib.h-t2 stdlib.h-t3
 EXTRA_DIST += stdlib.in.h
 
 endif
-## end   gnulib module stdlib
+## end   gnulib module stdlib-h
 
 ## begin gnulib module stpcpy
 ifeq (,$(OMIT_GNULIB_MODULE_stpcpy))
@@ -3621,8 +3624,8 @@ endif
 endif
 ## end   gnulib module stpcpy
 
-## begin gnulib module string
-ifeq (,$(OMIT_GNULIB_MODULE_string))
+## begin gnulib module string-h
+ifeq (,$(OMIT_GNULIB_MODULE_string-h))
 
 BUILT_SOURCES += string.h
 
@@ -3740,7 +3743,7 @@ MOSTLYCLEANFILES += string.h string.h-t1 string.h-t2
 EXTRA_DIST += string.in.h
 
 endif
-## end   gnulib module string
+## end   gnulib module string-h
 
 ## begin gnulib module strnlen
 ifeq (,$(OMIT_GNULIB_MODULE_strnlen))
@@ -3788,8 +3791,8 @@ endif
 endif
 ## end   gnulib module symlink
 
-## begin gnulib module sys_random
-ifeq (,$(OMIT_GNULIB_MODULE_sys_random))
+## begin gnulib module sys_random-h
+ifeq (,$(OMIT_GNULIB_MODULE_sys_random-h))
 
 BUILT_SOURCES += sys/random.h
 
@@ -3818,10 +3821,10 @@ MOSTLYCLEANDIRS += sys
 EXTRA_DIST += sys_random.in.h
 
 endif
-## end   gnulib module sys_random
+## end   gnulib module sys_random-h
 
-## begin gnulib module sys_select
-ifeq (,$(OMIT_GNULIB_MODULE_sys_select))
+## begin gnulib module sys_select-h
+ifeq (,$(OMIT_GNULIB_MODULE_sys_select-h))
 
 BUILT_SOURCES += sys/select.h
 
@@ -3852,10 +3855,10 @@ MOSTLYCLEANDIRS += sys
 EXTRA_DIST += sys_select.in.h
 
 endif
-## end   gnulib module sys_select
+## end   gnulib module sys_select-h
 
-## begin gnulib module sys_stat
-ifeq (,$(OMIT_GNULIB_MODULE_sys_stat))
+## begin gnulib module sys_stat-h
+ifeq (,$(OMIT_GNULIB_MODULE_sys_stat-h))
 
 BUILT_SOURCES += sys/stat.h
 
@@ -3927,10 +3930,10 @@ MOSTLYCLEANDIRS += sys
 EXTRA_DIST += sys_stat.in.h
 
 endif
-## end   gnulib module sys_stat
+## end   gnulib module sys_stat-h
 
-## begin gnulib module sys_time
-ifeq (,$(OMIT_GNULIB_MODULE_sys_time))
+## begin gnulib module sys_time-h
+ifeq (,$(OMIT_GNULIB_MODULE_sys_time-h))
 
 BUILT_SOURCES += sys/time.h
 
@@ -3962,10 +3965,10 @@ MOSTLYCLEANDIRS += sys
 EXTRA_DIST += sys_time.in.h
 
 endif
-## end   gnulib module sys_time
+## end   gnulib module sys_time-h
 
-## begin gnulib module sys_types
-ifeq (,$(OMIT_GNULIB_MODULE_sys_types))
+## begin gnulib module sys_types-h
+ifeq (,$(OMIT_GNULIB_MODULE_sys_types-h))
 
 BUILT_SOURCES += sys/types.h
 
@@ -3990,7 +3993,7 @@ MOSTLYCLEANDIRS += sys
 EXTRA_DIST += sys_types.in.h
 
 endif
-## end   gnulib module sys_types
+## end   gnulib module sys_types-h
 
 ## begin gnulib module tempname
 ifeq (,$(OMIT_GNULIB_MODULE_tempname))
@@ -4140,8 +4143,8 @@ EXTRA_DIST += u64.h
 endif
 ## end   gnulib module u64
 
-## begin gnulib module unistd
-ifeq (,$(OMIT_GNULIB_MODULE_unistd))
+## begin gnulib module unistd-h
+ifeq (,$(OMIT_GNULIB_MODULE_unistd-h))
 
 BUILT_SOURCES += unistd.h
 libgnu_a_SOURCES += unistd.c
@@ -4359,7 +4362,7 @@ MOSTLYCLEANFILES += unistd.h unistd.h-t1 unistd.h-t2 unistd.h-t3 unistd.h-t4
 EXTRA_DIST += unistd.in.h
 
 endif
-## end   gnulib module unistd
+## end   gnulib module unistd-h
 
 ## begin gnulib module unlocked-io-internal
 ifeq (,$(OMIT_GNULIB_MODULE_unlocked-io-internal))
diff --git a/lib/group-member.c b/lib/group-member.c
index 919f6e7d84b..a26eebe37d2 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-2025 Free
-   Software Foundation, Inc.
+   Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2025 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 6b650b8105a..5642c83c2d9 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2025 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 8eeafc1df33..fdbf97a682b 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-2025 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2025 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 c8578476c96..ae2622a1e75 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-2025 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2025 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 3635cd65ebd..b42b7b010ce 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-2025 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2025 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 9801fe387f0..0410596a110 100644
--- a/lib/memmem.c
+++ b/lib/memmem.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2025 Free
-   Software Foundation, Inc.
+/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2025 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 b45f4e7c601..b143fb0a3a5 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-2025 Free
-   Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2025 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 e3dbd4ec142..cfafa4e37e1 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-2025 Free Software Foundation,
-   Inc.
+   Copyright (C) 1999-2000, 2002, 2004-2025 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/save-cwd.h b/lib/save-cwd.h
index 8e3ace79c68..f0c79431eb1 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995, 1997-1998, 2003, 2009-2025 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 7a17e1c4575..d10c159af6c 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000-2001, 2003-2006, 2008-2025 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 dc906b3e00e..e8c830c6daf 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-2025 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2004, 2006, 2009-2025 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/stdlib.in.h b/lib/stdlib.in.h
index 2b785a1896a..f8e2a6ce344 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-2025 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2025 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/strtoimax.c b/lib/strtoimax.c
index e34f081a103..1dec8130baf 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 1999, 2001-2004, 2006, 2009-2025 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 381a694edb2..0bcc6f40eca 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-2025 Free
-   Software Foundation, Inc.
+   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2025 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 efcf7089202..4326f5f0306 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-2025 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995-1997, 1999, 2001, 2009-2025 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 e2dd422b9c6..15d65d599c2 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-2025 Free Software Foundation,
-   Inc.
+   Copyright (C) 2003, 2006-2007, 2010-2025 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/verify.h b/lib/verify.h
index 4b67aa226eb..96fde0b9c81 100644
--- a/lib/verify.h
+++ b/lib/verify.h
@@ -255,6 +255,11 @@ template <int w>
 #  endif
 # endif
 /* Define static_assert if needed.  */
+# if defined __cplusplus && defined __clang__ && __clang_major__ < 9
+/* clang++ before commit 5c739665a8721228cf6143fd4ef95870a59f55ae had a
+   two-arguments static_assert but not the one-argument static_assert.  */
+#  undef static_assert
+# endif
 # if (!defined static_assert \
       && __STDC_VERSION__ < 202311 \
       && (!defined __cplusplus \