[Reproducible-builds] Bug#778570: sbuild: ignore .buildinfo files in .changes

[Vagrant Cascadian]

Package: sbuild
Version: 0.65.0-1
Severity: wishlist
Tags: patch
X-Debbugs-Cc: reproducible-builds at lists.alioth.debian.org

Thanks for maintaining sbuild!

When using dpkg from the reproducible builds toolchain, it generates a
.buildinfo file in the .changes file:

  https://wiki.debian.org/ReproducibleBuilds/ExperimentalToolchain#dpkg


When .buildinfo files are present in the .changes, sbuild treats it as
an "attempted" build, rather than a successful build; it appears to be
treating the .buildinfo file as a .deb and tries to unpack it:

  ltsp_5.5.4-4~20150213~1_amd64.buildinfo
  ───────────────────────────────────────

  dpkg-deb: error: `/«CHROOT»/«BUILDDIR»/ltsp_5.5.4-4~20150213~1_amd64.buildinfo' is not a debian format archive

  dpkg-deb: error: `/«CHROOT»/«BUILDDIR»/ltsp_5.5.4-4~20150213~1_amd64.buildinfo' is not a debian format archive


The following patch should fix/workaround this:

>From 8468411099b8ec28641df015742784b63b98b573 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant at debian.org>
Date: Fri, 13 Feb 2015 23:51:11 -0800
Subject: [PATCH 2/2] Ignore .buildinfo files produced by reproducible builds.

---
 lib/Sbuild/Build.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm
index 5149a8a..f15e94a 100644
--- a/lib/Sbuild/Build.pm
+++ b/lib/Sbuild/Build.pm
@@ -1768,6 +1768,8 @@ sub build {
 	foreach (@debcfiles) {
 	    my $deb = "$build_dir/$_";
 	    next if $deb !~ /(\Q$host_arch\E|all)\.[\w\d.-]*$/;
+	    # ignore .buildinfo files produced by reproducible builds.
+    	    next if $deb =~ /\.*buildinfo$/;
 
 	    $self->log_subsubsection("$_");
 	    if (!open( PIPE, "dpkg --info $deb 2>&1 |" )) {
-- 
2.1.4


live well,
  vagrant


-- System Information:
Debian Release: 8.0
  APT prefers testing
  APT policy: (500, 'testing'), (120, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages sbuild depends on:
ii  adduser         3.113+nmu3
ii  apt-utils       1.0.9.6
ii  libsbuild-perl  0.65.0-1
ii  perl            5.20.1-5
ii  perl-modules    5.20.1-5

Versions of packages sbuild recommends:
ii  debootstrap  1.0.66
ii  fakeroot     1.20.2-1

Versions of packages sbuild suggests:
pn  deborphan  <none>
ii  wget       1.16-1

-- no debconf information
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/reproducible-builds/attachments/20150216/5dc19f93/attachment.sig>