Diff of the two buildlogs:

--
--- b1/build.log	2023-06-03 23:31:21.048673737 +0000
+++ b2/build.log	2023-06-03 23:37:52.371552817 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Sat Jun  3 11:28:50 -12 2023
-I: pbuilder-time-stamp: 1685834930
+I: Current time: Sun Jun  4 13:31:30 +14 2023
+I: pbuilder-time-stamp: 1685835090
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/bookworm-reproducible-base.tgz]
 I: copying local configuration
@@ -16,7 +16,7 @@
 I: copying [./golang-github-hashicorp-terraform-svchost_0.0~git20200729.f050f53.orig.tar.xz]
 I: copying [./golang-github-hashicorp-terraform-svchost_0.0~git20200729.f050f53-3.debian.tar.xz]
 I: Extracting source
-gpgv: Signature made Tue Nov 29 09:26:06 2022 -12
+gpgv: Signature made Wed Nov 30 11:26:06 2022 +14
 gpgv:                using RSA key B23862C415D6565A4E86CBD7579C160D4C9E23E8
 gpgv: Can't check signature: No public key
 dpkg-source: warning: cannot verify inline signature for ./golang-github-hashicorp-terraform-svchost_0.0~git20200729.f050f53-3.dsc: no acceptable signature found
@@ -27,135 +27,167 @@
 dpkg-source: info: applying disable-strange-tests.patch
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/13085/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/10616/tmp/hooks/D01_modify_environment starting
+debug: Running on ff4a.
+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 Jun  4 13:32 /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/10616/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/10616/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 parallel=3 '
-  DISTRIBUTION='bookworm'
-  HOME='/root'
-  HOST_ARCH='armhf'
+  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]="15" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf")
+  BASH_VERSION='5.2.15(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 parallel=4 '
+  DIRSTACK=()
+  DISTRIBUTION=bookworm
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=arm
+  HOST_ARCH=armhf
   IFS=' 	
   '
-  INVOCATION_ID='5599eaebb7684cbab7a151d015a12cf2'
-  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='13085'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=0f0bcd9527a74bc99173212a41d70cbe
+  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=10616
   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.gYOaLFw0/pbuilderrc_d7J4 --distribution bookworm --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.gYOaLFw0/b1 --logfile b1/build.log golang-github-hashicorp-terraform-svchost_0.0~git20200729.f050f53-3.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:3142/'
+  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.gYOaLFw0/pbuilderrc_H2SS --distribution bookworm --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.gYOaLFw0/b2 --logfile b2/build.log --extrapackages usrmerge golang-github-hashicorp-terraform-svchost_0.0~git20200729.f050f53-3.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:3142/
 I: uname -a
-  Linux virt64c 5.10.0-23-arm64 #1 SMP Debian 5.10.179-1 (2023-05-12) aarch64 GNU/Linux
+  Linux i-capture-the-hostname 5.10.0-23-armmp-lpae #1 SMP Debian 5.10.179-1 (2023-05-12) armv7l GNU/Linux
 I: ls -l /bin
   total 5072
