From unknown Tue Jun 24 05:08:22 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#41192 <41192@debbugs.gnu.org> To: bug#41192 <41192@debbugs.gnu.org> Subject: Status: [PATCH 0/2] wireguard-tools: Fix wg-quick Reply-To: bug#41192 <41192@debbugs.gnu.org> Date: Tue, 24 Jun 2025 12:08:22 +0000 retitle 41192 [PATCH 0/2] wireguard-tools: Fix wg-quick reassign 41192 guix-patches submitter 41192 Brice Waegeneire severity 41192 normal tag 41192 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon May 11 14:43:21 2020 Received: (at submit) by debbugs.gnu.org; 11 May 2020 18:43:21 +0000 Received: from localhost ([127.0.0.1]:53239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYDOb-0003qC-GI for submit@debbugs.gnu.org; Mon, 11 May 2020 14:43:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:50838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYDOa-0003q5-Hq for submit@debbugs.gnu.org; Mon, 11 May 2020 14:43:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYDOZ-0005oa-16 for guix-patches@gnu.org; Mon, 11 May 2020 14:43:20 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:48195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYDOV-0006Ez-2F for guix-patches@gnu.org; Mon, 11 May 2020 14:43:18 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 1B0121BF20C for ; Mon, 11 May 2020 18:43:12 +0000 (UTC) From: Brice Waegeneire To: guix-patches@gnu.org Subject: [PATCH 0/2] wireguard-tools: Fix wg-quick Date: Mon, 11 May 2020 20:43:12 +0200 Message-Id: <20200511184312.21587-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.201; envelope-from=brice@waegenei.re; helo=relay8-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 14:43:01 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Brice Waegeneire (2): gnu: Add openresolv. gnu: wireguard-tools: Fix wg-quick. gnu/local.mk | 2 ++ gnu/packages/dns.scm | 34 +++++++++++++++++++ .../patches/openresolv-restartcmd-guix.patch | 30 ++++++++++++++++ gnu/packages/vpn.scm | 33 +++++++++++++++++- 4 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openresolv-restartcmd-guix.patch -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Mon May 11 14:53:20 2020 Received: (at submit) by debbugs.gnu.org; 11 May 2020 18:53:20 +0000 Received: from localhost ([127.0.0.1]:53272 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYDYG-00047E-BK for submit@debbugs.gnu.org; Mon, 11 May 2020 14:53:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:33236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYDYE-000476-WA for submit@debbugs.gnu.org; Mon, 11 May 2020 14:53:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYDYE-0003ZZ-Nk for guix-patches@gnu.org; Mon, 11 May 2020 14:53:18 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:44619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYDYD-0003Fb-Mv for guix-patches@gnu.org; Mon, 11 May 2020 14:53:18 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 46BA8E0003 for ; Mon, 11 May 2020 18:53:14 +0000 (UTC) From: Brice Waegeneire To: guix-patches@gnu.org Subject: [PATCH 2/2] gnu: wireguard-tools: Fix wg-quick. Date: Mon, 11 May 2020 20:53:10 +0200 Message-Id: <20200511185310.24537-2-brice@waegenei.re> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200511184312.21587-1-brice@waegenei.re> References: <20200511184312.21587-1-brice@waegenei.re> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.196; envelope-from=brice@waegenei.re; helo=relay4-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 14:53:15 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/vpn.scm (wireguard-tools)[arguments]: Add phase 'wrap-wg-quick'. [inputs]: Add 'openresolv', 'iproute' and 'iptables'. --- gnu/packages/vpn.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index ebae1c43f7..1e31f05c98 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -40,7 +40,9 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages check) + #:use-module (gnu packages dns) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) @@ -541,7 +543,36 @@ WireGuard was added to Linux 5.6.") #:phases (modify-phases %standard-phases ;; No configure script - (delete 'configure)))) + (delete 'configure) + (add-after 'install 'install-contrib + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "contrib/" + (string-append out "/share/doc/wireguard-tools")) + #t))) + (add-after 'install 'wrap-wg-quick + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (inputs-sbin (map (lambda (input) + (string-append (assoc-ref inputs input) "/sbin")) + (list "resolvconf" "iproute" "procps" + "iptables"))) + (coreutils (string-append (assoc-ref inputs "coreutils") + "/bin"))) + (wrap-program (string-append out "/bin/wg-quick") + `("PATH" ":" = ,(append inputs-sbin + (list coreutils + "/run/setuid-programs")))) + #t)))))) + (native-inputs + `(("bash" ,bash))) ; for contrib scripts using /dev/tcp + (inputs + `(("resolvconf" ,openresolv) + ("coreutils" ,coreutils) + ("bash" ,bash) ; for contrib scripts using /dev/tcp + ("procps" ,procps) + ("iproute" ,iproute) + ("iptables" ,iptables))) (home-page "https://www.wireguard.com/") (synopsis "Tools for configuring WireGuard tunnels") (description -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Mon May 11 14:53:36 2020 Received: (at submit) by debbugs.gnu.org; 11 May 2020 18:53:36 +0000 Received: from localhost ([127.0.0.1]:53274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYDYQ-00047e-Iq for submit@debbugs.gnu.org; Mon, 11 May 2020 14:53:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:33238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYDYF-00047D-V0 for submit@debbugs.gnu.org; Mon, 11 May 2020 14:53:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYDYF-0003Zd-NN for guix-patches@gnu.org; Mon, 11 May 2020 14:53:19 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:45983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYDYC-0003FU-Li for guix-patches@gnu.org; Mon, 11 May 2020 14:53:19 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 1B9F960005 for ; Mon, 11 May 2020 18:53:13 +0000 (UTC) From: Brice Waegeneire To: guix-patches@gnu.org Subject: [PATCH 1/2] gnu: Add openresolv. Date: Mon, 11 May 2020 20:53:09 +0200 Message-Id: <20200511185310.24537-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200511184312.21587-1-brice@waegenei.re> References: <20200511184312.21587-1-brice@waegenei.re> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.195; envelope-from=brice@waegenei.re; helo=relay3-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 14:53:14 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/dns.scm (openresolv): New variable. --- gnu/local.mk | 2 ++ gnu/packages/dns.scm | 34 +++++++++++++++++++ .../patches/openresolv-restartcmd-guix.patch | 30 ++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 gnu/packages/patches/openresolv-restartcmd-guix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 90c1c64888..48169fcdb6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -34,6 +34,7 @@ # Copyright © 2020 Felix Gruber # Copyright © 2020 Ryan Prior # Copyright © 2020 Jan Wielkiewicz +# Copyright © 2020 Brice Waegeneire # # This file is part of GNU Guix. # @@ -1323,6 +1324,7 @@ dist_patch_DATA = \ %D%/packages/patches/openmpi-mtl-priorities.patch \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssh-hurd.patch \ + %D%/packages/patches/openresolv-restartcmd-guix.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 7ac1611cbf..c33f690b15 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Leo Famulari +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -1001,3 +1002,36 @@ known public suffixes.") consists of a UDP-only authoritative DNS server for hosting domains, and a UDP and TCP-capable recursive DNS server for finding domains on the internet.") (license license:bsd-2))) + +(define-public openresolv + (package + (name "openresolv") + (version "3.10.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://roy.marples.name/openresolv.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gh7d0lczpxcap4fsxlvy2jxk9km4dg0chidlmgfvxbq61xpagbl")) + (patches + (search-patches "openresolv-restartcmd-guix.patch")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No test suite + #:configure-flags + (list (string-append "--sysconfdir=/etc")) + #:make-flags + (list (string-append "SYSCONFDIR=/" (assoc-ref %outputs "out") "/etc")))) + (home-page "https://roy.marples.name/projects/openresolv/") + (synopsis "A POSIX resolvconf implementation, a middleman for resolv.conf") + (description "openresolv is an implementation of @command{resolvconf}, the +the middleman between the network configuration services and +@file{/etc/resolv.conf}. @command{resolvconf} itself is just a script that +stores, removes and lists a full @file{resolv.conf} generated for the +interface. It then calls all the helper scripts it knows about so it can +configure the real @file{/etc/resolv.conf} and optionally any local +nameservers other than libc.") + (license license:bsd-2))) diff --git a/gnu/packages/patches/openresolv-restartcmd-guix.patch b/gnu/packages/patches/openresolv-restartcmd-guix.patch new file mode 100644 index 0000000000..2fd0e87590 --- /dev/null +++ b/gnu/packages/patches/openresolv-restartcmd-guix.patch @@ -0,0 +1,30 @@ +From 7f0ce36828ec1e130bee857b8236ca091e4d8a2c Mon Sep 17 00:00:00 2001 +From: Brice Waegeneire +Date: Sat, 9 May 2020 15:52:06 +0200 +Subject: [PATCH] Add RESTARTCMD for Guix System. + +--- + resolvconf.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/resolvconf.in b/resolvconf.in +index 3cad04d..5ef5294 100644 +--- a/resolvconf.in ++++ b/resolvconf.in +@@ -369,6 +369,13 @@ detect_init() + then + /etc/rc.d/$1 restart + fi' ++ elif [ -e /gnu/store ] && [ -e /run/current-system/profile ]; then ++ # Guix System ++ RESTARTCMD=' ++ if /run/current-system/profile/bin/herd status $1 2>&1 ++ then ++ /run/current-system/profile/bin/herd restart $1 ++ fi' + else + for x in /etc/init.d/rc.d /etc/rc.d /etc/init.d; do + [ -d $x ] || continue +-- +2.26.0 + -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Mon May 11 15:15:38 2020 Received: (at control) by debbugs.gnu.org; 11 May 2020 19:15:38 +0000 Received: from localhost ([127.0.0.1]:53347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYDtq-0004j3-24 for submit@debbugs.gnu.org; Mon, 11 May 2020 15:15:38 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:49439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYDto-0004ip-93 for control@debbugs.gnu.org; Mon, 11 May 2020 15:15:37 -0400 Received: from webmail.gandi.net (webmail18.sd4.0x35.net [10.200.201.18]) (Authenticated sender: brice@waegenei.re) by relay2-d.mail.gandi.net (Postfix) with ESMTPA id 1580A40004 for ; Mon, 11 May 2020 19:15:29 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 11 May 2020 19:15:29 +0000 From: Brice Waegeneire To: control@debbugs.gnu.org Subject: Blocked by #41192 Message-ID: <35a2f74084f3e711a8537b0f1c08a040@waegenei.re> X-Sender: brice@waegenei.re User-Agent: Roundcube Webmail/1.3.8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) block 41193 with 41192 block 41080 with 41192 quit From debbugs-submit-bounces@debbugs.gnu.org Mon May 11 15:52:43 2020 Received: (at 41192) by debbugs.gnu.org; 11 May 2020 19:52:43 +0000 Received: from localhost ([127.0.0.1]:53364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYETj-0007lz-Aq for submit@debbugs.gnu.org; Mon, 11 May 2020 15:52:43 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:38033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYETh-0007ll-FF for 41192@debbugs.gnu.org; Mon, 11 May 2020 15:52:42 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id EF5DE5C00AD; Mon, 11 May 2020 15:52:35 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 11 May 2020 15:52:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=anXyKVG+K88wvZAZdaRtDzjR 2YHqp5IX7kRhcerJbDk=; b=fv9fRd/lp+bRVHbamZXIKzFU/3m1v3KYyIl1PuCg ogiOQwRyTdyHs9cHheTesUUiBfUwJOy3b7TNxnLtXNpqNF3cNklKTDWZPLwHBQQt hNUj7DkNWDxqIekI5dqMK1w8nLi0i6FREIRFtwL34qj0TQCWDm6E/RhO6pSvqQch xGw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=anXyKV G+K88wvZAZdaRtDzjR2YHqp5IX7kRhcerJbDk=; b=gUvFbxIC8Ewu9WJHPgPu61 680dVC+kNb84Cu8EZbdwaHl6Vn5u8viOJbLjAInPZVAqj2e07gJVz7vexCt28+FF y239UEyo8whCoE4wmchzDtTd8V73nw0cqLh3XaA/7UEjwI3XaLvLi1y4ivu5x6t0 uLb73jVbbSFgTOpUMoZIiuNUb5UKzcusIVu754TBTB0TfE0RydppX8xkxVPzdVhr ZWMJNtuczcrSZ/GF9904AQXIdHuvU8FbflAXQ17qv9j/zMXrykZ4qnDwzhO9CFp+ R+kPrpVKp3i+LakZVfdMUwROUBh6ylFvsDTzCRzOCvVIsghgbrPIpZwJx4hWWmXw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrledtgddufeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpeeujeehhfehfeevkeetueffudevvdeiieduveffheevleegleduueehiedutdej keenucffohhmrghinhepmhgrrhhplhgvshdrnhgrmhgvpdhhthhtphhgihhtuhhrlhhsrd hishenucfkphepjeeirdduvdegrddufeekrdeifeenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 314DF3280066; Mon, 11 May 2020 15:52:35 -0400 (EDT) Date: Mon, 11 May 2020 15:52:33 -0400 From: Leo Famulari To: Brice Waegeneire Subject: Re: [bug#41192] [PATCH 1/2] gnu: Add openresolv. Message-ID: <20200511195233.GA15862@jasmine.lan> References: <20200511184312.21587-1-brice@waegenei.re> <20200511185310.24537-1-brice@waegenei.re> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200511185310.24537-1-brice@waegenei.re> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41192 Cc: 41192@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Mon, May 11, 2020 at 08:53:09PM +0200, Brice Waegeneire wrote: > +(define-public openresolv Thanks, it will be great to fix wg-quick. > + (url "git://roy.marples.name/openresolv.git") We should avoid the Git protocol if possible, preferring, first, tarballs and, second, HTTPS or HTTP Git URLS. Is that possible for this package? The Git protocol depends on access to an unusual port, and it's not private or authenticated. > diff --git a/gnu/packages/patches/openresolv-restartcmd-guix.patch b/gnu/packages/patches/openresolv-restartcmd-guix.patch Is this just for sysvinit? If so, can you add a comment saying so? Or explain the context of the patch a little more? From debbugs-submit-bounces@debbugs.gnu.org Mon May 11 15:58:43 2020 Received: (at 41192) by debbugs.gnu.org; 11 May 2020 19:58:43 +0000 Received: from localhost ([127.0.0.1]:53373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYEZX-0007um-6e for submit@debbugs.gnu.org; Mon, 11 May 2020 15:58:43 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:44069) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYEZV-0007ua-Ng for 41192@debbugs.gnu.org; Mon, 11 May 2020 15:58:42 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 8ED8A5C0134; Mon, 11 May 2020 15:58:36 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 11 May 2020 15:58:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=hRPzHKYgdtb3ECwh5Fug876e AKgEYTG9KAWfXi4oRjY=; b=TPdAXMLAeD5MQT5iVORM0SL2hbUNPLxA4KMEh3Z/ Al7e51C6X8B3lwlpluDn5hVmp+HPTUNVCuWm7xYxRayNR34xkE0qbz+Bz85BdpNK tExolgy2B8GjbAL6kmFwpYxes+bCOmpsRGszOxqAt5YVnpplZKB1y04g1uf/6wKU jXM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=hRPzHK Ygdtb3ECwh5Fug876eAKgEYTG9KAWfXi4oRjY=; b=QUYy9kpRWqYlabab2zKXeA hpE6/cIFE7C0SJAvsBPqYh45jAhkEpbKBiQ8iHUSy29DvtjsMG6EXpLiX3Ii3Hd/ weEsq41O4GxzNy5CxlyKMIc1vo6suJr3PQ4QZSW/yX+Aei8ivQ2a/alFg+ywlZKl oShPZ3+cEpZngMN5+hHsxWskR9XvwlB5Ph6yC5haylYrKYk97n2wHPnRU8WrrJXt D+i+teMxxYHZBYqmexinO1a8cC2yp66egbMVNPwjgYJk8IxC5AU4tgLaZBAEUdBv 1aKqInN0HxGeDK2gYG+hc5QtPyaVTmo4hQO4CJbSLcMPhwFVPXFEnv4F/1obIqYA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrledtgddufeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpedukeevgeetkeeltefgiedtjefgjeekffduteehvdfhueekudelieekjeefheff teenucfkphepjeeirdduvdegrddufeekrdeifeenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 0F8FD306629B; Mon, 11 May 2020 15:58:36 -0400 (EDT) Date: Mon, 11 May 2020 15:58:34 -0400 From: Leo Famulari To: Brice Waegeneire Subject: Re: [bug#41192] [PATCH 2/2] gnu: wireguard-tools: Fix wg-quick. Message-ID: <20200511195834.GB15862@jasmine.lan> References: <20200511184312.21587-1-brice@waegenei.re> <20200511185310.24537-2-brice@waegenei.re> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="nFreZHaLTZJo0R7j" Content-Disposition: inline In-Reply-To: <20200511185310.24537-2-brice@waegenei.re> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41192 Cc: 41192@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --nFreZHaLTZJo0R7j Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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"?. > + (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. > + (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'. --nFreZHaLTZJo0R7j Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl65rmoACgkQJkb6MLrK fwhDJg/9Hlhv3b/FPCc2n7GXxN7iWnlSmRW/onWcDQIdr5wryB0MC5OpjjiC/IeT XFRAc8e9fHyBZ3S21JNumT4JwL9u3xCNS+9cFRFWpOSDp/LsE17V8TCdpJlVAyj0 zQHAqNdfUCL5y1MGms8jhKzqD8RNHUz/KjAZeKglE7jg8rNCozgFQddO2RFNDuqv gt8g1eyoLuu0BdzjaPFSNOLvkVBTx/uyT/Eli36gLocVRL/kc24FnuIV17tHdfa0 6NiX7hspqXudPJ+RNwo847nRodTamRrnUQPLIyMvcFnTw51YxslMojYD1OISfvej ZzpTGwBbVoe2yLsgrQoNXEoGXw78nB/SXqnNYqwW7pQ/yCzp9fuMhIOONv7HxEY9 D0lN/7QHOMJvYa3pGCJavNuc0G1X3ASKWcdP0NKpu5ovGo7a997KcdJFC/P1X6JV EiqQ4KIGTyFlI9GzrkYsgN8wkOEQxpkeu8vl5+jWGktWvvUxpnaJlVB5O6AR/XxX x6z2gfu9Z4TaK2oN0SKAtNQ+0Rt8K9M25bn5e0taR8bZvlfVVloJbsZlNxcqqjPI AZ5kCvwZbUJXvImMyk8G5UZuU7TXCYLiFsMS7Fw+y3sVD78TAXdfuHiLNe2I2bfe rWvvRrbRxHe3EvjZzmp5nsVpFQcVAGmxm8QSPdVOAQvIdcHP8CI= =MDaL -----END PGP SIGNATURE----- --nFreZHaLTZJo0R7j-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 12 16:34:50 2020 Received: (at 41192) by debbugs.gnu.org; 12 May 2020 20:34:50 +0000 Received: from localhost ([127.0.0.1]:56587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYbc2-0006tZ-AU for submit@debbugs.gnu.org; Tue, 12 May 2020 16:34:50 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:59749) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYbc0-0006tK-Lc for 41192@debbugs.gnu.org; Tue, 12 May 2020 16:34:49 -0400 Received: from webmail.gandi.net (webmail18.sd4.0x35.net [10.200.201.18]) (Authenticated sender: brice@waegenei.re) by relay4-d.mail.gandi.net (Postfix) with ESMTPA id 8BE7AE0006; Tue, 12 May 2020 20:34:41 +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:34:41 +0000 From: Brice Waegeneire To: Leo Famulari Subject: Re: [bug#41192] [PATCH 1/2] gnu: Add openresolv. In-Reply-To: <20200511195233.GA15862@jasmine.lan> References: <20200511184312.21587-1-brice@waegenei.re> <20200511185310.24537-1-brice@waegenei.re> <20200511195233.GA15862@jasmine.lan> Message-ID: <07fb96d664a09538385613825c5140fa@waegenei.re> X-Sender: brice@waegenei.re User-Agent: Roundcube Webmail/1.3.8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41192 Cc: 41192@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On 2020-05-11 19:52, Leo Famulari wrote: > On Mon, May 11, 2020 at 08:53:09PM +0200, Brice Waegeneire wrote: >> +(define-public openresolv > > Thanks, it will be great to fix wg-quick. > >> + (url "git://roy.marples.name/openresolv.git") > > We should avoid the Git protocol if possible, preferring, first, > tarballs and, second, HTTPS or HTTP Git URLS. Is that possible for this > package? The Git protocol depends on access to an unusual port, and > it's > not private or authenticated. Switched to tarball. >> diff --git a/gnu/packages/patches/openresolv-restartcmd-guix.patch >> b/gnu/packages/patches/openresolv-restartcmd-guix.patch > > Is this just for sysvinit? If so, can you add a comment saying so? Or > explain the context of the patch a little more? Explained in the patch: it needs to know how to restart nscd so this patch add support for doing so with shepherd when on a Guix System. From debbugs-submit-bounces@debbugs.gnu.org Tue May 12 16:58:05 2020 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 To: Leo Famulari Subject: Re: [bug#41192] [PATCH 2/2] gnu: wireguard-tools: Fix wg-quick. 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-Debbugs-Envelope-To: 41192 Cc: 41192@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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. From debbugs-submit-bounces@debbugs.gnu.org Tue May 12 17:02:09 2020 Received: (at 41192) by debbugs.gnu.org; 12 May 2020 21:02:10 +0000 Received: from localhost ([127.0.0.1]:56634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYc2T-0007fF-M1 for submit@debbugs.gnu.org; Tue, 12 May 2020 17:02:09 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:34043) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYc2O-0007eT-Nb for 41192@debbugs.gnu.org; Tue, 12 May 2020 17:02:08 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id B2B5840002; Tue, 12 May 2020 21:01:57 +0000 (UTC) From: Brice Waegeneire To: 41192@debbugs.gnu.org Subject: [PATCH v2 0/2] gnu: wireguard-tools: Fix wg-quick. Date: Tue, 12 May 2020 23:01:50 +0200 Message-Id: <20200512210152.11991-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41192 Cc: leo@famulari.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Brice Waegeneire (2): gnu: Add openresolv. gnu: wireguard-tools: Fix wg-quick. gnu/local.mk | 2 ++ gnu/packages/dns.scm | 32 +++++++++++++++++ .../patches/openresolv-restartcmd-guix.patch | 34 +++++++++++++++++++ gnu/packages/vpn.scm | 30 +++++++++++++++- 4 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openresolv-restartcmd-guix.patch -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Tue May 12 17:02:20 2020 Received: (at 41192) by debbugs.gnu.org; 12 May 2020 21:02:20 +0000 Received: from localhost ([127.0.0.1]:56636 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYc2V-0007fO-TL for submit@debbugs.gnu.org; Tue, 12 May 2020 17:02:20 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:57715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYc2Q-0007eW-Ku for 41192@debbugs.gnu.org; Tue, 12 May 2020 17:02:09 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 9178A1BF203; Tue, 12 May 2020 21:01:59 +0000 (UTC) From: Brice Waegeneire To: 41192@debbugs.gnu.org Subject: [PATCH v2 1/2] gnu: Add openresolv. Date: Tue, 12 May 2020 23:01:51 +0200 Message-Id: <20200512210152.11991-2-brice@waegenei.re> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200512210152.11991-1-brice@waegenei.re> References: <20200512210152.11991-1-brice@waegenei.re> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41192 Cc: leo@famulari.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/dns.scm (openresolv): New variable. --- gnu/local.mk | 2 ++ gnu/packages/dns.scm | 32 +++++++++++++++++ .../patches/openresolv-restartcmd-guix.patch | 34 +++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 gnu/packages/patches/openresolv-restartcmd-guix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 90c1c64888..48169fcdb6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -34,6 +34,7 @@ # Copyright © 2020 Felix Gruber # Copyright © 2020 Ryan Prior # Copyright © 2020 Jan Wielkiewicz +# Copyright © 2020 Brice Waegeneire # # This file is part of GNU Guix. # @@ -1323,6 +1324,7 @@ dist_patch_DATA = \ %D%/packages/patches/openmpi-mtl-priorities.patch \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssh-hurd.patch \ + %D%/packages/patches/openresolv-restartcmd-guix.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 7ac1611cbf..2ab512f8ac 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Leo Famulari +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -1001,3 +1002,34 @@ known public suffixes.") consists of a UDP-only authoritative DNS server for hosting domains, and a UDP and TCP-capable recursive DNS server for finding domains on the internet.") (license license:bsd-2))) + +(define-public openresolv + (package + (name "openresolv") + (version "3.10.0") + (source (origin + (method url-fetch) + (uri (string-append "https://roy.marples.name/downloads/openresolv/" + "openresolv-" version ".tar.xz")) + (sha256 + (base32 + "01ms6c087la4hk0f0w6n2vpsb7dg4kklah2rqyhz88p0vr9bqy20")) + (patches + (search-patches "openresolv-restartcmd-guix.patch")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No test suite + #:configure-flags + (list (string-append "--sysconfdir=/etc")) + #:make-flags + (list (string-append "SYSCONFDIR=/" (assoc-ref %outputs "out") "/etc")))) + (home-page "https://roy.marples.name/projects/openresolv/") + (synopsis "A POSIX resolvconf implementation, a middleman for resolv.conf") + (description "openresolv is an implementation of @command{resolvconf}, the +the middleman between the network configuration services and +@file{/etc/resolv.conf}. @command{resolvconf} itself is just a script that +stores, removes and lists a full @file{resolv.conf} generated for the +interface. It then calls all the helper scripts it knows about so it can +configure the real @file{/etc/resolv.conf} and optionally any local +nameservers other than libc.") + (license license:bsd-2))) diff --git a/gnu/packages/patches/openresolv-restartcmd-guix.patch b/gnu/packages/patches/openresolv-restartcmd-guix.patch new file mode 100644 index 0000000000..ad70ebd6f2 --- /dev/null +++ b/gnu/packages/patches/openresolv-restartcmd-guix.patch @@ -0,0 +1,34 @@ +From 7f0ce36828ec1e130bee857b8236ca091e4d8a2c Mon Sep 17 00:00:00 2001 +From: Brice Waegeneire +Date: Sat, 9 May 2020 15:52:06 +0200 +Subject: [PATCH] Add RESTARTCMD for Guix System. + +--- + +openresolv need to know how to restart the nscd service, this patch teach it +to do it on Guix System by using shepherd. + + resolvconf.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/resolvconf.in b/resolvconf.in +index 3cad04d..5ef5294 100644 +--- a/resolvconf.in ++++ b/resolvconf.in +@@ -369,6 +369,13 @@ detect_init() + then + /etc/rc.d/$1 restart + fi' ++ elif [ -e /gnu/store ] && [ -e /run/current-system/profile ]; then ++ # Guix System ++ RESTARTCMD=' ++ if /run/current-system/profile/bin/herd status $1 2>&1 ++ then ++ /run/current-system/profile/bin/herd restart $1 ++ fi' + else + for x in /etc/init.d/rc.d /etc/rc.d /etc/init.d; do + [ -d $x ] || continue +-- +2.26.0 + -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Tue May 12 17:02:20 2020 Received: (at 41192) by debbugs.gnu.org; 12 May 2020 21:02:21 +0000 Received: from localhost ([127.0.0.1]:56638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYc2e-0007fZ-O1 for submit@debbugs.gnu.org; Tue, 12 May 2020 17:02:20 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:62375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYc2S-0007eq-QY for 41192@debbugs.gnu.org; Tue, 12 May 2020 17:02:09 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 72F4A240003; Tue, 12 May 2020 21:02:01 +0000 (UTC) From: Brice Waegeneire To: 41192@debbugs.gnu.org Subject: [PATCH v2 2/2] gnu: wireguard-tools: Fix wg-quick. Date: Tue, 12 May 2020 23:01:52 +0200 Message-Id: <20200512210152.11991-3-brice@waegenei.re> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200512210152.11991-1-brice@waegenei.re> References: <20200512210152.11991-1-brice@waegenei.re> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41192 Cc: leo@famulari.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vpn.scm (wireguard-tools)[arguments]: Add phase 'wrap-wg-quick'. [inputs]: Add 'openresolv', 'iproute' and 'iptables'. --- gnu/packages/vpn.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index ebae1c43f7..369d3200c1 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -40,7 +40,9 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages check) + #:use-module (gnu packages dns) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) @@ -541,7 +543,33 @@ WireGuard was added to Linux 5.6.") #:phases (modify-phases %standard-phases ;; No configure script - (delete 'configure)))) + (delete 'configure) + (add-after 'install 'install-contrib-docs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "contrib/" + (string-append out "/share/doc/wireguard-tools")) + #t))) + (add-after 'install 'wrap-wg-quick + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (inputs-sbin (map (lambda (input) + (string-append (assoc-ref inputs input) "/sbin")) + (list "resolvconf" "iproute" "procps" + "iptables"))) + (coreutils (string-append (assoc-ref inputs "coreutils") + "/bin"))) + (wrap-program (string-append out "/bin/wg-quick") + `("PATH" ":" prefix ,(append inputs-sbin + (list coreutils)))) + #t)))))) + (inputs + `(("resolvconf" ,openresolv) + ("coreutils" ,coreutils) + ("bash" ,bash) ; for scripts using /dev/tcp + ("procps" ,procps) + ("iproute" ,iproute) + ("iptables" ,iptables))) (home-page "https://www.wireguard.com/") (synopsis "Tools for configuring WireGuard tunnels") (description -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Tue May 12 17:28:28 2020 Received: (at 41192) by debbugs.gnu.org; 12 May 2020 21:28:28 +0000 Received: from localhost ([127.0.0.1]:56694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYcRv-0008Nl-Tj for submit@debbugs.gnu.org; Tue, 12 May 2020 17:28:28 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:38561) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYcRt-0008NY-Q9 for 41192@debbugs.gnu.org; Tue, 12 May 2020 17:28:26 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 7C5995C013C; Tue, 12 May 2020 17:28:20 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 12 May 2020 17:28:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=cAPa2ElxTABitLTBqgTkPBvs zXO4We638KAJc1yZ9XA=; b=XG8F0ArtElfDgyXuCgF5BGGep5HRjG9f/CXN3eUY ojHOD61lhq8dWyFAJX+I/TYc0tKGtGeYdbCWtiuEAvdmmdstCC/nWiH1Epd3qRi2 L5nxbr3p8jGcQSO30CMGZivZyYdpJNJuJx78W4vrLLMN5V4DbwOLRVJCtA+iy9Yz pFE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=cAPa2E lxTABitLTBqgTkPBvszXO4We638KAJc1yZ9XA=; b=n3wW7RnvUD2dgKEoiToV40 u/sMcJqg8nD0CoLNn1R4GGqKC/A+wEMV5fMvelRDCPTu3Cw92JPSipcOL+xj0CkI wRmmtE2xtzfsddD2HpDnlZi5SrF7/O+ue19khKTRR3MFnLpnTA9eB1r+4J/6QoSY 2Bww+gafMbI+wr0s5F08E8BXS+2f7yO5jjCOa5Diuw9G+AkHrNSL2t6yAy21BJKl OAeYoV7paWeX1n5DcswnTRNTgJo5IHKHt0Qpwb5GL6h52Frv1pHdubg8Q8Nd0J5D E0lFxdWjHqLnmdTZLO76BFgbABXvXzlAMOJSqAX0GC/fHtaxzin0DlGi2JDod3zQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrledvgdduheekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpeeukeektdffvddtudegjeegtdevhfeufeeivdejiedtieegtdevjedvjeehffev gfenucfkphepjeeirdduvdegrddufeekrdeifeenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id E13A6328005D; Tue, 12 May 2020 17:28:19 -0400 (EDT) Date: Tue, 12 May 2020 17:28:17 -0400 From: Leo Famulari To: Brice Waegeneire Subject: Re: [PATCH v2 0/2] gnu: wireguard-tools: Fix wg-quick. Message-ID: <20200512212817.GB12212@jasmine.lan> References: <20200512210152.11991-1-brice@waegenei.re> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200512210152.11991-1-brice@waegenei.re> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41192 Cc: 41192@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Tue, May 12, 2020 at 11:01:50PM +0200, Brice Waegeneire wrote: > Brice Waegeneire (2): > gnu: Add openresolv. > gnu: wireguard-tools: Fix wg-quick. Assuming you addressed my previous comments, these patches will LGTM. Please push :) From debbugs-submit-bounces@debbugs.gnu.org Wed May 13 05:28:44 2020 Received: (at 41192-done) by debbugs.gnu.org; 13 May 2020 09:28:44 +0000 Received: from localhost ([127.0.0.1]:57373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYngy-0004ms-3l for submit@debbugs.gnu.org; Wed, 13 May 2020 05:28:44 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:63389) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYngw-0004mb-FM for 41192-done@debbugs.gnu.org; Wed, 13 May 2020 05:28:43 -0400 Received: from webmail.gandi.net (webmail18.sd4.0x35.net [10.200.201.18]) (Authenticated sender: brice@waegenei.re) by relay2-d.mail.gandi.net (Postfix) with ESMTPA id 6915140002; Wed, 13 May 2020 09:28:35 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Wed, 13 May 2020 09:28:35 +0000 From: Brice Waegeneire To: Leo Famulari Subject: Re: [PATCH v2 0/2] gnu: wireguard-tools: Fix wg-quick. In-Reply-To: <20200512212817.GB12212@jasmine.lan> References: <20200512210152.11991-1-brice@waegenei.re> <20200512212817.GB12212@jasmine.lan> Message-ID: X-Sender: brice@waegenei.re User-Agent: Roundcube Webmail/1.3.8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41192-done Cc: 41192-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On 2020-05-12 21:28, Leo Famulari wrote: > On Tue, May 12, 2020 at 11:01:50PM +0200, Brice Waegeneire wrote: >> Brice Waegeneire (2): >> gnu: Add openresolv. >> gnu: wireguard-tools: Fix wg-quick. > > Assuming you addressed my previous comments, these patches will LGTM. > Please push :) Pushed as d084e71c0d and 6b6647f815. With fixed typo in openresolv synopsis and description. From unknown Tue Jun 24 05:08:22 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 10 Jun 2020 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator