On Wed, Nov 28, 2018 at 04:25:38PM +0100, Andreas Henriksson wrote: > 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.
And attach you'll find a third (simplified) version. Rationale below. I wondered why zgrep (which is a shell script) doesn't just default to plain "grep" and rely on PATH, but apparently using the full path is a workaround for systems where the "default grep" doesn't support -e. commit 60b3f4eb672a85de28ecaad47ed426f8c8fe6c32 Author: Paul Eggert <[email protected]> Date: Sat Oct 20 23:15:26 2012 -0700 zgrep: do not assume standard 'grep' has -e On Solaris 11, /usr/bin/grep -e does not work. Problem reported by Petr Sumbera in <http://lists.gnu.org/archive/html/bug-gzip/2012-10/msg00003.html>. So I guess upstream aren't interested in going back to what they had before. At the same time the problem they're adressing just causes issues for us. Thus explicitly specify GREP=grep to get back to using a path-less grep as default for zgrep. 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,11 @@ +gzip (1.9-2.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Set GREP=grep during configure, otherwise zgrep embeds the full + path. (Closes: #914907) + + -- Andreas Henriksson <[email protected]> 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:47.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=grep ../configure ${CONFIGURE_ARGS} :>$@ configure-indep: configure-indep-stamp
