Diff of the two buildlogs:

--
--- b1/build.log	2025-03-14 14:29:42.983734837 +0000
+++ b2/build.log	2025-03-14 14:37:50.013716494 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Fri Mar 14 02:25:16 -12 2025
-I: pbuilder-time-stamp: 1741962316
+I: Current time: Fri Apr 17 10:52:46 +14 2026
+I: pbuilder-time-stamp: 1776372766
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz]
 I: copying local configuration
@@ -27,52 +27,84 @@
 dpkg-source: info: applying wget-passive_ftp-default
 I: Not using root during the build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/474110/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/3803986/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink03-arm64.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Apr 16 20:52 /bin/sh -> /bin/bash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/3803986/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/3803986/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build/reproducible-path'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='arm64'
-  DEBIAN_FRONTEND='noninteractive'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu")
+  BASH_VERSION='5.2.37(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=arm64
+  DEBIAN_FRONTEND=noninteractive
   DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=12 '
-  DISTRIBUTION='trixie'
-  HOME='/root'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=trixie
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=aarch64
+  HOST_ARCH=arm64
   IFS=' 	
   '
-  INVOCATION_ID='9721e5cfc9654b4d92391d9434893bee'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='474110'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=d31bfd18200d4dc98ec66255c54f2767
+  LANG=C
+  LANGUAGE=nl_BE:nl
+  LC_ALL=C
+  MACHTYPE=aarch64-unknown-linux-gnu
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnu
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=3803986
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.yjjvxqDV/pbuilderrc_2HQE --distribution trixie --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.yjjvxqDV/b1 --logfile b1/build.log wget_1.25.0-2.dsc'
-  SUDO_GID='109'
-  SUDO_UID='104'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://192.168.101.4:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.yjjvxqDV/pbuilderrc_ovw8 --distribution trixie --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.yjjvxqDV/b2 --logfile b2/build.log wget_1.25.0-2.dsc'
+  SUDO_GID=109
+  SUDO_UID=104
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://192.168.101.4:3128
 I: uname -a
-  Linux codethink04-arm64 6.1.0-31-cloud-arm64 #1 SMP Debian 6.1.128-1 (2025-02-07) aarch64 GNU/Linux
+  Linux i-capture-the-hostname 6.1.0-31-cloud-arm64 #1 SMP Debian 6.1.128-1 (2025-02-07) aarch64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Mar  4 11:20 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/474110/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Mar  4  2025 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/3803986/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -210,7 +242,7 @@
 Get: 78 http://deb.debian.org/debian trixie/main arm64 texinfo all 7.1.1-1 [1753 kB]
 Get: 79 http://deb.debian.org/debian trixie/main arm64 uuid-dev arm64 2.40.4-5 [48.5 kB]
 Get: 80 http://deb.debian.org/debian trixie/main arm64 zlib1g-dev arm64 1:1.3.dfsg+really1.3.1-1+b1 [917 kB]
-Fetched 37.3 MB in 0s (154 MB/s)
+Fetched 37.3 MB in 1s (69.0 MB/s)
 Preconfiguring packages ...
 Selecting previously unselected package libproc2-0:arm64.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19916 files and directories currently installed.)
@@ -554,7 +586,11 @@
 Building tag database...
  -> Finished parsing the build-deps
 I: Building the package
-I: Running cd /build/reproducible-path/wget-1.25.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../wget_1.25.0-2_source.changes
+I: user script /srv/workspace/pbuilder/3803986/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for trixie
+I: user script /srv/workspace/pbuilder/3803986/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/wget-1.25.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../wget_1.25.0-2_source.changes
 dpkg-buildpackage: info: source package wget
 dpkg-buildpackage: info: source version 1.25.0-2
 dpkg-buildpackage: info: source distribution unstable
@@ -2086,18 +2122,6 @@
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
       -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
       -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_CTYPE_H''@|<ctype.h>|g' \
-      -e 's/@''GNULIB_ISBLANK''@/1/g' \
-      -e 's/@''HAVE_ISBLANK''@/1/g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/ctype.in.h > ctype.h-t
-mv alloca.h-t alloca.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
       -e 's|@''HAVE_FEATURES_H''@|1|g' \
       -e 's|@''NEXT_ARPA_INET_H''@|<arpa/inet.h>|g' \
       -e 's|@''HAVE_ARPA_INET_H''@|1|g' \
@@ -2116,6 +2140,20 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/arpa_inet.in.h > arpa/inet.h-t
+mv alloca.h-t alloca.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_CTYPE_H''@|<ctype.h>|g' \
+      -e 's/@''GNULIB_ISBLANK''@/1/g' \
+      -e 's/@''HAVE_ISBLANK''@/1/g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      ../../lib/ctype.in.h > ctype.h-t
+mv arpa/inet.h-t arpa/inet.h
+mv ctype.h-t ctype.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_DIRENT_H''@|1|g' \
@@ -2151,9 +2189,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/dirent.in.h > dirent.h-t
-mv ctype.h-t ctype.h
-mv arpa/inet.h-t arpa/inet.h
-mv dirent.h-t dirent.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_ERROR_H''@|1|g' \
@@ -2188,6 +2223,9 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/fcntl.in.h > fcntl.h-t
+mv dirent.h-t dirent.h
+mv error.h-t error.h
+mv fcntl.h-t fcntl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2196,15 +2234,12 @@
       -e 's|@''NEXT_FLOAT_H''@|<float.h>|g' \
       -e 's|@''REPLACE_ITOLD''@|0|g' \
       ../../lib/float.in.h > float.h-t
-mv error.h-t error.h
 /usr/bin/mkdir -p 'malloc'
 mv float.h-t float.h
-/usr/bin/mkdir -p 'malloc'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
   -e '/libc_hidden_proto/d' \
   ../../lib/malloc/dynarray.h > malloc/dynarray.gl.h-t
 /usr/bin/mkdir -p 'malloc'
-mv fcntl.h-t fcntl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \
       -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \
@@ -2214,6 +2249,8 @@
       -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \
       ../../lib/malloc/dynarray-skeleton.c > malloc/dynarray-skeleton.gl.h-t
 mv malloc/dynarray.gl.h-t malloc/dynarray.gl.h
+/usr/bin/mkdir -p 'malloc'
+mv malloc/dynarray-skeleton.gl.h-t malloc/dynarray-skeleton.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \
       -e 's|__glibc_likely|_GL_LIKELY|g' \
@@ -2249,8 +2286,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/inttypes.in.h > inttypes.h-t
-mv malloc/dynarray-skeleton.gl.h-t malloc/dynarray-skeleton.gl.h
-mv malloc/scratch_buffer.gl.h-t malloc/scratch_buffer.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_LANGINFO_H''@|1|g' \
@@ -2269,7 +2304,9 @@
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/langinfo.in.h > langinfo.h-t
+mv malloc/scratch_buffer.gl.h-t malloc/scratch_buffer.gl.h
 mv inttypes.h-t inttypes.h
+mv langinfo.h-t langinfo.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2277,7 +2314,6 @@
       -e 's|@''PRAGMA_COLUMNS''@||g' \
       -e 's|@''NEXT_LIMITS_H''@|<limits.h>|g' \
       ../../lib/limits.in.h > limits.h-t
-mv langinfo.h-t langinfo.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2324,6 +2360,8 @@
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/netdb.in.h > netdb.h-t
 mv limits.h-t limits.h
+mv locale.h-t locale.h
+mv netdb.h-t netdb.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_PTHREAD_H''@|1|g' \
@@ -2371,9 +2409,6 @@
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sched.in.h > sched.h-t
-mv locale.h-t locale.h
-mv netdb.h-t netdb.h
-mv sched.h-t sched.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2446,6 +2481,44 @@
       -e 's|@''HAVE_PTHREAD_SPIN_UNLOCK''@|1|g' \
       -e 's|@''HAVE_PTHREAD_SPIN_DESTROY''@|1|g' \
       < pthread.h-t1 > pthread.h-t2
+mv sched.h-t sched.h
+mv signal.h-t signal.h
+sed \
+      -e 's|@''REPLACE_PTHREAD_CREATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_GETDETACHSTATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_SETDETACHSTATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SELF''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_EQUAL''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_DETACH''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_JOIN''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_EXIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ONCE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETTYPE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETTYPE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETROBUST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETROBUST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_LOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_TRYLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_TIMEDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_RDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_WRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYRDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYWRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|0|g' \
+      < pthread.h-t2 > pthread.h-t3
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_SPAWN_H''@|1|g' \
@@ -2502,6 +2575,33 @@
       -e 's|@''REPLACE_NULL''@|0|g' \
       -e 's|@''HAVE_MAX_ALIGN_T''@|1|g' \
       ../../lib/stddef.in.h > stddef.h-t
+sed \
+      -e 's|@''REPLACE_PTHREAD_COND_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_CONDATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_CONDATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_WAIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_TIMEDWAIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_SIGNAL''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_BROADCAST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_KEY_CREATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SETSPECIFIC''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_GETSPECIFIC''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_KEY_DELETE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_LOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_TRYLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_DESTROY''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _Noreturn/r ../../lib/_Noreturn.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      < pthread.h-t3 > pthread.h-t4
+mv spawn.h-t spawn.h
+mv stddef.h-t stddef.h
+rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
+mv pthread.h-t4 pthread.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2581,8 +2681,6 @@
       -e 's/@''GNULIB_MDA_PUTW''@/1/g' \
       -e 's/@''GNULIB_MDA_TEMPNAM''@/1/g' \
       < ../../lib/stdio.in.h > stdio.h-t1
-mv signal.h-t signal.h
-mv stddef.h-t stddef.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2643,43 +2741,6 @@
       -e 's/@''GNULIB_MDA_MKTEMP''@/1/g' \
       -e 's/@''GNULIB_MDA_PUTENV''@/1/g' \
       < ../../lib/stdlib.in.h > stdlib.h-t1
-sed \
-      -e 's|@''REPLACE_PTHREAD_CREATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_GETDETACHSTATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_SETDETACHSTATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SELF''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_EQUAL''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_DETACH''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_JOIN''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_EXIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ONCE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETTYPE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETTYPE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETROBUST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETROBUST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_LOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_TRYLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_TIMEDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_RDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_WRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYRDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYWRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|0|g' \
-      < pthread.h-t2 > pthread.h-t3
-mv spawn.h-t spawn.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2747,7 +2808,27 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/strings.in.h > strings.h-t
-/usr/bin/mkdir -p 'sys'
+sed \
+      -e 's|@''HAVE_DECL_FCLOSEALL''@|1|g' \
+      -e 's|@''HAVE_DECL_FPURGE''@|0|g' \
+      -e 's|@''HAVE_DECL_FSEEKO''@|1|g' \
+      -e 's|@''HAVE_DECL_FTELLO''@|1|g' \
+      -e 's|@''HAVE_DECL_GETDELIM''@|1|g' \
+      -e 's|@''HAVE_DECL_GETLINE''@|1|g' \
+      -e 's|@''HAVE_DECL_GETW''@|1|g' \
+      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_PUTW''@|1|g' \
+      -e 's|@''HAVE_DECL_SNPRINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_VSNPRINTF''@|1|g' \
+      -e 's|@''HAVE_DPRINTF''@|1|g' \
+      -e 's|@''HAVE_FSEEKO''@|1|g' \
+      -e 's|@''HAVE_FTELLO''@|1|g' \
+      -e 's|@''HAVE_PCLOSE''@|1|g' \
+      -e 's|@''HAVE_POPEN''@|1|g' \
+      -e 's|@''HAVE_RENAMEAT''@|1|g' \
+      -e 's|@''HAVE_VASPRINTF''@|1|g' \
+      -e 's|@''HAVE_VDPRINTF''@|1|g' \
+      < stdio.h-t1 > stdio.h-t2
 sed \
       -e 's|@''HAVE__EXIT''@|1|g' \
       -e 's|@''HAVE_ALIGNED_ALLOC''@|1|g' \
@@ -2797,29 +2878,6 @@
       -e 's|@''HAVE_DECL_UNSETENV''@|1|g' \
       < stdlib.h-t1 > stdlib.h-t2
 sed \
-      -e 's|@''REPLACE_PTHREAD_COND_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_CONDATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_CONDATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_WAIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_TIMEDWAIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_SIGNAL''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_BROADCAST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_KEY_CREATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SETSPECIFIC''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_GETSPECIFIC''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_KEY_DELETE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_LOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_TRYLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_DESTROY''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _Noreturn/r ../../lib/_Noreturn.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < pthread.h-t3 > pthread.h-t4
-sed \
       -e 's|@''HAVE_EXPLICIT_BZERO''@|1|g' \
       -e 's|@''HAVE_FFSL''@|1|g' \
       -e 's|@''HAVE_FFSLL''@|1|g' \
@@ -2871,39 +2929,46 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < string.h-t1 > string.h-t2
-sed \
-      -e 's|@''HAVE_DECL_FCLOSEALL''@|1|g' \
-      -e 's|@''HAVE_DECL_FPURGE''@|0|g' \
-      -e 's|@''HAVE_DECL_FSEEKO''@|1|g' \
-      -e 's|@''HAVE_DECL_FTELLO''@|1|g' \
-      -e 's|@''HAVE_DECL_GETDELIM''@|1|g' \
-      -e 's|@''HAVE_DECL_GETLINE''@|1|g' \
-      -e 's|@''HAVE_DECL_GETW''@|1|g' \
-      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_PUTW''@|1|g' \
-      -e 's|@''HAVE_DECL_SNPRINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_VSNPRINTF''@|1|g' \
-      -e 's|@''HAVE_DPRINTF''@|1|g' \
-      -e 's|@''HAVE_FSEEKO''@|1|g' \
-      -e 's|@''HAVE_FTELLO''@|1|g' \
-      -e 's|@''HAVE_PCLOSE''@|1|g' \
-      -e 's|@''HAVE_POPEN''@|1|g' \
-      -e 's|@''HAVE_RENAMEAT''@|1|g' \
-      -e 's|@''HAVE_VASPRINTF''@|1|g' \
-      -e 's|@''HAVE_VDPRINTF''@|1|g' \
-      < stdio.h-t1 > stdio.h-t2
 mv strings.h-t strings.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's/@''HAVE_SYS_FILE_H''@/1/g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_SYS_FILE_H''@|<sys/file.h>|g' \
-      -e 's/@''HAVE_FLOCK''@/1/g' \
-      -e 's/@''GNULIB_FLOCK''@/1/g' \
+sed \
+      -e 's|@''REPLACE_DPRINTF''@|0|g' \
+      -e 's|@''REPLACE_FCLOSE''@|1|g' \
+      -e 's|@''REPLACE_FDOPEN''@|0|g' \
+      -e 's|@''REPLACE_FFLUSH''@|1|g' \
+      -e 's|@''REPLACE_FOPEN''@|1|g' \
+      -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|1|g' \
+      -e 's|@''REPLACE_FPRINTF''@|0|g' \
+      -e 's|@''REPLACE_FPURGE''@|0|g' \
+      -e 's|@''REPLACE_FREOPEN''@|0|g' \
+      -e 's|@''REPLACE_FSEEK''@|1|g' \
+      -e 's|@''REPLACE_FSEEKO''@|1|g' \
+      -e 's|@''REPLACE_FTELL''@|0|g' \
+      -e 's|@''REPLACE_FTELLO''@|0|g' \
+      -e 's|@''REPLACE_GETDELIM''@|0|g' \
+      -e 's|@''REPLACE_GETLINE''@|0|g' \
+      -e 's|@''REPLACE_OBSTACK_PRINTF''@|0|g' \
+      -e 's|@''REPLACE_PERROR''@|0|g' \
+      -e 's|@''REPLACE_POPEN''@|0|g' \
+      -e 's|@''REPLACE_PRINTF''@|0|g' \
+      -e 's|@''REPLACE_REMOVE''@|0|g' \
+      -e 's|@''REPLACE_RENAME''@|0|g' \
+      -e 's|@''REPLACE_RENAMEAT''@|0|g' \
+      -e 's|@''REPLACE_SNPRINTF''@|0|g' \
+      -e 's|@''REPLACE_SPRINTF''@|0|g' \
+      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|0|g' \
+      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|0|g' \
+      -e 's|@''REPLACE_TMPFILE''@|0|g' \
+      -e 's|@''REPLACE_VASPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VDPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VFPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VSNPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VSPRINTF''@|0|g' \
+      -e 's|@''ASM_SYMBOL_PREFIX''@|""|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/sys_file.in.h > sys/file.h-t
+      < stdio.h-t2 > stdio.h-t3
 /usr/bin/mkdir -p 'sys'
 sed \
       -e 's|@''REPLACE__EXIT''@|0|g' \
@@ -2954,48 +3019,25 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < stdlib.h-t2 > stdlib.h-t3
-rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
 rm -f string.h-t1