-  -rwxr-xr-x 1 root root 838488 Apr 23 09:24 bash
-  -rwxr-xr-x 3 root root  67144 Sep 18  2022 bunzip2
-  -rwxr-xr-x 3 root root  67144 Sep 18  2022 bzcat
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzcmp -> bzdiff
-  -rwxr-xr-x 1 root root   2225 Sep 18  2022 bzdiff
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzegrep -> bzgrep
-  -rwxr-xr-x 1 root root   4893 Nov 27  2021 bzexe
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzfgrep -> bzgrep
-  -rwxr-xr-x 1 root root   3775 Sep 18  2022 bzgrep
-  -rwxr-xr-x 3 root root  67144 Sep 18  2022 bzip2
-  -rwxr-xr-x 1 root root  67112 Sep 18  2022 bzip2recover
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzless -> bzmore
-  -rwxr-xr-x 1 root root   1297 Sep 18  2022 bzmore
-  -rwxr-xr-x 1 root root  67632 Sep 20  2022 cat
-  -rwxr-xr-x 1 root root  67676 Sep 20  2022 chgrp
-  -rwxr-xr-x 1 root root  67644 Sep 20  2022 chmod
-  -rwxr-xr-x 1 root root  67684 Sep 20  2022 chown
-  -rwxr-xr-x 1 root root 133532 Sep 20  2022 cp
-  -rwxr-xr-x 1 root root 132868 Jan  5 01:20 dash
-  -rwxr-xr-x 1 root root 133220 Sep 20  2022 date
-  -rwxr-xr-x 1 root root  67732 Sep 20  2022 dd
-  -rwxr-xr-x 1 root root  68104 Sep 20  2022 df
-  -rwxr-xr-x 1 root root 133632 Sep 20  2022 dir
-  -rwxr-xr-x 1 root root  59128 Mar 22 21:02 dmesg
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 dnsdomainname -> hostname
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 domainname -> hostname
-  -rwxr-xr-x 1 root root  67560 Sep 20  2022 echo
-  -rwxr-xr-x 1 root root     41 Jan 24 02:43 egrep
-  -rwxr-xr-x 1 root root  67548 Sep 20  2022 false
-  -rwxr-xr-x 1 root root     41 Jan 24 02:43 fgrep
-  -rwxr-xr-x 1 root root  55748 Mar 22 21:02 findmnt
-  -rwsr-xr-x 1 root root  26208 Mar 22 20:15 fusermount
-  -rwxr-xr-x 1 root root 128608 Jan 24 02:43 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  64220 Apr  9  2022 gzip
-  -rwxr-xr-x 1 root root  67032 Dec 19 01:33 hostname
-  -rwxr-xr-x 1 root root  67720 Sep 20  2022 ln
-  -rwxr-xr-x 1 root root  35132 Mar 22 21:51 login
-  -rwxr-xr-x 1 root root 133632 Sep 20  2022 ls
-  -rwxr-xr-x 1 root root 136808 Mar 22 21:02 lsblk
-  -rwxr-xr-x 1 root root  67800 Sep 20  2022 mkdir
-  -rwxr-xr-x 1 root root  67764 Sep 20  2022 mknod
-  -rwxr-xr-x 1 root root  67596 Sep 20  2022 mktemp
-  -rwxr-xr-x 1 root root  38504 Mar 22 21:02 more
-  -rwsr-xr-x 1 root root  38496 Mar 22 21:02 mount
-  -rwxr-xr-x 1 root root   9824 Mar 22 21:02 mountpoint
-  -rwxr-xr-x 1 root root 133532 Sep 20  2022 mv
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root     14 Apr  2 18:25 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root  67608 Sep 20  2022 pwd
-  lrwxrwxrwx 1 root root      4 Apr 23 09:24 rbash -> bash
-  -rwxr-xr-x 1 root root  67600 Sep 20  2022 readlink
-  -rwxr-xr-x 1 root root  67672 Sep 20  2022 rm
-  -rwxr-xr-x 1 root root  67600 Sep 20  2022 rmdir
-  -rwxr-xr-x 1 root root  67400 Nov  2  2022 run-parts
-  -rwxr-xr-x 1 root root 133372 Jan  5 07:55 sed
-  lrwxrwxrwx 1 root root      4 Jan  5 01:20 sh -> dash
-  -rwxr-xr-x 1 root root  67584 Sep 20  2022 sleep
-  -rwxr-xr-x 1 root root  67644 Sep 20  2022 stty
-  -rwsr-xr-x 1 root root  50800 Mar 22 21:02 su
-  -rwxr-xr-x 1 root root  67584 Sep 20  2022 sync
-  -rwxr-xr-x 1 root root 336764 Apr  6 02:25 tar
-  -rwxr-xr-x 1 root root  67144 Nov  2  2022 tempfile
-  -rwxr-xr-x 1 root root 133224 Sep 20  2022 touch
-  -rwxr-xr-x 1 root root  67548 Sep 20  2022 true
-  -rwxr-xr-x 1 root root   9768 Mar 22 20:15 ulockmgr_server
-  -rwsr-xr-x 1 root root  22108 Mar 22 21:02 umount
-  -rwxr-xr-x 1 root root  67572 Sep 20  2022 uname
-  -rwxr-xr-x 2 root root   2346 Apr  9  2022 uncompress
-  -rwxr-xr-x 1 root root 133632 Sep 20  2022 vdir
-  -rwxr-xr-x 1 root root  42608 Mar 22 21:02 wdctl
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 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   6460 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   8103 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/13085/tmp/hooks/D02_print_environment finished
+  -rwxr-xr-x 1 root root 838488 Apr 24 11:24 bash
+  -rwxr-xr-x 3 root root  67144 Sep 19  2022 bunzip2
+  -rwxr-xr-x 3 root root  67144 Sep 19  2022 bzcat
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzcmp -> bzdiff
+  -rwxr-xr-x 1 root root   2225 Sep 19  2022 bzdiff
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzegrep -> bzgrep
+  -rwxr-xr-x 1 root root   4893 Nov 28  2021 bzexe
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzfgrep -> bzgrep
+  -rwxr-xr-x 1 root root   3775 Sep 19  2022 bzgrep
+  -rwxr-xr-x 3 root root  67144 Sep 19  2022 bzip2
+  -rwxr-xr-x 1 root root  67112 Sep 19  2022 bzip2recover
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzless -> bzmore
+  -rwxr-xr-x 1 root root   1297 Sep 19  2022 bzmore
+  -rwxr-xr-x 1 root root  67632 Sep 21  2022 cat
+  -rwxr-xr-x 1 root root  67676 Sep 21  2022 chgrp
+  -rwxr-xr-x 1 root root  67644 Sep 21  2022 chmod
+  -rwxr-xr-x 1 root root  67684 Sep 21  2022 chown
+  -rwxr-xr-x 1 root root 133532 Sep 21  2022 cp
+  -rwxr-xr-x 1 root root 132868 Jan  6 03:20 dash
+  -rwxr-xr-x 1 root root 133220 Sep 21  2022 date
+  -rwxr-xr-x 1 root root  67732 Sep 21  2022 dd
+  -rwxr-xr-x 1 root root  68104 Sep 21  2022 df
+  -rwxr-xr-x 1 root root 133632 Sep 21  2022 dir
+  -rwxr-xr-x 1 root root  59128 Mar 23 23:02 dmesg
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 dnsdomainname -> hostname
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 domainname -> hostname
+  -rwxr-xr-x 1 root root  67560 Sep 21  2022 echo
+  -rwxr-xr-x 1 root root     41 Jan 25 04:43 egrep
+  -rwxr-xr-x 1 root root  67548 Sep 21  2022 false
+  -rwxr-xr-x 1 root root     41 Jan 25 04:43 fgrep
+  -rwxr-xr-x 1 root root  55748 Mar 23 23:02 findmnt
+  -rwsr-xr-x 1 root root  26208 Mar 23 22:15 fusermount
+  -rwxr-xr-x 1 root root 128608 Jan 25 04:43 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  64220 Apr 10  2022 gzip
+  -rwxr-xr-x 1 root root  67032 Dec 20 03:33 hostname
+  -rwxr-xr-x 1 root root  67720 Sep 21  2022 ln
+  -rwxr-xr-x 1 root root  35132 Mar 23 23:51 login
+  -rwxr-xr-x 1 root root 133632 Sep 21  2022 ls
+  -rwxr-xr-x 1 root root 136808 Mar 23 23:02 lsblk
+  -rwxr-xr-x 1 root root  67800 Sep 21  2022 mkdir
+  -rwxr-xr-x 1 root root  67764 Sep 21  2022 mknod
+  -rwxr-xr-x 1 root root  67596 Sep 21  2022 mktemp
+  -rwxr-xr-x 1 root root  38504 Mar 23 23:02 more
+  -rwsr-xr-x 1 root root  38496 Mar 23 23:02 mount
+  -rwxr-xr-x 1 root root   9824 Mar 23 23:02 mountpoint
+  -rwxr-xr-x 1 root root 133532 Sep 21  2022 mv
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root     14 Apr  3 20:25 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root  67608 Sep 21  2022 pwd
+  lrwxrwxrwx 1 root root      4 Apr 24 11:24 rbash -> bash
+  -rwxr-xr-x 1 root root  67600 Sep 21  2022 readlink
+  -rwxr-xr-x 1 root root  67672 Sep 21  2022 rm
+  -rwxr-xr-x 1 root root  67600 Sep 21  2022 rmdir
+  -rwxr-xr-x 1 root root  67400 Nov  3  2022 run-parts
+  -rwxr-xr-x 1 root root 133372 Jan  6 09:55 sed
+  lrwxrwxrwx 1 root root      9 Jun  4 13:32 sh -> /bin/bash
+  -rwxr-xr-x 1 root root  67584 Sep 21  2022 sleep
+  -rwxr-xr-x 1 root root  67644 Sep 21  2022 stty
+  -rwsr-xr-x 1 root root  50800 Mar 23 23:02 su
+  -rwxr-xr-x 1 root root  67584 Sep 21  2022 sync
+  -rwxr-xr-x 1 root root 336764 Apr  7 04:25 tar
+  -rwxr-xr-x 1 root root  67144 Nov  3  2022 tempfile
+  -rwxr-xr-x 1 root root 133224 Sep 21  2022 touch
+  -rwxr-xr-x 1 root root  67548 Sep 21  2022 true
+  -rwxr-xr-x 1 root root   9768 Mar 23 22:15 ulockmgr_server
+  -rwsr-xr-x 1 root root  22108 Mar 23 23:02 umount
+  -rwxr-xr-x 1 root root  67572 Sep 21  2022 uname
+  -rwxr-xr-x 2 root root   2346 Apr 10  2022 uncompress
+  -rwxr-xr-x 1 root root 133632 Sep 21  2022 vdir
+  -rwxr-xr-x 1 root root  42608 Mar 23 23:02 wdctl
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 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   6460 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   8103 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/10616/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -256,7 +288,7 @@
 Get: 47 http://deb.debian.org/debian bookworm/main armhf golang-golang-x-oauth2-dev all 0.3.0-1 [35.0 kB]
 Get: 48 http://deb.debian.org/debian bookworm/main armhf golang-google-cloud-compute-metadata-dev all 0.56.0-3 [32.2 kB]
 Get: 49 http://deb.debian.org/debian bookworm/main armhf golang-golang-x-oauth2-google-dev all 0.3.0-1 [43.4 kB]
