Diff of the two buildlogs:

--
--- b1/build.log	2023-04-29 18:33:53.061770205 +0000
+++ b2/build.log	2023-04-29 18:45:40.710688793 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Fri May 31 12:52:18 -12 2024
-I: pbuilder-time-stamp: 1717203138
+I: Current time: Sun Apr 30 08:34:05 +14 2023
+I: pbuilder-time-stamp: 1682793245
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/bullseye-reproducible-base.tgz]
 I: copying local configuration
@@ -17,8 +17,8 @@
 I: copying [./shim_15.7-1~deb11u1.debian.tar.xz]
 I: Extracting source
 gpgv: unknown type of key resource 'trustedkeys.kbx'
-gpgv: keyblock resource '/tmp/dpkg-verify-sig.Dwfpfyc1/trustedkeys.kbx': General error
-gpgv: Signature made Tue Jan 31 01:29:46 2023 -12
+gpgv: keyblock resource '/tmp/dpkg-verify-sig.u0_H5uXy/trustedkeys.kbx': General error
+gpgv: Signature made Wed Feb  1 03:29:46 2023 +14
 gpgv:                using RSA key CEBB52301D617E910390FE16587979573442684E
 gpgv:                issuer "93sam@debian.org"
 gpgv: Can't check signature: No public key
@@ -34,135 +34,166 @@
 dpkg-source: info: applying block-grub-sbat3-debian.patch
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/2928286/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/2293514/tmp/hooks/D01_modify_environment starting
+debug: Running on ionos1-amd64.
+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 30 08:35 /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/2293514/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/2293514/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='amd64'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all,-fixfilepath parallel=16'
-  DISTRIBUTION='bullseye'
-  HOME='/root'
-  HOST_ARCH='amd64'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="1" [2]="4" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu")
+  BASH_VERSION='5.1.4(1)-release'
+  BUILDDIR=/build
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=amd64
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all,-fixfilepath parallel=15'
+  DIRSTACK=()
+  DISTRIBUTION=bullseye
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=x86_64
+  HOST_ARCH=amd64
   IFS=' 	
   '
-  INVOCATION_ID='691d421f2ce94cafb8ddfaa6893b7ea9'
-  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='2928286'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=177c8ce75f9e4ab59408cd85521538b6
+  LANG=C
+  LANGUAGE=et_EE:et
+  LC_ALL=C
+  MACHTYPE=x86_64-pc-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=2293514
   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.ZYEtAbSK/pbuilderrc_QdF0 --distribution bullseye --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bullseye-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.ZYEtAbSK/b1 --logfile b1/build.log shim_15.7-1~deb11u1.dsc'
-  SUDO_GID='111'
-  SUDO_UID='106'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://85.184.249.68: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.ZYEtAbSK/pbuilderrc_obgC --distribution bullseye --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bullseye-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.ZYEtAbSK/b2 --logfile b2/build.log shim_15.7-1~deb11u1.dsc'
+  SUDO_GID=110
+  SUDO_UID=105
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://78.137.99.97:3128
 I: uname -a
-  Linux ionos15-amd64 6.1.0-0.deb11.6-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.15-1~bpo11+1 (2023-03-16) x86_64 GNU/Linux
+  Linux i-capture-the-hostname 5.10.0-21-amd64 #1 SMP Debian 5.10.162-1 (2023-01-21) x86_64 GNU/Linux
 I: ls -l /bin
   total 5476
