[Reproducible-builds] Bug#833472: aghermann: please make BUILT_BY reproducible (username, hostname)

[Daniel Shahaf]

Source: aghermann
Version: 1.1.0-1
Severity: wishlist
Tags: upstream patch
User: reproducible-builds at lists.alioth.debian.org
Usertags: username hostname

Dear Maintainer,

While working on the “reproducible builds” effort [1], we have noticed
that aghermann could not be built reproducibly:

    https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/aghermann.html
    │   │   │   │   │    0x004c5e00 41676865 726d616e 6e20312e 312e3020 Aghermann 1.1.0 
    │   │   │   │   │    0x004c5e10 6275696c 74204a75 6e203236 20323031 built Jun 26 201
    │   │   │   │   │    0x004c5e20 36203232 3a31323a 30302062 79207062 6 22:12:00 by pb
    │   │   │   │   │ -  0x004c5e30 75696c64 65723140 70726f66 69746272 uilder1 at profitbr
    │   │   │   │   │ -  0x004c5e40 69636b73 2d627569 6c64312d 616d6436 icks-build1-amd6
    │   │   │   │   │ -  0x004c5e50 340a00                              4..
    │   │   │   │   │ +  0x004c5e30 75696c64 65723240 692d6361 70747572 uilder2 at i-captur
    │   │   │   │   │ +  0x004c5e40 652d7468 652d686f 73746e61 6d650a00 e-the-hostname..

Following up on #828008, a second patch is attached to make BUILT_BY
deterministic.  It's written to accomodate vendor names having embedded
spaces, since deb-origin(5) implies such names are valid.

Cheers,

Daniel


diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
new file mode 100644
index 0000000..09f93e6
--- /dev/null
+++ b/debian/patches/reproducible.patch
@@ -0,0 +1,19 @@
+Description: Make the build reproducible
+  Eliminate needless, variable information.
+Author: Daniel Shahaf <danielsh at apache.org>
+Bug-Debian: https://bugs.debian.org/-1
+Last-Update: 2016-08-04
+Forwarded: not-needed
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -190,7 +190,8 @@
+ fi
+ 
+ dnl Any private defines
+-AC_SUBST(user, [`whoami`@`hostname`])
++BUILT_BY="\"`dpkg-vendor --query vendor`\""
++AC_SUBST(user, [$BUILT_BY])
+ AC_SUBST(build_date, [`date --utc --date=@${SOURCE_DATE_EPOCH:-$(date +%s)} +"%F"`])
+ AC_SUBST(build_datetime, [`date --utc --date=@${SOURCE_DATE_EPOCH:-$(date +%s)}`])
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..038ee28
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+reproducible.patch