-Fetched 98.8 MB in 6s (15.3 MB/s)
+Fetched 98.8 MB in 8s (12.4 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package sensible-utils.
 (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 ... 19324 files and directories currently installed.)
@@ -469,10 +501,17 @@
 Reading package lists...
 Building dependency tree...
 Reading state information...
+usrmerge is already the newest version (35).
 fakeroot is already the newest version (1.31-1.2).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/golang-github-hashicorp-terraform-svchost-0.0~git20200729.f050f53/ && 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  > ../golang-github-hashicorp-terraform-svchost_0.0~git20200729.f050f53-3_source.changes
+I: user script /srv/workspace/pbuilder/10616/tmp/hooks/A99_set_merged_usr starting
+Re-configuring usrmerge...
+removed '/etc/unsupported-skip-usrmerge-conversion'
+The system has been successfully converted.
+I: user script /srv/workspace/pbuilder/10616/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/golang-github-hashicorp-terraform-svchost-0.0~git20200729.f050f53/ && 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  > ../golang-github-hashicorp-terraform-svchost_0.0~git20200729.f050f53-3_source.changes
 dpkg-buildpackage: info: source package golang-github-hashicorp-terraform-svchost
 dpkg-buildpackage: info: source version 0.0~git20200729.f050f53-3
 dpkg-buildpackage: info: source distribution unstable
@@ -490,27 +529,27 @@
    dh_autoreconf -O--buildsystem=golang
    dh_auto_configure -O--buildsystem=golang
    dh_auto_build -O--buildsystem=golang
-	cd obj-arm-linux-gnueabihf && go install -trimpath -v -p 3 github.com/hashicorp/terraform-svchost github.com/hashicorp/terraform-svchost/auth github.com/hashicorp/terraform-svchost/disco
+	cd obj-arm-linux-gnueabihf && go install -trimpath -v -p 4 github.com/hashicorp/terraform-svchost github.com/hashicorp/terraform-svchost/auth github.com/hashicorp/terraform-svchost/disco
 internal/unsafeheader
 internal/goarch
 internal/cpu
 internal/goexperiment
-internal/abi
 internal/goos
+internal/abi
 runtime/internal/math
 runtime/internal/sys
 runtime/internal/syscall
-internal/bytealg
-runtime/internal/atomic
 internal/itoa
 math/bits
 unicode/utf8
-math
 internal/race
+internal/bytealg
+runtime/internal/atomic
 sync/atomic
-runtime
+math
 unicode
 container/list
+runtime
 encoding
 unicode/utf16
 crypto/internal/subtle
@@ -522,122 +561,122 @@
 internal/reflectlite
 sync
 internal/testlog
-math/rand
 internal/singleflight
+math/rand
 runtime/cgo
 errors
 sort
-strconv
 io
+strconv
 internal/oserror
 syscall
-reflect
 internal/safefilepath
 path
-internal/syscall/unix
-time
-internal/syscall/execenv
 bytes
+reflect
 golang.org/x/text/transform
 strings
-internal/poll
-internal/fmtsort
-io/fs
-encoding/binary
+internal/syscall/unix
+time
+internal/syscall/execenv
 hash
 hash/crc32
 hash/crc64
-os
 bufio
-encoding/base64
-context
 crypto
-crypto/cipher
 crypto/internal/randutil
 crypto/internal/nistec/fiat
+crypto/rc4
+vendor/golang.org/x/net/dns/dnsmessage
+internal/poll
+io/fs
+context
+internal/fmtsort
+encoding/binary
+os
+vendor/golang.org/x/text/transform
+net/http/internal/ascii
+regexp/syntax
+encoding/base64
+crypto/cipher
 fmt
 crypto/internal/boring
 crypto/aes
 crypto/des
 crypto/sha512
+crypto/internal/nistec
 crypto/internal/edwards25519/field
+crypto/hmac
+crypto/md5
+crypto/internal/edwards25519
+crypto/sha1
 log
 golang.org/x/text/unicode/norm
 golang.org/x/text/unicode/bidi
-golang.org/x/text/secure/bidirule
 encoding/json
 github.com/zclconf/go-cty/cty/set
-golang.org/x/net/idna
 math/big
-github.com/hashicorp/terraform-svchost
+golang.org/x/text/secure/bidirule
 compress/flate
-crypto/internal/nistec
+crypto/sha256
+golang.org/x/net/idna
 compress/gzip
+encoding/hex
+encoding/pem
+internal/godebug
+internal/intern
+net/url
+net/netip
 github.com/zclconf/go-cty/cty
 crypto/rand
 crypto/elliptic
+github.com/hashicorp/terraform-svchost
 crypto/internal/boring/bbig
 encoding/asn1
-crypto/internal/edwards25519
-vendor/golang.org/x/crypto/cryptobyte
 crypto/ed25519
-crypto/hmac
-crypto/ecdsa
-crypto/md5
-crypto/rc4
 crypto/rsa
-crypto/sha1
-github.com/zclconf/go-cty/cty/convert
-crypto/sha256
 crypto/dsa
-encoding/hex
-encoding/pem
-crypto/x509/pkix
-internal/godebug
-vendor/golang.org/x/net/dns/dnsmessage
-internal/intern
-net/netip
-github.com/zclconf/go-cty/cty/json
-net/url
 net
 path/filepath
+vendor/golang.org/x/crypto/cryptobyte
+crypto/x509/pkix
 vendor/golang.org/x/crypto/chacha20
+crypto/ecdsa
 vendor/golang.org/x/crypto/internal/poly1305
 vendor/golang.org/x/crypto/curve25519/internal/field
 vendor/golang.org/x/crypto/chacha20poly1305
 vendor/golang.org/x/crypto/hkdf
-vendor/golang.org/x/crypto/curve25519
-vendor/golang.org/x/text/transform
+github.com/zclconf/go-cty/cty/convert
 vendor/golang.org/x/text/unicode/bidi
+vendor/golang.org/x/crypto/curve25519
 vendor/golang.org/x/text/unicode/norm
+github.com/zclconf/go-cty/cty/json
 vendor/golang.org/x/text/secure/bidirule
 vendor/golang.org/x/net/http2/hpack
 mime
-vendor/golang.org/x/net/idna
 mime/quotedprintable
+vendor/golang.org/x/net/idna
 net/http/internal
-net/http/internal/ascii
 os/exec
-regexp/syntax
-io/ioutil
 regexp
+io/ioutil
 github.com/hashicorp/go-version
-vendor/golang.org/x/net/http/httpproxy
 net/textproto
+vendor/golang.org/x/net/http/httpproxy
 crypto/x509
 vendor/golang.org/x/net/http/httpguts
 mime/multipart
 crypto/tls
 net/http/httptrace
 net/http
+github.com/hashicorp/terraform-svchost/auth
 golang.org/x/net/context/ctxhttp
 github.com/hashicorp/go-cleanhttp
-github.com/hashicorp/terraform-svchost/auth
 golang.org/x/oauth2/internal
 golang.org/x/oauth2
 github.com/hashicorp/terraform-svchost/disco
    dh_auto_test -O--buildsystem=golang
-	cd obj-arm-linux-gnueabihf && go test -vet=off -v -p 3 github.com/hashicorp/terraform-svchost github.com/hashicorp/terraform-svchost/auth github.com/hashicorp/terraform-svchost/disco
+	cd obj-arm-linux-gnueabihf && go test -vet=off -v -p 4 github.com/hashicorp/terraform-svchost github.com/hashicorp/terraform-svchost/auth github.com/hashicorp/terraform-svchost/disco
 === RUN   TestForDisplay
 === RUN   TestForDisplay/#00
 === RUN   TestForDisplay/example.com
@@ -653,7 +692,7 @@
 === RUN   TestForDisplay/example.com:boo
 === RUN   TestForDisplay/example.com:boo:boo
 === RUN   TestForDisplay/example.com:081
---- PASS: TestForDisplay (0.00s)
+--- PASS: TestForDisplay (0.01s)
     --- PASS: TestForDisplay/#00 (0.00s)
     --- PASS: TestForDisplay/example.com (0.00s)
     --- PASS: TestForDisplay/invalid (0.00s)
@@ -715,7 +754,7 @@
     --- PASS: TestHostnameForDisplay/xn--80akhbyknj4f.com:8080 (0.00s)
     --- PASS: TestHostnameForDisplay/xn--mnchen-3ya.de (0.00s)
 PASS
-ok  	github.com/hashicorp/terraform-svchost	0.020s
+ok  	github.com/hashicorp/terraform-svchost	0.045s
 === RUN   TestHelperProgramCredentialsSource
     helper_program_test.go:17: testing with helper at /build/golang-github-hashicorp-terraform-svchost-0.0~git20200729.f050f53/obj-arm-linux-gnueabihf/src/github.com/hashicorp/terraform-svchost/auth/testdata/test-helper
 --- PASS: TestHelperProgramCredentialsSource (0.00s)
@@ -728,36 +767,36 @@
 === RUN   TestHostCredentialsToken
 --- PASS: TestHostCredentialsToken (0.00s)
 PASS
-ok  	github.com/hashicorp/terraform-svchost/auth	0.010s
+ok  	github.com/hashicorp/terraform-svchost/auth	0.034s
 === RUN   TestDiscover
 === RUN   TestDiscover/happy_path
-2023/06/03 11:31:04 [DEBUG] Service discovery for localhost:44713 at https://localhost:44713/.well-known/terraform.json
+2023/06/04 13:37:12 [DEBUG] Service discovery for localhost:34065 at https://localhost:34065/.well-known/terraform.json
 === RUN   TestDiscover/chunked_encoding
-2023/06/03 11:31:05 [DEBUG] Service discovery for localhost:37147 at https://localhost:37147/.well-known/terraform.json
+2023/06/04 13:37:12 [DEBUG] Service discovery for localhost:39557 at https://localhost:39557/.well-known/terraform.json
 === RUN   TestDiscover/with_credentials
-2023/06/03 11:31:05 [DEBUG] Service discovery for localhost:46351 at https://localhost:46351/.well-known/terraform.json
+2023/06/04 13:37:12 [DEBUG] Service discovery for localhost:34127 at https://localhost:34127/.well-known/terraform.json
 === RUN   TestDiscover/forced_services_override
 === RUN   TestDiscover/not_JSON
-2023/06/03 11:31:05 [DEBUG] Service discovery for localhost:39711 at https://localhost:39711/.well-known/terraform.json
+2023/06/04 13:37:12 [DEBUG] Service discovery for localhost:34861 at https://localhost:34861/.well-known/terraform.json
 === RUN   TestDiscover/malformed_JSON
-2023/06/03 11:31:05 [DEBUG] Service discovery for localhost:36087 at https://localhost:36087/.well-known/terraform.json
+2023/06/04 13:37:12 [DEBUG] Service discovery for localhost:45427 at https://localhost:45427/.well-known/terraform.json
 === RUN   TestDiscover/JSON_with_redundant_charset
-2023/06/03 11:31:05 [DEBUG] Service discovery for localhost:37195 at https://localhost:37195/.well-known/terraform.json
+2023/06/04 13:37:12 [DEBUG] Service discovery for localhost:45839 at https://localhost:45839/.well-known/terraform.json
 === RUN   TestDiscover/no_discovery_doc
-2023/06/03 11:31:05 [DEBUG] Service discovery for localhost:44561 at https://localhost:44561/.well-known/terraform.json
+2023/06/04 13:37:12 [DEBUG] Service discovery for localhost:33871 at https://localhost:33871/.well-known/terraform.json
 === RUN   TestDiscover/redirect
-2023/06/03 11:31:05 [DEBUG] Service discovery for localhost:38917 at https://localhost:38917/.well-known/terraform.json
-2023/06/03 11:31:05 [DEBUG] Service discovery redirected to https://127.0.0.1:40239/.well-known/terraform.json
---- PASS: TestDiscover (0.36s)
-    --- PASS: TestDiscover/happy_path (0.04s)
-    --- PASS: TestDiscover/chunked_encoding (0.04s)
-    --- PASS: TestDiscover/with_credentials (0.04s)
+2023/06/04 13:37:12 [DEBUG] Service discovery for localhost:42953 at https://localhost:42953/.well-known/terraform.json
+2023/06/04 13:37:12 [DEBUG] Service discovery redirected to https://127.0.0.1:34181/.well-known/terraform.json
+--- PASS: TestDiscover (0.67s)
+    --- PASS: TestDiscover/happy_path (0.08s)
+    --- PASS: TestDiscover/chunked_encoding (0.07s)
+    --- PASS: TestDiscover/with_credentials (0.06s)
     --- PASS: TestDiscover/forced_services_override (0.00s)
-    --- PASS: TestDiscover/not_JSON (0.04s)
-    --- PASS: TestDiscover/malformed_JSON (0.04s)
-    --- PASS: TestDiscover/JSON_with_redundant_charset (0.04s)
-    --- PASS: TestDiscover/no_discovery_doc (0.04s)
-    --- PASS: TestDiscover/redirect (0.08s)
+    --- PASS: TestDiscover/not_JSON (0.07s)
+    --- PASS: TestDiscover/malformed_JSON (0.07s)
+    --- PASS: TestDiscover/JSON_with_redundant_charset (0.06s)
+    --- PASS: TestDiscover/no_discovery_doc (0.07s)
+    --- PASS: TestDiscover/redirect (0.17s)
 === RUN   TestHostServiceURL
 === RUN   TestHostServiceURL/absolute.v1
 === RUN   TestHostServiceURL/absolutewithport.v1
@@ -796,7 +835,7 @@
 === RUN   TestHostServiceOAuthClient/scopesincluded.v1
 === RUN   TestHostServiceOAuthClient/scopesempty.v1
 === RUN   TestHostServiceOAuthClient/scopesbad.v1
---- PASS: TestHostServiceOAuthClient (0.00s)
+--- PASS: TestHostServiceOAuthClient (0.01s)
     --- PASS: TestHostServiceOAuthClient/explicitgranttype.v1 (0.00s)
     --- PASS: TestHostServiceOAuthClient/customports.v1 (0.00s)
     --- PASS: TestHostServiceOAuthClient/invalidports.v1 (0.00s)
@@ -816,25 +855,25 @@
     --- PASS: TestHostServiceOAuthClient/scopesbad.v1 (0.00s)
 === RUN   TestVersionConstrains
 === RUN   TestVersionConstrains/exact_service_version_is_provided
-2023/06/03 11:31:05 [DEBUG] Retrieve version constraints for service thingy.v1 and product terraform
+2023/06/04 13:37:12 [DEBUG] Retrieve version constraints for service thingy.v1 and product terraform
 === RUN   TestVersionConstrains/service_provided_with_different_versions
-2023/06/03 11:31:05 [DEBUG] Retrieve version constraints for service thingy.v3 and product terraform
+2023/06/04 13:37:12 [DEBUG] Retrieve version constraints for service thingy.v3 and product terraform
 === RUN   TestVersionConstrains/service_not_provided
 === RUN   TestVersionConstrains/versions_service_returns_a_404
-2023/06/03 11:31:05 [DEBUG] Retrieve version constraints for service thingy.v1 and product terraform
+2023/06/04 13:37:12 [DEBUG] Retrieve version constraints for service thingy.v1 and product terraform
 === RUN   TestVersionConstrains/checkpoint_is_disabled
 === RUN   TestVersionConstrains/versions_service_not_discovered
 === RUN   TestVersionConstrains/versions_service_version_not_discovered
---- PASS: TestVersionConstrains (0.12s)
-    --- PASS: TestVersionConstrains/exact_service_version_is_provided (0.04s)
-    --- PASS: TestVersionConstrains/service_provided_with_different_versions (0.04s)
+--- PASS: TestVersionConstrains (0.23s)
+    --- PASS: TestVersionConstrains/exact_service_version_is_provided (0.09s)
+    --- PASS: TestVersionConstrains/service_provided_with_different_versions (0.08s)
     --- PASS: TestVersionConstrains/service_not_provided (0.00s)
-    --- PASS: TestVersionConstrains/versions_service_returns_a_404 (0.04s)
+    --- PASS: TestVersionConstrains/versions_service_returns_a_404 (0.07s)
     --- PASS: TestVersionConstrains/checkpoint_is_disabled (0.00s)
     --- PASS: TestVersionConstrains/versions_service_not_discovered (0.00s)
     --- PASS: TestVersionConstrains/versions_service_version_not_discovered (0.00s)
 PASS
-ok  	github.com/hashicorp/terraform-svchost/disco	0.499s
+ok  	github.com/hashicorp/terraform-svchost/disco	0.934s
    create-stamp debian/debhelper-build-stamp
  fakeroot debian/rules binary
 dh binary --buildsystem=golang --with=golang
@@ -868,12 +907,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/10616/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/10616/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/13085 and its subdirectories
-I: Current time: Sat Jun  3 11:31:17 -12 2023
-I: pbuilder-time-stamp: 1685835077
+I: removing directory /srv/workspace/pbuilder/10616 and its subdirectories
+I: Current time: Sun Jun  4 13:37:48 +14 2023
+I: pbuilder-time-stamp: 1685835468