-sed \
-      -e 's|@''REPLACE_DPRINTF''@|0|g' \
-      -e 's|@''REPLACE_FCLOSE''@|1|g' \
-      -e 's|@''REPLACE_FDOPEN''@|0|g' \
-      -e 's|@''REPLACE_FFLUSH''@|1|g' \
-      -e 's|@''REPLACE_FOPEN''@|1|g' \
-      -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|1|g' \
-      -e 's|@''REPLACE_FPRINTF''@|0|g' \
-      -e 's|@''REPLACE_FPURGE''@|0|g' \
-      -e 's|@''REPLACE_FREOPEN''@|0|g' \
-      -e 's|@''REPLACE_FSEEK''@|1|g' \
-      -e 's|@''REPLACE_FSEEKO''@|1|g' \
-      -e 's|@''REPLACE_FTELL''@|0|g' \
-      -e 's|@''REPLACE_FTELLO''@|0|g' \
-      -e 's|@''REPLACE_GETDELIM''@|0|g' \
-      -e 's|@''REPLACE_GETLINE''@|0|g' \
-      -e 's|@''REPLACE_OBSTACK_PRINTF''@|0|g' \
-      -e 's|@''REPLACE_PERROR''@|0|g' \
-      -e 's|@''REPLACE_POPEN''@|0|g' \
-      -e 's|@''REPLACE_PRINTF''@|0|g' \
-      -e 's|@''REPLACE_REMOVE''@|0|g' \
-      -e 's|@''REPLACE_RENAME''@|0|g' \
-      -e 's|@''REPLACE_RENAMEAT''@|0|g' \
-      -e 's|@''REPLACE_SNPRINTF''@|0|g' \
-      -e 's|@''REPLACE_SPRINTF''@|0|g' \
-      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|0|g' \
-      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|0|g' \
-      -e 's|@''REPLACE_TMPFILE''@|0|g' \
-      -e 's|@''REPLACE_VASPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VDPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VFPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VSNPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VSPRINTF''@|0|g' \
-      -e 's|@''ASM_SYMBOL_PREFIX''@|""|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's/@''HAVE_SYS_FILE_H''@/1/g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_SYS_FILE_H''@|<sys/file.h>|g' \
+      -e 's/@''HAVE_FLOCK''@/1/g' \
+      -e 's/@''GNULIB_FLOCK''@/1/g' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < stdio.h-t2 > stdio.h-t3
+      ../../lib/sys_file.in.h > sys/file.h-t
+rm -f stdio.h-t1 stdio.h-t2
+mv string.h-t2 string.h
+rm -f stdlib.h-t1 stdlib.h-t2
 mv sys/file.h-t sys/file.h
+mv stdio.h-t3 stdio.h
+mv stdlib.h-t3 stdlib.h
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_SYS_IOCTL_H''@|1|g' \
@@ -3010,12 +3052,7 @@
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_ioctl.in.h > sys/ioctl.h-t
-mv pthread.h-t4 pthread.h
-mv string.h-t2 string.h
 /usr/bin/mkdir -p 'sys'
-rm -f stdlib.h-t1 stdlib.h-t2
-rm -f stdio.h-t1 stdio.h-t2
-mv sys/ioctl.h-t sys/ioctl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -3030,10 +3067,9 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_random.in.h > sys/random.h-t
-mv stdlib.h-t3 stdlib.h
-mv stdio.h-t3 stdio.h
-/usr/bin/mkdir -p 'sys'
+mv sys/ioctl.h-t sys/ioctl.h
 mv sys/random.h-t sys/random.h
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -3051,7 +3087,6 @@
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_select.in.h > sys/select.h-t
 /usr/bin/mkdir -p 'sys'
-/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -3086,6 +3121,8 @@
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_socket.in.h > sys/socket.h-t
 mv sys/select.h-t sys/select.h
+mv sys/socket.h-t sys/socket.h
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -3144,7 +3181,6 @@
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_stat.in.h > sys/stat.h-t
 /usr/bin/mkdir -p 'sys'
-mv sys/socket.h-t sys/socket.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_SYS_TIME_H''@/1/g' \
@@ -3162,7 +3198,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_time.in.h > sys/time.h-t
-/usr/bin/mkdir -p 'sys'
+mv sys/stat.h-t sys/stat.h
+mv sys/time.h-t sys/time.h
 /usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -3174,8 +3211,7 @@
       -e 's|@''HAVE_OFF64_T''@|1|g' \
       -e 's|@''WINDOWS_STAT_INODES''@|0|g' \
       ../../lib/sys_types.in.h > sys/types.h-t
-mv sys/stat.h-t sys/stat.h
-mv sys/time.h-t sys/time.h
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -3192,6 +3228,16 @@
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
       -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
       -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_SYS_WAIT_H''@|<sys/wait.h>|g' \
+      -e 's/@''GNULIB_WAITPID''@/1/g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      ../../lib/sys_wait.in.h > sys/wait.h-t
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
       -e 's|@''NEXT_TIME_H''@|<time.h>|g' \
       -e 's/@''GNULIB_CTIME''@/0/g' \
       -e 's/@''GNULIB_LOCALTIME''@/0/g' \
@@ -3239,16 +3285,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/time.in.h > time.h-t
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_SYS_WAIT_H''@|<sys/wait.h>|g' \
-      -e 's/@''GNULIB_WAITPID''@/1/g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/sys_wait.in.h > sys/wait.h-t
+mv sys/wait.h-t sys/wait.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_UCHAR_H''@/1/g' \
@@ -3322,10 +3359,10 @@
       -e 's/@''GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE''@//g' \
       -e 's/@''GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE''@//g' \
       ../../lib/unicase.in.h > unicase.h-t
-mv sys/wait.h-t sys/wait.h
-/usr/bin/mkdir -p 'unicase'
 mv time.h-t time.h
+mv uchar.h-t uchar.h
 mv unicase.h-t unicase.h
+/usr/bin/mkdir -p 'unicase'
 declaration=`grep '^gl_unicase_special_lookup' ../../lib/unicase/special-casing-table.h | sed -e 's/register //g'` && \
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
   -e "/gl_unicase_special_lookup/s/gl_unicase_special_lookup.*/${declaration};/" \
@@ -3371,7 +3408,6 @@
       -e 's/@''GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < ../../lib/unictype.in.h > unictype.h-t1
-mv uchar.h-t uchar.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|0|g' \
       -e 's/@''GNULIB_UNINORM_NFD_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -3411,26 +3447,7 @@
       -e 's/@''GNULIB_FSYNC''@/0/g' \
       -e 's/@''GNULIB_FTRUNCATE''@/0/g' \
       < ../../lib/unistd.in.h > unistd.h-t1
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unistr.h-t' ../../lib/unistr.in.h
-mv uninorm.h-t uninorm.h
-mv unistr.h-t unistr.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unitypes.h-t' ../../lib/unitypes.in.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w uniwidth.h-t' ../../lib/uniwidth.in.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's/@''HAVE_UTIME_H''@/1/g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_UTIME_H''@|<utime.h>|g' \
-      -e 's/@''GNULIB_UTIME''@/1/g' \
-      -e 's/@''GNULIB_MDA_UTIME''@/1/g' \
-      -e 's|@''HAVE_UTIME''@|1|g' \
-      -e 's|@''REPLACE_UTIME''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/utime.in.h > utime.h-t
+mv unicase/special-casing.h-t unicase/special-casing.h
 sed \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -3457,7 +3474,7 @@
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE''@//g' \
       < unictype.h-t1 > unictype.h-t2
-mv unicase/special-casing.h-t unicase/special-casing.h
+mv uninorm.h-t uninorm.h
 sed \
       -e 's/@''GNULIB_GETCWD''@/1/g' \
       -e 's/@''GNULIB_GETDOMAINNAME''@/0/g' \
@@ -3521,9 +3538,7 @@
       -e 's/@''GNULIB_MDA_UNLINK''@/1/g' \
       -e 's/@''GNULIB_MDA_WRITE''@/1/g' \
       < unistd.h-t1 > unistd.h-t2
-mv unitypes.h-t unitypes.h
-mv uniwidth.h-t uniwidth.h
-mv utime.h-t utime.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unistr.h-t' ../../lib/unistr.in.h
 sed \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -3559,96 +3574,8 @@
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < unictype.h-t2 > unictype.h-t3
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''HAVE_FEATURES_H''@|1|g' \
-      -e 's|@''NEXT_WCHAR_H''@|<wchar.h>|g' \
-      -e 's|@''HAVE_WCHAR_H''@|1|g' \
-      -e 's/@''HAVE_CRTDEFS_H''@/0/g' \
-      -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/0/g' \
-      -e 's/@''GNULIB_BTOWC''@/1/g' \
-      -e 's/@''GNULIB_WCTOB''@/0/g' \
-      -e 's/@''GNULIB_MBSINIT''@/1/g' \
-      -e 's/@''GNULIB_MBSZERO''@/1/g' \
-      -e 's/@''GNULIB_MBRTOWC''@/1/g' \
-      -e 's/@''GNULIB_MBRLEN''@/0/g' \
-      -e 's/@''GNULIB_MBSRTOWCS''@/1/g' \
-      -e 's/@''GNULIB_MBSNRTOWCS''@/0/g' \
-      -e 's/@''GNULIB_WCRTOMB''@/1/g' \
-      -e 's/@''GNULIB_WCSRTOMBS''@/0/g' \
-      -e 's/@''GNULIB_WCSNRTOMBS''@/0/g' \
-      -e 's/@''GNULIB_WCWIDTH''@/1/g' \
-      -e 's/@''GNULIB_WMEMCHR''@/1/g' \
-      -e 's/@''GNULIB_WMEMCMP''@/0/g' \
-      -e 's/@''GNULIB_WMEMCPY''@/0/g' \
-      -e 's/@''GNULIB_WMEMMOVE''@/0/g' \
-      -e 's/@''GNULIB_WMEMPCPY''@/1/g' \
-      -e 's/@''GNULIB_WMEMSET''@/0/g' \
-      -e 's/@''GNULIB_WCSLEN''@/0/g' \
-      -e 's/@''GNULIB_WCSNLEN''@/0/g' \
-      -e 's/@''GNULIB_WCSCPY''@/0/g' \
-      -e 's/@''GNULIB_WCPCPY''@/0/g' \
-      -e 's/@''GNULIB_WCSNCPY''@/0/g' \
-      -e 's/@''GNULIB_WCPNCPY''@/0/g' \
-      -e 's/@''GNULIB_WCSCAT''@/0/g' \
-      -e 's/@''GNULIB_WCSNCAT''@/0/g' \
-      -e 's/@''GNULIB_WCSCMP''@/0/g' \
-      -e 's/@''GNULIB_WCSNCMP''@/0/g' \
-      -e 's/@''GNULIB_WCSCASECMP''@/0/g' \
-      -e 's/@''GNULIB_WCSNCASECMP''@/0/g' \
-      -e 's/@''GNULIB_WCSCOLL''@/0/g' \
-      -e 's/@''GNULIB_WCSXFRM''@/0/g' \
-      -e 's/@''GNULIB_WCSDUP''@/0/g' \
-      -e 's/@''GNULIB_WCSCHR''@/0/g' \
-      -e 's/@''GNULIB_WCSRCHR''@/0/g' \
-      -e 's/@''GNULIB_WCSCSPN''@/0/g' \
-      -e 's/@''GNULIB_WCSSPN''@/0/g' \
-      -e 's/@''GNULIB_WCSPBRK''@/0/g' \
-      -e 's/@''GNULIB_WCSSTR''@/0/g' \
-      -e 's/@''GNULIB_WCSTOK''@/0/g' \
-      -e 's/@''GNULIB_WCSWIDTH''@/0/g' \
-      -e 's/@''GNULIB_WCSFTIME''@/0/g' \
-      -e 's/@''GNULIB_WGETCWD''@/0/g' \
-      -e 's/@''GNULIB_MDA_WCSDUP''@/1/g' \
-      -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
-      < ../../lib/wchar.in.h > wchar.h-t1
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's/@''HAVE_WCTYPE_H''@/1/g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_WCTYPE_H''@|<wctype.h>|g' \
-      -e 's/@''HAVE_CRTDEFS_H''@/0/g' \
-      -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/0/g' \
-      -e 's/@''GNULIB_ISWBLANK''@/1/g' \
-      -e 's/@''GNULIB_ISWDIGIT''@/1/g' \
-      -e 's/@''GNULIB_ISWPUNCT''@/1/g' \
-      -e 's/@''GNULIB_ISWXDIGIT''@/1/g' \
-      -e 's/@''GNULIB_WCTYPE''@/1/g' \
-      -e 's/@''GNULIB_ISWCTYPE''@/1/g' \
-      -e 's/@''GNULIB_WCTRANS''@/0/g' \
-      -e 's/@''GNULIB_TOWCTRANS''@/0/g' \
-      -e 's/@''HAVE_ISWBLANK''@/1/g' \
-      -e 's/@''HAVE_ISWCNTRL''@/1/g' \
-      -e 's/@''HAVE_WCTYPE_T''@/1/g' \
-      -e 's/@''HAVE_WCTRANS_T''@/1/g' \
-      -e 's/@''HAVE_WINT_T''@/1/g' \
-      -e 's/@''REPLACE_ISWBLANK''@/0/g' \
-      -e 's/@''REPLACE_ISWDIGIT''@/0/g' \
-      -e 's/@''REPLACE_ISWPUNCT''@/0/g' \
-      -e 's/@''REPLACE_ISWXDIGIT''@/0/g' \
-      -e 's/@''REPLACE_ISWCNTRL''@/0/g' \
-      -e 's/@''REPLACE_TOWLOWER''@/0/g' \
-      -e 's/@''REPLACE_WCTRANS''@/0/g' \
-      -e 's/@''REPLACE_WCTYPE''@/0/g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/wctype.in.h > wctype.h-t
+mv unistr.h-t unistr.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unitypes.h-t' ../../lib/unitypes.in.h
 sed \
       -e 's|@''HAVE_CHOWN''@|1|g' \
       -e 's|@''HAVE_COPY_FILE_RANGE''@|1|g' \
@@ -3698,7 +3625,6 @@
       -e 's|@''HAVE_OS_H''@|0|g' \
       -e 's|@''HAVE_SYS_PARAM_H''@|0|g' \
       < unistd.h-t2 > unistd.h-t3
-mv wctype.h-t wctype.h
 sed \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -3742,51 +3668,9 @@
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < unictype.h-t3 > unictype.h-t4
-sed \
-      -e 's|@''HAVE_WINT_T''@|1|g' \
-      -e 's|@''HAVE_BTOWC''@|1|g' \
-      -e 's|@''HAVE_MBSINIT''@|1|g' \
-      -e 's|@''HAVE_MBRTOWC''@|1|g' \
-      -e 's|@''HAVE_MBRLEN''@|1|g' \
-      -e 's|@''HAVE_MBSRTOWCS''@|1|g' \
-      -e 's|@''HAVE_MBSNRTOWCS''@|1|g' \
-      -e 's|@''HAVE_WCRTOMB''@|1|g' \
-      -e 's|@''HAVE_WCSRTOMBS''@|1|g' \
-      -e 's|@''HAVE_WCSNRTOMBS''@|1|g' \
-      -e 's|@''HAVE_WMEMCHR''@|1|g' \
-      -e 's|@''HAVE_WMEMCMP''@|1|g' \
-      -e 's|@''HAVE_WMEMCPY''@|1|g' \
-      -e 's|@''HAVE_WMEMMOVE''@|1|g' \
-      -e 's|@''HAVE_WMEMPCPY''@|1|g' \
-      -e 's|@''HAVE_WMEMSET''@|1|g' \
-      -e 's|@''HAVE_WCSLEN''@|1|g' \
-      -e 's|@''HAVE_WCSNLEN''@|1|g' \
-      -e 's|@''HAVE_WCSCPY''@|1|g' \
-      -e 's|@''HAVE_WCPCPY''@|1|g' \
-      -e 's|@''HAVE_WCSNCPY''@|1|g' \
-      -e 's|@''HAVE_WCPNCPY''@|1|g' \
-      -e 's|@''HAVE_WCSCAT''@|1|g' \
-      -e 's|@''HAVE_WCSNCAT''@|1|g' \
-      -e 's|@''HAVE_WCSCMP''@|1|g' \
-      -e 's|@''HAVE_WCSNCMP''@|1|g' \
-      -e 's|@''HAVE_WCSCASECMP''@|1|g' \
-      -e 's|@''HAVE_WCSNCASECMP''@|1|g' \
-      -e 's|@''HAVE_WCSCOLL''@|1|g' \
-      -e 's|@''HAVE_WCSXFRM''@|1|g' \
-      -e 's|@''HAVE_WCSDUP''@|1|g' \
-      -e 's|@''HAVE_WCSCHR''@|1|g' \
-      -e 's|@''HAVE_WCSRCHR''@|1|g' \
-      -e 's|@''HAVE_WCSCSPN''@|1|g' \
-      -e 's|@''HAVE_WCSSPN''@|1|g' \
-      -e 's|@''HAVE_WCSPBRK''@|1|g' \
-      -e 's|@''HAVE_WCSSTR''@|1|g' \
-      -e 's|@''HAVE_WCSTOK''@|1|g' \
-      -e 's|@''HAVE_WCSWIDTH''@|1|g' \
-      -e 's|@''HAVE_WCSFTIME''@|1|g' \
-      -e 's|@''HAVE_DECL_WCTOB''@|1|g' \
-      -e 's|@''HAVE_DECL_WCSDUP''@|1|g' \
-      -e 's|@''HAVE_DECL_WCWIDTH''@|1|g' \
-      < wchar.h-t1 > wchar.h-t2
+mv unitypes.h-t unitypes.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w uniwidth.h-t' ../../lib/uniwidth.in.h
+mv uniwidth.h-t uniwidth.h
 sed \
       -e 's|@''REPLACE_ACCESS''@|0|g' \
       -e 's|@''REPLACE_CHOWN''@|0|g' \
