Diff of the two buildlogs:

--
--- b1/build.log	2025-03-05 18:47:11.824685226 +0000
+++ b2/build.log	2025-03-05 18:50:06.984771232 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Wed Mar  5 06:44:48 -12 2025
-I: pbuilder-time-stamp: 1741200288
+I: Current time: Wed Apr  8 15:10:14 +14 2026
+I: pbuilder-time-stamp: 1775610614
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz]
 I: copying local configuration
@@ -33,52 +33,84 @@
 dpkg-source: info: applying 0010-Apply-fix-for-CVE-2024-28054.patch
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/1234157/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/3830712/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  8 01:10 /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/3830712/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/3830712/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='0dce2afed7be42019c3f739daecc341f'
-  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='1234157'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=694dd4480cd640cfb23dddc161f7de3e
+  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=3830712
   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.jYkYGZki/pbuilderrc_Za7x --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.jYkYGZki/b1 --logfile b1/build.log amavisd-new_2.13.0-7.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.jYkYGZki/pbuilderrc_vava --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.jYkYGZki/b2 --logfile b2/build.log amavisd-new_2.13.0-7.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 Nov 22 14:40 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/1234157/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Nov 22  2024 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/3830712/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -361,7 +393,7 @@
 Get: 214 http://deb.debian.org/debian trixie/main arm64 libtest-most-perl all 0.38-1 [25.1 kB]
 Get: 215 http://deb.debian.org/debian trixie/main arm64 libunix-syslog-perl arm64 1.1-4+b4 [20.2 kB]
 Get: 216 http://deb.debian.org/debian trixie/main arm64 spamassassin all 4.0.1-3 [1239 kB]
-Fetched 36.9 MB in 1s (55.6 MB/s)
+Fetched 36.9 MB in 1s (70.7 MB/s)
 Preconfiguring packages ...
 Selecting previously unselected package tzdata.
 (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 ... 19914 files and directories currently installed.)
@@ -1061,8 +1093,8 @@
 Setting up tzdata (2025a-2) ...
 
 Current default time zone: 'Etc/UTC'
-Local time is now:      Wed Mar  5 18:45:43 UTC 2025.
-Universal Time is now:  Wed Mar  5 18:45:43 UTC 2025.
+Local time is now:      Wed Apr  8 01:11:18 UTC 2026.
+Universal Time is now:  Wed Apr  8 01:11:18 UTC 2026.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 Setting up liberror-perl (0.17030-1) ...
@@ -1266,7 +1298,11 @@
 fakeroot is already the newest version (1.37-1).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/reproducible-path/amavisd-new-2.13.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  > ../amavisd-new_2.13.0-7_source.changes
+I: user script /srv/workspace/pbuilder/3830712/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for trixie
+I: user script /srv/workspace/pbuilder/3830712/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/amavisd-new-2.13.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  > ../amavisd-new_2.13.0-7_source.changes
 dpkg-buildpackage: info: source package amavisd-new
 dpkg-buildpackage: info: source version 1:2.13.0-7
 dpkg-buildpackage: info: source distribution unstable
@@ -1296,76 +1332,76 @@
    dh_auto_build -D .build/debian-build
 	cd .build/debian-build && make -j12
 make[1]: Entering directory '/build/reproducible-path/amavisd-new-2.13.0/.build/debian-build'
-cp lib/Amavis/Lookup/OpaqueRef.pm blib/lib/Amavis/Lookup/OpaqueRef.pm
+cp lib/Amavis/In/SMTP.pm blib/lib/Amavis/In/SMTP.pm
+cp lib/Amavis/JSON.pm blib/lib/Amavis/JSON.pm
+cp lib/Amavis/Custom.pm blib/lib/Amavis/Custom.pm
+cp lib/Amavis/In/Message/PerRecip.pm blib/lib/Amavis/In/Message/PerRecip.pm
+cp lib/Amavis/Conf.pm blib/lib/Amavis/Conf.pm
+cp lib/Amavis.pm blib/lib/Amavis.pm
+cp lib/Amavis/Boot.pm blib/lib/Amavis/Boot.pm
 cp lib/Amavis/OS_Fingerprint.pm blib/lib/Amavis/OS_Fingerprint.pm