-  -rwxr-xr-x 1 root root 1234376 Mar 27  2022 bash
-  -rwxr-xr-x 3 root root   38984 Jul 20  2020 bunzip2
-  -rwxr-xr-x 3 root root   38984 Jul 20  2020 bzcat
-  lrwxrwxrwx 1 root root       6 Jul 20  2020 bzcmp -> bzdiff
-  -rwxr-xr-x 1 root root    2225 Jul 20  2020 bzdiff
-  lrwxrwxrwx 1 root root       6 Jul 20  2020 bzegrep -> bzgrep
-  -rwxr-xr-x 1 root root    4877 Sep  4  2019 bzexe
-  lrwxrwxrwx 1 root root       6 Jul 20  2020 bzfgrep -> bzgrep
-  -rwxr-xr-x 1 root root    3775 Jul 20  2020 bzgrep
-  -rwxr-xr-x 3 root root   38984 Jul 20  2020 bzip2
-  -rwxr-xr-x 1 root root   18424 Jul 20  2020 bzip2recover
-  lrwxrwxrwx 1 root root       6 Jul 20  2020 bzless -> bzmore
-  -rwxr-xr-x 1 root root    1297 Jul 20  2020 bzmore
-  -rwxr-xr-x 1 root root   43936 Sep 23  2020 cat
-  -rwxr-xr-x 1 root root   72672 Sep 23  2020 chgrp
-  -rwxr-xr-x 1 root root   64448 Sep 23  2020 chmod
-  -rwxr-xr-x 1 root root   72672 Sep 23  2020 chown
-  -rwxr-xr-x 1 root root  151168 Sep 23  2020 cp
-  -rwxr-xr-x 1 root root  125560 Dec 10  2020 dash
-  -rwxr-xr-x 1 root root  113664 Sep 23  2020 date
-  -rwxr-xr-x 1 root root   80968 Sep 23  2020 dd
-  -rwxr-xr-x 1 root root   93936 Sep 23  2020 df
-  -rwxr-xr-x 1 root root  147176 Sep 23  2020 dir
-  -rwxr-xr-x 1 root root   84440 Jan 20  2022 dmesg
-  lrwxrwxrwx 1 root root       8 Nov  6  2019 dnsdomainname -> hostname
-  lrwxrwxrwx 1 root root       8 Nov  6  2019 domainname -> hostname
-  -rwxr-xr-x 1 root root   39712 Sep 23  2020 echo
-  -rwxr-xr-x 1 root root      28 Jan 24  2023 egrep
-  -rwxr-xr-x 1 root root   39680 Sep 23  2020 false
-  -rwxr-xr-x 1 root root      28 Jan 24  2023 fgrep
-  -rwxr-xr-x 1 root root   69032 Jan 20  2022 findmnt
-  -rwsr-xr-x 1 root root   34896 Feb 26  2021 fusermount
-  -rwxr-xr-x 1 root root  203072 Jan 24  2023 grep
-  -rwxr-xr-x 2 root root    2346 Apr  9  2022 gunzip
-  -rwxr-xr-x 1 root root    6447 Apr  9  2022 gzexe
-  -rwxr-xr-x 1 root root   98048 Apr  9  2022 gzip
-  -rwxr-xr-x 1 root root   22600 Nov  6  2019 hostname
-  -rwxr-xr-x 1 root root   72840 Sep 23  2020 ln
-  -rwxr-xr-x 1 root root   56952 Feb  7  2020 login
-  -rwxr-xr-x 1 root root  147176 Sep 23  2020 ls
-  -rwxr-xr-x 1 root root  149736 Jan 20  2022 lsblk
-  -rwxr-xr-x 1 root root   85184 Sep 23  2020 mkdir
-  -rwxr-xr-x 1 root root   76896 Sep 23  2020 mknod
-  -rwxr-xr-x 1 root root   48064 Sep 23  2020 mktemp
-  -rwxr-xr-x 1 root root   59632 Jan 20  2022 more
-  -rwsr-xr-x 1 root root   55528 Jan 20  2022 mount
-  -rwxr-xr-x 1 root root   18664 Jan 20  2022 mountpoint
-  -rwxr-xr-x 1 root root  147080 Sep 23  2020 mv
-  lrwxrwxrwx 1 root root       8 Nov  6  2019 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root      14 Dec 16  2021 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root   43872 Sep 23  2020 pwd
-  lrwxrwxrwx 1 root root       4 Mar 27  2022 rbash -> bash
-  -rwxr-xr-x 1 root root   52032 Sep 23  2020 readlink
-  -rwxr-xr-x 1 root root   72704 Sep 23  2020 rm
-  -rwxr-xr-x 1 root root   52032 Sep 23  2020 rmdir
-  -rwxr-xr-x 1 root root   27472 Sep 27  2020 run-parts
-  -rwxr-xr-x 1 root root  122224 Dec 22  2018 sed
-  lrwxrwxrwx 1 root root       4 May 23 03:55 sh -> dash
-  -rwxr-xr-x 1 root root   43808 Sep 23  2020 sleep
-  -rwxr-xr-x 1 root root   84928 Sep 23  2020 stty
-  -rwsr-xr-x 1 root root   71912 Jan 20  2022 su
-  -rwxr-xr-x 1 root root   39744 Sep 23  2020 sync
-  -rwxr-xr-x 1 root root  531928 Feb 16  2021 tar
-  -rwxr-xr-x 1 root root   14456 Sep 27  2020 tempfile
-  -rwxr-xr-x 1 root root  101408 Sep 23  2020 touch
-  -rwxr-xr-x 1 root root   39680 Sep 23  2020 true
-  -rwxr-xr-x 1 root root   14328 Feb 26  2021 ulockmgr_server
-  -rwsr-xr-x 1 root root   35040 Jan 20  2022 umount
-  -rwxr-xr-x 1 root root   39744 Sep 23  2020 uname
-  -rwxr-xr-x 2 root root    2346 Apr  9  2022 uncompress
-  -rwxr-xr-x 1 root root  147176 Sep 23  2020 vdir
-  -rwxr-xr-x 1 root root   63744 Jan 20  2022 wdctl
-  lrwxrwxrwx 1 root root       8 Nov  6  2019 ypdomainname -> hostname
-  -rwxr-xr-x 1 root root    1984 Apr  9  2022 zcat
-  -rwxr-xr-x 1 root root    1678 Apr  9  2022 zcmp
-  -rwxr-xr-x 1 root root    5898 Apr  9  2022 zdiff
-  -rwxr-xr-x 1 root root      29 Apr  9  2022 zegrep
-  -rwxr-xr-x 1 root root      29 Apr  9  2022 zfgrep
-  -rwxr-xr-x 1 root root    2081 Apr  9  2022 zforce
-  -rwxr-xr-x 1 root root    8049 Apr  9  2022 zgrep
-  -rwxr-xr-x 1 root root    2206 Apr  9  2022 zless
-  -rwxr-xr-x 1 root root    1842 Apr  9  2022 zmore
-  -rwxr-xr-x 1 root root    4577 Apr  9  2022 znew
-I: user script /srv/workspace/pbuilder/2928286/tmp/hooks/D02_print_environment finished
+  -rwxr-xr-x 1 root root 1234376 Mar 28  2022 bash
+  -rwxr-xr-x 3 root root   38984 Jul 21  2020 bunzip2
+  -rwxr-xr-x 3 root root   38984 Jul 21  2020 bzcat
+  lrwxrwxrwx 1 root root       6 Jul 21  2020 bzcmp -> bzdiff
+  -rwxr-xr-x 1 root root    2225 Jul 21  2020 bzdiff
+  lrwxrwxrwx 1 root root       6 Jul 21  2020 bzegrep -> bzgrep
+  -rwxr-xr-x 1 root root    4877 Sep  5  2019 bzexe
+  lrwxrwxrwx 1 root root       6 Jul 21  2020 bzfgrep -> bzgrep
+  -rwxr-xr-x 1 root root    3775 Jul 21  2020 bzgrep
+  -rwxr-xr-x 3 root root   38984 Jul 21  2020 bzip2
+  -rwxr-xr-x 1 root root   18424 Jul 21  2020 bzip2recover
+  lrwxrwxrwx 1 root root       6 Jul 21  2020 bzless -> bzmore
+  -rwxr-xr-x 1 root root    1297 Jul 21  2020 bzmore
+  -rwxr-xr-x 1 root root   43936 Sep 24  2020 cat
+  -rwxr-xr-x 1 root root   72672 Sep 24  2020 chgrp
+  -rwxr-xr-x 1 root root   64448 Sep 24  2020 chmod
+  -rwxr-xr-x 1 root root   72672 Sep 24  2020 chown
+  -rwxr-xr-x 1 root root  151168 Sep 24  2020 cp
+  -rwxr-xr-x 1 root root  125560 Dec 11  2020 dash
+  -rwxr-xr-x 1 root root  113664 Sep 24  2020 date
+  -rwxr-xr-x 1 root root   80968 Sep 24  2020 dd
+  -rwxr-xr-x 1 root root   93936 Sep 24  2020 df
+  -rwxr-xr-x 1 root root  147176 Sep 24  2020 dir
+  -rwxr-xr-x 1 root root   84440 Jan 21  2022 dmesg
+  lrwxrwxrwx 1 root root       8 Nov  8  2019 dnsdomainname -> hostname
+  lrwxrwxrwx 1 root root       8 Nov  8  2019 domainname -> hostname
+  -rwxr-xr-x 1 root root   39712 Sep 24  2020 echo
+  -rwxr-xr-x 1 root root      28 Jan 25 22:23 egrep
+  -rwxr-xr-x 1 root root   39680 Sep 24  2020 false
+  -rwxr-xr-x 1 root root      28 Jan 25 22:23 fgrep
+  -rwxr-xr-x 1 root root   69032 Jan 21  2022 findmnt
+  -rwsr-xr-x 1 root root   34896 Feb 27  2021 fusermount
+  -rwxr-xr-x 1 root root  203072 Jan 25 22:23 grep
+  -rwxr-xr-x 2 root root    2346 Apr 10  2022 gunzip
+  -rwxr-xr-x 1 root root    6447 Apr 10  2022 gzexe
+  -rwxr-xr-x 1 root root   98048 Apr 10  2022 gzip
+  -rwxr-xr-x 1 root root   22600 Nov  8  2019 hostname
+  -rwxr-xr-x 1 root root   72840 Sep 24  2020 ln
+  -rwxr-xr-x 1 root root   56952 Feb  8  2020 login
+  -rwxr-xr-x 1 root root  147176 Sep 24  2020 ls
+  -rwxr-xr-x 1 root root  149736 Jan 21  2022 lsblk
+  -rwxr-xr-x 1 root root   85184 Sep 24  2020 mkdir
+  -rwxr-xr-x 1 root root   76896 Sep 24  2020 mknod
+  -rwxr-xr-x 1 root root   48064 Sep 24  2020 mktemp
+  -rwxr-xr-x 1 root root   59632 Jan 21  2022 more
+  -rwsr-xr-x 1 root root   55528 Jan 21  2022 mount
+  -rwxr-xr-x 1 root root   18664 Jan 21  2022 mountpoint
+  -rwxr-xr-x 1 root root  147080 Sep 24  2020 mv
+  lrwxrwxrwx 1 root root       8 Nov  8  2019 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root      14 Dec 17  2021 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root   43872 Sep 24  2020 pwd
+  lrwxrwxrwx 1 root root       4 Mar 28  2022 rbash -> bash
+  -rwxr-xr-x 1 root root   52032 Sep 24  2020 readlink
+  -rwxr-xr-x 1 root root   72704 Sep 24  2020 rm
+  -rwxr-xr-x 1 root root   52032 Sep 24  2020 rmdir
+  -rwxr-xr-x 1 root root   27472 Sep 28  2020 run-parts
+  -rwxr-xr-x 1 root root  122224 Dec 23  2018 sed
+  lrwxrwxrwx 1 root root       9 Apr 30 08:35 sh -> /bin/bash
+  -rwxr-xr-x 1 root root   43808 Sep 24  2020 sleep
+  -rwxr-xr-x 1 root root   84928 Sep 24  2020 stty
+  -rwsr-xr-x 1 root root   71912 Jan 21  2022 su
+  -rwxr-xr-x 1 root root   39744 Sep 24  2020 sync
+  -rwxr-xr-x 1 root root  531928 Feb 17  2021 tar
+  -rwxr-xr-x 1 root root   14456 Sep 28  2020 tempfile
+  -rwxr-xr-x 1 root root  101408 Sep 24  2020 touch
+  -rwxr-xr-x 1 root root   39680 Sep 24  2020 true
+  -rwxr-xr-x 1 root root   14328 Feb 27  2021 ulockmgr_server
+  -rwsr-xr-x 1 root root   35040 Jan 21  2022 umount
+  -rwxr-xr-x 1 root root   39744 Sep 24  2020 uname
+  -rwxr-xr-x 2 root root    2346 Apr 10  2022 uncompress
+  -rwxr-xr-x 1 root root  147176 Sep 24  2020 vdir
+  -rwxr-xr-x 1 root root   63744 Jan 21  2022 wdctl
+  lrwxrwxrwx 1 root root       8 Nov  8  2019 ypdomainname -> hostname
+  -rwxr-xr-x 1 root root    1984 Apr 10  2022 zcat
+  -rwxr-xr-x 1 root root    1678 Apr 10  2022 zcmp
+  -rwxr-xr-x 1 root root    5898 Apr 10  2022 zdiff
+  -rwxr-xr-x 1 root root      29 Apr 10  2022 zegrep
+  -rwxr-xr-x 1 root root      29 Apr 10  2022 zfgrep
+  -rwxr-xr-x 1 root root    2081 Apr 10  2022 zforce
+  -rwxr-xr-x 1 root root    8049 Apr 10  2022 zgrep
+  -rwxr-xr-x 1 root root    2206 Apr 10  2022 zless
+  -rwxr-xr-x 1 root root    1842 Apr 10  2022 zmore
+  -rwxr-xr-x 1 root root    4577 Apr 10  2022 znew
+I: user script /srv/workspace/pbuilder/2293514/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -267,7 +298,7 @@
 Get: 51 http://deb.debian.org/debian bullseye/main amd64 pesign amd64 0.112-6 [94.0 kB]
 Get: 52 http://deb.debian.org/debian bullseye/main amd64 sbsigntool amd64 0.9.2-2 [63.5 kB]
 Get: 53 http://deb.debian.org/debian bullseye/main amd64 xxd amd64 2:8.2.2434-3+deb11u1 [192 kB]