@@ -3846,6 +3730,162 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < unistd.h-t3 > unistd.h-t4
+rm -f unictype.h-t1 unictype.h-t2 unictype.h-t3
+mv unictype.h-t4 unictype.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's/@''HAVE_UTIME_H''@/1/g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_UTIME_H''@|<utime.h>|g' \
+      -e 's/@''GNULIB_UTIME''@/1/g' \
+      -e 's/@''GNULIB_MDA_UTIME''@/1/g' \
+      -e 's|@''HAVE_UTIME''@|1|g' \
+      -e 's|@''REPLACE_UTIME''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      ../../lib/utime.in.h > utime.h-t
+rm -f unistd.h-t1 unistd.h-t2 unistd.h-t3
+mv unistd.h-t4 unistd.h
+mv utime.h-t utime.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''HAVE_FEATURES_H''@|1|g' \
+      -e 's|@''NEXT_WCHAR_H''@|<wchar.h>|g' \
+      -e 's|@''HAVE_WCHAR_H''@|1|g' \
+      -e 's/@''HAVE_CRTDEFS_H''@/0/g' \
+      -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/0/g' \
+      -e 's/@''GNULIB_BTOWC''@/1/g' \
+      -e 's/@''GNULIB_WCTOB''@/0/g' \
+      -e 's/@''GNULIB_MBSINIT''@/1/g' \
+      -e 's/@''GNULIB_MBSZERO''@/1/g' \
+      -e 's/@''GNULIB_MBRTOWC''@/1/g' \
+      -e 's/@''GNULIB_MBRLEN''@/0/g' \
+      -e 's/@''GNULIB_MBSRTOWCS''@/1/g' \
+      -e 's/@''GNULIB_MBSNRTOWCS''@/0/g' \
+      -e 's/@''GNULIB_WCRTOMB''@/1/g' \
+      -e 's/@''GNULIB_WCSRTOMBS''@/0/g' \
+      -e 's/@''GNULIB_WCSNRTOMBS''@/0/g' \
+      -e 's/@''GNULIB_WCWIDTH''@/1/g' \
+      -e 's/@''GNULIB_WMEMCHR''@/1/g' \
+      -e 's/@''GNULIB_WMEMCMP''@/0/g' \
+      -e 's/@''GNULIB_WMEMCPY''@/0/g' \
+      -e 's/@''GNULIB_WMEMMOVE''@/0/g' \
+      -e 's/@''GNULIB_WMEMPCPY''@/1/g' \
+      -e 's/@''GNULIB_WMEMSET''@/0/g' \
+      -e 's/@''GNULIB_WCSLEN''@/0/g' \
+      -e 's/@''GNULIB_WCSNLEN''@/0/g' \
+      -e 's/@''GNULIB_WCSCPY''@/0/g' \
+      -e 's/@''GNULIB_WCPCPY''@/0/g' \
+      -e 's/@''GNULIB_WCSNCPY''@/0/g' \
+      -e 's/@''GNULIB_WCPNCPY''@/0/g' \
+      -e 's/@''GNULIB_WCSCAT''@/0/g' \
+      -e 's/@''GNULIB_WCSNCAT''@/0/g' \
+      -e 's/@''GNULIB_WCSCMP''@/0/g' \
+      -e 's/@''GNULIB_WCSNCMP''@/0/g' \
+      -e 's/@''GNULIB_WCSCASECMP''@/0/g' \
+      -e 's/@''GNULIB_WCSNCASECMP''@/0/g' \
+      -e 's/@''GNULIB_WCSCOLL''@/0/g' \
+      -e 's/@''GNULIB_WCSXFRM''@/0/g' \
+      -e 's/@''GNULIB_WCSDUP''@/0/g' \
+      -e 's/@''GNULIB_WCSCHR''@/0/g' \
+      -e 's/@''GNULIB_WCSRCHR''@/0/g' \
+      -e 's/@''GNULIB_WCSCSPN''@/0/g' \
+      -e 's/@''GNULIB_WCSSPN''@/0/g' \
+      -e 's/@''GNULIB_WCSPBRK''@/0/g' \
+      -e 's/@''GNULIB_WCSSTR''@/0/g' \
+      -e 's/@''GNULIB_WCSTOK''@/0/g' \
+      -e 's/@''GNULIB_WCSWIDTH''@/0/g' \
+      -e 's/@''GNULIB_WCSFTIME''@/0/g' \
+      -e 's/@''GNULIB_WGETCWD''@/0/g' \
+      -e 's/@''GNULIB_MDA_WCSDUP''@/1/g' \
+      -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
+      < ../../lib/wchar.in.h > wchar.h-t1
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's/@''HAVE_WCTYPE_H''@/1/g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_WCTYPE_H''@|<wctype.h>|g' \
+      -e 's/@''HAVE_CRTDEFS_H''@/0/g' \
+      -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/0/g' \
+      -e 's/@''GNULIB_ISWBLANK''@/1/g' \
+      -e 's/@''GNULIB_ISWDIGIT''@/1/g' \
+      -e 's/@''GNULIB_ISWPUNCT''@/1/g' \
+      -e 's/@''GNULIB_ISWXDIGIT''@/1/g' \
+      -e 's/@''GNULIB_WCTYPE''@/1/g' \
+      -e 's/@''GNULIB_ISWCTYPE''@/1/g' \
+      -e 's/@''GNULIB_WCTRANS''@/0/g' \
+      -e 's/@''GNULIB_TOWCTRANS''@/0/g' \
+      -e 's/@''HAVE_ISWBLANK''@/1/g' \
+      -e 's/@''HAVE_ISWCNTRL''@/1/g' \
+      -e 's/@''HAVE_WCTYPE_T''@/1/g' \
+      -e 's/@''HAVE_WCTRANS_T''@/1/g' \
+      -e 's/@''HAVE_WINT_T''@/1/g' \
+      -e 's/@''REPLACE_ISWBLANK''@/0/g' \
+      -e 's/@''REPLACE_ISWDIGIT''@/0/g' \
+      -e 's/@''REPLACE_ISWPUNCT''@/0/g' \
+      -e 's/@''REPLACE_ISWXDIGIT''@/0/g' \
+      -e 's/@''REPLACE_ISWCNTRL''@/0/g' \
+      -e 's/@''REPLACE_TOWLOWER''@/0/g' \
+      -e 's/@''REPLACE_WCTRANS''@/0/g' \
+      -e 's/@''REPLACE_WCTYPE''@/0/g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      ../../lib/wctype.in.h > wctype.h-t
+mv wctype.h-t wctype.h
+sed \
+      -e 's|@''HAVE_WINT_T''@|1|g' \
+      -e 's|@''HAVE_BTOWC''@|1|g' \
+      -e 's|@''HAVE_MBSINIT''@|1|g' \
+      -e 's|@''HAVE_MBRTOWC''@|1|g' \
+      -e 's|@''HAVE_MBRLEN''@|1|g' \
+      -e 's|@''HAVE_MBSRTOWCS''@|1|g' \
+      -e 's|@''HAVE_MBSNRTOWCS''@|1|g' \
+      -e 's|@''HAVE_WCRTOMB''@|1|g' \
+      -e 's|@''HAVE_WCSRTOMBS''@|1|g' \
+      -e 's|@''HAVE_WCSNRTOMBS''@|1|g' \
+      -e 's|@''HAVE_WMEMCHR''@|1|g' \
+      -e 's|@''HAVE_WMEMCMP''@|1|g' \
+      -e 's|@''HAVE_WMEMCPY''@|1|g' \
+      -e 's|@''HAVE_WMEMMOVE''@|1|g' \
+      -e 's|@''HAVE_WMEMPCPY''@|1|g' \
+      -e 's|@''HAVE_WMEMSET''@|1|g' \
+      -e 's|@''HAVE_WCSLEN''@|1|g' \
+      -e 's|@''HAVE_WCSNLEN''@|1|g' \
+      -e 's|@''HAVE_WCSCPY''@|1|g' \
+      -e 's|@''HAVE_WCPCPY''@|1|g' \
+      -e 's|@''HAVE_WCSNCPY''@|1|g' \
+      -e 's|@''HAVE_WCPNCPY''@|1|g' \
+      -e 's|@''HAVE_WCSCAT''@|1|g' \
+      -e 's|@''HAVE_WCSNCAT''@|1|g' \
+      -e 's|@''HAVE_WCSCMP''@|1|g' \
+      -e 's|@''HAVE_WCSNCMP''@|1|g' \
+      -e 's|@''HAVE_WCSCASECMP''@|1|g' \
+      -e 's|@''HAVE_WCSNCASECMP''@|1|g' \
+      -e 's|@''HAVE_WCSCOLL''@|1|g' \
+      -e 's|@''HAVE_WCSXFRM''@|1|g' \
+      -e 's|@''HAVE_WCSDUP''@|1|g' \
+      -e 's|@''HAVE_WCSCHR''@|1|g' \
+      -e 's|@''HAVE_WCSRCHR''@|1|g' \
+      -e 's|@''HAVE_WCSCSPN''@|1|g' \
+      -e 's|@''HAVE_WCSSPN''@|1|g' \
+      -e 's|@''HAVE_WCSPBRK''@|1|g' \
+      -e 's|@''HAVE_WCSSTR''@|1|g' \
+      -e 's|@''HAVE_WCSTOK''@|1|g' \
+      -e 's|@''HAVE_WCSWIDTH''@|1|g' \
+      -e 's|@''HAVE_WCSFTIME''@|1|g' \
+      -e 's|@''HAVE_DECL_WCTOB''@|1|g' \
+      -e 's|@''HAVE_DECL_WCSDUP''@|1|g' \
+      -e 's|@''HAVE_DECL_WCWIDTH''@|1|g' \
+      < wchar.h-t1 > wchar.h-t2
 sed \
       -e 's|@''REPLACE_MBSTATE_T''@|0|g' \
       -e 's|@''REPLACE_BTOWC''@|1|g' \
@@ -3873,12 +3913,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < wchar.h-t2 > wchar.h-t3
-rm -f unictype.h-t1 unictype.h-t2 unictype.h-t3
-mv unictype.h-t4 unictype.h
 rm -f wchar.h-t1 wchar.h-t2
 mv wchar.h-t3 wchar.h
-rm -f unistd.h-t1 unistd.h-t2 unistd.h-t3
-mv unistd.h-t4 unistd.h
 make  all-am
 make[5]: Entering directory '/build/reproducible-path/wget-1.25.0/build/lib'
 gcc -DHAVE_CONFIG_H -I. -I../../lib -I../src  -DDEFAULT_TEXT_DOMAIN=\"wget-gnulib\" -Wdate-time -D_FORTIFY_SOURCE=2   -Wno-cast-qual -Wno-conversion -Wno-float-equal -Wno-sign-compare -Wno-undef -Wno-unused-function -Wno-unused-parameter -Wno-float-conversion -Wimplicit-fallthrough -Wno-pedantic -Wno-sign-conversion -Wno-type-limits -Wno-unused-const-variable -Wno-unsuffixed-float-constants -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libgnu_a-arpa_inet.o `test -f 'arpa_inet.c' || echo '../../lib/'`arpa_inet.c
@@ -4089,8 +4125,8 @@
       |        ^~~
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o http.o ../../src/http.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o init.o ../../src/init.c
-../../src/cookies.c: In function 'cookie_header':
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o log.o ../../src/log.c
+../../src/cookies.c: In function 'cookie_header':
 ../../src/cookies.c:1157:12: warning: argument 1 value '18446744073709551615' exceeds maximum object size 9223372036854775807 [-Walloc-size-larger-than=]
  1157 |   result = xmalloc (result_size);
       |            ^~~~~~~~~~~~~~~~~~~~~
@@ -4138,13 +4174,13 @@
 restore=: && backupdir=".am$$" && \
 am__cwd=`pwd` && CDPATH="${ZSH_VERSION+.}:" && cd ../../doc && \
 rm -rf $backupdir && mkdir $backupdir && \
-if (/bin/bash '/build/reproducible-path/wget-1.25.0/build-aux/missing' makeinfo --version) >/dev/null 2>&1; then \
+if (/bin/sh '/build/reproducible-path/wget-1.25.0/build-aux/missing' makeinfo --version) >/dev/null 2>&1; then \
   for f in ../../doc/wget.info ../../doc/wget.info-[0-9] ../../doc/wget.info-[0-9][0-9] ../../doc/wget.i[0-9] ../../doc/wget.i[0-9][0-9]; do \
     if test -f $f; then mv $f $backupdir; restore=mv; else :; fi; \
   done; \
 else :; fi && \
 cd "$am__cwd"; \
-if /bin/bash '/build/reproducible-path/wget-1.25.0/build-aux/missing' makeinfo   -I ../../doc \
+if /bin/sh '/build/reproducible-path/wget-1.25.0/build-aux/missing' makeinfo   -I ../../doc \
  -o ../../doc/wget.info ../../doc/wget.texi; \
 then \
   rc=0; \
@@ -4232,129 +4268,129 @@
 test ! -f ../../po/wget.pot || \
   test -z "../../po/be.gmo ../../po/bg.gmo ../../po/ca.gmo ../../po/cs.gmo ../../po/da.gmo ../../po/de.gmo ../../po/el.gmo ../../po/en_GB.gmo ../../po/eo.gmo ../../po/es.gmo ../../po/et.gmo ../../po/eu.gmo ../../po/fi.gmo ../../po/fr.gmo ../../po/ga.gmo ../../po/gl.gmo ../../po/he.gmo ../../po/hr.gmo ../../po/hu.gmo ../../po/id.gmo ../../po/it.gmo ../../po/ja.gmo ../../po/ka.gmo ../../po/ko.gmo ../../po/lt.gmo ../../po/nb.gmo ../../po/nl.gmo ../../po/pl.gmo ../../po/pt.gmo ../../po/pt_BR.gmo ../../po/ro.gmo ../../po/ru.gmo ../../po/sk.gmo ../../po/sl.gmo ../../po/sr.gmo ../../po/sv.gmo ../../po/tr.gmo ../../po/uk.gmo ../../po/vi.gmo ../../po/zh_CN.gmo ../../po/zh_TW.gmo" || make ../../po/be.gmo ../../po/bg.gmo ../../po/ca.gmo ../../po/cs.gmo ../../po/da.gmo ../../po/de.gmo ../../po/el.gmo ../../po/en_GB.gmo ../../po/eo.gmo ../../po/es.gmo ../../po/et.gmo ../../po/eu.gmo ../../po/fi.gmo ../../po/fr.gmo ../../po/ga.gmo ../../po/gl.gmo ../../po/he.gmo ../../po/hr.gmo ../../po/hu.gmo ../../po/id.gmo ../../po/it.gmo ../../po/ja.gmo ../../po/ka.gmo ../../po/ko.gmo ../../po/lt.gmo ../../po/nb.gmo ../../po/nl.gmo ../../po/pl.gmo ../../po/pt.gmo ../../po/pt_BR.gmo ../../po/ro.gmo ../../po/ru.gmo ../../po/sk.gmo ../../po/sl.gmo ../../po/sr.gmo ../../po/sv.gmo ../../po/tr.gmo ../../po/uk.gmo ../../po/vi.gmo ../../po/zh_CN.gmo ../../po/zh_TW.gmo
 make[5]: Entering directory '/build/reproducible-path/wget-1.25.0/build/po'
-cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=bg --previous bg.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=be --previous be.po wget.pot
-cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=da --previous da.po wget.pot
+cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=bg --previous bg.po wget.pot
+cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ca --previous ca.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=cs --previous cs.po wget.pot
+cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=da --previous da.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=de --previous de.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=el --previous el.po wget.pot
-cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ca --previous ca.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=en_GB --previous en_GB.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=eo --previous eo.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=es --previous es.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=et --previous et.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=eu --previous eu.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=fi --previous fi.po wget.pot
-cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ga --previous ga.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=fr --previous fr.po wget.pot
+cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ga --previous ga.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=gl --previous gl.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=he --previous he.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=hr --previous hr.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=hu --previous hu.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=id --previous id.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=it --previous it.po wget.pot
-cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ka --previous ka.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ja --previous ja.po wget.pot
-cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ko --previous ko.po wget.pot
+cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ka --previous ka.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=lt --previous lt.po wget.pot
+cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ko --previous ko.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=nb --previous nb.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=nl --previous nl.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=pl --previous pl.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=pt --previous pt.po wget.pot
-cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ro --previous ro.po wget.pot
-cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ru --previous ru.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=pt_BR --previous pt_BR.po wget.pot
-cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=sl --previous sl.po wget.pot
+cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ro --previous ro.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=sk --previous sk.po wget.pot
+cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=sl --previous sl.po wget.pot
+cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=ru --previous ru.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=sr --previous sr.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=sv --previous sv.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=tr --previous tr.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=uk --previous uk.po wget.pot
-cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=zh_CN --previous zh_CN.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=vi --previous vi.po wget.pot
+cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=zh_CN --previous zh_CN.po wget.pot
 cd ../../po && /usr/bin/msgmerge --update --quiet  --lang=zh_TW --previous zh_TW.po wget.pot
 cd ../../po && rm -f be.gmo && /usr/bin/msgmerge --for-msgfmt -o be.1po be.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o be.gmo be.1po && rm -f be.1po
-cd ../../po && rm -f ca.gmo && /usr/bin/msgmerge --for-msgfmt -o ca.1po ca.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ca.gmo ca.1po && rm -f ca.1po
 cd ../../po && rm -f bg.gmo && /usr/bin/msgmerge --for-msgfmt -o bg.1po bg.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o bg.gmo bg.1po && rm -f bg.1po
+cd ../../po && rm -f ca.gmo && /usr/bin/msgmerge --for-msgfmt -o ca.1po ca.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ca.gmo ca.1po && rm -f ca.1po
 cd ../../po && rm -f cs.gmo && /usr/bin/msgmerge --for-msgfmt -o cs.1po cs.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o cs.gmo cs.1po && rm -f cs.1po
 cd ../../po && rm -f da.gmo && /usr/bin/msgmerge --for-msgfmt -o da.1po da.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o da.gmo da.1po && rm -f da.1po
 cd ../../po && rm -f de.gmo && /usr/bin/msgmerge --for-msgfmt -o de.1po de.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o de.gmo de.1po && rm -f de.1po
 cd ../../po && rm -f el.gmo && /usr/bin/msgmerge --for-msgfmt -o el.1po el.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o el.gmo el.1po && rm -f el.1po
 cd ../../po && rm -f en_GB.gmo && /usr/bin/msgmerge --for-msgfmt -o en_GB.1po en_GB.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o en_GB.gmo en_GB.1po && rm -f en_GB.1po
-ca.1po: 311 translated messages.
-bg.1po: 93 translated messages.
-cd ../../po && rm -f es.gmo && /usr/bin/msgmerge --for-msgfmt -o es.1po es.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o es.gmo es.1po && rm -f es.1po
 cd ../../po && rm -f eo.gmo && /usr/bin/msgmerge --for-msgfmt -o eo.1po eo.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o eo.gmo eo.1po && rm -f eo.1po
