Diff of the two buildlogs:

--
--- b1/build.log	2021-08-05 10:29:52.126118574 +0000
+++ b2/build.log	2021-08-05 10:31:12.599084841 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Wed Aug  4 22:26:43 -12 2021
-I: pbuilder-time-stamp: 1628159203
+I: Current time: Fri Aug  6 00:30:00 +14 2021
+I: pbuilder-time-stamp: 1628159400
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/bullseye-reproducible-base.tgz]
 I: copying local configuration
@@ -16,8 +16,8 @@
 I: copying [./php-elisp_1.23.0-1.debian.tar.xz]
 I: Extracting source
 gpgv: unknown type of key resource 'trustedkeys.kbx'
-gpgv: keyblock resource '/tmp/dpkg-verify-sig.CNLPoCPc/trustedkeys.kbx': General error
-gpgv: Signature made Fri May  8 12:35:48 2020 -12
+gpgv: keyblock resource '/tmp/dpkg-verify-sig.9b_t5lxk/trustedkeys.kbx': General error
+gpgv: Signature made Sat May  9 14:35:48 2020 +14
 gpgv:                using RSA key E2A6261E3900AED7CDC667085A8830475F7D1061
 gpgv: Can't check signature: No public key
 dpkg-source: warning: failed to verify signature on ./php-elisp_1.23.0-1.dsc
@@ -26,135 +26,169 @@
 dpkg-source: info: unpacking php-elisp_1.23.0-1.debian.tar.xz
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/10176/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/19505/tmp/hooks/D01_modify_environment starting
+debug: Running on virt64b.
+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
+Removing 'diversion of /bin/sh to /bin/sh.distrib by dash'
+Adding 'diversion of /bin/sh to /bin/sh.distrib by bash'
+Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash'
+Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by 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/19505/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/19505/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='armhf'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all,-fixfilepath parallel=3'
-  DISTRIBUTION=''
-  HOME='/root'
-  HOST_ARCH='armhf'
+  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]="arm-unknown-linux-gnueabihf")
+  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=armhf
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all,-fixfilepath parallel=4'
+  DIRSTACK=()
+  DISTRIBUTION=
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=arm
+  HOST_ARCH=armhf
   IFS=' 	
   '
-  INVOCATION_ID='ad718b82ec8c4ab1ac805e6e90b18b9e'
-  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='10176'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=e5cf3e32f3cd42cea4af632113e67310
+  LANG=C
+  LANGUAGE=it_CH:it
+  LC_ALL=C
+  MACHTYPE=arm-unknown-linux-gnueabihf
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnueabihf
+  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=19505
   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/tmp.snK6v47Eh3/pbuilderrc_DJoH --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bullseye-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.snK6v47Eh3/b1 --logfile b1/build.log php-elisp_1.23.0-1.dsc'
-  SUDO_GID='113'
-  SUDO_UID='107'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://10.0.0.15:8000/'
+  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/tmp.snK6v47Eh3/pbuilderrc_4kAo --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bullseye-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.snK6v47Eh3/b2 --logfile b2/build.log --extrapackages usrmerge php-elisp_1.23.0-1.dsc'
+  SUDO_GID=113
+  SUDO_UID=107
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://10.0.0.15:8000/
 I: uname -a
-  Linux wbq0 5.10.0-8-armmp #1 SMP Debian 5.10.46-3 (2021-07-28) armv7l GNU/Linux
+  Linux i-capture-the-hostname 5.10.0-8-arm64 #1 SMP Debian 5.10.46-3 (2021-07-28) aarch64 GNU/Linux
 I: ls -l /bin
   total 3580