+cp lib/Amavis/Lookup/Label.pm blib/lib/Amavis/Lookup/Label.pm
 cp lib/Amavis/AV.pm blib/lib/Amavis/AV.pm
-cp lib/Amavis/Conf.pm blib/lib/Amavis/Conf.pm
 cp lib/Amavis/Out/Local.pm blib/lib/Amavis/Out/Local.pm
-cp lib/Amavis/In/Message/PerRecip.pm blib/lib/Amavis/In/Message/PerRecip.pm
-cp lib/Amavis/Lookup/RE.pm blib/lib/Amavis/Lookup/RE.pm
-cp lib/Amavis/Log.pm blib/lib/Amavis/Log.pm
-cp lib/Amavis/Lookup/LDAP.pm blib/lib/Amavis/Lookup/LDAP.pm
-cp lib/Amavis/MIME/Body/OnOpenFh.pm blib/lib/Amavis/MIME/Body/OnOpenFh.pm
-cp lib/Amavis/Notify.pm blib/lib/Amavis/Notify.pm
-cp lib/Amavis/In/SMTP.pm blib/lib/Amavis/In/SMTP.pm
-cp lib/Amavis/LDAP/Connection.pm blib/lib/Amavis/LDAP/Connection.pm
-cp lib/Amavis/Out/Pipe.pm blib/lib/Amavis/Out/Pipe.pm
+cp lib/Amavis/Out.pm blib/lib/Amavis/Out.pm
 cp lib/Amavis/In/Message.pm blib/lib/Amavis/In/Message.pm
-cp lib/Amavis/DKIM.pm blib/lib/Amavis/DKIM.pm
-cp lib/Amavis/Lookup/Opaque.pm blib/lib/Amavis/Lookup/Opaque.pm
-cp lib/Amavis/Custom.pm blib/lib/Amavis/Custom.pm
-cp lib/Amavis/Lookup/LDAPattr.pm blib/lib/Amavis/Lookup/LDAPattr.pm
-cp lib/Amavis/Lookup/DNSxL.pm blib/lib/Amavis/Lookup/DNSxL.pm
-cp lib/Amavis/JSON.pm blib/lib/Amavis/JSON.pm
-cp lib/Amavis/IO/FileHandle.pm blib/lib/Amavis/IO/FileHandle.pm
-cp lib/Amavis/Lookup/SQL.pm blib/lib/Amavis/Lookup/SQL.pm
-cp lib/Amavis.pm blib/lib/Amavis.pm
+cp lib/Amavis/MIME/Body/OnOpenFh.pm blib/lib/Amavis/MIME/Body/OnOpenFh.pm
 cp lib/Amavis/Out/EditHeader.pm blib/lib/Amavis/Out/EditHeader.pm
-cp lib/Amavis/Lookup.pm blib/lib/Amavis/Lookup.pm
-cp lib/Amavis/Out/SMTP/Protocol.pm blib/lib/Amavis/Out/SMTP/Protocol.pm
-cp lib/Amavis/In/Connection.pm blib/lib/Amavis/In/Connection.pm
 cp lib/Amavis/Expand.pm blib/lib/Amavis/Expand.pm