-cd ../../po && rm -f eu.gmo && /usr/bin/msgmerge --for-msgfmt -o eu.1po eu.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o eu.gmo eu.1po && rm -f eu.1po
-be.1po: 599 translated messages.
-de.1po: 599 translated messages.
 cd ../../po && rm -f et.gmo && /usr/bin/msgmerge --for-msgfmt -o et.1po et.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o et.gmo et.1po && rm -f et.1po
-el.1po: 93 translated messages.
-cd ../../po && rm -f fr.gmo && /usr/bin/msgmerge --for-msgfmt -o fr.1po fr.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o fr.gmo fr.1po && rm -f fr.1po
-da.1po: 599 translated messages.
+cd ../../po && rm -f es.gmo && /usr/bin/msgmerge --for-msgfmt -o es.1po es.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o es.gmo es.1po && rm -f es.1po
+bg.1po: 93 translated messages.
+ca.1po: 311 translated messages.
+be.1po: 599 translated messages.
+cd ../../po && rm -f eu.gmo && /usr/bin/msgmerge --for-msgfmt -o eu.1po eu.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o eu.gmo eu.1po && rm -f eu.1po
 en_GB.1po: 103 translated messages.
-cs.1po: 599 translated messages.
+cs.1po: el.1po: 599 translated messages.
+93 translated messages.
 cd ../../po && rm -f fi.gmo && /usr/bin/msgmerge --for-msgfmt -o fi.1po fi.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o fi.gmo fi.1po && rm -f fi.1po
+cd ../../po && rm -f fr.gmo && /usr/bin/msgmerge --for-msgfmt -o fr.1po fr.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o fr.gmo fr.1po && rm -f fr.1po
+da.1po: 599 translated messages.
+de.1po: 599 translated messages.
 cd ../../po && rm -f ga.gmo && /usr/bin/msgmerge --for-msgfmt -o ga.1po ga.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ga.gmo ga.1po && rm -f ga.1po
-cd ../../po && rm -f gl.gmo && /usr/bin/msgmerge --for-msgfmt -o gl.1po gl.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o gl.gmo gl.1po && rm -f gl.1po
-cd ../../po && rm -f he.gmo && /usr/bin/msgmerge --for-msgfmt -o he.1po he.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o he.gmo he.1po && rm -f he.1po
 eu.1po: 118 translated messages.
+cd ../../po && rm -f he.gmo && /usr/bin/msgmerge --for-msgfmt -o he.1po he.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o he.gmo he.1po && rm -f he.1po
+cd ../../po && rm -f gl.gmo && /usr/bin/msgmerge --for-msgfmt -o gl.1po gl.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o gl.gmo gl.1po && rm -f gl.1po
+eo.1po: et.1po: 599 translated messages.
+594 translated messages.
 cd ../../po && rm -f hr.gmo && /usr/bin/msgmerge --for-msgfmt -o hr.1po hr.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o hr.gmo hr.1po && rm -f hr.1po
-eo.1po: 594 translated messages.
 cd ../../po && rm -f hu.gmo && /usr/bin/msgmerge --for-msgfmt -o hu.1po hu.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o hu.gmo hu.1po && rm -f hu.1po
-es.1po: 599 translated messages.
-et.1po: 599 translated messages.
-fi.1po: 521 translated messages.
 cd ../../po && rm -f id.gmo && /usr/bin/msgmerge --for-msgfmt -o id.1po id.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o id.gmo id.1po && rm -f id.1po
+es.1po: 599 translated messages.
 cd ../../po && rm -f it.gmo && /usr/bin/msgmerge --for-msgfmt -o it.1po it.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o it.gmo it.1po && rm -f it.1po
-cd ../../po && rm -f ka.gmo && /usr/bin/msgmerge --for-msgfmt -o ka.1po ka.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ka.gmo ka.1po && rm -f ka.1po
+he.1po: fi.1po: 521 translated messages.
 cd ../../po && rm -f ja.gmo && /usr/bin/msgmerge --for-msgfmt -o ja.1po ja.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ja.gmo ja.1po && rm -f ja.1po
+85 translated messages.
+cd ../../po && rm -f ka.gmo && /usr/bin/msgmerge --for-msgfmt -o ka.1po ka.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ka.gmo ka.1po && rm -f ka.1po
+cd ../../po && rm -f ko.gmo && /usr/bin/msgmerge --for-msgfmt -o ko.1po ko.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ko.gmo ko.1po && rm -f ko.1po
+fr.1po: 594 translated messages.
 gl.1po: 226 translated messages.
-fr.1po: cd ../../po && rm -f lt.gmo && /usr/bin/msgmerge --for-msgfmt -o lt.1po lt.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o lt.gmo lt.1po && rm -f lt.1po
-594 translated messages.
-he.1po: 85 translated messages.
+cd ../../po && rm -f lt.gmo && /usr/bin/msgmerge --for-msgfmt -o lt.1po lt.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o lt.gmo lt.1po && rm -f lt.1po
 ga.1po: 552 translated messages.
-cd ../../po && rm -f ko.gmo && /usr/bin/msgmerge --for-msgfmt -o ko.1po ko.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ko.gmo ko.1po && rm -f ko.1po
-hr.1po: hu.1po: 594 translated messages.
-599 translated messages.
+ka.1po: 97 translated messages.
+cd ../../po && rm -f nb.gmo && /usr/bin/msgmerge --for-msgfmt -o nb.1po nb.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o nb.gmo nb.1po && rm -f nb.1po
+hr.1po: 599 translated messages.
 cd ../../po && rm -f nl.gmo && /usr/bin/msgmerge --for-msgfmt -o nl.1po nl.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o nl.gmo nl.1po && rm -f nl.1po
+hu.1po: id.1po: 594 translated messages.
 cd ../../po && rm -f pl.gmo && /usr/bin/msgmerge --for-msgfmt -o pl.1po pl.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o pl.gmo pl.1po && rm -f pl.1po
-cd ../../po && rm -f nb.gmo && /usr/bin/msgmerge --for-msgfmt -o nb.1po nb.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o nb.gmo nb.1po && rm -f nb.1po
+599 translated messages.
+lt.1po: 165 translated messages.
 it.1po: 588 translated messages.
 cd ../../po && rm -f pt.gmo && /usr/bin/msgmerge --for-msgfmt -o pt.1po pt.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o pt.gmo pt.1po && rm -f pt.1po
-ka.1po: 97 translated messages.
-lt.1po: 165 translated messages.
-id.1po: 599 translated messages.
 cd ../../po && rm -f pt_BR.gmo && /usr/bin/msgmerge --for-msgfmt -o pt_BR.1po pt_BR.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o pt_BR.gmo pt_BR.1po && rm -f pt_BR.1po
-cd ../../po && rm -f ro.gmo && /usr/bin/msgmerge --for-msgfmt -o ro.1po ro.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ro.gmo ro.1po && rm -f ro.1po
-cd ../../po && rm -f ru.gmo && /usr/bin/msgmerge --for-msgfmt -o ru.1po ru.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ru.gmo ru.1po && rm -f ru.1po
 ja.1po: 599 translated messages.
-ko.1po: cd ../../po && rm -f sk.gmo && /usr/bin/msgmerge --for-msgfmt -o sk.1po sk.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o sk.gmo sk.1po && rm -f sk.1po
+ko.1po: cd ../../po && rm -f ro.gmo && /usr/bin/msgmerge --for-msgfmt -o ro.1po ro.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ro.gmo ro.1po && rm -f ro.1po
+cd ../../po && rm -f ru.gmo && /usr/bin/msgmerge --for-msgfmt -o ru.1po ru.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o ru.gmo ru.1po && rm -f ru.1po
 599 translated messages.
-nb.1po: 599 translated messages.
+cd ../../po && rm -f sk.gmo && /usr/bin/msgmerge --for-msgfmt -o sk.1po sk.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o sk.gmo sk.1po && rm -f sk.1po
 cd ../../po && rm -f sl.gmo && /usr/bin/msgmerge --for-msgfmt -o sl.1po sl.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o sl.gmo sl.1po && rm -f sl.1po
-nl.1po: pt.1po: 593 translated messages.
-515 translated messages.
+nl.1po: 515 translated messages.
+cd ../../po && rm -f sr.gmo && /usr/bin/msgmerge --for-msgfmt -o sr.1po sr.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o sr.gmo sr.1po && rm -f sr.1po
 cd ../../po && rm -f sv.gmo && /usr/bin/msgmerge --for-msgfmt -o sv.1po sv.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o sv.gmo sv.1po && rm -f sv.1po
+nb.1po: 599 translated messages.
+cd ../../po && rm -f tr.gmo && /usr/bin/msgmerge --for-msgfmt -o tr.1po tr.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o tr.gmo tr.1po && rm -f tr.1po
 pl.1po: 599 translated messages.
-cd ../../po && rm -f sr.gmo && /usr/bin/msgmerge --for-msgfmt -o sr.1po sr.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o sr.gmo sr.1po && rm -f sr.1po
 cd ../../po && rm -f uk.gmo && /usr/bin/msgmerge --for-msgfmt -o uk.1po uk.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o uk.gmo uk.1po && rm -f uk.1po
-cd ../../po && rm -f tr.gmo && /usr/bin/msgmerge --for-msgfmt -o tr.1po tr.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o tr.gmo tr.1po && rm -f tr.1po
-pt_BR.1po: 599 translated messages.
+pt.1po: 593 translated messages.
+ro.1po: 599 translated messages.
+cd ../../po && rm -f vi.gmo && /usr/bin/msgmerge --for-msgfmt -o vi.1po vi.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o vi.gmo vi.1po && rm -f vi.1po
 ru.1po: 599 translated messages.
-sl.1po: 246 translated messages.
+sl.1po: sk.1po: pt_BR.1po: 246 translated messages.
+599 translated messages.
+599 translated messages.
 cd ../../po && rm -f zh_CN.gmo && /usr/bin/msgmerge --for-msgfmt -o zh_CN.1po zh_CN.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o zh_CN.gmo zh_CN.1po && rm -f zh_CN.1po
 cd ../../po && rm -f zh_TW.gmo && /usr/bin/msgmerge --for-msgfmt -o zh_TW.1po zh_TW.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o zh_TW.gmo zh_TW.1po && rm -f zh_TW.1po
-ro.1po: 599 translated messages.
-cd ../../po && rm -f vi.gmo && /usr/bin/msgmerge --for-msgfmt -o vi.1po vi.po wget.pot && /usr/bin/msgfmt -c --statistics --verbose -o vi.gmo vi.1po && rm -f vi.1po
-sk.1po: 599 translated messages.
+sv.1po: tr.1po: 599 translated messages.
+555 translated messages.
 sr.1po: 599 translated messages.
-sv.1po: 599 translated messages.
+vi.1po: 599 translated messages.
 uk.1po: 599 translated messages.
-tr.1po: 555 translated messages.
 zh_CN.1po: 599 translated messages.
-zh_TW.1po: vi.1po: 599 translated messages.
-599 translated messages.
+zh_TW.1po: 599 translated messages.
 make[5]: Leaving directory '/build/reproducible-path/wget-1.25.0/build/po'
 touch ../../po/stamp-po
 make[4]: Leaving directory '/build/reproducible-path/wget-1.25.0/build/po'
@@ -4396,17 +4432,6 @@
   -e 's|@''HAVE_ALLOCA_H''@|1|g' \
   ../../lib/alloca.in.h > alloca.h-t
 /usr/bin/mkdir -p 'arpa'
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_CTYPE_H''@|<ctype.h>|g' \
-      -e 's/@''GNULIB_ISBLANK''@/1/g' \
-      -e 's/@''HAVE_ISBLANK''@/1/g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/ctype.in.h > ctype.h-t
 mv alloca.h-t alloca.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -4431,7 +4456,18 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/arpa_inet.in.h > arpa/inet.h-t
-mv ctype.h-t ctype.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_CTYPE_H''@|<ctype.h>|g' \
+      -e 's/@''GNULIB_ISBLANK''@/1/g' \
+      -e 's/@''HAVE_ISBLANK''@/1/g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      ../../lib/ctype.in.h > ctype.h-t
+mv arpa/inet.h-t arpa/inet.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_DIRENT_H''@|1|g' \
@@ -4467,6 +4503,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/dirent.in.h > dirent.h-t
+mv ctype.h-t ctype.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_ERROR_H''@|1|g' \
@@ -4478,7 +4515,6 @@
       -e 's|@''REPLACE_ERROR_AT_LINE''@|0|g' \
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       ../../lib/error.in.h > error.h-t
-mv arpa/inet.h-t arpa/inet.h
 mv dirent.h-t dirent.h
 mv error.h-t error.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
@@ -4512,10 +4548,15 @@
       -e 's|@''NEXT_FLOAT_H''@|<float.h>|g' \
       -e 's|@''REPLACE_ITOLD''@|0|g' \
       ../../lib/float.in.h > float.h-t
-/usr/bin/mkdir -p 'malloc'
+mv fcntl.h-t fcntl.h
 /usr/bin/mkdir -p 'malloc'
 mv float.h-t float.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+  -e '/libc_hidden_proto/d' \
+  ../../lib/malloc/dynarray.h > malloc/dynarray.gl.h-t
+/usr/bin/mkdir -p 'malloc'
+mv malloc/dynarray.gl.h-t malloc/dynarray.gl.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \
       -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \
       -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \
@@ -4525,6 +4566,13 @@
       ../../lib/malloc/dynarray-skeleton.c > malloc/dynarray-skeleton.gl.h-t
 /usr/bin/mkdir -p 'malloc'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \
+      -e 's|__glibc_likely|_GL_LIKELY|g' \
+      -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \
+      -e '/libc_hidden_proto/d' \
+      ../../lib/malloc/scratch_buffer.h > malloc/scratch_buffer.gl.h-t
+mv malloc/dynarray-skeleton.gl.h-t malloc/dynarray-skeleton.gl.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's/@''HAVE_INTTYPES_H''@/1/g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
       -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
@@ -4553,19 +4601,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/inttypes.in.h > inttypes.h-t
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-  -e '/libc_hidden_proto/d' \
-  ../../lib/malloc/dynarray.h > malloc/dynarray.gl.h-t
-mv malloc/dynarray-skeleton.gl.h-t malloc/dynarray-skeleton.gl.h
-mv fcntl.h-t fcntl.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \
-      -e 's|__glibc_likely|_GL_LIKELY|g' \
-      -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \
-      -e '/libc_hidden_proto/d' \
-      ../../lib/malloc/scratch_buffer.h > malloc/scratch_buffer.gl.h-t
-mv inttypes.h-t inttypes.h
-mv malloc/dynarray.gl.h-t malloc/dynarray.gl.h
 mv malloc/scratch_buffer.gl.h-t malloc/scratch_buffer.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -4592,6 +4627,9 @@
       -e 's|@''PRAGMA_COLUMNS''@||g' \
       -e 's|@''NEXT_LIMITS_H''@|<limits.h>|g' \
       ../../lib/limits.in.h > limits.h-t
+mv inttypes.h-t inttypes.h
+mv langinfo.h-t langinfo.h
+mv limits.h-t limits.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -4637,10 +4675,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/netdb.in.h > netdb.h-t
-mv langinfo.h-t langinfo.h
-mv limits.h-t limits.h
-mv locale.h-t locale.h
-mv netdb.h-t netdb.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_PTHREAD_H''@|1|g' \
@@ -4673,6 +4707,51 @@
       -e 's|@''HAVE_PTHREAD_JOIN''@|1|g' \
       -e 's|@''HAVE_PTHREAD_EXIT''@|1|g' \
       < ../../lib/pthread.in.h > pthread.h-t1
+mv locale.h-t locale.h
+mv netdb.h-t netdb.h
+sed \
+      -e 's|@''HAVE_PTHREAD_ONCE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETTYPE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETTYPE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETROBUST''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETROBUST''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_LOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_TRYLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_TIMEDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_UNLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_RDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_WRLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYRDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYWRLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_UNLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_CONDATTR_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_CONDATTR_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_WAIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_TIMEDWAIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_SIGNAL''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_BROADCAST''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_KEY_CREATE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SETSPECIFIC''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_GETSPECIFIC''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_KEY_DELETE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_LOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_TRYLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_UNLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_DESTROY''@|1|g' \
+      < pthread.h-t1 > pthread.h-t2
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_SCHED_H''@|1|g' \
@@ -4717,6 +4796,43 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/signal.in.h > signal.h-t
+sed \
+      -e 's|@''REPLACE_PTHREAD_CREATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_GETDETACHSTATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_SETDETACHSTATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SELF''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_EQUAL''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_DETACH''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_JOIN''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_EXIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ONCE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETTYPE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETTYPE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETROBUST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETROBUST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_LOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_TRYLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_TIMEDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_RDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_WRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYRDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYWRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|0|g' \
+      < pthread.h-t2 > pthread.h-t3
+mv sched.h-t sched.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_SPAWN_H''@|1|g' \
@@ -4762,6 +4878,30 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/spawn.in.h > spawn.h-t
+mv signal.h-t signal.h
+sed \
+      -e 's|@''REPLACE_PTHREAD_COND_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_CONDATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_CONDATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_WAIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_TIMEDWAIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_SIGNAL''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_BROADCAST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_KEY_CREATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SETSPECIFIC''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_GETSPECIFIC''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_KEY_DELETE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_LOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_TRYLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_DESTROY''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _Noreturn/r ../../lib/_Noreturn.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      < pthread.h-t3 > pthread.h-t4
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -4773,6 +4913,10 @@
       -e 's|@''REPLACE_NULL''@|0|g' \
       -e 's|@''HAVE_MAX_ALIGN_T''@|1|g' \
       ../../lib/stddef.in.h > stddef.h-t
+mv spawn.h-t spawn.h
+rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
+mv stddef.h-t stddef.h
+mv pthread.h-t4 pthread.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -4852,8 +4996,6 @@
       -e 's/@''GNULIB_MDA_PUTW''@/1/g' \
       -e 's/@''GNULIB_MDA_TEMPNAM''@/1/g' \
       < ../../lib/stdio.in.h > stdio.h-t1
