Source: heartbeat
Version: 3.0.6-8
Severity: normal
Tags: patch
User: m...@linux.it
Usertags: usrmerge

Dear Maintainer,

The package currently fails to build reproducibly on merged-usr vs
non-merged systems.

https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/heartbeat.html

This can easily be fixed by passing in the paths explicitly to configure
instead of relying on PATH at build-time for lookup.
(Best of all would be if using PATH at runtime and avoiding to hard-code
the full path of the tools, but unfortunately the full path is required
by the generated configure script to be able to override.)

Please see attached debdiff.

Regards,
Andreas Henriksson
diff -Nru heartbeat-3.0.6/debian/changelog heartbeat-3.0.6/debian/changelog
--- heartbeat-3.0.6/debian/changelog    2018-05-01 20:00:13.000000000 +0200
+++ heartbeat-3.0.6/debian/changelog    2018-12-02 18:28:26.000000000 +0100
@@ -1,3 +1,11 @@
+heartbeat (1:3.0.6-8.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Pass PING=/bin/ping IFCONFIG=/sbin/ifconfig IP2UTIL=/sbin/ip to configure
+    - fixes reproducible build on merged-usr vs non-merged systems
+
+ -- Andreas Henriksson <andr...@fatal.se>  Sun, 02 Dec 2018 18:28:26 +0100
+
 heartbeat (1:3.0.6-8) unstable; urgency=medium
 
   * Drop unused patch fix-ftbfs-lp1188428.patch
diff -Nru heartbeat-3.0.6/debian/rules heartbeat-3.0.6/debian/rules
--- heartbeat-3.0.6/debian/rules        2018-05-01 20:00:13.000000000 +0200
+++ heartbeat-3.0.6/debian/rules        2018-12-02 18:28:24.000000000 +0100
@@ -9,7 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-cfg:=--prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+cfg:=PING=/bin/ping IFCONFIG=/sbin/ifconfig IP2UTIL=/sbin/ip \
+  --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   --libexecdir=/usr/lib \
   --mandir=/usr/share/man --disable-crm \
   --with-group-name=haclient --with-ccmuser-name=hacluster \

Reply via email to