--- /t/orig	2026-09-05 02:36:17.624332000 -0700
+++ /t/new2	2026-09-05 03:17:05.764909573 -0700
@@ -9 +9 @@
-(atdir_set): Return AT_FDCWD, not 1, when returning negative.
+(atdir_set): Return AT_FDCWD, not -1, when returning negative.
@@ -229 +232 @@
-simplify gzip by not call8ing the functions if the
+simplify gzip by not calling the functions if the
@@ -241 +244 @@
-TRY_OPENING_DIRECTORIEs is in use.
+TRY_OPENING_DIRECTORIES is in use.
@@ -436 +440,0 @@
-* configure.ac: Check for fchmodat.
@@ -551 +556 @@
-Subject: [PATCH 07/14] * THANKS: Sort.
+Subject: [PATCH 07/14] maint: sort THANKS
@@ -552,0 +558 @@
+* THANKS: Sort.
@@ -842 +852 @@
-Without this change, gzip was more vulnerables to attackers
+Without this change, gzip was more vulnerable to attackers
@@ -1007 +1018 @@
-+static int  check_ofname (int parentfd);
++static int  check_ofname (int atfd);
@@ -1281 +1294 @@
-Subject: [PATCH 14/14] maint: update .gitignore files
+Subject: [PATCH 14/14] maint: update .gitignore files and bootstrap
@@ -1284,4 +1297,33 @@
- lib/.gitignore | 42 ++----------------------------------------
- m4/.gitignore  | 23 -----------------------
- 2 files changed, 2 insertions(+), 63 deletions(-)
-
+ bootstrap      | 10 ++++++---
+ lib/.gitignore | 42 ++---------------------------------
+ m4/.gitignore  | 59 ++++++++++++++++----------------------------------
+ 3 files changed, 28 insertions(+), 83 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. <https://stackoverflow.com/questions/65524512/>).
+-            git -C "$gnulib_path" -c init.defaultBranch=master init
++            # (cf. <https://stackoverflow.com/questions/65524512/>)
++            # 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
@@ -1441 +1483,3 @@
-@@ -6,7 +6,6 @@
+@@ -4,37 +4,31 @@
+ /assert_h.m4
+ /build-cc.m4
@@ -1443 +1487 @@
- /c-bool.m4
+-/c-bool.m4
@@ -1445,0 +1490 @@
++/c-bool.m4
@@ -1447 +1492 @@
- /close.m4
+-/close.m4
@@ -1449 +1494,5 @@
-@@ -16,7 +15,6 @@
++/close.m4
+ /codeset.m4
+-/crc-x86_64.m4
+ /crc.m4
++/crc-x86_64.m4
@@ -1457 +1506,3 @@
-@@ -25,16 +23,12 @@
+-/error.m4
+ /error_h.m4
++/error.m4
@@ -1463 +1514 @@
- /fcntl-o.m4
+-/fcntl-o.m4
@@ -1465 +1516 @@
- /fcntl.m4
+-/fcntl.m4
@@ -1466,0 +1518,2 @@
++/fcntl.m4
++/fcntl-o.m4
@@ -1474 +1527 @@
-@@ -43,11 +37,9 @@
+@@ -43,40 +37,35 @@
@@ -1486 +1539,19 @@
-@@ -71,12 +63,8 @@
+ /gettext_h.m4
+ /gettime.m4
+ /gettimeofday.m4
+-/gnu-make.m4
+ /gnulib-cache.m4
+ /gnulib-common.m4
+ /gnulib-comp.m4
+ /gnulib-tool.m4
++/gnu-make.m4
+ /include_next.m4
+ /init-package-version.m4
+ /inttypes.m4
+ /largefile.m4
+ /lib-ignore.m4
+ /limits-h.m4
++/locale-en.m4
+ /lseek.m4
+ /lstat.m4
+-/malloc.m4
@@ -1487,0 +1559 @@
++/malloc.m4
@@ -1499 +1571,3 @@
-@@ -88,22 +76,17 @@
+@@ -86,42 +75,36 @@
+ /off64_t.m4
+ /off_t.m4
@@ -1501,2 +1575,2 @@
- /open-slash.m4
- /open.m4
+-/open-slash.m4
+-/open.m4
@@ -1504,0 +1579,2 @@
++/open.m4
++/open-slash.m4
@@ -1515 +1591 @@
- /realloc.m4
+-/realloc.m4
@@ -1518,0 +1595 @@
++/realloc.m4
@@ -1521,2 +1598,15 @@
- /signal_h.m4
-@@ -121,7 +104,6 @@
+-/signal_h.m4
+ /signalblocking.m4
++/signal_h.m4
+ /ssize_t.m4
+-/stat-time.m4
+ /stat.m4
+-/std-gnu11.m4
++/stat-time.m4
+ /stdalign.m4
+ /stdbit_h.m4
+ /stdckdint_h.m4
+ /stdcountof_h.m4
+ /stddef_h.m4
++/std-gnu11.m4
+ /stdint.m4
@@ -1530 +1620,5 @@
-@@ -134,10 +116,7 @@
+@@ -130,24 +113,20 @@
+ /sys_stat_h.m4
+ /sys_time_h.m4
+ /sys_types_h.m4
+-/time.m4
@@ -1531,0 +1626 @@
++/time.m4
@@ -1539 +1634 @@
- /utime.m4
+-/utime.m4
@@ -1541 +1636,8 @@
-@@ -149,5 +128,3 @@
++/utime.m4
+ /utimens.m4
+ /utimes.m4
+ /vararrays.m4
+-/warn-on-use.m4
+ /warnings.m4
++/warn-on-use.m4
++/wint_t.m4