Bug#914907: gzip: reproducible build (usrmerge): zgrep embeds path of grep found via PATH

[Andreas Henriksson]

On Wed, Nov 28, 2018 at 03:15:10PM +0100, Andreas Henriksson wrote:
> Package: gzip
> Version: 1.9-2
> Severity: normal
> Tags: patch
[...]

Got some feedback. Improved patch attached.

Regards,
Andreas Henriksson

diff -Nru gzip-1.9/debian/changelog gzip-1.9/debian/changelog
--- gzip-1.9/debian/changelog   2018-09-29 18:28:06.000000000 +0200
+++ gzip-1.9/debian/changelog   2018-11-28 16:11:47.000000000 +0100
@@ -1,3 +1,12 @@
+gzip (1.9-2.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Set GREP=/bin/grep during configure to fix reproducible build on
+    merged-usr vs non-merged systems. (zgrep embeds the full path.)
+    (Closes: #914907)
+
+ -- Andreas Henriksson <andr...@fatal.se>  Wed, 28 Nov 2018 16:11:47 +0100
+
 gzip (1.9-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru gzip-1.9/debian/rules gzip-1.9/debian/rules
--- gzip-1.9/debian/rules       2018-09-29 18:24:07.000000000 +0200
+++ gzip-1.9/debian/rules       2018-11-28 16:11:39.000000000 +0100
@@ -78,7 +78,7 @@
        mkdir -p builddir
        cd builddir && env \
            $(foreach i,CC CFLAGS CPPFLAGS LDFLAGS,$(call shellexport,$i)) \
-           CONFIG_SHELL=/bin/sh ../configure ${CONFIGURE_ARGS}
+           CONFIG_SHELL=/bin/sh GREP=/bin/grep ../configure ${CONFIGURE_ARGS}
        :>$@
 
 configure-indep: configure-indep-stamp