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 GMktGRIOu14qUwAA0tVLHw (envelope-from ) for ; Tue, 12 May 2020 20:58:58 +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 eH56NCAOu151NwAAbx9fmQ (envelope-from ) for ; Tue, 12 May 2020 20:59:12 +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 407C79400EF for ; Tue, 12 May 2020 20:59:10 +0000 (UTC) Received: from localhost ([::1]:59240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYbza-0002Ek-IW for larch@yhetil.org; Tue, 12 May 2020 16:59:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYbzS-0002Eb-Bj for guix-patches@gnu.org; Tue, 12 May 2020 16:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jYbzS-0008Fm-3A for guix-patches@gnu.org; Tue, 12 May 2020 16:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jYbzS-0007Yc-2m for guix-patches@gnu.org; Tue, 12 May 2020 16:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41192] [PATCH 2/2] gnu: wireguard-tools: Fix wg-quick. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 May 2020 20:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41192 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 41192@debbugs.gnu.org Received: via spool by 41192-submit@debbugs.gnu.org id=B41192.158931708528979 (code B ref 41192); Tue, 12 May 2020 20:59:02 +0000 Received: (at 41192) by debbugs.gnu.org; 12 May 2020 20:58:05 +0000 Received: from localhost ([127.0.0.1]:56628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYbyX-0007XL-61 for submit@debbugs.gnu.org; Tue, 12 May 2020 16:58:05 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:34155) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYbyU-0007Wm-TH for 41192@debbugs.gnu.org; Tue, 12 May 2020 16:58:03 -0400 Received: from webmail.gandi.net (webmail18.sd4.0x35.net [10.200.201.18]) (Authenticated sender: brice@waegenei.re) by relay11.mail.gandi.net (Postfix) with ESMTPA id C8974100003; Tue, 12 May 2020 20:57:55 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 12 May 2020 20:57:55 +0000 From: Brice Waegeneire In-Reply-To: <20200511195834.GB15862@jasmine.lan> References: <20200511184312.21587-1-brice@waegenei.re> <20200511185310.24537-2-brice@waegenei.re> <20200511195834.GB15862@jasmine.lan> Message-ID: <4a36f3e98940666676235563088a18ff@waegenei.re> X-Sender: brice@waegenei.re User-Agent: Roundcube Webmail/1.3.8 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) 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 X-Spam-Score: -1.01 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-Scan-Result: default: False [-1.01 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.53968317251418]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.51.188.0/24:c]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.06), country: US(-0.00), ip: 209.51.188.17(-0.54)]; DWL_DNSWL_FAIL(0.00)[209.51.188.17:server fail]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; RCPT_COUNT_TWO(0.00)[2]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:22989, ipnet:209.51.188.0/24, country:US]; FROM_NEQ_ENVFROM(0.00)[brice@waegenei.re,guix-patches-bounces@gnu.org]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_DKIM_NA(0.00)[]; DMARC_NA(0.00)[waegenei.re]; HAS_LIST_UNSUB(-0.01)[]; DNSWL_BLOCKED(0.00)[209.51.188.17:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.51.188.17:from]; RCVD_COUNT_SEVEN(0.00)[8]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: B+3bqflZaF0f On 2020-05-11 19:58, Leo Famulari wrote: > On Mon, May 11, 2020 at 08:53:10PM +0200, Brice Waegeneire wrote: >> + (add-after 'install 'install-contrib > > How about calling this phase "install-docs" or "install-contrib-docs"?. This is a more informative name, renamed. >> + (wrap-program (string-append out "/bin/wg-quick") >> + `("PATH" ":" = ,(append inputs-sbin >> + (list coreutils >> + >> "/run/setuid-programs")))) >> + #t)))))) > > Setuid Guix only exists on Guix System, so we should drop this wrapper. > It's okay to make users do `sudo wg-quick` or similar. Replaced '=' with 'prefix' and dropped "/run/setuid-programs" from the wrapper. >> + (native-inputs >> + `(("bash" ,bash))) ; for contrib scripts using /dev/tcp >> + (inputs >> + `(("resolvconf" ,openresolv) >> + ("coreutils" ,coreutils) > > Is coreutils not already available in the build environment? > >> + ("bash" ,bash) ; for contrib scripts using >> /dev/tcp > > IIUC, we don't need to include Bash in both 'native-inputs' and > 'inputs'. If this Bash will be used at run-time (e.g. as a script > shebang), we should just use 'inputs'. Only kept in inputs.