[Reproducible-builds] dpkg has lost some of its superpowers

[Santiago Vila]

On Mon, Oct 12, 2015 at 10:09:29AM +0200, Holger Levsen wrote:
> Could someone please rebuild dpkg with that fix, test if this fixes the 
> problem and if so, upload to our repo? I'm a bit swamped to do this right now…

Done, but I have had to do it without the git stuff because it seems
to be broken at this moment:

Cloning into 'dpkg'...
remote: Counting objects: 76098, done.
remote: Compressing objects: 100% (14920/14920), done.
remote: Total 76098 (delta 63711), reused 73079 (delta 60765)
Receiving objects: 100% (76098/76098), 52.53 MiB | 1.36 MiB/s, done.
Resolving deltas: 100% (63711/63711), done.
Checking connectivity... done.
warning: remote HEAD refers to nonexistent ref, unable to checkout.

So, plain old dpkg-source from our repo + changes + upload.

Attached the trivial patch I've applied.

Thanks.
-------------- next part --------------
diff -ru dpkg-1.18.3.0~reproducible2.original/debian/changelog dpkg-1.18.3.0~reproducible2/debian/changelog
--- dpkg-1.18.3.0~reproducible2.original/debian/changelog	2015-10-08 18:40:17.000000000 +0200
+++ dpkg-1.18.3.0~reproducible2/debian/changelog	2015-10-12 11:35:55.385268393 +0200
@@ -1,3 +1,10 @@
+dpkg (1.18.3.0~reproducible3) UNRELEASED; urgency=low
+
+  * scripts/dpkg-buildpackage.pl: Use SOURCE_DATE_EPOCH instead
+    of DEB_BUILD_TIMESTAMP, to be in sync with dpkg-deb.
+
+ -- Santiago Vila <sanvila at debian.org>  Mon, 12 Oct 2015 11:35:30 +0200
+
 dpkg (1.18.3.0~reproducible2) UNRELEASED; urgency=low
 
   [ Jérémy Bobbio ]
diff -ru dpkg-1.18.3.0~reproducible2.original/scripts/dpkg-buildpackage.pl dpkg-1.18.3.0~reproducible2/scripts/dpkg-buildpackage.pl
--- dpkg-1.18.3.0~reproducible2.original/scripts/dpkg-buildpackage.pl	2015-10-08 18:40:09.000000000 +0200
+++ dpkg-1.18.3.0~reproducible2/scripts/dpkg-buildpackage.pl	2015-10-12 11:32:00.833844266 +0200
@@ -445,10 +445,10 @@
     $maintainer = mustsetvar($changelog->{maintainer}, g_('source changed by'));
 }
 
-if (!$ENV{DEB_BUILD_TIMESTAMP}) {
+if (!$ENV{SOURCE_DATE_EPOCH}) {
     my $timestamp = `date -d'$changelog->{date}' +%s`;
     chomp $timestamp;
-    $ENV{DEB_BUILD_TIMESTAMP} = $timestamp;
+    $ENV{SOURCE_DATE_EPOCH} = $timestamp;
 }
 
 my @arch_opts;