From ff5921491a8840eed4f426ac46a681d8a799b5fb Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 11 Aug 2026 08:45:09 -0700 Subject: [PATCH] build: update gnulib submodule to latest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In addition to the usual ‘git submodule foreach git pull origin master’, this also makes the following changes to adjust to current Gnulib: * bootstrap: Sync from gnulib. * lib/.gitignore, m4/.gitignore: Update to match current Gnulib. * sed/utils.c: Include min-eloop-threshold.h, not eloop-threshold.h. (follow_symlink): Use MIN_ELOOP_THRESHOLD, not __eloop_threshold (). --- bootstrap | 10 +++++++--- gnulib | 2 +- lib/.gitignore | 7 +------ m4/.gitignore | 2 ++ sed/utils.c | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/bootstrap b/bootstrap index 19f9424..da6337a 100755 --- a/bootstrap +++ b/bootstrap @@ -37,7 +37,7 @@ medir=`dirname "$me"` # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2025-12-04.19; # UTC +scriptlibversion=2026-08-09.13; # UTC # Copyright (C) 2003-2026 Free Software Foundation, Inc. # @@ -597,8 +597,12 @@ prepare_GNULIB_SRCDIR () mkdir -p "$gnulib_path" # Use a -c option to silence an annoying message # "hint: Using 'master' as the name for the initial branch." - # (cf. ). - git -C "$gnulib_path" -c init.defaultBranch=master init + # (cf. ) + # and another -c option to override a configuration + # init.defaultObjectFormat=sha256 that some users have installed. + git -C "$gnulib_path" -c init.defaultBranch=master \ + -c init.defaultObjectFormat=sha1 \ + init git -C "$gnulib_path" remote add origin "$gnulib_url" if git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" then diff --git a/gnulib b/gnulib index 6ecfb72..7370e33 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 6ecfb724a6b8f48c8fbd6e13dca800bca1fa9e2e +Subproject commit 7370e33b8ba15e3d270cc045383ad6c022e4def5 diff --git a/lib/.gitignore b/lib/.gitignore index 2a94591..0e0b090 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -18,11 +18,6 @@ /btoc32.c /btowc.c /c++defs.h -/c-ctype.c -/c-ctype.h -/c-strcase.h -/c-strcasecmp.c -/c-strcaseeq.h /c32_apply_type_test.c /c32_get_type_test.c /c32is-impl.h @@ -60,7 +55,6 @@ /dirname.h /dup2.c /dynarray.h -/eloop-threshold.h /errno.h /errno.in.h /error.c @@ -155,6 +149,7 @@ /memeq.c /mempcpy.c /memrchr.c +/min-eloop-threshold.h /minmax.h /mkdir.c /mkostemp.c diff --git a/m4/.gitignore b/m4/.gitignore index d03c886..32f5d3b 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -218,6 +218,7 @@ /std-gnu11.m4 /stdalign.m4 /stdarg.m4 +/stdbit_h.m4 /stdckdint_h.m4 /stdcountof_h.m4 /stddef_h.m4 @@ -267,6 +268,7 @@ /warn-on-use.m4 /warnings.m4 /wchar_h.m4 +/wchar_t.m4 /wcrtomb.m4 /wctob.m4 /wctomb.m4 diff --git a/sed/utils.c b/sed/utils.c index f58a1c4..7cf5131 100644 --- a/sed/utils.c +++ b/sed/utils.c @@ -27,7 +27,7 @@ #include #include "binary-io.h" -#include "eloop-threshold.h" +#include "min-eloop-threshold.h" #include "idx.h" #include "minmax.h" #include "quotearg.h" @@ -374,7 +374,7 @@ follow_symlink (const char *fname) break; panic (_("couldn't readlink %s: %s"), quotef (fn), strerror (errno)); } - if (__eloop_threshold () <= num_links) + if (MIN_ELOOP_THRESHOLD <= num_links) panic (_("couldn't follow symlink %s: %s"), quotef (fname), strerror (ELOOP));