-mv sched.h-t sched.h
-mv stddef.h-t stddef.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -4914,50 +5056,6 @@
       -e 's/@''GNULIB_MDA_MKTEMP''@/1/g' \
       -e 's/@''GNULIB_MDA_PUTENV''@/1/g' \
       < ../../lib/stdlib.in.h > stdlib.h-t1
-sed \
-      -e 's|@''HAVE_PTHREAD_ONCE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETTYPE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETTYPE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETROBUST''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETROBUST''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_LOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_TRYLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_TIMEDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_UNLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_RDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_WRLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYRDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYWRLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_UNLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_CONDATTR_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_CONDATTR_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_WAIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_TIMEDWAIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_SIGNAL''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_BROADCAST''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_KEY_CREATE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SETSPECIFIC''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_GETSPECIFIC''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_KEY_DELETE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_LOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_TRYLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_UNLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_DESTROY''@|1|g' \
-      < pthread.h-t1 > pthread.h-t2
-mv signal.h-t signal.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5010,7 +5108,6 @@
       -e 's/@''GNULIB_MDA_STRDUP''@/1/g' \
       -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
       < ../../lib/string.in.h > string.h-t1
-mv spawn.h-t spawn.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_STRINGS_H''@|1|g' \
@@ -5026,27 +5123,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/strings.in.h > strings.h-t
-sed \
-      -e 's|@''HAVE_DECL_FCLOSEALL''@|1|g' \
-      -e 's|@''HAVE_DECL_FPURGE''@|0|g' \
-      -e 's|@''HAVE_DECL_FSEEKO''@|1|g' \
-      -e 's|@''HAVE_DECL_FTELLO''@|1|g' \
-      -e 's|@''HAVE_DECL_GETDELIM''@|1|g' \
-      -e 's|@''HAVE_DECL_GETLINE''@|1|g' \
-      -e 's|@''HAVE_DECL_GETW''@|1|g' \
-      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_PUTW''@|1|g' \
-      -e 's|@''HAVE_DECL_SNPRINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_VSNPRINTF''@|1|g' \
-      -e 's|@''HAVE_DPRINTF''@|1|g' \
-      -e 's|@''HAVE_FSEEKO''@|1|g' \
-      -e 's|@''HAVE_FTELLO''@|1|g' \
-      -e 's|@''HAVE_PCLOSE''@|1|g' \
-      -e 's|@''HAVE_POPEN''@|1|g' \
-      -e 's|@''HAVE_RENAMEAT''@|1|g' \
-      -e 's|@''HAVE_VASPRINTF''@|1|g' \
-      -e 's|@''HAVE_VDPRINTF''@|1|g' \
-      < stdio.h-t1 > stdio.h-t2
+/usr/bin/mkdir -p 'sys'
+/usr/bin/mkdir -p 'sys'
 sed \
       -e 's|@''HAVE__EXIT''@|1|g' \
       -e 's|@''HAVE_ALIGNED_ALLOC''@|1|g' \
@@ -5096,41 +5174,26 @@
       -e 's|@''HAVE_DECL_UNSETENV''@|1|g' \
       < stdlib.h-t1 > stdlib.h-t2
 sed \
-      -e 's|@''REPLACE_PTHREAD_CREATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_GETDETACHSTATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_SETDETACHSTATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SELF''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_EQUAL''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_DETACH''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_JOIN''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_EXIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ONCE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETTYPE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETTYPE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETROBUST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETROBUST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_LOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_TRYLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_TIMEDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_RDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_WRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYRDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYWRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|0|g' \
-      < pthread.h-t2 > pthread.h-t3
+      -e 's|@''HAVE_DECL_FCLOSEALL''@|1|g' \
+      -e 's|@''HAVE_DECL_FPURGE''@|0|g' \
+      -e 's|@''HAVE_DECL_FSEEKO''@|1|g' \
+      -e 's|@''HAVE_DECL_FTELLO''@|1|g' \
+      -e 's|@''HAVE_DECL_GETDELIM''@|1|g' \
+      -e 's|@''HAVE_DECL_GETLINE''@|1|g' \
+      -e 's|@''HAVE_DECL_GETW''@|1|g' \
+      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_PUTW''@|1|g' \
+      -e 's|@''HAVE_DECL_SNPRINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_VSNPRINTF''@|1|g' \
+      -e 's|@''HAVE_DPRINTF''@|1|g' \
+      -e 's|@''HAVE_FSEEKO''@|1|g' \
+      -e 's|@''HAVE_FTELLO''@|1|g' \
+      -e 's|@''HAVE_PCLOSE''@|1|g' \
+      -e 's|@''HAVE_POPEN''@|1|g' \
+      -e 's|@''HAVE_RENAMEAT''@|1|g' \
+      -e 's|@''HAVE_VASPRINTF''@|1|g' \
+      -e 's|@''HAVE_VDPRINTF''@|1|g' \
+      < stdio.h-t1 > stdio.h-t2
 sed \
       -e 's|@''HAVE_EXPLICIT_BZERO''@|1|g' \
       -e 's|@''HAVE_FFSL''@|1|g' \
@@ -5184,46 +5247,6 @@
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < string.h-t1 > string.h-t2
 mv strings.h-t strings.h
-/usr/bin/mkdir -p 'sys'
-sed \
-      -e 's|@''REPLACE_DPRINTF''@|0|g' \
-      -e 's|@''REPLACE_FCLOSE''@|1|g' \
-      -e 's|@''REPLACE_FDOPEN''@|0|g' \
-      -e 's|@''REPLACE_FFLUSH''@|1|g' \
-      -e 's|@''REPLACE_FOPEN''@|1|g' \
-      -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|1|g' \
-      -e 's|@''REPLACE_FPRINTF''@|0|g' \
-      -e 's|@''REPLACE_FPURGE''@|0|g' \
-      -e 's|@''REPLACE_FREOPEN''@|0|g' \
-      -e 's|@''REPLACE_FSEEK''@|1|g' \
-      -e 's|@''REPLACE_FSEEKO''@|1|g' \
-      -e 's|@''REPLACE_FTELL''@|0|g' \
-      -e 's|@''REPLACE_FTELLO''@|0|g' \
-      -e 's|@''REPLACE_GETDELIM''@|0|g' \
-      -e 's|@''REPLACE_GETLINE''@|0|g' \
-      -e 's|@''REPLACE_OBSTACK_PRINTF''@|0|g' \
-      -e 's|@''REPLACE_PERROR''@|0|g' \
-      -e 's|@''REPLACE_POPEN''@|0|g' \
-      -e 's|@''REPLACE_PRINTF''@|0|g' \
-      -e 's|@''REPLACE_REMOVE''@|0|g' \
-      -e 's|@''REPLACE_RENAME''@|0|g' \
-      -e 's|@''REPLACE_RENAMEAT''@|0|g' \
-      -e 's|@''REPLACE_SNPRINTF''@|0|g' \
-      -e 's|@''REPLACE_SPRINTF''@|0|g' \
-      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|0|g' \
-      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|0|g' \
-      -e 's|@''REPLACE_TMPFILE''@|0|g' \
-      -e 's|@''REPLACE_VASPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VDPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VFPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VSNPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VSPRINTF''@|0|g' \
-      -e 's|@''ASM_SYMBOL_PREFIX''@|""|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < stdio.h-t2 > stdio.h-t3
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_SYS_FILE_H''@/1/g' \
@@ -5235,7 +5258,20 @@
       -e 's/@''GNULIB_FLOCK''@/1/g' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_file.in.h > sys/file.h-t
-/usr/bin/mkdir -p 'sys'
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''HAVE_SYS_IOCTL_H''@|1|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_SYS_IOCTL_H''@|<sys/ioctl.h>|g' \
+      -e 's/@''GNULIB_IOCTL''@/1/g' \
+      -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|0|g' \
+      -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|0|g' \
+      -e 's|@''REPLACE_IOCTL''@|1|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      ../../lib/sys_ioctl.in.h > sys/ioctl.h-t
 sed \
       -e 's|@''REPLACE__EXIT''@|0|g' \
       -e 's|@''REPLACE_ABORT''@|0|g' \
@@ -5286,47 +5322,53 @@
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < stdlib.h-t2 > stdlib.h-t3
 sed \
-      -e 's|@''REPLACE_PTHREAD_COND_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_CONDATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_CONDATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_WAIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_TIMEDWAIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_SIGNAL''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_BROADCAST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_KEY_CREATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SETSPECIFIC''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_GETSPECIFIC''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_KEY_DELETE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_LOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_TRYLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_DPRINTF''@|0|g' \
+      -e 's|@''REPLACE_FCLOSE''@|1|g' \
+      -e 's|@''REPLACE_FDOPEN''@|0|g' \
+      -e 's|@''REPLACE_FFLUSH''@|1|g' \
+      -e 's|@''REPLACE_FOPEN''@|1|g' \
+      -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|1|g' \
+      -e 's|@''REPLACE_FPRINTF''@|0|g' \
+      -e 's|@''REPLACE_FPURGE''@|0|g' \
+      -e 's|@''REPLACE_FREOPEN''@|0|g' \
+      -e 's|@''REPLACE_FSEEK''@|1|g' \
+      -e 's|@''REPLACE_FSEEKO''@|1|g' \
+      -e 's|@''REPLACE_FTELL''@|0|g' \
+      -e 's|@''REPLACE_FTELLO''@|0|g' \
+      -e 's|@''REPLACE_GETDELIM''@|0|g' \
+      -e 's|@''REPLACE_GETLINE''@|0|g' \
+      -e 's|@''REPLACE_OBSTACK_PRINTF''@|0|g' \
+      -e 's|@''REPLACE_PERROR''@|0|g' \
+      -e 's|@''REPLACE_POPEN''@|0|g' \
+      -e 's|@''REPLACE_PRINTF''@|0|g' \
+      -e 's|@''REPLACE_REMOVE''@|0|g' \
+      -e 's|@''REPLACE_RENAME''@|0|g' \
+      -e 's|@''REPLACE_RENAMEAT''@|0|g' \
+      -e 's|@''REPLACE_SNPRINTF''@|0|g' \
+      -e 's|@''REPLACE_SPRINTF''@|0|g' \
+      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|0|g' \
+      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|0|g' \
+      -e 's|@''REPLACE_TMPFILE''@|0|g' \
+      -e 's|@''REPLACE_VASPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VDPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VFPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VSNPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VSPRINTF''@|0|g' \
+      -e 's|@''ASM_SYMBOL_PREFIX''@|""|g' \
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _Noreturn/r ../../lib/_Noreturn.h' \
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < pthread.h-t3 > pthread.h-t4
+      < stdio.h-t2 > stdio.h-t3
 rm -f string.h-t1
 mv sys/file.h-t sys/file.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''HAVE_SYS_IOCTL_H''@|1|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_SYS_IOCTL_H''@|<sys/ioctl.h>|g' \
-      -e 's/@''GNULIB_IOCTL''@/1/g' \
-      -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|0|g' \
-      -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|0|g' \
-      -e 's|@''REPLACE_IOCTL''@|1|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/sys_ioctl.in.h > sys/ioctl.h-t
-/usr/bin/mkdir -p 'sys'
+mv sys/ioctl.h-t sys/ioctl.h
+rm -f stdlib.h-t1 stdlib.h-t2
 rm -f stdio.h-t1 stdio.h-t2
 mv string.h-t2 string.h
+mv stdlib.h-t3 stdlib.h
+mv stdio.h-t3 stdio.h
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5341,14 +5383,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_random.in.h > sys/random.h-t
-mv sys/ioctl.h-t sys/ioctl.h
-rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
-mv stdio.h-t3 stdio.h
-mv sys/random.h-t sys/random.h
-mv pthread.h-t4 pthread.h
-/usr/bin/mkdir -p 'sys'
 /usr/bin/mkdir -p 'sys'
-rm -f stdlib.h-t1 stdlib.h-t2
+mv sys/random.h-t sys/random.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5365,6 +5401,7 @@
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_select.in.h > sys/select.h-t
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5398,11 +5435,9 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_socket.in.h > sys/socket.h-t
-mv stdlib.h-t3 stdlib.h
-/usr/bin/mkdir -p 'sys'
-/usr/bin/mkdir -p 'sys'
-/usr/bin/mkdir -p 'sys'
 mv sys/select.h-t sys/select.h
+mv sys/socket.h-t sys/socket.h
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5460,6 +5495,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_stat.in.h > sys/stat.h-t
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_SYS_TIME_H''@/1/g' \
@@ -5477,6 +5513,9 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_time.in.h > sys/time.h-t
+mv sys/stat.h-t sys/stat.h
+mv sys/time.h-t sys/time.h
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5488,8 +5527,6 @@
       -e 's|@''WINDOWS_STAT_INODES''@|0|g' \
       ../../lib/sys_types.in.h > sys/types.h-t
 /usr/bin/mkdir -p 'sys'
-/usr/bin/mkdir -p 'sys'
-mv sys/types.h-t sys/types.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5498,8 +5535,9 @@
       -e 's|@''NEXT_SYS_UIO_H''@|<sys/uio.h>|g' \
       -e 's|@''HAVE_SYS_UIO_H''@|1|g' \
       ../../lib/sys_uio.in.h > sys/uio.h-t
-mv sys/socket.h-t sys/socket.h
-mv sys/time.h-t sys/time.h
+/usr/bin/mkdir -p 'sys'
+mv sys/types.h-t sys/types.h
+mv sys/uio.h-t sys/uio.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5510,7 +5548,6 @@
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_wait.in.h > sys/wait.h-t
-mv sys/uio.h-t sys/uio.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5563,6 +5600,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/time.in.h > time.h-t
+mv sys/wait.h-t sys/wait.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_UCHAR_H''@/1/g' \
@@ -5631,17 +5669,19 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/uchar.in.h > uchar.h-t
-mv sys/wait.h-t sys/wait.h
-mv sys/stat.h-t sys/stat.h
+mv time.h-t time.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|0|g' \
       -e 's/@''GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE''@//g' \
       -e 's/@''GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE''@//g' \
       ../../lib/unicase.in.h > unicase.h-t
-mv time.h-t time.h
-mv uchar.h-t uchar.h
 /usr/bin/mkdir -p 'unicase'
+declaration=`grep '^gl_unicase_special_lookup' ../../lib/unicase/special-casing-table.h | sed -e 's/register //g'` && \
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+  -e "/gl_unicase_special_lookup/s/gl_unicase_special_lookup.*/${declaration};/" \
+  ../../lib/unicase/special-casing.in.h > unicase/special-casing.h-t
 mv unicase.h-t unicase.h
+mv uchar.h-t uchar.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|0|g' \
       -e 's/@''GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -5683,10 +5723,7 @@
       -e 's/@''GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < ../../lib/unictype.in.h > unictype.h-t1
-declaration=`grep '^gl_unicase_special_lookup' ../../lib/unicase/special-casing-table.h | sed -e 's/register //g'` && \
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-  -e "/gl_unicase_special_lookup/s/gl_unicase_special_lookup.*/${declaration};/" \
-  ../../lib/unicase/special-casing.in.h > unicase/special-casing.h-t
+mv unicase/special-casing.h-t unicase/special-casing.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|0|g' \
       -e 's/@''GNULIB_UNINORM_NFD_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -5726,9 +5763,6 @@
       -e 's/@''GNULIB_FSYNC''@/0/g' \
       -e 's/@''GNULIB_FTRUNCATE''@/0/g' \
       < ../../lib/unistd.in.h > unistd.h-t1
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unistr.h-t' ../../lib/unistr.in.h
-mv uninorm.h-t uninorm.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unitypes.h-t' ../../lib/unitypes.in.h
 sed \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -5755,7 +5789,8 @@
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE''@//g' \
       < unictype.h-t1 > unictype.h-t2
-mv unicase/special-casing.h-t unicase/special-casing.h
+mv uninorm.h-t uninorm.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unistr.h-t' ../../lib/unistr.in.h
 sed \
       -e 's/@''GNULIB_GETCWD''@/1/g' \
       -e 's/@''GNULIB_GETDOMAINNAME''@/0/g' \
@@ -5819,9 +5854,199 @@
       -e 's/@''GNULIB_MDA_UNLINK''@/1/g' \
       -e 's/@''GNULIB_MDA_WRITE''@/1/g' \
       < unistd.h-t1 > unistd.h-t2
+sed \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      < unictype.h-t2 > unictype.h-t3
 mv unistr.h-t unistr.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unitypes.h-t' ../../lib/unitypes.in.h
