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

[Holger Levsen]

Hi Niko,

On Montag, 12. Oktober 2015, Niko Tyni wrote:
> The 5eacc4dbec35525468ad195e6b026a857dc12220 commit message (in
> dpkg pu/reproducible_builds) talks about dpkg-buildpackage setting
> SOURCE_DATE_EPOCH, but the code uses DEB_BUILD_TIMESTAMP.

Ah!
 
> So if I understand this correctly, dpkg-buildpackage now sets
> DEB_BUILD_TIMESTAMP but dpkg-deb looks at SOURCE_DATE_EPOCH.
> 
> Looks like an accidental merge/rebase error to me?

To me too!

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…


cheers,
Holger, glad that this has been found




signature.asc
Description: This is a digitally signed message part.
___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

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

[Santiago Vila]

On Mon, Oct 12, 2015 at 01:01:24PM +0200, Holger Levsen wrote:
> check out the pu/reproducible_builds branch…

Ah, ok. Done that as well.

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

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

[Holger Levsen]

Hi Santiago,

On Montag, 12. Oktober 2015, Santiago Vila wrote:
> Done

cool, thanks!

> but I have had to do it without the git stuff because it seems
> to be broken at this moment:
[...]
> warning: remote HEAD refers to nonexistent ref, unable to checkout.

no, it works as documented. check out the pu/reproducible_builds branch…
 
> Attached the trivial patch I've applied.

…and please push and commit your changes.

I'll now build armf packages and upload those…


cheers,
Holger


signature.asc
Description: This is a digitally signed message part.
___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Re: [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.
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.0 +0200
+++ dpkg-1.18.3.0~reproducible2/debian/changelog2015-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   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.0 +0200
+++ dpkg-1.18.3.0~reproducible2/scripts/dpkg-buildpackage.pl2015-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;
___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

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

[Santiago Vila]

Hi.

Some packages have started to FTBR again:

--- aaa/dialog_1.2-20150920-1_amd64.deb
+++ bbb/dialog_1.2-20150920-1_amd64.deb
├── metadata
│ @@ -1,3 +1,3 @@
│ -rw-r--r-- 0/0  4 Oct 11 12:08 2015 debian-binary
│ -rw-r--r-- 0/0   4814 Oct 11 12:08 2015 control.tar.gz
│ -rw-r--r-- 0/0 250668 Oct 11 12:08 2015 data.tar.xz
│ +rw-r--r-- 0/0  4 Oct 11 12:10 2015 debian-binary
│ +rw-r--r-- 0/0   4814 Oct 11 12:10 2015 control.tar.gz
│ +rw-r--r-- 0/0 250668 Oct 11 12:10 2015 data.tar.xz

This is the only difference, and even if the package does not use
debhelper, it does everything a non-debhelper-using package is
supposed to do to be reproducible (or at least that's what I thought).

I suspect of (our forked) dpkg, hence the subject :-)

Thanks.

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

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

[Santiago Vila]

On Sun, Oct 11, 2015 at 12:35:18PM +, Santiago Vila wrote:

> │ -rw-r--r-- 0/0  4 Oct 11 12:08 2015 debian-binary
> │ -rw-r--r-- 0/0   4814 Oct 11 12:08 2015 control.tar.gz
> │ -rw-r--r-- 0/0 250668 Oct 11 12:08 2015 data.tar.xz
> │ +rw-r--r-- 0/0  4 Oct 11 12:10 2015 debian-binary
> │ +rw-r--r-- 0/0   4814 Oct 11 12:10 2015 control.tar.gz
> │ +rw-r--r-- 0/0 250668 Oct 11 12:10 2015 data.tar.xz

Ok, as an experiment I managed this to be 1970-01-01 by setting
SOURCE_DATE_EPOCH=0 before dpkg-buildpackage.

But I don't think setting such variable should be required, because
then: why Bug #75 talks about the latest changelog entry?

This is supposed to be automatic, right?

Thanks.

___
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds