From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2G6YL6fuMF8FIwAA0tVLHw (envelope-from ) for ; Mon, 10 Aug 2020 06:52:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id KDFJK6fuMF82fQAAbx9fmQ (envelope-from ) for ; Mon, 10 Aug 2020 06:52:23 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 165189402CB for ; Mon, 10 Aug 2020 06:52:22 +0000 (UTC) Received: from localhost ([::1]:59096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51fR-0006AZ-22 for larch@yhetil.org; Mon, 10 Aug 2020 02:52:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k51f8-0005yS-Nr for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k51f8-0006nf-EP for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k51f8-0004hm-D6 for guix-patches@gnu.org; Mon, 10 Aug 2020 02:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35619] [PATCH 3/5] gnu: postfix-minimal: Fix startup warnings. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Aug 2020 06:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: =?UTF-8?Q?G=C3=A1bor?= Boskovits , 35619@debbugs.gnu.org Received: via spool by 35619-submit@debbugs.gnu.org id=B35619.159704229118018 (code B ref 35619); Mon, 10 Aug 2020 06:52:02 +0000 Received: (at 35619) by debbugs.gnu.org; 10 Aug 2020 06:51:31 +0000 Received: from localhost ([127.0.0.1]:34156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51eY-0004gN-8r for submit@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k51eU-0004fb-37 for 35619@debbugs.gnu.org; Mon, 10 Aug 2020 02:51:22 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44335) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k51eO-0006kT-Pe; Mon, 10 Aug 2020 02:51:16 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=46134 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1k51eO-0003F6-7p; Mon, 10 Aug 2020 02:51:16 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 10 Aug 2020 08:51:10 +0200 Message-Id: <20200810065112.6879-3-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200810065112.6879-1-janneke@gnu.org> References: <20200810065112.6879-1-janneke@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: W0n/94SZuSSo This avoids kind of funny replacements like these of `rm' find -prune -perm -020 => find -prune -pe/gnu/store/zibwkb5xavnv6z3gzknfqjsxb9b0izh0-coreutils-8.31/bin/rm -020 * gnu/packages/mail.scm (postfix-minimal)[phases]: Set PATH rather than substituting individual commands. --- gnu/packages/mail.scm | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 94236bbbcd..5f622595c9 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Brant Gardner +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -3569,7 +3570,10 @@ based on asyncio.") "1k2mxx9yx8lif804ff7zjyllizv4najfv3dca912k6j46fbr5b12")))) (build-system gnu-build-system) (arguments - '(#:phases + '(#:modules ((srfi srfi-26) + (guix build utils) + (guix build gnu-build-system)) + #:phases (modify-phases %standard-phases (add-before 'build 'patch-/bin/sh (lambda _ @@ -3601,14 +3605,20 @@ based on asyncio.") (lambda _ (invoke "make" "makefiles" "pie=yes" "dynamicmaps=yes"))) (add-before 'install 'fix-postfix-scripts-path - (lambda _ - (for-each - (lambda (command) - (substitute* '("postfix-install" "conf/post-install" "conf/postfix-script") - (((string-append command " ")) (string-append (which command) " ")))) - '("awk" "chmod" "chown" "chgrp" "cp" "find" "ln" "mkdir" "mv" "rm" "sed" - "sleep" "sort" "touch" "uname")) - #t)) + (lambda* (#:key inputs #:allow-other-keys) + (let ((path (string-join + (map (compose (cute string-append <> "/bin") + (cute assoc-ref inputs <>)) + '("bash" "coreutils" "findutils" "gawk" "grep" + "sed")) + ":"))) + (substitute* '("postfix-install" + "conf/post-install" + "conf/postfix-script") + (("^SHELL=/bin/sh") + (string-append "PATH=" path "\n" + "SHELL=" (assoc-ref inputs "bash") "/bin/sh"))) + #t))) (add-before 'install 'configure-install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com