+sed \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      < unictype.h-t3 > unictype.h-t4
+sed \
+      -e 's|@''HAVE_CHOWN''@|1|g' \
+      -e 's|@''HAVE_COPY_FILE_RANGE''@|1|g' \
+      -e 's|@''HAVE_DUP3''@|1|g' \
+      -e 's|@''HAVE_EUIDACCESS''@|1|g' \
+      -e 's|@''HAVE_EXECVPE''@|1|g' \
+      -e 's|@''HAVE_FACCESSAT''@|1|g' \
+      -e 's|@''HAVE_FCHDIR''@|1|g' \
+      -e 's|@''HAVE_FCHOWNAT''@|1|g' \
+      -e 's|@''HAVE_FDATASYNC''@|1|g' \
+      -e 's|@''HAVE_FSYNC''@|1|g' \
+      -e 's|@''HAVE_FTRUNCATE''@|1|g' \
+      -e 's|@''HAVE_GETDTABLESIZE''@|1|g' \
+      -e 's|@''HAVE_GETENTROPY''@|1|g' \
+      -e 's|@''HAVE_GETGROUPS''@|1|g' \
+      -e 's|@''HAVE_GETHOSTNAME''@|1|g' \
+      -e 's|@''HAVE_GETPAGESIZE''@|1|g' \
+      -e 's|@''HAVE_GETPASS''@|1|g' \
+      -e 's|@''HAVE_GROUP_MEMBER''@|1|g' \
+      -e 's|@''HAVE_LCHOWN''@|1|g' \
+      -e 's|@''HAVE_LINK''@|1|g' \
+      -e 's|@''HAVE_LINKAT''@|1|g' \
+      -e 's|@''HAVE_PIPE''@|1|g' \
+      -e 's|@''HAVE_PIPE2''@|1|g' \
+      -e 's|@''HAVE_PREAD''@|1|g' \
+      -e 's|@''HAVE_PWRITE''@|1|g' \
+      -e 's|@''HAVE_READLINK''@|1|g' \
+      -e 's|@''HAVE_READLINKAT''@|1|g' \
+      -e 's|@''HAVE_SETHOSTNAME''@|1|g' \
+      -e 's|@''HAVE_SLEEP''@|1|g' \
+      -e 's|@''HAVE_SYMLINK''@|1|g' \
+      -e 's|@''HAVE_SYMLINKAT''@|1|g' \
+      -e 's|@''HAVE_UNLINKAT''@|1|g' \
+      -e 's|@''HAVE_USLEEP''@|1|g' \
+      -e 's|@''HAVE_DECL_ENVIRON''@|1|g' \
+      -e 's|@''HAVE_DECL_EXECVPE''@|1|g' \
+      -e 's|@''HAVE_DECL_FCHDIR''@|1|g' \
+      -e 's|@''HAVE_DECL_FDATASYNC''@|1|g' \
+      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|1|g' \
+      -e 's|@''HAVE_DECL_GETLOGIN''@|1|g' \
+      -e 's|@''HAVE_DECL_GETLOGIN_R''@|1|g' \
+      -e 's|@''HAVE_DECL_GETPAGESIZE''@|1|g' \
+      -e 's|@''HAVE_DECL_GETUSERSHELL''@|1|g' \
+      -e 's|@''HAVE_DECL_SETHOSTNAME''@|1|g' \
+      -e 's|@''HAVE_DECL_TRUNCATE''@|1|g' \
+      -e 's|@''HAVE_DECL_TTYNAME_R''@|1|g' \
+      -e 's|@''HAVE_OS_H''@|0|g' \
+      -e 's|@''HAVE_SYS_PARAM_H''@|0|g' \
+      < unistd.h-t2 > unistd.h-t3
 mv unitypes.h-t unitypes.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w uniwidth.h-t' ../../lib/uniwidth.in.h
+mv uniwidth.h-t uniwidth.h
+rm -f unictype.h-t1 unictype.h-t2 unictype.h-t3
+sed \
+      -e 's|@''REPLACE_ACCESS''@|0|g' \
+      -e 's|@''REPLACE_CHOWN''@|0|g' \
+      -e 's|@''REPLACE_CLOSE''@|0|g' \
+      -e 's|@''REPLACE_COPY_FILE_RANGE''@|0|g' \
+      -e 's|@''REPLACE_DUP''@|0|g' \
+      -e 's|@''REPLACE_DUP2''@|0|g' \
+      -e 's|@''REPLACE_DUP3''@|0|g' \
+      -e 's|@''REPLACE_EXECL''@|0|g' \
+      -e 's|@''REPLACE_EXECLE''@|0|g' \
+      -e 's|@''REPLACE_EXECLP''@|0|g' \
+      -e 's|@''REPLACE_EXECV''@|0|g' \
+      -e 's|@''REPLACE_EXECVE''@|0|g' \
+      -e 's|@''REPLACE_EXECVP''@|0|g' \
+      -e 's|@''REPLACE_EXECVPE''@|0|g' \
+      -e 's|@''REPLACE_FACCESSAT''@|0|g' \
+      -e 's|@''REPLACE_FCHDIR''@|0|g' \
+      -e 's|@''REPLACE_FCHOWNAT''@|0|g' \
+      -e 's|@''REPLACE_FDATASYNC''@|0|g' \
+      -e 's|@''REPLACE_FTRUNCATE''@|0|g' \
+      -e 's|@''REPLACE_GETCWD''@|0|g' \
+      -e 's|@''REPLACE_GETDOMAINNAME''@|0|g' \
+      -e 's|@''REPLACE_GETDTABLESIZE''@|0|g' \
+      -e 's|@''REPLACE_GETENTROPY''@|0|g' \
+      -e 's|@''REPLACE_GETLOGIN_R''@|0|g' \
+      -e 's|@''REPLACE_GETGROUPS''@|0|g' \
+      -e 's|@''REPLACE_GETPAGESIZE''@|0|g' \
+      -e 's|@''REPLACE_GETPASS''@|0|g' \
+      -e 's|@''REPLACE_GETPASS_FOR_GETPASS_GNU''@|0|g' \
+      -e 's|@''REPLACE_GETUSERSHELL''@|0|g' \
+      -e 's|@''REPLACE_ISATTY''@|0|g' \
+      -e 's|@''REPLACE_LCHOWN''@|0|g' \
+      -e 's|@''REPLACE_LINK''@|0|g' \
+      -e 's|@''REPLACE_LINKAT''@|0|g' \
+      -e 's|@''REPLACE_LSEEK''@|0|g' \
+      -e 's|@''REPLACE_PIPE2''@|1|g' \
+      -e 's|@''REPLACE_PREAD''@|0|g' \
+      -e 's|@''REPLACE_PWRITE''@|0|g' \
+      -e 's|@''REPLACE_READ''@|0|g' \
+      -e 's|@''REPLACE_READLINK''@|0|g' \
+      -e 's|@''REPLACE_READLINKAT''@|0|g' \
+      -e 's|@''REPLACE_RMDIR''@|0|g' \
+      -e 's|@''REPLACE_SETHOSTNAME''@|0|g' \
+      -e 's|@''REPLACE_SLEEP''@|0|g' \
+      -e 's|@''REPLACE_SYMLINK''@|0|g' \
+      -e 's|@''REPLACE_SYMLINKAT''@|0|g' \
+      -e 's|@''REPLACE_TRUNCATE''@|0|g' \
+      -e 's|@''REPLACE_TTYNAME_R''@|0|g' \
+      -e 's|@''REPLACE_UNLINK''@|0|g' \
+      -e 's|@''REPLACE_UNLINKAT''@|0|g' \
+      -e 's|@''REPLACE_USLEEP''@|0|g' \
+      -e 's|@''REPLACE_WRITE''@|0|g' \
+      -e 's|@''UNISTD_H_HAVE_SYS_RANDOM_H''@|1|g' \
+      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|0|g' \
+      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      < unistd.h-t3 > unistd.h-t4
+mv unictype.h-t4 unictype.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_UTIME_H''@/1/g' \
@@ -5837,7 +6062,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/utime.in.h > utime.h-t
-mv uniwidth.h-t uniwidth.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5928,93 +6152,9 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/wctype.in.h > wctype.h-t
+rm -f unistd.h-t1 unistd.h-t2 unistd.h-t3
 mv utime.h-t utime.h
 sed \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      < unictype.h-t2 > unictype.h-t3
-mv wctype.h-t wctype.h
-sed \
-      -e 's|@''HAVE_CHOWN''@|1|g' \
-      -e 's|@''HAVE_COPY_FILE_RANGE''@|1|g' \
-      -e 's|@''HAVE_DUP3''@|1|g' \
-      -e 's|@''HAVE_EUIDACCESS''@|1|g' \
-      -e 's|@''HAVE_EXECVPE''@|1|g' \
-      -e 's|@''HAVE_FACCESSAT''@|1|g' \
-      -e 's|@''HAVE_FCHDIR''@|1|g' \
-      -e 's|@''HAVE_FCHOWNAT''@|1|g' \
-      -e 's|@''HAVE_FDATASYNC''@|1|g' \
-      -e 's|@''HAVE_FSYNC''@|1|g' \
-      -e 's|@''HAVE_FTRUNCATE''@|1|g' \
-      -e 's|@''HAVE_GETDTABLESIZE''@|1|g' \
-      -e 's|@''HAVE_GETENTROPY''@|1|g' \
-      -e 's|@''HAVE_GETGROUPS''@|1|g' \
-      -e 's|@''HAVE_GETHOSTNAME''@|1|g' \
-      -e 's|@''HAVE_GETPAGESIZE''@|1|g' \
-      -e 's|@''HAVE_GETPASS''@|1|g' \
-      -e 's|@''HAVE_GROUP_MEMBER''@|1|g' \
-      -e 's|@''HAVE_LCHOWN''@|1|g' \
-      -e 's|@''HAVE_LINK''@|1|g' \
-      -e 's|@''HAVE_LINKAT''@|1|g' \
-      -e 's|@''HAVE_PIPE''@|1|g' \
-      -e 's|@''HAVE_PIPE2''@|1|g' \
-      -e 's|@''HAVE_PREAD''@|1|g' \
-      -e 's|@''HAVE_PWRITE''@|1|g' \
-      -e 's|@''HAVE_READLINK''@|1|g' \
-      -e 's|@''HAVE_READLINKAT''@|1|g' \
-      -e 's|@''HAVE_SETHOSTNAME''@|1|g' \
-      -e 's|@''HAVE_SLEEP''@|1|g' \
-      -e 's|@''HAVE_SYMLINK''@|1|g' \
-      -e 's|@''HAVE_SYMLINKAT''@|1|g' \
-      -e 's|@''HAVE_UNLINKAT''@|1|g' \
-      -e 's|@''HAVE_USLEEP''@|1|g' \
-      -e 's|@''HAVE_DECL_ENVIRON''@|1|g' \
-      -e 's|@''HAVE_DECL_EXECVPE''@|1|g' \
-      -e 's|@''HAVE_DECL_FCHDIR''@|1|g' \
-      -e 's|@''HAVE_DECL_FDATASYNC''@|1|g' \
-      -e 's|@''HAVE_DECL_GETDOMAINNAME''@|1|g' \
-      -e 's|@''HAVE_DECL_GETLOGIN''@|1|g' \
-      -e 's|@''HAVE_DECL_GETLOGIN_R''@|1|g' \
-      -e 's|@''HAVE_DECL_GETPAGESIZE''@|1|g' \
-      -e 's|@''HAVE_DECL_GETUSERSHELL''@|1|g' \
-      -e 's|@''HAVE_DECL_SETHOSTNAME''@|1|g' \
-      -e 's|@''HAVE_DECL_TRUNCATE''@|1|g' \
-      -e 's|@''HAVE_DECL_TTYNAME_R''@|1|g' \
-      -e 's|@''HAVE_OS_H''@|0|g' \
-      -e 's|@''HAVE_SYS_PARAM_H''@|0|g' \
-      < unistd.h-t2 > unistd.h-t3
-sed \
       -e 's|@''HAVE_WINT_T''@|1|g' \
       -e 's|@''HAVE_BTOWC''@|1|g' \
       -e 's|@''HAVE_MBSINIT''@|1|g' \
@@ -6059,49 +6199,8 @@
       -e 's|@''HAVE_DECL_WCSDUP''@|1|g' \
       -e 's|@''HAVE_DECL_WCWIDTH''@|1|g' \
       < wchar.h-t1 > wchar.h-t2
-sed \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      < unictype.h-t3 > unictype.h-t4
+mv wctype.h-t wctype.h
+mv unistd.h-t4 unistd.h
 sed \
       -e 's|@''REPLACE_MBSTATE_T''@|0|g' \
       -e 's|@''REPLACE_BTOWC''@|1|g' \
@@ -6129,71 +6228,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < wchar.h-t2 > wchar.h-t3
-sed \
-      -e 's|@''REPLACE_ACCESS''@|0|g' \
-      -e 's|@''REPLACE_CHOWN''@|0|g' \
-      -e 's|@''REPLACE_CLOSE''@|0|g' \
-      -e 's|@''REPLACE_COPY_FILE_RANGE''@|0|g' \
-      -e 's|@''REPLACE_DUP''@|0|g' \
-      -e 's|@''REPLACE_DUP2''@|0|g' \
-      -e 's|@''REPLACE_DUP3''@|0|g' \
-      -e 's|@''REPLACE_EXECL''@|0|g' \
-      -e 's|@''REPLACE_EXECLE''@|0|g' \
-      -e 's|@''REPLACE_EXECLP''@|0|g' \
-      -e 's|@''REPLACE_EXECV''@|0|g' \
-      -e 's|@''REPLACE_EXECVE''@|0|g' \
-      -e 's|@''REPLACE_EXECVP''@|0|g' \
-      -e 's|@''REPLACE_EXECVPE''@|0|g' \
-      -e 's|@''REPLACE_FACCESSAT''@|0|g' \
-      -e 's|@''REPLACE_FCHDIR''@|0|g' \
-      -e 's|@''REPLACE_FCHOWNAT''@|0|g' \
-      -e 's|@''REPLACE_FDATASYNC''@|0|g' \
-      -e 's|@''REPLACE_FTRUNCATE''@|0|g' \
-      -e 's|@''REPLACE_GETCWD''@|0|g' \
-      -e 's|@''REPLACE_GETDOMAINNAME''@|0|g' \
-      -e 's|@''REPLACE_GETDTABLESIZE''@|0|g' \
-      -e 's|@''REPLACE_GETENTROPY''@|0|g' \
-      -e 's|@''REPLACE_GETLOGIN_R''@|0|g' \
-      -e 's|@''REPLACE_GETGROUPS''@|0|g' \
-      -e 's|@''REPLACE_GETPAGESIZE''@|0|g' \
-      -e 's|@''REPLACE_GETPASS''@|0|g' \
-      -e 's|@''REPLACE_GETPASS_FOR_GETPASS_GNU''@|0|g' \
-      -e 's|@''REPLACE_GETUSERSHELL''@|0|g' \
-      -e 's|@''REPLACE_ISATTY''@|0|g' \
-      -e 's|@''REPLACE_LCHOWN''@|0|g' \
-      -e 's|@''REPLACE_LINK''@|0|g' \
-      -e 's|@''REPLACE_LINKAT''@|0|g' \
-      -e 's|@''REPLACE_LSEEK''@|0|g' \
-      -e 's|@''REPLACE_PIPE2''@|1|g' \
-      -e 's|@''REPLACE_PREAD''@|0|g' \
-      -e 's|@''REPLACE_PWRITE''@|0|g' \
-      -e 's|@''REPLACE_READ''@|0|g' \
-      -e 's|@''REPLACE_READLINK''@|0|g' \
-      -e 's|@''REPLACE_READLINKAT''@|0|g' \
-      -e 's|@''REPLACE_RMDIR''@|0|g' \
-      -e 's|@''REPLACE_SETHOSTNAME''@|0|g' \
-      -e 's|@''REPLACE_SLEEP''@|0|g' \
-      -e 's|@''REPLACE_SYMLINK''@|0|g' \
-      -e 's|@''REPLACE_SYMLINKAT''@|0|g' \
-      -e 's|@''REPLACE_TRUNCATE''@|0|g' \
-      -e 's|@''REPLACE_TTYNAME_R''@|0|g' \
-      -e 's|@''REPLACE_UNLINK''@|0|g' \
-      -e 's|@''REPLACE_UNLINKAT''@|0|g' \
-      -e 's|@''REPLACE_USLEEP''@|0|g' \
-      -e 's|@''REPLACE_WRITE''@|0|g' \
-      -e 's|@''UNISTD_H_HAVE_SYS_RANDOM_H''@|1|g' \
-      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|0|g' \
-      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < unistd.h-t3 > unistd.h-t4
-rm -f unictype.h-t1 unictype.h-t2 unictype.h-t3
-mv unictype.h-t4 unictype.h
 rm -f wchar.h-t1 wchar.h-t2
 mv wchar.h-t3 wchar.h
-rm -f unistd.h-t1 unistd.h-t2 unistd.h-t3
-mv unistd.h-t4 unistd.h
 make  all-am
 make[5]: Entering directory '/build/reproducible-path/wget-1.25.0/build-udeb/lib'
 gcc -DHAVE_CONFIG_H -I. -I../../lib -I../src  -DDEFAULT_TEXT_DOMAIN=\"wget-gnulib\" -Wdate-time -D_FORTIFY_SOURCE=2   -Wno-cast-qual -Wno-conversion -Wno-float-equal -Wno-sign-compare -Wno-undef -Wno-unused-function -Wno-unused-parameter -Wno-float-conversion -Wimplicit-fallthrough -Wno-pedantic -Wno-sign-conversion -Wno-type-limits -Wno-unused-const-variable -Wno-unsuffixed-float-constants -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libgnu_a-arpa_inet.o `test -f 'arpa_inet.c' || echo '../../lib/'`arpa_inet.c
@@ -6390,11 +6426,11 @@
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o host.o ../../src/host.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o hsts.o ../../src/hsts.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o html-parse.o ../../src/html-parse.c
-gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o html-url.o ../../src/html-url.c
 ../../src/hsts.c: In function 'hsts_store_save':
 ../../src/hsts.c:577:11: warning: ignoring return value of 'ftruncate' declared with attribute 'warn_unused_result' [-Wunused-result]
   577 |           ftruncate (fd, 0);
       |           ^~~~~~~~~~~~~~~~~
+gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o html-url.o ../../src/html-url.c
 ../../src/convert.c: In function 'local_quote_string':
 ../../src/convert.c:806:1: warning: function may return address of local variable [-Wreturn-local-addr]
   806 | }
@@ -6422,10 +6458,6 @@
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o ftp-opie.o ../../src/ftp-opie.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o http-ntlm.o ../../src/http-ntlm.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o openssl.o ../../src/openssl.c
-echo '/* version.c */' > version.c
-echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> version.c
-echo '' >> version.c
-echo '#include "version.h"' >> version.c
 ../../src/http-ntlm.c: In function 'setup_des_key':
 ../../src/http-ntlm.c:201:3: warning: 'DES_set_odd_parity' is deprecated: Since OpenSSL 3.0 [-Wdeprecated-declarations]
   201 |   DES_set_odd_parity(&key);
@@ -6491,6 +6523,10 @@
 /usr/include/openssl/md4.h:52:27: note: declared here
    52 | OSSL_DEPRECATEDIN_3_0 int MD4_Final(unsigned char *md, MD4_CTX *c);
       |                           ^~~~~~~~~