-cp lib/Amavis/Out.pm blib/lib/Amavis/Out.pm
-cp lib/Amavis/DbgLog.pm blib/lib/Amavis/DbgLog.pm
-cp lib/Amavis/Lookup/IP.pm blib/lib/Amavis/Lookup/IP.pm
-cp lib/Amavis/IO/SQL.pm blib/lib/Amavis/IO/SQL.pm
-cp lib/Amavis/IO/Zlib.pm blib/lib/Amavis/IO/Zlib.pm
+cp lib/Amavis/DKIM.pm blib/lib/Amavis/DKIM.pm
+cp lib/Amavis/LDAP/Connection.pm blib/lib/Amavis/LDAP/Connection.pm
+cp lib/Amavis/Lookup/LDAP.pm blib/lib/Amavis/Lookup/LDAP.pm
+cp lib/Amavis/In/Connection.pm blib/lib/Amavis/In/Connection.pm
+cp lib/Amavis/Lookup/OpaqueRef.pm blib/lib/Amavis/Lookup/OpaqueRef.pm
+cp lib/Amavis/Out/SMTP/Protocol.pm blib/lib/Amavis/Out/SMTP/Protocol.pm
 cp lib/Amavis/In/AMPDP.pm blib/lib/Amavis/In/AMPDP.pm
-cp lib/Amavis/Out/BSMTP.pm blib/lib/Amavis/Out/BSMTP.pm
-cp lib/Amavis/IO/RW.pm blib/lib/Amavis/IO/RW.pm
-cp lib/Amavis/Lookup/SQLfield.pm blib/lib/Amavis/Lookup/SQLfield.pm
 cp lib/Amavis/Out/SMTP.pm blib/lib/Amavis/Out/SMTP.pm
+cp lib/Amavis/DKIM/CustomSigner.pm blib/lib/Amavis/DKIM/CustomSigner.pm
+cp lib/Amavis/IO/Zlib.pm blib/lib/Amavis/IO/Zlib.pm
+cp lib/Amavis/Lookup/LDAPattr.pm blib/lib/Amavis/Lookup/LDAPattr.pm
+cp lib/Amavis/Lookup/Opaque.pm blib/lib/Amavis/Lookup/Opaque.pm
+cp lib/Amavis/Lookup.pm blib/lib/Amavis/Lookup.pm
+cp lib/Amavis/Out/Pipe.pm blib/lib/Amavis/Out/Pipe.pm
+cp lib/Amavis/Lookup/SQLfield.pm blib/lib/Amavis/Lookup/SQLfield.pm
+cp lib/Amavis/IO/RW.pm blib/lib/Amavis/IO/RW.pm
+cp lib/Amavis/Notify.pm blib/lib/Amavis/Notify.pm
+cp lib/Amavis/Lookup/RE.pm blib/lib/Amavis/Lookup/RE.pm
+cp lib/Amavis/Lookup/SQL.pm blib/lib/Amavis/Lookup/SQL.pm
+cp lib/Amavis/IO/SQL.pm blib/lib/Amavis/IO/SQL.pm
+cp lib/Amavis/Lookup/IP.pm blib/lib/Amavis/Lookup/IP.pm
+cp lib/Amavis/Lookup/DNSxL.pm blib/lib/Amavis/Lookup/DNSxL.pm
 cp lib/Amavis/DB.pm blib/lib/Amavis/DB.pm
-cp lib/Amavis/Lookup/Label.pm blib/lib/Amavis/Lookup/Label.pm
-cp lib/Amavis/Boot.pm blib/lib/Amavis/Boot.pm
 cp lib/Amavis/DB/SNMP.pm blib/lib/Amavis/DB/SNMP.pm
-cp lib/Amavis/DKIM/CustomSigner.pm blib/lib/Amavis/DKIM/CustomSigner.pm
-cp lib/Amavis/SpamControl/RspamdClient.pm blib/lib/Amavis/SpamControl/RspamdClient.pm
-cp lib/Amavis/ZMQ.pm blib/lib/Amavis/ZMQ.pm
-cp lib/Amavis/Out/SQL/Quarantine.pm blib/lib/Amavis/Out/SQL/Quarantine.pm
-cp lib/Amavis/Unpackers/Validity.pm blib/lib/Amavis/Unpackers/Validity.pm
-cp lib/Amavis/SpamControl/SpamAssassin.pm blib/lib/Amavis/SpamControl/SpamAssassin.pm
-cp lib/Amavis/Out/SQL/Log.pm blib/lib/Amavis/Out/SQL/Log.pm
-cp lib/Amavis/Unpackers.pm blib/lib/Amavis/Unpackers.pm
+cp lib/Amavis/IO/FileHandle.pm blib/lib/Amavis/IO/FileHandle.pm
+cp lib/Amavis/Out/BSMTP.pm blib/lib/Amavis/Out/BSMTP.pm
+cp lib/Amavis/DbgLog.pm blib/lib/Amavis/DbgLog.pm
+cp lib/Amavis/Log.pm blib/lib/Amavis/Log.pm
+cp lib/Amavis/TinyRedis.pm blib/lib/Amavis/TinyRedis.pm
 cp lib/Amavis/Unpackers/NewFilename.pm blib/lib/Amavis/Unpackers/NewFilename.pm
-cp lib/Amavis/Out/SQL/Connection.pm blib/lib/Amavis/Out/SQL/Connection.pm
-cp lib/Amavis/Util.pm blib/lib/Amavis/Util.pm
-cp lib/Amavis/UnmangleSender.pm blib/lib/Amavis/UnmangleSender.pm
 cp lib/Amavis/Redis.pm blib/lib/Amavis/Redis.pm
-cp lib/Amavis/SpamControl/ExtProg.pm blib/lib/Amavis/SpamControl/ExtProg.pm
-cp lib/Amavis/Unpackers/Part.pm blib/lib/Amavis/Unpackers/Part.pm
-cp lib/Amavis/Timing.pm blib/lib/Amavis/Timing.pm
-cp lib/Amavis/SpamControl.pm blib/lib/Amavis/SpamControl.pm
-cp lib/Amavis/Tools.pm blib/lib/Amavis/Tools.pm
 cp lib/Amavis/TempDir.pm blib/lib/Amavis/TempDir.pm
-cp lib/Amavis/Unpackers/OurFiler.pm blib/lib/Amavis/Unpackers/OurFiler.pm
-cp lib/Amavis/TinyRedis.pm blib/lib/Amavis/TinyRedis.pm
-cp lib/Amavis/ProcControl.pm blib/lib/Amavis/ProcControl.pm
-cp lib/Mail/SpamAssassin/Logger/Amavislog.pm blib/lib/Mail/SpamAssassin/Logger/Amavislog.pm
 cp lib/Amavis/SpamControl/SpamdClient.pm blib/lib/Amavis/SpamControl/SpamdClient.pm
+cp lib/Amavis/ProcControl.pm blib/lib/Amavis/ProcControl.pm
+cp lib/Amavis/Out/SMTP/Session.pm blib/lib/Amavis/Out/SMTP/Session.pm
+cp lib/Amavis/Unpackers/Validity.pm blib/lib/Amavis/Unpackers/Validity.pm
+cp lib/Amavis/Tools.pm blib/lib/Amavis/Tools.pm
+cp lib/Amavis/Unpackers/Part.pm blib/lib/Amavis/Unpackers/Part.pm
+cp lib/Amavis/Timing.pm blib/lib/Amavis/Timing.pm
+cp lib/Amavis/Out/SQL/Quarantine.pm blib/lib/Amavis/Out/SQL/Quarantine.pm
+cp lib/Amavis/SpamControl/SpamAssassin.pm blib/lib/Amavis/SpamControl/SpamAssassin.pm
 cp lib/Amavis/rfc2821_2822_Tools.pm blib/lib/Amavis/rfc2821_2822_Tools.pm
+cp lib/Amavis/Out/SQL/Connection.pm blib/lib/Amavis/Out/SQL/Connection.pm
+cp lib/Amavis/ZMQ.pm blib/lib/Amavis/ZMQ.pm
 cp lib/Amavis/Unpackers/MIME.pm blib/lib/Amavis/Unpackers/MIME.pm
-cp lib/Amavis/Out/SMTP/Session.pm blib/lib/Amavis/Out/SMTP/Session.pm
+cp lib/Amavis/UnmangleSender.pm blib/lib/Amavis/UnmangleSender.pm
+cp lib/Amavis/Unpackers/OurFiler.pm blib/lib/Amavis/Unpackers/OurFiler.pm
+cp lib/Amavis/SpamControl/RspamdClient.pm blib/lib/Amavis/SpamControl/RspamdClient.pm
+cp lib/Amavis/Out/SQL/Log.pm blib/lib/Amavis/Out/SQL/Log.pm
+cp lib/Amavis/Util.pm blib/lib/Amavis/Util.pm
+cp lib/Mail/SpamAssassin/Logger/Amavislog.pm blib/lib/Mail/SpamAssassin/Logger/Amavislog.pm
+cp lib/Amavis/Unpackers.pm blib/lib/Amavis/Unpackers.pm
+cp lib/Amavis/SpamControl.pm blib/lib/Amavis/SpamControl.pm
+cp lib/Amavis/SpamControl/ExtProg.pm blib/lib/Amavis/SpamControl/ExtProg.pm
 cp bin/amavis-mc blib/script/amavis-mc
 "/usr/bin/perl" -MExtUtils::MY -e 'MY->fixin(shift)' -- blib/script/amavis-mc
 cp bin/amavis-services blib/script/amavis-services
@@ -1523,22 +1559,22 @@
 ok
 # 
 # Amavis::IO::RWTest->line_boundary_at_start
-2025/03/05-06:46:40 Amavis::IO::RWTest::Sink (type Net::Server) starting! pid(1255272)
+2026/04/08-15:12:31 Amavis::IO::RWTest::Sink (type Net::Server) starting! pid(3850390)
 Resolved [*]:12345 to [::]:12345, IPv6
 Not including resolved host [0.0.0.0] IPv4 because it will be handled by [::] IPv6
 Binding to TCP port 12345 on host :: with IPv6
-Group Not Defined.  Defaulting to EGID '1111 1111'
-User Not Defined.  Defaulting to EUID '1111'
-2025/03/05-06:46:40 Server closing!
+Group Not Defined.  Defaulting to EGID '2222 2222'
+User Not Defined.  Defaulting to EUID '2222'
+2026/04/08-15:12:31 Server closing!
 # 
 # Amavis::IO::RWTest->line_boundary_chunking
-2025/03/05-06:46:40 Amavis::IO::RWTest::Sink (type Net::Server) starting! pid(1255280)
+2026/04/08-15:12:31 Amavis::IO::RWTest::Sink (type Net::Server) starting! pid(3850397)
 Resolved [*]:12345 to [::]:12345, IPv6
 Not including resolved host [0.0.0.0] IPv4 because it will be handled by [::] IPv6
 Binding to TCP port 12345 on host :: with IPv6
-Group Not Defined.  Defaulting to EGID '1111 1111'
-User Not Defined.  Defaulting to EUID '1111'
-2025/03/05-06:46:40 Server closing!
+Group Not Defined.  Defaulting to EGID '2222 2222'
+User Not Defined.  Defaulting to EUID '2222'
+2026/04/08-15:12:31 Server closing!
 t/Amavis/IO/RWTest.t ..................... 
 1..26
 ok 1 - use Amavis::IO::RW;
@@ -1960,7 +1996,7 @@
 ok 6 - mail_addr_decode
 ok
 All tests successful.