-Fetched 25.9 MB in 1s (37.0 MB/s)
+Fetched 25.9 MB in 4s (6233 kB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package bsdextrautils.
 (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 ... 19707 files and directories currently installed.)
@@ -501,7 +532,11 @@
 fakeroot is already the newest version (1.25.3-1.1).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/shim-15.7/ && 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  > ../shim_15.7-1~deb11u1_source.changes
+I: user script /srv/workspace/pbuilder/2293514/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for bullseye
+I: user script /srv/workspace/pbuilder/2293514/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/shim-15.7/ && 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  > ../shim_15.7-1~deb11u1_source.changes
 dpkg-buildpackage: info: source package shim
 dpkg-buildpackage: info: source version 15.7-1~deb11u1
 dpkg-buildpackage: info: source distribution bullseye
@@ -513,7 +548,7 @@
    debian/rules override_dh_auto_clean
 make[1]: Entering directory '/build/shim-15.7'
 dh_auto_clean -- MAKELEVEL=0
-	make -j16 clean MAKELEVEL=0
+	make -j15 clean MAKELEVEL=0
 make: Entering directory '/build/shim-15.7'
 make: Entering directory '/build/shim-15.7'
 make: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
@@ -664,7 +699,7 @@
 # If we have an empty data/sbat.debian.csv, delete
 if [ ! -s data/sbat.debian.csv ]; then rm -f data/sbat.debian.csv; fi
 dh_auto_build -- INSTALL=install RELEASE=15.7 COMMIT_ID=XXXX MAKELEVEL=0 ENABLE_HTTPBOOT=true VENDOR_CERT_FILE=debian/debian-uefi-ca.der VENDOR_DBX_FILE=dbx.esl EFIDIR=debian CROSS_COMPILE=x86_64-linux-gnu- CC=x86_64-linux-gnu-gcc-10 
-	make -j16 "INSTALL=install --strip-program=true" INSTALL=install RELEASE=15.7 COMMIT_ID=XXXX MAKELEVEL=0 ENABLE_HTTPBOOT=true VENDOR_CERT_FILE=debian/debian-uefi-ca.der VENDOR_DBX_FILE=dbx.esl EFIDIR=debian CROSS_COMPILE=x86_64-linux-gnu- CC=x86_64-linux-gnu-gcc-10
+	make -j15 "INSTALL=install --strip-program=true" INSTALL=install RELEASE=15.7 COMMIT_ID=XXXX MAKELEVEL=0 ENABLE_HTTPBOOT=true VENDOR_CERT_FILE=debian/debian-uefi-ca.der VENDOR_DBX_FILE=dbx.esl EFIDIR=debian CROSS_COMPILE=x86_64-linux-gnu- CC=x86_64-linux-gnu-gcc-10
 make: Entering directory '/build/shim-15.7'
 sed	-e "s,@@VERSION@@,15.7," \
 	-e "s,@@UNAME@@,buildhost," \
@@ -1162,8 +1197,8 @@
 make: Entering directory '/build/shim-15.7/gnu-efi'
 mkdir -p /build/shim-15.7/gnu-efi/x86_64/lib
 make -C /build/shim-15.7/gnu-efi/x86_64/lib -f /build/shim-15.7/gnu-efi//lib/Makefile SRCDIR=/build/shim-15.7/gnu-efi//lib ARCH=x86_64
-make: Entering directory '/build/shim-15.7/gnu-efi/x86_64/lib'
 mkdir -p /build/shim-15.7/gnu-efi/x86_64/inc
+make: Entering directory '/build/shim-15.7/gnu-efi/x86_64/lib'
 make -C /build/shim-15.7/gnu-efi/x86_64/inc -f /build/shim-15.7/gnu-efi//inc/Makefile SRCDIR=/build/shim-15.7/gnu-efi//inc ARCH=x86_64
 make: Entering directory '/build/shim-15.7/gnu-efi/x86_64/inc'
 x86_64-linux-gnu-gcc-10 -I/build/shim-15.7/gnu-efi//lib -I/build/shim-15.7/gnu-efi/inc -I/build/shim-15.7/gnu-efi/inc/x86_64 -I/build/shim-15.7/gnu-efi/inc/protocol -std=gnu11 -ggdb -ffreestanding -fmacro-prefix-map=/build/shim-15.7/= -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar -Os -Wall -Wextra -Wno-missing-field-initializers  -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args  -m64 -DMDE_CPU_X64 -DPAGE_SIZE=4096 -Werror -nostdinc -I/build/shim-15.7/Cryptlib -I/build/shim-15.7/Cryptlib/Include -I/build/shim-15.7/gnu-efi/inc -I/build/shim-15.7/gnu-efi/inc/x86_64 -I/build/shim-15.7/gnu-efi/inc/protocol -I/build/shim-15.7/include -iquote /build/shim-15.7 -iquote /build/shim-15.7 -isystem /build/shim-15.7/include/system -isystem /usr/lib/gcc/x86_64-linux-gnu/10/include -DDEFAULT_LOADER='L"\\\\grubx64.efi"' -DDEFAULT_LOADER_CHAR='"\\\\grubx64.efi"' -DEFI_ARCH='L"x64"' -DDEBUGDIR='L"/usr/lib/debug/usr/share/shim/x64-15.7-15.7/"' -DVENDOR_CERT_FILE=\"debian/debian-uefi-ca.der\" -DVENDOR_DBX_FILE=\"dbx.esl\" -DGNU_EFI_USE_EXTERNAL_STDARG -Wno-error=pragmas -mno-red-zone -mno-avx -fpic  -Os -Wall -Wextra -Wno-missing-field-initializers -Werror -fshort-wchar -fno-strict-aliasing -ffreestanding -fno-stack-protector -fno-stack-check -nostdinc   -isystem /build/shim-15.7/gnu-efi/../include/system -isystem /usr/lib/gcc/x86_64-linux-gnu/10/include -fno-merge-all-constants -Wno-error=pragmas -mno-red-zone -mno-avx -fpic  -Os -Wall -Wextra -Wno-missing-field-initializers -Werror -fshort-wchar -fno-strict-aliasing -ffreestanding -fno-stack-protector -fno-stack-check -nostdinc   -isystem /build/shim-15.7/gnu-efi/../include/system -isystem /usr/lib/gcc/x86_64-linux-gnu/10/include -fno-merge-all-constants -Wdate-time -D_FORTIFY_SOURCE=2 -DCONFIG_x86_64 -DGNU_EFI_USE_MS_ABI -DGNU_EFI_USE_EXTERNAL_STDARG -maccumulate-outgoing-args --std=c11 -DCONFIG_x86_64 -DGNU_EFI_USE_MS_ABI -DGNU_EFI_USE_EXTERNAL_STDARG -maccumulate-outgoing-args --std=c11 -c /build/shim-15.7/gnu-efi//lib/boxdraw.c -o boxdraw.o
@@ -1304,14 +1339,14 @@
    debian/rules override_dh_auto_test
 make[1]: Entering directory '/build/shim-15.7'
 dh_auto_test -- INSTALL=install RELEASE=15.7 COMMIT_ID=XXXX MAKELEVEL=0 ENABLE_HTTPBOOT=true VENDOR_CERT_FILE=debian/debian-uefi-ca.der VENDOR_DBX_FILE=dbx.esl EFIDIR=debian CROSS_COMPILE=x86_64-linux-gnu- CC=x86_64-linux-gnu-gcc-10 
-	make -j16 test INSTALL=install RELEASE=15.7 COMMIT_ID=XXXX MAKELEVEL=0 ENABLE_HTTPBOOT=true VENDOR_CERT_FILE=debian/debian-uefi-ca.der VENDOR_DBX_FILE=dbx.esl EFIDIR=debian CROSS_COMPILE=x86_64-linux-gnu- CC=x86_64-linux-gnu-gcc-10
+	make -j15 test INSTALL=install RELEASE=15.7 COMMIT_ID=XXXX MAKELEVEL=0 ENABLE_HTTPBOOT=true VENDOR_CERT_FILE=debian/debian-uefi-ca.der VENDOR_DBX_FILE=dbx.esl EFIDIR=debian CROSS_COMPILE=x86_64-linux-gnu- CC=x86_64-linux-gnu-gcc-10
 make: Entering directory '/build/shim-15.7'
 make: Entering directory '/build/shim-15.7'
 make: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
 dd if=/dev/urandom bs=512 count=17 of=random.bin
 17+0 records in
 17+0 records out
-8704 bytes (8.7 kB, 8.5 KiB) copied, 0.000215847 s, 40.3 MB/s
+8704 bytes (8.7 kB, 8.5 KiB) copied, 0.000214109 s, 40.7 MB/s
 xxd -i random.bin test-random.h
 make -C gnu-efi \
 	COMPILER="gcc" \
@@ -1329,29 +1364,29 @@
 removed directory 'x86_64/gnuefi'
 removed directory 'x86_64/inc'
 removed 'x86_64/lib/libefi.a'
+removed 'x86_64/lib/misc.o'
 removed 'x86_64/lib/print.o'
 removed 'x86_64/lib/str.o'
-removed 'x86_64/lib/misc.o'
-removed 'x86_64/lib/cmdline.o'
 removed 'x86_64/lib/sread.o'
+removed 'x86_64/lib/cmdline.o'
 removed 'x86_64/lib/dpath.o'
-removed 'x86_64/lib/pause.o'
 removed 'x86_64/lib/hand.o'
-removed 'x86_64/lib/lock.o'
+removed 'x86_64/lib/pause.o'
 removed 'x86_64/lib/init.o'
 removed 'x86_64/lib/hw.o'
+removed 'x86_64/lib/lock.o'
 removed 'x86_64/lib/guid.o'
-removed 'x86_64/lib/exit.o'
 removed 'x86_64/lib/event.o'
+removed 'x86_64/lib/exit.o'
 removed 'x86_64/lib/error.o'
-removed 'x86_64/lib/debug.o'
-removed 'x86_64/lib/data.o'
 removed 'x86_64/lib/crc.o'
-removed 'x86_64/lib/smbios.o'
+removed 'x86_64/lib/data.o'
 removed 'x86_64/lib/console.o'
+removed 'x86_64/lib/debug.o'
+removed 'x86_64/lib/smbios.o'
 removed 'x86_64/lib/boxdraw.o'
-removed 'x86_64/lib/runtime/rtdata.o'
 removed 'x86_64/lib/runtime/rtstr.o'
+removed 'x86_64/lib/runtime/rtdata.o'
 removed 'x86_64/lib/runtime/vm.o'
 removed 'x86_64/lib/runtime/efirtlib.o'
 removed 'x86_64/lib/runtime/rtlock.o'
@@ -1360,8 +1395,8 @@
 removed directory 'x86_64/lib/arm'
 removed directory 'x86_64/lib/aarch64'
 removed directory 'x86_64/lib/ia64'
-removed 'x86_64/lib/x86_64/efi_stub.o'
 removed 'x86_64/lib/x86_64/callwrap.o'
+removed 'x86_64/lib/x86_64/efi_stub.o'
 removed 'x86_64/lib/x86_64/math.o'
 removed 'x86_64/lib/x86_64/setjmp.o'
 removed 'x86_64/lib/x86_64/initplat.o'
@@ -1510,10 +1545,10 @@
 running test_simple_sbat_csv
 test_simple_sbat_csv: passed
 running test_csv_simple_fuzz
-parsed 2 entries
+parsed 4 entries
 test_csv_simple_fuzz: passed
 running test_csv_simple_fuzz
-parsed 74 entries
+parsed 67 entries
 test_csv_simple_fuzz: passed
 x86_64-linux-gnu-gcc-10 -O2 -ggdb -std=gnu11 -isystem /build/shim-15.7/include/system -I/build/shim-15.7/gnu-efi/inc -I/build/shim-15.7/gnu-efi/inc/x86_64 -I/build/shim-15.7/gnu-efi/inc/protocol -Iinclude -iquote . -isystem /usr/include -isystem /usr/lib/gcc/x86_64-linux-gnu/10/include -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args  -m64 -DMDE_CPU_X64 -DPAGE_SIZE=4096   -fshort-wchar -fno-builtin -rdynamic -fno-inline -fno-eliminate-unused-debug-types -fno-eliminate-unused-debug-symbols -gpubnames -grecord-gcc-switches  -Wall -Wextra -Wno-missing-field-initializers -Wsign-compare -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-unused-variable -Wno-pointer-sign -Werror -Werror=nonnull -Werror=nonnull-compare  -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DPAGE_SIZE=4096 -DSHIM_UNIT_TEST "-DDEFAULT_DEBUG_PRINT_STATE=0" -isystem include-fixed -isystem /usr/include/x86_64-linux-gnu -DHAVE_SHIM_LOCK_GUID -o test-load-options lib/guid.c load-options.c test-load-options.c test.c libefi-test.a -lefivar
 ./test-load-options
@@ -1751,7 +1786,7 @@
    debian/rules override_dh_auto_install
 make[1]: Entering directory '/build/shim-15.7'
 dh_auto_install --destdir=debian/tmp -- INSTALL=install RELEASE=15.7 COMMIT_ID=XXXX MAKELEVEL=0 ENABLE_HTTPBOOT=true VENDOR_CERT_FILE=debian/debian-uefi-ca.der VENDOR_DBX_FILE=dbx.esl EFIDIR=debian CROSS_COMPILE=x86_64-linux-gnu- CC=x86_64-linux-gnu-gcc-10 
-	make -j16 install DESTDIR=/build/shim-15.7/debian/tmp AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" INSTALL=install RELEASE=15.7 COMMIT_ID=XXXX MAKELEVEL=0 ENABLE_HTTPBOOT=true VENDOR_CERT_FILE=debian/debian-uefi-ca.der VENDOR_DBX_FILE=dbx.esl EFIDIR=debian CROSS_COMPILE=x86_64-linux-gnu- CC=x86_64-linux-gnu-gcc-10
+	make -j15 install DESTDIR=/build/shim-15.7/debian/tmp AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" INSTALL=install RELEASE=15.7 COMMIT_ID=XXXX MAKELEVEL=0 ENABLE_HTTPBOOT=true VENDOR_CERT_FILE=debian/debian-uefi-ca.der VENDOR_DBX_FILE=dbx.esl EFIDIR=debian CROSS_COMPILE=x86_64-linux-gnu- CC=x86_64-linux-gnu-gcc-10
 make: Entering directory '/build/shim-15.7'
 mkdir -p gnu-efi/lib gnu-efi/gnuefi
 make -C gnu-efi \
@@ -1765,8 +1800,8 @@
 make: Entering directory '/build/shim-15.7/gnu-efi'
 mkdir -p /build/shim-15.7/gnu-efi/x86_64/lib
 make -C /build/shim-15.7/gnu-efi/x86_64/lib -f /build/shim-15.7/gnu-efi//lib/Makefile SRCDIR=/build/shim-15.7/gnu-efi//lib ARCH=x86_64
-make: Entering directory '/build/shim-15.7/gnu-efi/x86_64/lib'
 mkdir -p /build/shim-15.7/gnu-efi/x86_64/inc
+make: Entering directory '/build/shim-15.7/gnu-efi/x86_64/lib'
 make -C /build/shim-15.7/gnu-efi/x86_64/inc -f /build/shim-15.7/gnu-efi//inc/Makefile SRCDIR=/build/shim-15.7/gnu-efi//inc ARCH=x86_64
 make: Entering directory '/build/shim-15.7/gnu-efi/x86_64/inc'
 x86_64-linux-gnu-gcc-10 -I/build/shim-15.7/gnu-efi//lib -I/build/shim-15.7/gnu-efi/inc -I/build/shim-15.7/gnu-efi/inc/x86_64 -I/build/shim-15.7/gnu-efi/inc/protocol -std=gnu11 -ggdb -ffreestanding -fmacro-prefix-map=/build/shim-15.7/= -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar -Os -Wall -Wextra -Wno-missing-field-initializers  -mno-mmx -mno-sse -mno-red-zone -nostdinc -maccumulate-outgoing-args  -m64 -DMDE_CPU_X64 -DPAGE_SIZE=4096 -Werror -nostdinc -I/build/shim-15.7/Cryptlib -I/build/shim-15.7/Cryptlib/Include -I/build/shim-15.7/gnu-efi/inc -I/build/shim-15.7/gnu-efi/inc/x86_64 -I/build/shim-15.7/gnu-efi/inc/protocol -I/build/shim-15.7/include -iquote /build/shim-15.7 -iquote /build/shim-15.7 -isystem /build/shim-15.7/include/system -isystem /usr/lib/gcc/x86_64-linux-gnu/10/include -DDEFAULT_LOADER='L"\\\\grubx64.efi"' -DDEFAULT_LOADER_CHAR='"\\\\grubx64.efi"' -DEFI_ARCH='L"x64"' -DDEBUGDIR='L"/usr/lib/debug/usr/share/shim/x64-15.7-15.7/"' -DVENDOR_CERT_FILE=\"debian/debian-uefi-ca.der\" -DVENDOR_DBX_FILE=\"dbx.esl\" -DGNU_EFI_USE_EXTERNAL_STDARG -Wno-error=pragmas -mno-red-zone -mno-avx -fpic  -Os -Wall -Wextra -Wno-missing-field-initializers -Werror -fshort-wchar -fno-strict-aliasing -ffreestanding -fno-stack-protector -fno-stack-check -nostdinc   -isystem /build/shim-15.7/gnu-efi/../include/system -isystem /usr/lib/gcc/x86_64-linux-gnu/10/include -fno-merge-all-constants -Wno-error=pragmas -mno-red-zone -mno-avx -fpic  -Os -Wall -Wextra -Wno-missing-field-initializers -Werror -fshort-wchar -fno-strict-aliasing -ffreestanding -fno-stack-protector -fno-stack-check -nostdinc   -isystem /build/shim-15.7/gnu-efi/../include/system -isystem /usr/lib/gcc/x86_64-linux-gnu/10/include -fno-merge-all-constants -Wdate-time -D_FORTIFY_SOURCE=2 -DCONFIG_x86_64 -DGNU_EFI_USE_MS_ABI -DGNU_EFI_USE_EXTERNAL_STDARG -maccumulate-outgoing-args --std=c11 -DCONFIG_x86_64 -DGNU_EFI_USE_MS_ABI -DGNU_EFI_USE_EXTERNAL_STDARG -maccumulate-outgoing-args --std=c11 -c /build/shim-15.7/gnu-efi//lib/boxdraw.c -o boxdraw.o
@@ -1949,8 +1984,8 @@
 dpkg-gencontrol: warning: Depends field of package shim-unsigned: substitution variable ${shlibs:Depends} used, but is not defined
    dh_md5sums
    dh_builddeb
-dpkg-deb: building package 'shim-unsigned' in '../shim-unsigned_15.7-1~deb11u1_amd64.deb'.
 dpkg-deb: building package 'shim-helpers-amd64-signed-template' in '../shim-helpers-amd64-signed-template_15.7-1~deb11u1_amd64.deb'.
+dpkg-deb: building package 'shim-unsigned' in '../shim-unsigned_15.7-1~deb11u1_amd64.deb'.
  dpkg-genbuildinfo --build=binary
  dpkg-genchanges --build=binary >../shim_15.7-1~deb11u1_amd64.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
@@ -1958,12 +1993,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: including full source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/2293514/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/2293514/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/2928286 and its subdirectories
-I: Current time: Fri May 31 12:56:53 -12 2024
-I: pbuilder-time-stamp: 1717203413
+I: removing directory /srv/workspace/pbuilder/2293514 and its subdirectories
+I: Current time: Sun Apr 30 08:45:38 +14 2023
+I: pbuilder-time-stamp: 1682793938