+echo '/* version.c */' > version.c
+echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> version.c
+echo '' >> version.c
+echo '#include "version.h"' >> version.c
 echo 'const char *version_string = "1.25.0";' >> version.c
 echo 'const char *compilation_string = "'gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -I../lib -I../../lib  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os'";' \
     | sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$/";/' >> version.c
@@ -6508,13 +6544,13 @@
 restore=: && backupdir=".am$$" && \
 am__cwd=`pwd` && CDPATH="${ZSH_VERSION+.}:" && cd ../../doc && \
 rm -rf $backupdir && mkdir $backupdir && \
-if (/bin/bash '/build/reproducible-path/wget-1.25.0/build-aux/missing' makeinfo --version) >/dev/null 2>&1; then \
+if (/bin/sh '/build/reproducible-path/wget-1.25.0/build-aux/missing' makeinfo --version) >/dev/null 2>&1; then \
   for f in ../../doc/wget.info ../../doc/wget.info-[0-9] ../../doc/wget.info-[0-9][0-9] ../../doc/wget.i[0-9] ../../doc/wget.i[0-9][0-9]; do \
     if test -f $f; then mv $f $backupdir; restore=mv; else :; fi; \
   done; \
 else :; fi && \
 cd "$am__cwd"; \
-if /bin/bash '/build/reproducible-path/wget-1.25.0/build-aux/missing' makeinfo   -I ../../doc \
+if /bin/sh '/build/reproducible-path/wget-1.25.0/build-aux/missing' makeinfo   -I ../../doc \
  -o ../../doc/wget.info ../../doc/wget.texi; \
 then \
   rc=0; \
@@ -6604,15 +6640,6 @@
 ../../src/hsts.c:577:11: warning: ignoring return value of 'ftruncate' declared with attribute 'warn_unused_result' [-Wunused-result]
   577 |           ftruncate (fd, 0);
       |           ^~~~~~~~~~~~~~~~~
-../../src/cookies.c: In function 'cookie_header':
-../../src/cookies.c:1157:12: warning: argument 1 value '18446744073709551615' exceeds maximum object size 9223372036854775807 [-Walloc-size-larger-than=]
- 1157 |   result = xmalloc (result_size);
-      |            ^~~~~~~~~~~~~~~~~~~~~
-In file included from ../../src/wget.h:155,
-                 from ../../src/cookies.c:46:
-../../lib/xalloc.h:59:7: note: in a call to allocation function 'xmalloc' declared here
-   59 | void *xmalloc (size_t s)
-      |       ^~~~~~~
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-html-url.o `test -f 'html-url.c' || echo '../../src/'`html-url.c
 ../../src/convert.c: In function 'local_quote_string':
 ../../src/convert.c:806:1: warning: function may return address of local variable [-Wreturn-local-addr]
@@ -6623,6 +6650,15 @@
       |        ^~~
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-http.o `test -f 'http.c' || echo '../../src/'`http.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-init.o `test -f 'init.c' || echo '../../src/'`init.c
+../../src/cookies.c: In function 'cookie_header':
+../../src/cookies.c:1157:12: warning: argument 1 value '18446744073709551615' exceeds maximum object size 9223372036854775807 [-Walloc-size-larger-than=]
+ 1157 |   result = xmalloc (result_size);
+      |            ^~~~~~~~~~~~~~~~~~~~~
+In file included from ../../src/wget.h:155,
+                 from ../../src/cookies.c:46:
+../../lib/xalloc.h:59:7: note: in a call to allocation function 'xmalloc' declared here
+   59 | void *xmalloc (size_t s)
+      |       ^~~~~~~
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-log.o `test -f 'log.c' || echo '../../src/'`log.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-main.o `test -f 'main.c' || echo '../../src/'`main.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-netrc.o `test -f 'netrc.c' || echo '../../src/'`netrc.c
@@ -6633,11 +6669,11 @@
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-retr.o `test -f 'retr.c' || echo '../../src/'`retr.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-spider.o `test -f 'spider.c' || echo '../../src/'`spider.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-url.o `test -f 'url.c' || echo '../../src/'`url.c
+gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-warc.o `test -f 'warc.c' || echo '../../src/'`warc.c
 ../../src/retr.c: In function 'test_retr_rate':
 ../../src/retr.c:1629:25: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  1629 |   for (struct test *t = tests; t < tests+countof(tests); t++)
       |                         ^~~~~
-gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-warc.o `test -f 'warc.c' || echo '../../src/'`warc.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-utils.o `test -f 'utils.c' || echo '../../src/'`utils.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-exits.o `test -f 'exits.c' || echo '../../src/'`exits.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o libunittest_a-build_info.o `test -f 'build_info.c' || echo '../../src/'`build_info.c
@@ -6676,44 +6712,44 @@
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o main.o ../../fuzz/main.c
 make  -C ../src libunittest.a
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o wget_css_fuzzer.o ../../fuzz/wget_css_fuzzer.c
+make[6]: Entering directory '/build/reproducible-path/wget-1.25.0/build/src'
+make[6]: 'libunittest.a' is up to date.
+make[6]: Leaving directory '/build/reproducible-path/wget-1.25.0/build/src'
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o wget_ftpls_fuzzer.o ../../fuzz/wget_ftpls_fuzzer.c
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o wget_html_fuzzer.o ../../fuzz/wget_html_fuzzer.c
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o wget_netrc_fuzzer.o ../../fuzz/wget_netrc_fuzzer.c
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o wget_options_fuzzer.o ../../fuzz/wget_options_fuzzer.c
-make[6]: Entering directory '/build/reproducible-path/wget-1.25.0/build/src'
-make[6]: 'libunittest.a' is up to date.
-make[6]: Leaving directory '/build/reproducible-path/wget-1.25.0/build/src'
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o wget_progress_fuzzer.o ../../fuzz/wget_progress_fuzzer.c
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o wget_read_hunk_fuzzer.o ../../fuzz/wget_read_hunk_fuzzer.c
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o wget_robots_fuzzer.o ../../fuzz/wget_robots_fuzzer.c
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o wget_url_fuzzer.o ../../fuzz/wget_url_fuzzer.c
+gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o wget_ntlm_fuzzer.o ../../fuzz/wget_ntlm_fuzzer.c
+../../fuzz/wget_ftpls_fuzzer.c: In function 'exit':
+../../fuzz/wget_ftpls_fuzzer.c:82:1: warning: 'noreturn' function does return
+   82 | }
+      | ^
 ../../fuzz/wget_css_fuzzer.c: In function 'exit':
 ../../fuzz/wget_css_fuzzer.c:90:1: warning: 'noreturn' function does return
    90 | }
       | ^
-gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -c -o wget_ntlm_fuzzer.o ../../fuzz/wget_ntlm_fuzzer.c
 ../../fuzz/wget_options_fuzzer.c: In function 'exit':
 ../../fuzz/wget_options_fuzzer.c:92:1: warning: 'noreturn' function does return
    92 | }
       | ^
-../../fuzz/wget_ftpls_fuzzer.c: In function 'exit':
-../../fuzz/wget_ftpls_fuzzer.c:82:1: warning: 'noreturn' function does return
-   82 | }
-      | ^
 ../../fuzz/wget_netrc_fuzzer.c: In function 'exit':
+gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_cookie_fuzzer wget_cookie_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 ../../fuzz/wget_netrc_fuzzer.c:81:1: warning: 'noreturn' function does return
    81 | }
       | ^
-gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_cookie_fuzzer wget_cookie_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
-gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_css_fuzzer wget_css_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_ftpls_fuzzer wget_ftpls_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_html_fuzzer wget_html_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
-gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_netrc_fuzzer wget_netrc_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
+gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_css_fuzzer wget_css_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_options_fuzzer wget_options_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_progress_fuzzer wget_progress_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_robots_fuzzer wget_robots_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_url_fuzzer wget_url_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_ntlm_fuzzer wget_ntlm_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
+gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_netrc_fuzzer wget_netrc_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_read_hunk_fuzzer wget_read_hunk_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 make[5]: Leaving directory '/build/reproducible-path/wget-1.25.0/build/fuzz'
 make  check-TESTS
@@ -6749,16 +6785,16 @@
 gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_robots_fuzzer wget_robots_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_url_fuzzer wget_url_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
 gcc    -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o wget_ntlm_fuzzer wget_ntlm_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
-SKIP: wget_html_fuzzer
-SKIP: wget_netrc_fuzzer
 SKIP: wget_cookie_fuzzer
-SKIP: wget_read_hunk_fuzzer
-SKIP: wget_options_fuzzer
+PASS: wget_css_fuzzer
 SKIP: wget_ftpls_fuzzer
+SKIP: wget_netrc_fuzzer
+SKIP: wget_html_fuzzer
+SKIP: wget_options_fuzzer
 SKIP: wget_progress_fuzzer
-PASS: wget_css_fuzzer
-SKIP: wget_robots_fuzzer
+SKIP: wget_read_hunk_fuzzer
 SKIP: wget_url_fuzzer
+SKIP: wget_robots_fuzzer
 SKIP: wget_ntlm_fuzzer
 ============================================================================
 Testsuite summary for wget 1.25.0
@@ -6797,94 +6833,94 @@
 make[7]: Entering directory '/build/reproducible-path/wget-1.25.0/build/src'
 make[7]: 'libunittest.a' is up to date.
 make[7]: Leaving directory '/build/reproducible-path/wget-1.25.0/build/src'
+PASS: Test-c-shorter.px
 PASS: Test-c-full.px
 PASS: Test-c-partial.px
-PASS: Test-cookies-401.px
-PASS: Test-c-shorter.px
+PASS: Test-ftp-dir.px
 PASS: Test-c.px
-PASS: Test-E-k-K.px
-PASS: Test-E-k.px
 PASS: Test-ftp.px
-PASS: Test-ftp-dir.px
+PASS: Test-E-k.px
 PASS: Test-ftp-bad-list.px
+PASS: Test-E-k-K.px
+PASS: Test-cookies-401.px
+PASS: Test-cookies.px
 PASS: Test-ftp-iri.px
-PASS: Test-ftp-iri-disabled.px
 PASS: Test-ftp-iri-fallback.px
+PASS: Test-ftp-iri-disabled.px
 PASS: Test-ftp-iri-recursive.px
-PASS: Test-ftp--start-pos.px
-PASS: Test-cookies.px
-PASS: Test-HTTP-Content-Disposition-1.px
 PASS: Test-ftp-list-Multinet.px
-PASS: Test-HTTP-Content-Disposition-2.px
-PASS: Test-ftp-list-Unknown.px
 PASS: Test-ftp-list-Unknown-list-a-fails.px
+PASS: Test-ftp-recursive.px
+PASS: Test-ftp-list-Unknown.px
+PASS: Test-ftp-list-Unknown-hidden.px
+PASS: Test-ftp-list-Unknown-a.px
+PASS: Test-ftp--start-pos.px
 PASS: Test-HTTP-Content-Disposition.px
 PASS: Test-ftp-list-UNIX-hidden.px
-PASS: Test-ftp-recursive.px
+PASS: Test-HTTP-Content-Disposition-2.px
+PASS: Test-HTTP-Content-Disposition-1.px
+PASS: Test-i-ftp.px
+PASS: Test-idn-cmd.px
 PASS: Test-idn-headers.px
-PASS: Test-ftp-list-Unknown-a.px
 PASS: Test-idn-meta.px
-PASS: Test-ftp-list-Unknown-hidden.px
-PASS: Test-idn-cmd.px
+PASS: Test-idn-robots-utf8.px
 PASS: Test-i-http.px
 PASS: Test-idn-cmd-utf8.px
-PASS: Test-i-ftp.px
-PASS: Test-idn-robots-utf8.px
+PASS: Test-ftp-pasv-fail.px
+PASS: Test-idn-robots.px
 PASS: Test-iri-percent.px
+PASS: Test-iri.px
+PASS: Test-iri-disabled.px
+PASS: Test-N-no-info.px
+PASS: Test-N-current.px
+PASS: Test-iri-forced-remote.px
 PASS: Test-N--no-content-disposition.px
 PASS: Test-N-HTTP-Content-Disposition.px
-PASS: Test-idn-robots.px
-PASS: Test-N-current.px
+PASS: Test-meta-robots.px
 PASS: Test-N--no-content-disposition-trivial.px
-PASS: Test-iri-disabled.px
-PASS: Test-iri-forced-remote.px
-PASS: Test-iri.px
-PASS: Test--no-content-disposition.px
 PASS: Test--no-content-disposition-trivial.px
-PASS: Test-N-old.px
-PASS: Test-N-no-info.px
-PASS: Test-nonexisting-quiet.px
 PASS: Test-iri-list.px
-PASS: Test-meta-robots.px
+PASS: Test--no-content-disposition.px
 PASS: Test-noop.px
+PASS: Test-N-old.px
+PASS: Test-nonexisting-quiet.px
 PASS: Test-O-HTTP-Content-Disposition.px
 PASS: Test-N.px
+PASS: Test-N-smaller.px
 PASS: Test-O-nc.px
 PASS: Test-O--no-content-disposition.px
 PASS: Test-np.px
-PASS: Test-O--no-content-disposition-trivial.px
-PASS: Test-N-smaller.px
 PASS: Test-O-nonexisting.px
+PASS: Test-O--no-content-disposition-trivial.px
 PASS: Test-O.px
 PASS: Test--post-file.px
-SKIP: Test-proxied-https-auth-keepalive.px
 SKIP: Test-proxied-https-auth.px
-PASS: Test-proxy-auth-basic.px
+SKIP: Test-proxied-https-auth-keepalive.px
+PASS: Test-restrict-ascii.px
 PASS: Test-Restrict-Lowercase.px
+PASS: Test-proxy-auth-basic.px
+PASS: Test-Restrict-Uppercase.px
 PASS: Test-stdouterr.px
-PASS: Test-restrict-ascii.px
 PASS: Test--spider-fail.px
-PASS: Test-Restrict-Uppercase.px
 PASS: Test--spider.px
 PASS: Test--spider-r--no-content-disposition.px
 PASS: Test--spider-r-HTTP-Content-Disposition.px
-PASS: Test--start-pos.px
-PASS: Test--start-pos--continue.px
 PASS: Test--spider-r.px
-PASS: Test-ftp-pasv-not-supported.px
-PASS: Test-ftp-pasv-fail.px
 PASS: Test--spider-r--no-content-disposition-trivial.px
+PASS: Test--start-pos.px
+PASS: Test--start-pos--continue.px
 gcc   -I/usr/include/p11-kit-1  -DHAVE_LIBGNUTLS   -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2  -Wl,-z,relro -Wl,-z,now -o unit-tests unit-tests.o ../src/libunittest.a ../lib/libgnu.a                     -lpcre2-8  -luuid -lidn2  -lnettle  -lgnutls  -lz  -lpsl  
-SKIP: Test-https-pfs.px
+PASS: Test-ftp-pasv-not-supported.px
 PASS: Test-204.px
+SKIP: Test-https-selfsigned.px
+SKIP: Test-https-pfs.px
 PASS: Test--httpsonly-r.px
-SKIP: Test-https-tlsv1.px
 SKIP: Test-https-tlsv1x.px
-SKIP: Test-https-selfsigned.px
-SKIP: Test-https-crl.px
-SKIP: Test-https-badcerts.px
+SKIP: Test-https-tlsv1.px
 SKIP: Test-https-weboftrust.px
 SKIP: Test-https-clientcert.px
+SKIP: Test-https-crl.px
+SKIP: Test-https-badcerts.px
 PASS: unit-tests
 ============================================================================
 Testsuite summary for wget 1.25.0
@@ -6964,12 +7000,11 @@
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-host.o `test -f 'host.c' || echo '../../src/'`host.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-hsts.o `test -f 'hsts.c' || echo '../../src/'`hsts.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-html-parse.o `test -f 'html-parse.c' || echo '../../src/'`html-parse.c
-gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-html-url.o `test -f 'html-url.c' || echo '../../src/'`html-url.c
 ../../src/hsts.c: In function 'hsts_store_save':
 ../../src/hsts.c:577:11: warning: ignoring return value of 'ftruncate' declared with attribute 'warn_unused_result' [-Wunused-result]
   577 |           ftruncate (fd, 0);
       |           ^~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-http.o `test -f 'http.c' || echo '../../src/'`http.c
+gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-html-url.o `test -f 'html-url.c' || echo '../../src/'`html-url.c
 ../../src/convert.c: In function 'local_quote_string':
 ../../src/convert.c:806:1: warning: function may return address of local variable [-Wreturn-local-addr]
   806 | }
@@ -6977,6 +7012,7 @@
 ../../src/convert.c:745:8: note: declared here
   745 |   char buf[1024];
       |        ^~~
+gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-http.o `test -f 'http.c' || echo '../../src/'`http.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-init.o `test -f 'init.c' || echo '../../src/'`init.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-log.o `test -f 'log.c' || echo '../../src/'`log.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-main.o `test -f 'main.c' || echo '../../src/'`main.c
@@ -6990,10 +7026,10 @@
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-url.o `test -f 'url.c' || echo '../../src/'`url.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-warc.o `test -f 'warc.c' || echo '../../src/'`warc.c
 ../../src/retr.c: In function 'test_retr_rate':
+gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-utils.o `test -f 'utils.c' || echo '../../src/'`utils.c
 ../../src/retr.c:1629:25: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  1629 |   for (struct test *t = tests; t < tests+countof(tests); t++)
       |                         ^~~~~
-gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-utils.o `test -f 'utils.c' || echo '../../src/'`utils.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-exits.o `test -f 'exits.c' || echo '../../src/'`exits.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-build_info.o `test -f 'build_info.c' || echo '../../src/'`build_info.c
 gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC=\"/etc/wgetrc\" -DLOCALEDIR=\"/usr/share/locale\" -I. -I../../src  -DTESTING "-I../lib" "-I../../lib"  -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o libunittest_a-xattr.o `test -f 'xattr.c' || echo '../../src/'`xattr.c