-  -rwxr-xr-x 1 root root 816764 Aug  4 08:25 bash
-  -rwxr-xr-x 3 root root  26052 Jul 20  2020 bunzip2
-  -rwxr-xr-x 3 root root  26052 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  26052 Jul 20  2020 bzip2
-  -rwxr-xr-x 1 root root   9636 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  26668 Sep 22  2020 cat
-  -rwxr-xr-x 1 root root  43104 Sep 22  2020 chgrp
-  -rwxr-xr-x 1 root root  38984 Sep 22  2020 chmod
-  -rwxr-xr-x 1 root root  43112 Sep 22  2020 chown
-  -rwxr-xr-x 1 root root  92616 Sep 22  2020 cp
-  -rwxr-xr-x 1 root root  75524 Dec 10  2020 dash
-  -rwxr-xr-x 1 root root  75880 Sep 22  2020 date
-  -rwxr-xr-x 1 root root  55436 Sep 22  2020 dd
-  -rwxr-xr-x 1 root root  59912 Sep 22  2020 df
-  -rwxr-xr-x 1 root root  96764 Sep 22  2020 dir
-  -rwxr-xr-x 1 root root  55012 Jul 28 07:09 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  22508 Sep 22  2020 echo
-  -rwxr-xr-x 1 root root     28 Nov  9  2020 egrep
-  -rwxr-xr-x 1 root root  22496 Sep 22  2020 false
-  -rwxr-xr-x 1 root root     28 Nov  9  2020 fgrep
-  -rwxr-xr-x 1 root root  47492 Jul 28 07:09 findmnt
-  -rwsr-xr-x 1 root root  26076 Feb 26 04:12 fusermount
-  -rwxr-xr-x 1 root root 124508 Nov  9  2020 grep
-  -rwxr-xr-x 2 root root   2346 Mar  2 11:30 gunzip
-  -rwxr-xr-x 1 root root   6376 Mar  2 11:30 gzexe
-  -rwxr-xr-x 1 root root  64212 Mar  2 11:30 gzip
-  -rwxr-xr-x 1 root root  13784 Nov  6  2019 hostname
-  -rwxr-xr-x 1 root root  43180 Sep 22  2020 ln
-  -rwxr-xr-x 1 root root  35068 Feb  7  2020 login
-  -rwxr-xr-x 1 root root  96764 Sep 22  2020 ls
-  -rwxr-xr-x 1 root root  99940 Jul 28 07:09 lsblk
-  -rwxr-xr-x 1 root root  51408 Sep 22  2020 mkdir
-  -rwxr-xr-x 1 root root  43184 Sep 22  2020 mknod
-  -rwxr-xr-x 1 root root  30780 Sep 22  2020 mktemp
-  -rwxr-xr-x 1 root root  34408 Jul 28 07:09 more
-  -rwsr-xr-x 1 root root  34400 Jul 28 07:09 mount
-  -rwxr-xr-x 1 root root   9824 Jul 28 07:09 mountpoint
-  -rwxr-xr-x 1 root root  88524 Sep 22  2020 mv
-  lrwxrwxrwx 1 root root      8 Nov  6  2019 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root     14 Apr 18 03:38 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root  26652 Sep 22  2020 pwd
-  lrwxrwxrwx 1 root root      4 Aug  4 08:25 rbash -> bash
-  -rwxr-xr-x 1 root root  30740 Sep 22  2020 readlink
-  -rwxr-xr-x 1 root root  43104 Sep 22  2020 rm
-  -rwxr-xr-x 1 root root  30732 Sep 22  2020 rmdir
-  -rwxr-xr-x 1 root root  14144 Sep 27  2020 run-parts
-  -rwxr-xr-x 1 root root  76012 Dec 22  2018 sed
-  lrwxrwxrwx 1 root root      4 Aug  4 21:27 sh -> dash
-  -rwxr-xr-x 1 root root  22532 Sep 22  2020 sleep
-  -rwxr-xr-x 1 root root  55360 Sep 22  2020 stty
-  -rwsr-xr-x 1 root root  46704 Jul 28 07:09 su
-  -rwxr-xr-x 1 root root  22532 Sep 22  2020 sync
-  -rwxr-xr-x 1 root root 340872 Feb 16 21:55 tar
-  -rwxr-xr-x 1 root root   9808 Sep 27  2020 tempfile
-  -rwxr-xr-x 1 root root  67696 Sep 22  2020 touch
-  -rwxr-xr-x 1 root root  22496 Sep 22  2020 true
-  -rwxr-xr-x 1 root root   9636 Feb 26 04:12 ulockmgr_server
-  -rwsr-xr-x 1 root root  22108 Jul 28 07:09 umount
-  -rwxr-xr-x 1 root root  22520 Sep 22  2020 uname
-  -rwxr-xr-x 2 root root   2346 Mar  2 11:30 uncompress
-  -rwxr-xr-x 1 root root  96764 Sep 22  2020 vdir
-  -rwxr-xr-x 1 root root  38512 Jul 28 07:09 wdctl
-  lrwxrwxrwx 1 root root      8 Nov  6  2019 ypdomainname -> hostname
-  -rwxr-xr-x 1 root root   1984 Mar  2 11:30 zcat
-  -rwxr-xr-x 1 root root   1678 Mar  2 11:30 zcmp
-  -rwxr-xr-x 1 root root   5880 Mar  2 11:30 zdiff
-  -rwxr-xr-x 1 root root     29 Mar  2 11:30 zegrep
-  -rwxr-xr-x 1 root root     29 Mar  2 11:30 zfgrep
-  -rwxr-xr-x 1 root root   2081 Mar  2 11:30 zforce
-  -rwxr-xr-x 1 root root   7585 Mar  2 11:30 zgrep
-  -rwxr-xr-x 1 root root   2206 Mar  2 11:30 zless
-  -rwxr-xr-x 1 root root   1842 Mar  2 11:30 zmore
-  -rwxr-xr-x 1 root root   4553 Mar  2 11:30 znew
-I: user script /srv/workspace/pbuilder/10176/tmp/hooks/D02_print_environment finished
+  -rwxr-xr-x 1 root root 816764 Aug  5 10:25 bash
+  -rwxr-xr-x 3 root root  26052 Jul 21  2020 bunzip2
+  -rwxr-xr-x 3 root root  26052 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  26052 Jul 21  2020 bzip2
+  -rwxr-xr-x 1 root root   9636 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  26668 Sep 23  2020 cat
+  -rwxr-xr-x 1 root root  43104 Sep 23  2020 chgrp
+  -rwxr-xr-x 1 root root  38984 Sep 23  2020 chmod
+  -rwxr-xr-x 1 root root  43112 Sep 23  2020 chown
+  -rwxr-xr-x 1 root root  92616 Sep 23  2020 cp
+  -rwxr-xr-x 1 root root  75524 Dec 11  2020 dash
+  -rwxr-xr-x 1 root root  75880 Sep 23  2020 date
+  -rwxr-xr-x 1 root root  55436 Sep 23  2020 dd
+  -rwxr-xr-x 1 root root  59912 Sep 23  2020 df
+  -rwxr-xr-x 1 root root  96764 Sep 23  2020 dir
+  -rwxr-xr-x 1 root root  55012 Jul 29 09:09 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  22508 Sep 23  2020 echo
+  -rwxr-xr-x 1 root root     28 Nov 10  2020 egrep
+  -rwxr-xr-x 1 root root  22496 Sep 23  2020 false
+  -rwxr-xr-x 1 root root     28 Nov 10  2020 fgrep
+  -rwxr-xr-x 1 root root  47492 Jul 29 09:09 findmnt
+  -rwsr-xr-x 1 root root  26076 Feb 27 06:12 fusermount
+  -rwxr-xr-x 1 root root 124508 Nov 10  2020 grep
+  -rwxr-xr-x 2 root root   2346 Mar  3 13:30 gunzip
+  -rwxr-xr-x 1 root root   6376 Mar  3 13:30 gzexe
+  -rwxr-xr-x 1 root root  64212 Mar  3 13:30 gzip
+  -rwxr-xr-x 1 root root  13784 Nov  8  2019 hostname
+  -rwxr-xr-x 1 root root  43180 Sep 23  2020 ln
+  -rwxr-xr-x 1 root root  35068 Feb  8  2020 login
+  -rwxr-xr-x 1 root root  96764 Sep 23  2020 ls
+  -rwxr-xr-x 1 root root  99940 Jul 29 09:09 lsblk
+  -rwxr-xr-x 1 root root  51408 Sep 23  2020 mkdir
+  -rwxr-xr-x 1 root root  43184 Sep 23  2020 mknod
+  -rwxr-xr-x 1 root root  30780 Sep 23  2020 mktemp
+  -rwxr-xr-x 1 root root  34408 Jul 29 09:09 more
+  -rwsr-xr-x 1 root root  34400 Jul 29 09:09 mount
+  -rwxr-xr-x 1 root root   9824 Jul 29 09:09 mountpoint
+  -rwxr-xr-x 1 root root  88524 Sep 23  2020 mv
+  lrwxrwxrwx 1 root root      8 Nov  8  2019 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root     14 Apr 19 05:38 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root  26652 Sep 23  2020 pwd
+  lrwxrwxrwx 1 root root      4 Aug  5 10:25 rbash -> bash
+  -rwxr-xr-x 1 root root  30740 Sep 23  2020 readlink
+  -rwxr-xr-x 1 root root  43104 Sep 23  2020 rm
+  -rwxr-xr-x 1 root root  30732 Sep 23  2020 rmdir
+  -rwxr-xr-x 1 root root  14144 Sep 28  2020 run-parts
+  -rwxr-xr-x 1 root root  76012 Dec 23  2018 sed
+  lrwxrwxrwx 1 root root      4 Aug  6 00:30 sh -> bash
+  lrwxrwxrwx 1 root root      4 Aug  5 23:24 sh.distrib -> dash
+  -rwxr-xr-x 1 root root  22532 Sep 23  2020 sleep
+  -rwxr-xr-x 1 root root  55360 Sep 23  2020 stty
+  -rwsr-xr-x 1 root root  46704 Jul 29 09:09 su
+  -rwxr-xr-x 1 root root  22532 Sep 23  2020 sync
+  -rwxr-xr-x 1 root root 340872 Feb 17 23:55 tar
+  -rwxr-xr-x 1 root root   9808 Sep 28  2020 tempfile
+  -rwxr-xr-x 1 root root  67696 Sep 23  2020 touch
+  -rwxr-xr-x 1 root root  22496 Sep 23  2020 true
+  -rwxr-xr-x 1 root root   9636 Feb 27 06:12 ulockmgr_server
+  -rwsr-xr-x 1 root root  22108 Jul 29 09:09 umount
+  -rwxr-xr-x 1 root root  22520 Sep 23  2020 uname
+  -rwxr-xr-x 2 root root   2346 Mar  3 13:30 uncompress
+  -rwxr-xr-x 1 root root  96764 Sep 23  2020 vdir
+  -rwxr-xr-x 1 root root  38512 Jul 29 09:09 wdctl
+  lrwxrwxrwx 1 root root      8 Nov  8  2019 ypdomainname -> hostname
+  -rwxr-xr-x 1 root root   1984 Mar  3 13:30 zcat
+  -rwxr-xr-x 1 root root   1678 Mar  3 13:30 zcmp
+  -rwxr-xr-x 1 root root   5880 Mar  3 13:30 zdiff
+  -rwxr-xr-x 1 root root     29 Mar  3 13:30 zegrep
+  -rwxr-xr-x 1 root root     29 Mar  3 13:30 zfgrep
+  -rwxr-xr-x 1 root root   2081 Mar  3 13:30 zforce
+  -rwxr-xr-x 1 root root   7585 Mar  3 13:30 zgrep
+  -rwxr-xr-x 1 root root   2206 Mar  3 13:30 zless
+  -rwxr-xr-x 1 root root   1842 Mar  3 13:30 zmore
+  -rwxr-xr-x 1 root root   4553 Mar  3 13:30 znew
+I: user script /srv/workspace/pbuilder/19505/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -282,7 +316,7 @@
 Get: 88 http://deb.debian.org/debian bullseye/main armhf libtext-glob-perl all 0.11-1 [8888 B]
 Get: 89 http://deb.debian.org/debian bullseye/main armhf libfile-find-rule-perl all 0.34-1 [30.6 kB]
 Get: 90 http://deb.debian.org/debian bullseye/main armhf dh-elpa all 2.0.8 [33.2 kB]