-Files=67, Tests=216, 21 wallclock secs ( 0.20 usr  0.10 sys +  8.94 cusr  1.79 csys = 11.03 CPU)
+Files=67, Tests=216, 29 wallclock secs ( 0.18 usr  0.11 sys +  9.17 cusr  1.58 csys = 11.04 CPU)
 Result: PASS
 make[1]: Leaving directory '/build/reproducible-path/amavisd-new-2.13.0/.build/debian-build'
    create-stamp debian/debhelper-build-stamp
@@ -1971,84 +2007,84 @@
 Manifying 1 pod document
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Mail/SpamAssassin/Logger/Amavislog.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/SpamControl.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Unpackers.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Util.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/UnmangleSender.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/ZMQ.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/rfc2821_2822_Tools.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Timing.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Tools.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/ProcControl.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/TinyRedis.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/TempDir.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Tools.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/SpamControl.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Timing.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Redis.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/UnmangleSender.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Util.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Unpackers.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/ZMQ.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Boot.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/DB.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/TinyRedis.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Log.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/DbgLog.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Expand.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/DB.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Notify.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/JSON.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Custom.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/DKIM.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Notify.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Log.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Conf.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Expand.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/AV.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/OS_Fingerprint.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Unpackers/MIME.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Boot.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Conf.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Custom.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/JSON.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/SpamControl/ExtProg.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/SpamControl/RspamdClient.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/SpamControl/SpamAssassin.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/SpamControl/SpamdClient.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Unpackers/OurFiler.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Unpackers/MIME.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Unpackers/Part.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Unpackers/NewFilename.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Unpackers/Validity.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/SpamControl/SpamdClient.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/SpamControl/ExtProg.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/SpamControl/SpamAssassin.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/SpamControl/RspamdClient.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/DKIM/CustomSigner.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Unpackers/NewFilename.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/DB/SNMP.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/IO/FileHandle.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/IO/SQL.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/IO/RW.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/IO/Zlib.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/IO/SQL.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/IO/FileHandle.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/DKIM/CustomSigner.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/LDAP/Connection.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/MIME/Body/OnOpenFh.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/In/AMPDP.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/In/Connection.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/In/Message.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/In/SMTP.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/In/Message/PerRecip.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/SMTP.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/BSMTP.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/EditHeader.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/Pipe.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/SMTP.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/EditHeader.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/Local.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/SQL/Connection.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/SQL/Log.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/SQL/Connection.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/SQL/Quarantine.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/SMTP/Session.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Out/SMTP/Protocol.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/Label.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/SQLfield.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/DNSxL.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/IP.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/SQL.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/DNSxL.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/LDAPattr.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/Opaque.pm
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/LDAP.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/RE.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/SQLfield.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/Opaque.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/LDAPattr.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/OpaqueRef.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/LDAP.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/Lookup/Label.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/In/AMPDP.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/In/Connection.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/In/Message.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/In/SMTP.pm
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/perl5/Amavis/In/Message/PerRecip.pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/share/man/man3/Amavis::SpamControl::RspamdClient.3pm
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavisd-submit
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavisd-release
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavisd-signer
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavisd-snmp-subagent
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavisd-agent
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavisd-signer
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavisd-release
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavisd-nanny
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavisd-agent
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavisd
-Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavis-services
 Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavis-mc
+Installing /build/reproducible-path/amavisd-new-2.13.0/debian/amavisd-new/usr/bin/amavis-services
 make[1]: Leaving directory '/build/reproducible-path/amavisd-new-2.13.0/.build/debian-build'
    debian/rules execute_after_dh_auto_install
 make[1]: Entering directory '/build/reproducible-path/amavisd-new-2.13.0'
@@ -2095,12 +2131,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/3830712/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/3830712/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/1234157 and its subdirectories
-I: Current time: Wed Mar  5 06:47:10 -12 2025
-I: pbuilder-time-stamp: 1741200430
+I: removing directory /srv/workspace/pbuilder/3830712 and its subdirectories
+I: Current time: Wed Apr  8 15:13:05 +14 2026
+I: pbuilder-time-stamp: 1775610785