@@ -7096,41 +7132,41 @@
 make  -C ../src libunittest.a
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_css_fuzzer.o ../../fuzz/wget_css_fuzzer.c
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_ftpls_fuzzer.o ../../fuzz/wget_ftpls_fuzzer.c
-gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_html_fuzzer.o ../../fuzz/wget_html_fuzzer.c
-gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_netrc_fuzzer.o ../../fuzz/wget_netrc_fuzzer.c
 make[6]: Entering directory '/build/reproducible-path/wget-1.25.0/build-udeb/src'
-gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_options_fuzzer.o ../../fuzz/wget_options_fuzzer.c
 make[6]: 'libunittest.a' is up to date.
 make[6]: Leaving directory '/build/reproducible-path/wget-1.25.0/build-udeb/src'
+gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_html_fuzzer.o ../../fuzz/wget_html_fuzzer.c
+gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_netrc_fuzzer.o ../../fuzz/wget_netrc_fuzzer.c
+gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_options_fuzzer.o ../../fuzz/wget_options_fuzzer.c
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_progress_fuzzer.o ../../fuzz/wget_progress_fuzzer.c
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_read_hunk_fuzzer.o ../../fuzz/wget_read_hunk_fuzzer.c
-../../fuzz/wget_css_fuzzer.c: In function 'exit':
 gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_robots_fuzzer.o ../../fuzz/wget_robots_fuzzer.c
+gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_url_fuzzer.o ../../fuzz/wget_url_fuzzer.c
+gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_ntlm_fuzzer.o ../../fuzz/wget_ntlm_fuzzer.c
+../../fuzz/wget_css_fuzzer.c: In function 'exit':
+../../fuzz/wget_options_fuzzer.c: In function 'exit':
+../../fuzz/wget_options_fuzzer.c:92:1: warning: 'noreturn' function does return
+   92 | }
+      | ^
 ../../fuzz/wget_css_fuzzer.c:90:1: warning: 'noreturn' function does return
    90 | }
       | ^
-gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_url_fuzzer.o ../../fuzz/wget_url_fuzzer.c
 ../../fuzz/wget_ftpls_fuzzer.c: In function 'exit':
 ../../fuzz/wget_ftpls_fuzzer.c:82:1: warning: 'noreturn' function does return
    82 | }
       | ^
-gcc -DHAVE_CONFIG_H -I. -I../../fuzz -I../src  -I../../src -I../../fuzz -I../lib -I../../lib  -DSRCDIR=\"/build/reproducible-path/wget-1.25.0/build-udeb/../fuzz\" -DTEST_RUN -Wdate-time -D_FORTIFY_SOURCE=2    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os -c -o wget_ntlm_fuzzer.o ../../fuzz/wget_ntlm_fuzzer.c
-gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_css_fuzzer wget_css_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
-../../fuzz/wget_options_fuzzer.c: In function 'exit':
-../../fuzz/wget_options_fuzzer.c:92:1: warning: 'noreturn' function does return
-   92 | }
-      | ^
 ../../fuzz/wget_netrc_fuzzer.c: In function 'exit':
 ../../fuzz/wget_netrc_fuzzer.c:81:1: warning: 'noreturn' function does return
    81 | }
       | ^
-gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_ftpls_fuzzer wget_ftpls_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
 gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_cookie_fuzzer wget_cookie_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
-gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_options_fuzzer wget_options_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
 gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_html_fuzzer wget_html_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
-gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_robots_fuzzer wget_robots_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
+gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_options_fuzzer wget_options_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
+gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_css_fuzzer wget_css_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
+gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_ftpls_fuzzer wget_ftpls_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
 gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_netrc_fuzzer wget_netrc_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
 gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_progress_fuzzer wget_progress_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
+gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_robots_fuzzer wget_robots_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
 gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_url_fuzzer wget_url_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
 gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_ntlm_fuzzer wget_ntlm_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
 gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_read_hunk_fuzzer wget_read_hunk_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
@@ -7168,17 +7204,17 @@
 gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_robots_fuzzer wget_robots_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
 gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_url_fuzzer wget_url_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
 gcc    -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o wget_ntlm_fuzzer wget_ntlm_fuzzer.o main.o ../src/libunittest.a ../lib/libgnu.a                        -lpcre2-8  -luuid -lssl -lcrypto  -lz  
-SKIP: wget_options_fuzzer
-SKIP: wget_ftpls_fuzzer
 SKIP: wget_cookie_fuzzer
+SKIP: wget_ftpls_fuzzer
+SKIP: wget_html_fuzzer
+SKIP: wget_options_fuzzer
 SKIP: wget_progress_fuzzer
 PASS: wget_css_fuzzer
 SKIP: wget_netrc_fuzzer
-SKIP: wget_html_fuzzer
-SKIP: wget_read_hunk_fuzzer
 SKIP: wget_url_fuzzer
-SKIP: wget_robots_fuzzer
 SKIP: wget_ntlm_fuzzer
+SKIP: wget_read_hunk_fuzzer
+SKIP: wget_robots_fuzzer
 ============================================================================
 Testsuite summary for wget 1.25.0
 ============================================================================
@@ -7216,93 +7252,93 @@
 make[7]: Entering directory '/build/reproducible-path/wget-1.25.0/build-udeb/src'
 make[7]: 'libunittest.a' is up to date.
 make[7]: Leaving directory '/build/reproducible-path/wget-1.25.0/build-udeb/src'
-PASS: Test-c-shorter.px
-PASS: Test-E-k.px
 PASS: Test-c-full.px
 PASS: Test-c-partial.px
-PASS: Test-ftp-dir.px
-PASS: Test-ftp.px
 PASS: Test-c.px
-PASS: Test-E-k-K.px
+PASS: Test-ftp.px
+PASS: Test-E-k.px
+PASS: Test-c-shorter.px
 PASS: Test-cookies-401.px
 PASS: Test-ftp-bad-list.px
+PASS: Test-ftp-dir.px
+PASS: Test-E-k-K.px
 SKIP: Test-ftp-iri.px
 SKIP: Test-ftp-iri-fallback.px
-SKIP: Test-ftp-iri-disabled.px
+PASS: Test-cookies.px
 SKIP: Test-ftp-iri-recursive.px
-PASS: Test-ftp--start-pos.px
-PASS: Test-HTTP-Content-Disposition-1.px
+SKIP: Test-ftp-iri-disabled.px
+PASS: Test-ftp-list-Unknown.px
+PASS: Test-ftp-recursive.px
 PASS: Test-HTTP-Content-Disposition-2.px
-PASS: Test-cookies.px
 PASS: Test-ftp-list-Multinet.px
-PASS: Test-ftp-list-UNIX-hidden.px
 PASS: Test-ftp-list-Unknown-list-a-fails.px
+PASS: Test-ftp--start-pos.px
+PASS: Test-ftp-list-UNIX-hidden.px
+PASS: Test-ftp-list-Unknown-a.px
+PASS: Test-HTTP-Content-Disposition-1.px
+PASS: Test-ftp-list-Unknown-hidden.px
 SKIP: Test-idn-headers.px
 PASS: Test-HTTP-Content-Disposition.px
+SKIP: Test-idn-cmd-utf8.px
 SKIP: Test-idn-meta.px
 SKIP: Test-idn-cmd.px
-PASS: Test-ftp-list-Unknown.px
 SKIP: Test-idn-robots.px
 SKIP: Test-iri.px
-PASS: Test-ftp-list-Unknown-hidden.px
-SKIP: Test-idn-cmd-utf8.px
-PASS: Test-ftp-list-Unknown-a.px
-PASS: Test-ftp-recursive.px
-SKIP: Test-iri-percent.px
 SKIP: Test-idn-robots-utf8.px
-PASS: Test-i-http.px
 PASS: Test-i-ftp.px
-SKIP: Test-iri-forced-remote.px
+PASS: Test-ftp-pasv-fail.px
+SKIP: Test-iri-percent.px
 SKIP: Test-iri-list.px
+SKIP: Test-iri-forced-remote.px
+PASS: Test-i-http.px
+PASS: Test-iri-disabled.px
 PASS: Test-N-current.px
 PASS: Test-N--no-content-disposition.px
-PASS: Test-N-no-info.px
-PASS: Test-N-old.px
+PASS: Test-N-HTTP-Content-Disposition.px
 PASS: Test-N--no-content-disposition-trivial.px
-PASS: Test--no-content-disposition.px
-PASS: Test--no-content-disposition-trivial.px
 PASS: Test-meta-robots.px
-PASS: Test-N-HTTP-Content-Disposition.px
-PASS: Test-iri-disabled.px
+PASS: Test-N-no-info.px
+PASS: Test--no-content-disposition-trivial.px
+PASS: Test--no-content-disposition.px
 PASS: Test-nonexisting-quiet.px
+PASS: Test-N-old.px
 PASS: Test-noop.px
 PASS: Test-N-smaller.px
-PASS: Test-O-nc.px
 PASS: Test-N.px
-PASS: Test-O.px
+PASS: Test-np.px
 PASS: Test-O-HTTP-Content-Disposition.px
-PASS: Test-O--no-content-disposition.px
-PASS: Test-O--no-content-disposition-trivial.px
+PASS: Test-O.px
+PASS: Test-O-nc.px
+SKIP: Test-proxied-https-auth-keepalive.px
 SKIP: Test-proxied-https-auth.px
+PASS: Test-O--no-content-disposition-trivial.px
+PASS: Test-O--no-content-disposition.px
 PASS: Test-O-nonexisting.px
 PASS: Test--post-file.px
-PASS: Test-np.px
-SKIP: Test-proxied-https-auth-keepalive.px
 PASS: Test-proxy-auth-basic.px
+PASS: Test-restrict-ascii.px
+PASS: Test-Restrict-Uppercase.px
 PASS: Test-Restrict-Lowercase.px
+PASS: Test--spider-r--no-content-disposition-trivial.px
+PASS: Test--spider-r-HTTP-Content-Disposition.px
 PASS: Test-stdouterr.px
-PASS: Test-restrict-ascii.px
 PASS: Test--spider.px
 PASS: Test--spider-fail.px
-PASS: Test-Restrict-Uppercase.px
-PASS: Test--spider-r--no-content-disposition.px
-PASS: Test--start-pos.px
-PASS: Test--spider-r-HTTP-Content-Disposition.px
 PASS: Test--spider-r.px
-PASS: Test--spider-r--no-content-disposition-trivial.px
+PASS: Test--spider-r--no-content-disposition.px
 PASS: Test--start-pos--continue.px
+PASS: Test--start-pos.px
 PASS: Test-ftp-pasv-not-supported.px
 gcc   -DHAVE_LIBSSL  -DNDEBUG -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/wget-1.25.0=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -DNO_SSLv2 -Os  -Wl,-z,relro -Wl,-z,now -o unit-tests unit-tests.o ../src/libunittest.a ../lib/libgnu.a                     -lpcre2-8  -luuid -lssl -lcrypto  -lz  
-PASS: Test--httpsonly-r.px
 PASS: Test-204.px
-SKIP: Test-https-tlsv1.px
-PASS: Test-ftp-pasv-fail.px
-SKIP: Test-https-pfs.px
+PASS: Test--httpsonly-r.px
 SKIP: Test-https-tlsv1x.px
-SKIP: Test-https-crl.px
+SKIP: Test-https-pfs.px
+SKIP: Test-https-tlsv1.px
+SKIP: Test-https-clientcert.px
 SKIP: Test-https-selfsigned.px
 SKIP: Test-https-weboftrust.px
-SKIP: Test-https-clientcert.px
+SKIP: Test-https-crl.px
 SKIP: Test-https-badcerts.px
 PASS: unit-tests
 ============================================================================
@@ -7374,11 +7410,11 @@
 make[3]: Entering directory '/build/reproducible-path/wget-1.25.0/build/doc'
 make[4]: Entering directory '/build/reproducible-path/wget-1.25.0/build/doc'
 make[4]: Nothing to be done for 'install-exec-am'.
-/bin/bash /build/reproducible-path/wget-1.25.0/build-aux/install-sh -d /build/reproducible-path/wget-1.25.0/debian/tmp/etc
-/bin/bash /build/reproducible-path/wget-1.25.0/build-aux/install-sh -d /build/reproducible-path/wget-1.25.0/debian/tmp/usr/share/man/man1
+/bin/sh /build/reproducible-path/wget-1.25.0/build-aux/install-sh -d /build/reproducible-path/wget-1.25.0/debian/tmp/etc
+/bin/sh /build/reproducible-path/wget-1.25.0/build-aux/install-sh -d /build/reproducible-path/wget-1.25.0/debian/tmp/usr/share/man/man1
  /usr/bin/mkdir -p '/build/reproducible-path/wget-1.25.0/debian/tmp/usr/share/info'
- /usr/bin/install -c -m 644 ../../doc/wget.info '/build/reproducible-path/wget-1.25.0/debian/tmp/usr/share/info'
 /usr/bin/install -c -m 644 wget.1 /build/reproducible-path/wget-1.25.0/debian/tmp/usr/share/man/man1/wget.1
+ /usr/bin/install -c -m 644 ../../doc/wget.info '/build/reproducible-path/wget-1.25.0/debian/tmp/usr/share/info'
 make[4]: Leaving directory '/build/reproducible-path/wget-1.25.0/build/doc'
 make[3]: Leaving directory '/build/reproducible-path/wget-1.25.0/build/doc'
 Making install in po
@@ -7535,8 +7571,28 @@
    dh_perl -O--builddir=build
    dh_link -O--builddir=build
    dh_strip_nondeterminism -O--builddir=build
+	Normalized debian/wget/usr/share/locale/ro/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/ro/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/pt_BR/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/pt_BR/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/pt/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/pt/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/pl/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/it/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/id/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/hu/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/hu/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/hr/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/he/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/gl/LC_MESSAGES/wget-gnulib.mo
 Garbage at end of string in strptime:  +02:00 at /usr/lib/aarch64-linux-gnu/perl/5.40/Time/Piece.pm line 598.
-Perhaps a format flag did not match the actual input? at /usr/lib/aarch64-linux-gnu/perl/5.40/Time/Piece.pm line 598.
+	Normalized debian/wget/usr/share/locale/pl/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/nl/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/nl/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/nb/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/nb/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/ms/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/lt/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/uk/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/tr/LC_MESSAGES/wget-gnulib.mo
 	Normalized debian/wget/usr/share/locale/tr/LC_MESSAGES/wget.mo
@@ -7551,27 +7607,7 @@
 	Normalized debian/wget/usr/share/locale/vi/LC_MESSAGES/wget-gnulib.mo
 	Normalized debian/wget/usr/share/locale/vi/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/uk/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/sl/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/sl/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/sk/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/sk/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/rw/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/ru/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/ru/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/eu/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/eu/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/et/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/et/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/es/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/es/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/eo/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/ro/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/ro/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/pt_BR/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/pt_BR/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/pt/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/pt/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/pl/LC_MESSAGES/wget-gnulib.mo
+Perhaps a format flag did not match the actual input? at /usr/lib/aarch64-linux-gnu/perl/5.40/Time/Piece.pm line 598.
 	Normalized debian/wget/usr/share/locale/ko/LC_MESSAGES/wget-gnulib.mo
 	Normalized debian/wget/usr/share/locale/ko/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/ka/LC_MESSAGES/wget-gnulib.mo
@@ -7579,6 +7615,13 @@
 	Normalized debian/wget/usr/share/locale/ja/LC_MESSAGES/wget-gnulib.mo
 	Normalized debian/wget/usr/share/locale/ja/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/it/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/sl/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/sl/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/sk/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/sk/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/rw/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/ru/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/ru/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/eo/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/en_GB/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/el/LC_MESSAGES/wget-gnulib.mo
@@ -7586,6 +7629,20 @@
 	Normalized debian/wget/usr/share/locale/de/LC_MESSAGES/wget-gnulib.mo
 	Normalized debian/wget/usr/share/locale/de/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/da/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/da/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/cs/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/cs/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/ca/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/ca/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/bg/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/bg/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/eu/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/eu/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/et/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/et/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/es/LC_MESSAGES/wget-gnulib.mo
+	Normalized debian/wget/usr/share/locale/es/LC_MESSAGES/wget.mo
+	Normalized debian/wget/usr/share/locale/eo/LC_MESSAGES/wget-gnulib.mo
 	Normalized debian/wget/usr/share/locale/gl/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/ga/LC_MESSAGES/wget-gnulib.mo
 	Normalized debian/wget/usr/share/locale/ga/LC_MESSAGES/wget.mo
@@ -7593,30 +7650,9 @@
 	Normalized debian/wget/usr/share/locale/fr/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/fi/LC_MESSAGES/wget-gnulib.mo
 	Normalized debian/wget/usr/share/locale/fi/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/pl/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/nl/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/nl/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/nb/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/nb/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/ms/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/lt/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/be/LC_MESSAGES/wget-gnulib.mo
 	Normalized debian/wget/usr/share/locale/be/LC_MESSAGES/wget.mo
 	Normalized debian/wget/usr/share/locale/af/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/it/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/id/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/hu/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/hu/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/hr/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/he/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/gl/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/da/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/cs/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/cs/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/ca/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/ca/LC_MESSAGES/wget.mo
-	Normalized debian/wget/usr/share/locale/bg/LC_MESSAGES/wget-gnulib.mo
-	Normalized debian/wget/usr/share/locale/bg/LC_MESSAGES/wget.mo
    dh_compress -O--builddir=build
    dh_fixperms -O--builddir=build
    dh_missing -O--builddir=build
@@ -7647,12 +7683,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/3803986/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/3803986/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/474110 and its subdirectories
-I: Current time: Fri Mar 14 02:29:41 -12 2025
-I: pbuilder-time-stamp: 1741962581
+I: removing directory /srv/workspace/pbuilder/3803986 and its subdirectories
+I: Current time: Fri Apr 17 11:00:48 +14 2026
+I: pbuilder-time-stamp: 1776373248