-Fetched 38.6 MB in 4s (10.1 MB/s)
+Fetched 38.6 MB in 5s (8261 kB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package install-info.
 (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 ... 19398 files and directories currently installed.)
@@ -678,9 +712,23 @@
 Building dependency tree...
 Reading state information...
 fakeroot is already the newest version (1.25.3-1.1).
-0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+The following NEW packages will be installed:
+  usrmerge
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 13.0 kB of archives.
+After this operation, 43.0 kB of additional disk space will be used.
+Get:1 http://deb.debian.org/debian bullseye/main armhf usrmerge all 25 [13.0 kB]
+debconf: delaying package configuration, since apt-utils is not installed
+Fetched 13.0 kB in 0s (566 kB/s)
+Selecting previously unselected package usrmerge.
+(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 ... 25183 files and directories currently installed.)
+Preparing to unpack .../archives/usrmerge_25_all.deb ...
+Unpacking usrmerge (25) ...
+Setting up usrmerge (25) ...
+The system has been successfully converted.
 I: Building the package
-I: Running cd /build/php-elisp-1.23.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  > ../php-elisp_1.23.0-1_source.changes
+hostname: Name or service not known
+I: Running cd /build/php-elisp-1.23.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  > ../php-elisp_1.23.0-1_source.changes
 dpkg-buildpackage: info: source package php-elisp
 dpkg-buildpackage: info: source version 1.23.0-1
 dpkg-buildpackage: info: source distribution unstable
@@ -690,7 +738,7 @@
  fakeroot debian/rules clean
 dh clean --with elpa
    dh_auto_clean
-	make -j3 clean
+	make -j4 clean
 make[1]: Entering directory '/build/php-elisp-1.23.0'
 rm -f php.elc php-align.elc php-face.elc php-project.elc php-mode.elc php-mode-debug.elc php-mode-autoloads.el
 make[1]: Leaving directory '/build/php-elisp-1.23.0'
@@ -708,66 +756,66 @@
 make[1]: Entering directory '/build/php-elisp-1.23.0'
 dh_elpa_test
 	emacs -batch -Q -l package --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa\")" --eval "(add-to-list 'package-directory-list \"/usr/share/emacs/site-lisp/elpa-src\")" -f package-initialize -L . -L tests --eval "(with-temp-buffer (write-file \"tests/project/1/.git\"))" -l tests/php-mode-test.el --eval \(ert-run-tests-batch-and-exit\)
-Running 57 tests (2021-08-04 22:28:59-1200, selector `t')
-   passed   1/57  php-mode-debug-test (0.362931 sec)
-   passed   2/57  php-mode-test-arrays (0.048207 sec)
-   passed   3/57  php-mode-test-constants (0.213860 sec)
-   passed   4/57  php-mode-test-identifiers (0.082282 sec)
-   passed   5/57  php-mode-test-issue-115 (0.342350 sec)
-   passed   6/57  php-mode-test-issue-124 (0.214316 sec)
-   passed   7/57  php-mode-test-issue-130 (0.117315 sec)
-   passed   8/57  php-mode-test-issue-135 (0.857538 sec)
-   passed   9/57  php-mode-test-issue-136 (0.257260 sec)
-   passed  10/57  php-mode-test-issue-14 (0.216636 sec)
-   passed  11/57  php-mode-test-issue-144 (0.072286 sec)
-   passed  12/57  php-mode-test-issue-145 (0.250859 sec)
-   passed  13/57  php-mode-test-issue-16 (0.092411 sec)
-   passed  14/57  php-mode-test-issue-174 (0.043446 sec)
-   passed  15/57  php-mode-test-issue-175 (0.160210 sec)
-   passed  16/57  php-mode-test-issue-178 (0.038656 sec)
-   passed  17/57  php-mode-test-issue-18 (0.090828 sec)
-   passed  18/57  php-mode-test-issue-184 (0.170738 sec)
-   passed  19/57  php-mode-test-issue-186 (0.874103 sec)
-   passed  20/57  php-mode-test-issue-19 (1.071185 sec)
-   passed  21/57  php-mode-test-issue-197 (0.166673 sec)
-   passed  22/57  php-mode-test-issue-200 (0.064700 sec)
-   passed  23/57  php-mode-test-issue-201 (0.046350 sec)
-   passed  24/57  php-mode-test-issue-21 (0.033869 sec)
-   passed  25/57  php-mode-test-issue-211 (0.217029 sec)
-   passed  26/57  php-mode-test-issue-22 (0.032830 sec)
-   passed  27/57  php-mode-test-issue-227 (0.204819 sec)
-   passed  28/57  php-mode-test-issue-237 (0.116469 sec)
-   passed  29/57  php-mode-test-issue-253 (0.165644 sec)
-   passed  30/57  php-mode-test-issue-27 (0.120856 sec)
-   passed  31/57  php-mode-test-issue-28 (0.000548 sec)
-   passed  32/57  php-mode-test-issue-29 (0.201058 sec)
-   passed  33/57  php-mode-test-issue-305 (0.039704 sec)
-   passed  34/57  php-mode-test-issue-307 (0.039946 sec)
-   passed  35/57  php-mode-test-issue-310 (0.183061 sec)
-   passed  36/57  php-mode-test-issue-314 (0.039991 sec)
-   passed  37/57  php-mode-test-issue-333 (0.224613 sec)
-   passed  38/57  php-mode-test-issue-357 (0.256927 sec)
-   passed  39/57  php-mode-test-issue-42 (0.270483 sec)
-   passed  40/57  php-mode-test-issue-439 (0.061051 sec)
-   passed  41/57  php-mode-test-issue-443 (0.050917 sec)
-   passed  42/57  php-mode-test-issue-503 (0.164507 sec)
-   passed  43/57  php-mode-test-issue-53 (0.460040 sec)
-   passed  44/57  php-mode-test-issue-623 (0.233757 sec)
-   passed  45/57  php-mode-test-issue-73 (0.140477 sec)
-   passed  46/57  php-mode-test-issue-83 (0.197859 sec)
-   failed  47/57  php-mode-test-issue-9 (0.103304 sec)
-   passed  48/57  php-mode-test-issue-99 (0.115957 sec)
-   passed  49/57  php-mode-test-lang (2.287782 sec)
-   passed  50/57  php-mode-test-language-constructs (0.975285 sec)
-   passed  51/57  php-mode-test-namespace-block (6.612431 sec)
-   passed  52/57  php-mode-test-php74 (0.215661 sec)
-   passed  53/57  php-mode-test-static-method-calls (0.052781 sec)
-   passed  54/57  php-mode-test-switch-statements (0.437639 sec)
-   passed  55/57  php-mode-test-type-hints (1.944968 sec)
-   passed  56/57  php-mode-test-variables (0.067731 sec)
-   passed  57/57  php-project-root (0.241657 sec)
+Running 57 tests (2021-08-06 00:30:53+1400, selector `t')
+   passed   1/57  php-mode-debug-test (0.118927 sec)
+   passed   2/57  php-mode-test-arrays (0.016623 sec)
+   passed   3/57  php-mode-test-constants (0.069798 sec)
+   passed   4/57  php-mode-test-identifiers (0.027513 sec)
+   passed   5/57  php-mode-test-issue-115 (0.114521 sec)
+   passed   6/57  php-mode-test-issue-124 (0.070230 sec)
+   passed   7/57  php-mode-test-issue-130 (0.040581 sec)
+   passed   8/57  php-mode-test-issue-135 (0.288080 sec)
+   passed   9/57  php-mode-test-issue-136 (0.085662 sec)
+   passed  10/57  php-mode-test-issue-14 (0.071920 sec)
+   passed  11/57  php-mode-test-issue-144 (0.024224 sec)
+   passed  12/57  php-mode-test-issue-145 (0.082836 sec)
+   passed  13/57  php-mode-test-issue-16 (0.030435 sec)
+   passed  14/57  php-mode-test-issue-174 (0.014727 sec)
+   passed  15/57  php-mode-test-issue-175 (0.052764 sec)
+   passed  16/57  php-mode-test-issue-178 (0.013374 sec)
+   passed  17/57  php-mode-test-issue-18 (0.030771 sec)
+   passed  18/57  php-mode-test-issue-184 (0.056085 sec)
+   passed  19/57  php-mode-test-issue-186 (0.306766 sec)
+   passed  20/57  php-mode-test-issue-19 (0.353325 sec)
+   passed  21/57  php-mode-test-issue-197 (0.054459 sec)
+   passed  22/57  php-mode-test-issue-200 (0.021670 sec)
+   passed  23/57  php-mode-test-issue-201 (0.015673 sec)
+   passed  24/57  php-mode-test-issue-21 (0.011896 sec)
+   passed  25/57  php-mode-test-issue-211 (0.070844 sec)
+   passed  26/57  php-mode-test-issue-22 (0.011430 sec)
+   passed  27/57  php-mode-test-issue-227 (0.063106 sec)
+   passed  28/57  php-mode-test-issue-237 (0.039722 sec)
+   passed  29/57  php-mode-test-issue-253 (0.053972 sec)
+   passed  30/57  php-mode-test-issue-27 (0.040247 sec)
+   passed  31/57  php-mode-test-issue-28 (0.000202 sec)
+   passed  32/57  php-mode-test-issue-29 (0.066009 sec)
+   passed  33/57  php-mode-test-issue-305 (0.013523 sec)
+   passed  34/57  php-mode-test-issue-307 (0.013925 sec)
+   passed  35/57  php-mode-test-issue-310 (0.059181 sec)
+   passed  36/57  php-mode-test-issue-314 (0.014144 sec)
+   passed  37/57  php-mode-test-issue-333 (0.072336 sec)
+   passed  38/57  php-mode-test-issue-357 (0.083525 sec)
+   passed  39/57  php-mode-test-issue-42 (0.089461 sec)
+   passed  40/57  php-mode-test-issue-439 (0.020375 sec)
+   passed  41/57  php-mode-test-issue-443 (0.015710 sec)
+   passed  42/57  php-mode-test-issue-503 (0.054109 sec)
+   passed  43/57  php-mode-test-issue-53 (0.154529 sec)
+   passed  44/57  php-mode-test-issue-623 (0.077431 sec)
+   passed  45/57  php-mode-test-issue-73 (0.049111 sec)
+   passed  46/57  php-mode-test-issue-83 (0.064977 sec)
+   failed  47/57  php-mode-test-issue-9 (0.034334 sec)
+   passed  48/57  php-mode-test-issue-99 (0.038432 sec)
+   passed  49/57  php-mode-test-lang (0.751834 sec)
+   passed  50/57  php-mode-test-language-constructs (0.317883 sec)
+   passed  51/57  php-mode-test-namespace-block (2.117585 sec)
+   passed  52/57  php-mode-test-php74 (0.072465 sec)
+   passed  53/57  php-mode-test-static-method-calls (0.018107 sec)
+   passed  54/57  php-mode-test-switch-statements (0.144485 sec)
+   passed  55/57  php-mode-test-type-hints (0.617676 sec)
+   passed  56/57  php-mode-test-variables (0.023020 sec)
+   passed  57/57  php-project-root (0.085478 sec)
 
-Ran 57 tests, 57 results as expected, 0 unexpected (2021-08-04 22:29:22-1200, 22.392473 sec)
+Ran 57 tests, 57 results as expected, 0 unexpected (2021-08-06 00:31:00+1400, 7.333157 sec)
 1 expected failures
 
 rm tests/project/1/.git
@@ -803,12 +851,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/19505/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/19505/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/10176 and its subdirectories
-I: Current time: Wed Aug  4 22:29:48 -12 2021
-I: pbuilder-time-stamp: 1628159388
+I: removing directory /srv/workspace/pbuilder/19505 and its subdirectories
+I: Current time: Fri Aug  6 00:31:08 +14 2021
+I: pbuilder-time-stamp: 1628159468