From patchwork Mon Nov 22 22:10:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 34762 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A0F3B27BBE3; Mon, 22 Nov 2021 22:15:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 644F727BBE1 for ; Mon, 22 Nov 2021 22:15:14 +0000 (GMT) Received: from localhost ([::1]:39998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpHaj-0001RD-Ed for patchwork@mira.cbaines.net; Mon, 22 Nov 2021 17:15:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpHaZ-0001R4-7j for guix-patches@gnu.org; Mon, 22 Nov 2021 17:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpHaX-0002LI-PT for guix-patches@gnu.org; Mon, 22 Nov 2021 17:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpHaX-0004JR-KT for guix-patches@gnu.org; Mon, 22 Nov 2021 17:15:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52009] [PATCH core-updates-frozen] openresolv: Wrap it. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Nov 2021 22:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52009 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 52009@debbugs.gnu.org Received: via spool by 52009-submit@debbugs.gnu.org id=B52009.163761927016521 (code B ref 52009); Mon, 22 Nov 2021 22:15:01 +0000 Received: (at 52009) by debbugs.gnu.org; 22 Nov 2021 22:14:30 +0000 Received: from localhost ([127.0.0.1]:49319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpHa2-0004IM-10 for submit@debbugs.gnu.org; Mon, 22 Nov 2021 17:14:30 -0500 Received: from planete-kraus.eu ([89.234.140.182]:58980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpHa0-0004I9-4C for 52009@debbugs.gnu.org; Mon, 22 Nov 2021 17:14:28 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 0f69e755; Mon, 22 Nov 2021 22:13:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= references:from:to:cc:subject:date:in-reply-to:message-id :mime-version:content-type; s=dkim; bh=9fODO23jOS6Sh3cLno95AvRce Lc=; b=JXpyXglUc5JFvNIriXJCfjJ+eP5SEFFALiPA0vjxPOXbnALE9q1ia69zF Qd8KVJN+92Y3JjUL2EUjG3LSps4RRogdAqPWfV/Mxq1T+cX28yhDJCPcpt2Jg0jk nH6+9UdCq2O3f3NXV9wnJtj7nfi6s5PDtmbVW5eTrPESYMcBFA= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 7aa05ff5 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Mon, 22 Nov 2021 22:13:26 +0000 (UTC) References: <8735nq5sz2.fsf@planete-kraus.eu> <877dczn9p0.fsf@gnu.org> User-agent: mu4e 1.6.10; emacs 27.2 Date: Mon, 22 Nov 2021 23:10:46 +0100 In-reply-to: <877dczn9p0.fsf@gnu.org> Message-ID: <87zgpvkfeu.fsf@planete-kraus.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus X-getmail-retrieved-from-mailbox: Patches Ludovic Courtès writes: > Vivien Kraus skribis: >> + (add-after 'install 'wrap-program >> + (lambda* (#:key inputs outputs #:allow-other-keys) >> + (let ((out (assoc-ref outputs "out")) >> + (coreutils (assoc-ref inputs "coreutils"))) >> + (wrap-program (string-append out "/sbin/resolvconf") >> + `("PATH" ":" = (,(string-append coreutils "/bin")))))))))) >> + (inputs >> + `(("bash-minimal" ,bash-minimal) >> + ("coreutils" ,coreutils))) > > Since /sbin/resolvconf is a shell script, how about, instead of wrapping > it, inserting with ‘substitute*’ something like: > > PATH=/gnu/store/…-coreutils/bin:$PATH > > somewhere at the top? Good idea. > (We could also use ‘coreutils-minimal’ here.) It contains the required binaries, so let’s go with it. Vivien From 8b26dda4284de0c3db8aa40c5d9ddd6130ded590 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 20 Nov 2021 23:48:17 +0100 Subject: [PATCH] gnu: openresolv: Wrap resolvconf. * gnu/packages/dns.scm (openresolv) [phases]: Wrap resolvconf to set PATH, for coreutils programs mkdir and rm. * gnu/packages/dns.scm (openresolv) [inputs]: Add coreutils, and bash-minimal to run the wrapper and the wrapped script. --- gnu/packages/dns.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index b289aa999e..f025b2242b 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -1417,7 +1417,22 @@ (define-public openresolv #:configure-flags (list (string-append "--sysconfdir=/etc")) #:make-flags - (list (string-append "SYSCONFDIR=/" (assoc-ref %outputs "out") "/etc")))) + (list (string-append "SYSCONFDIR=/" (assoc-ref %outputs "out") "/etc")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (coreutils (assoc-ref inputs "coreutils-minimal"))) + (substitute* (string-append out "/sbin/resolvconf") + (("RESOLVCONF=\"\\$0\"") + (format #f "\ +RESOLVCONF=\"$0\" +PATH=~a/bin:$PATH" + coreutils))))))))) + (inputs + `(("bash-minimal" ,bash-minimal) + ("coreutils-minimal" ,coreutils-minimal))) (home-page "https://roy.marples.name/projects/openresolv/") (synopsis "Resolvconf POSIX compliant implementation, a middleman for resolv.conf") (description "openresolv is an implementation of @command{resolvconf}, the -- 2.34.0