From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2cZO-0006pz-0p for guix-patches@gnu.org; Wed, 19 Sep 2018 09:31:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g2cZK-0008Uf-PG for guix-patches@gnu.org; Wed, 19 Sep 2018 09:31:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:41010) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g2cZK-0008UE-KL for guix-patches@gnu.org; Wed, 19 Sep 2018 09:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g2cZK-0000zi-Gn for guix-patches@gnu.org; Wed, 19 Sep 2018 09:31:02 -0400 Subject: [bug#32771] [PATCH 1/2] gnu: varnish: Use absolute file name of "rm". References: <20180919132803.12511-1-mbakke@fastmail.com> In-Reply-To: <20180919132803.12511-1-mbakke@fastmail.com> Resent-Message-ID: From: Marius Bakke Date: Wed, 19 Sep 2018 15:30:26 +0200 Message-Id: <20180919133027.12799-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32771@debbugs.gnu.org * gnu/packages/web.scm (varnish)[arguments]: Rename 'patch-bin-sh-phase to 'use-absolute-file-names and add substitution. --- gnu/packages/web.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b6bee57f9..26c2e9128 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5019,12 +5019,14 @@ deployments.") "--localstatedir=/var") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-/bin/sh + (add-after 'unpack 'use-absolute-file-names (lambda _ (substitute* '("bin/varnishtest/vtc_varnish.c" "bin/varnishtest/vtc_process.c" "bin/varnishd/mgt/mgt_vcc.c") (("/bin/sh") (which "sh"))) + (substitute* "bin/varnishd/mgt/mgt_shmem.c" + (("rm -rf") (string-append (which "rm") " -rf"))) #t)) (add-before 'install 'patch-Makefile (lambda _ -- 2.19.0