From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 05:50:52 2024 Received: (at submit) by debbugs.gnu.org; 12 Jul 2024 09:50:53 +0000 Received: from localhost ([127.0.0.1]:53225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSCvU-0006SD-91 for submit@debbugs.gnu.org; Fri, 12 Jul 2024 05:50:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:37400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSCvS-0006S6-9V for submit@debbugs.gnu.org; Fri, 12 Jul 2024 05:50:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sSCvR-00086m-Pa for guix-patches@gnu.org; Fri, 12 Jul 2024 05:50:49 -0400 Received: from m42-5.mailgun.net ([69.72.42.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sSCvN-0003Wh-8e for guix-patches@gnu.org; Fri, 12 Jul 2024 05:50:49 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.wilsonb.com; q=dns/txt; s=krs; t=1720777843; x=1720785043; h=Content-Type: MIME-Version: Message-Id: Subject: Subject: From: From: To: To: Date: Sender: Sender; bh=s81blLe+TkiiPP+RcFNIC8Cj9ooBI9BFu/vR2jo9XDA=; b=v3SpAoZmBScLG+AZskeW1mQpu+0Buwj+ReZ7QMs34uRl33/goBSR61FVcNIRinXdQPxjUd1YE2GzOSIowBqFhyec5ExrUKG5NIx3NWwsWPxX6vz13g51IdTitUE2ebdy+8BlZzcarTNLDXYjeZffO8cIh5xT4v4VYn5lCNPPyILIsi1RKVCdiPP+jHglHjhmXH+xC1R/mwT+V23jzlotWTZlBkGM6i4nX1n4zFCUxNLhEdGBYGQhdIbSKWJJyArCmTWrg6DyTwQjW6espN2fpDLI7sIZJECq7ZmOqGXd/iHFg4ow6Lbyuab1eub8ieAvMt9bOhWYVSvetHOe/N8SHw== X-Mailgun-Sending-Ip: 69.72.42.5 X-Mailgun-Sid: WyI5MmEzMyIsImd1aXgtcGF0Y2hlc0BnbnUub3JnIiwiMDg1NDdhIl0= Received: from wilsonb.com (wilsonb.com [104.199.203.42]) by 28a30437924b with SMTP id 6690fc73c143980835bdd703 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Fri, 12 Jul 2024 09:50:43 GMT Received: from localhost (p1267142-ipngn3402fukuhanazo.fukushima.ocn.ne.jp [125.174.241.142]) by wilsonb.com (Postfix) with ESMTPSA id 394DCA1BBA for ; Fri, 12 Jul 2024 09:50:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wilsonb.com; s=201703; t=1720777841; bh=s81blLe+TkiiPP+RcFNIC8Cj9ooBI9BFu/vR2jo9XDA=; h=Date:To:From:Subject:From; b=rxCHjvMBN9jpMtsXusZbWYa6dUGoicg2Xl9iQgVMlqm0FSffUhCErtx4xku1k6+G7 xH6crR86M6v1/qaygpNPOZA26Sr2z+RXXe5HoIN7YCgxeRvG6uwZ+NkqQH6dRnS4Rk d7yuXP6pWG0LzHBMsFOd3Pv6pdz85rpOKFHDS2EvD0nl5xyOthUtaUSCm9coJWzT2J 8AP+5RDBXVnDOrlcVhB/E0oyhkhah6CgSL39evUnXGPgOm3yQH8BezzWprcQRuUvZd kWrmaqsaBfD0XRO6SFjXsbJwDrHZfaDwc2gHsGYtnQwTdkUrakNIb7f/vg5XQkIJIK +0TZ7QU+HOjBSRntbq/WrRSZNAjp4K1BloEcMk92dJVdmIiwv2xOh0MJ+6dWrKXb9I ij+LX+LBhU9ExZ00oo6McL14tYClarEimulawSJfx50PrFHan4StzGO1PhgACq9Q6D Ixuk8nMfNI83rLkC14aZ862i2ZAtbKR8FIZfS2sws+SH0R5e1dqk9xr/T75XF5Q7uE e+kBtVf7V6vRfbYDEJQAHWDNmd22XXoRZFEsT+XNaO1KfdNK+2sWOv5FSlVEmQQCd5 tjZXQ0t6axrSUWT4Ys3XRJ9rRWwQFsq+9OoPqoCF+YyztYwK6Myj5ZMvUvWr5JO/M1 Na99S+DzopkkdoNeukp9FY00= Date: Fri, 12 Jul 2024 18:50:39 +0900 To: guix-patches@gnu.org From: "B. Wilson" Subject: gnu: isc-dhcp: Patch dhclient to support resolvconf. Message-Id: <2PLKK1GND1Y65.3DPU3DJOTRHJH@wilsonb.com> User-Agent: mblaze/1.2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----_=_1a0f869b58f81bf57f260f57_=_" Received-SPF: pass client-ip=69.72.42.5; envelope-from=bounce+686de0.08547a-guix-patches=gnu.org@mg.wilsonb.com; helo=m42-5.mailgun.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) 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.3 (--) This is a multipart message in MIME format. ------_=_1a0f869b58f81bf57f260f57_=_ Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hey Guix, This patch updates libexec/dhclient-script to use resolvconf instead of directly editing /etc/resolv.conf, similar to dhcpcd and friends. This allows dhclient to play nicely with other clients which may want to contend for /etc/resolv.conf control. My particular use case is running a l= ocal dnsmasq instance, configured to allow using the various DNS servers of mult= iple simultaneous VPN connections. Ideally, this would be an upstream patch, but ISC announced end of maintena= nce in 2022, so until we migrate dhcp-client-service-type to something else, I believe it makes sense to have the patch here. Using a bare-bones.scm VM, I have confirmed that this transparently works i= n the default case where no /etc/resolvconf.conf is setup. In a separate patc= h, I will be sharing my resolvconf-service-type definition that enables the dnsm= asq integration I mention. Note, however, that switching to this via a system reconfigure has the possibility of nuking DNS until the next time dhclient tries to update them= =2E Simply restarting the networking service is enough to force this, though. Thoughts? ------_=_1a0f869b58f81bf57f260f57_=_ Content-Disposition: attachment; filename*0*=UTF-8''0001-gnu-isc-dhcp-Patch-dhclient-to-support-resolvcon; filename*1*=f.patch Content-Type: text/x-diff Content-Transfer-Encoding: quoted-printable =46rom c96e6489117b2087db86161cc2b3fe0e813ac09f Mon Sep 17 00:00:00 2001 =46rom: "B. Wilson" =44ate: Fri, 12 Jul 2024 18:03:48 +0900 =53ubject: [PATCH] gnu: isc-dhcp: Patch dhclient to support resolvconf. =0A* gnu/packages/patches/dhclient-script-resolvconf-support.patch: New pat= =63h. =2A gnu/local.mk (dist_patch_DATA): Add it. =2A gnu/packages/admin.scm (isc-dhcp): Patch dhclient-script and update wra= =70per. =2D-- =20gnu/local.mk | 1 + =20gnu/packages/admin.scm | 21 ++++--- =20.../dhclient-script-resolvconf-support.patch | 58 +++++++++++++++++++ =203 files changed, 72 insertions(+), 8 deletions(-) =20create mode 100644 gnu/packages/patches/dhclient-script-resolvconf-suppo= =72t.patch =0Adiff --git a/gnu/local.mk b/gnu/local.mk =69ndex ea4cc251ae..e574154ef3 100644 =2D-- a/gnu/local.mk =2B++ b/gnu/local.mk =40@ -1116,6 +1116,7 @@ dist_patch_DATA =3D \ =20 %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ =20 %D%/packages/patches/dee-vapi.patch \ =20 %D%/packages/patches/dfu-programmer-fix-libusb.patch \ =2B %D%/packages/patches/dhclient-script-resolvconf-support.patch \ =20 %D%/packages/patches/diffutils-fix-signal-processing.patch \ =20 %D%/packages/patches/directfb-davinci-glibc-228-compat.patch \ =20 %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ =64iff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm =69ndex f0aa6adc85..509dfaba20 100644 =2D-- a/gnu/packages/admin.scm =2B++ b/gnu/packages/admin.scm =40@ -1477,7 +1477,9 @@ (define-public isc-dhcp =20 version "/dhcp-" version ".tar.gz"))= =0A (sha256 =20 (base32 =2D "1ivkvhhvqxap6c51cli7pa6xn76ngxri1zbl45ishz4ranxidi0a"= =29))) =2B "1ivkvhhvqxap6c51cli7pa6xn76ngxri1zbl45ishz4ranxidi0a"= =29) =2B (patches (search-patches =2B "dhclient-script-resolvconf-support.patch")))= =29 =20 (build-system gnu-build-system) =20 (arguments =20 `(#:parallel-build? #f =40@ -1571,12 +1573,13 @@ (define-public isc-dhcp =20 (lambda* (#:key inputs outputs #:allow-other-keys) =20 ;; Install the dhclient script for GNU/Linux and make sur= =65 =20 ;; if finds all the programs it needs. =2D (let* ((out (assoc-ref outputs "out")) =2D (libexec (string-append out "/libexec")) =2D (coreutils (assoc-ref inputs "coreutils*")) =2D (inetutils (assoc-ref inputs "inetutils")) =2D (grep (assoc-ref inputs "grep*")) =2D (sed (assoc-ref inputs "sed*")) =2B (let* ((out (assoc-ref outputs "out")) =2B (libexec (string-append out "/libexec")) =2B (coreutils (assoc-ref inputs "coreutils*")) =2B (inetutils (assoc-ref inputs "inetutils")) =2B (grep (assoc-ref inputs "grep*")) =2B (resolvconf (assoc-ref inputs "resolvconf*")) =2B (sed (assoc-ref inputs "sed*")) =20 (debianutils (assoc-ref inputs "debianutils"))) =20 (substitute* "client/scripts/linux" =20 (("/sbin/ip") =40@ -1592,7 +1595,8 @@ (define-public isc-dhcp =20 ,(map (lambda (dir) =20 (string-append dir "/bin:" =20 dir "/sbin")) =2D (list inetutils coreutils grep sed debianutil= =73)))))))))) =2B (list inetutils coreutils grep sed resolvconf= =0A+ debianutils)))))))))) =20= =20 (native-inputs =20 (list config perl file)) =40@ -1621,6 +1625,7 @@ (define-public isc-dhcp =20= =20 ("coreutils*" ,coreutils) =20 ("grep*" ,grep) =2B ("resolvconf*" ,openresolv) =20 ("sed*" ,sed))) =20= =20 (home-page "https://www.isc.org/dhcp/") =64iff --git a/gnu/packages/patches/dhclient-script-resolvconf-support.patc= =68 b/gnu/packages/patches/dhclient-script-resolvconf-support.patch =6Eew file mode 100644 =69ndex 0000000000..e4fd8f649e =2D-- /dev/null =2B++ b/gnu/packages/patches/dhclient-script-resolvconf-support.patch =40@ -0,0 +1,58 @@ =2BImplement resolvconf support =2B =2BDue to the potential for multiple sources contenting for /etc/resol.conf= =0A+control, this patch replaces direct file munging with resolvconf indire= =63tion. =2B =2B--- a/client/scripts/linux 1970-01-01 09:00:01.000000000 +0900 =2B+++ b/client/scripts/linux 1970-01-01 09:00:01.000000000 +0900 =2B@@ -36,11 +36,11 @@ =2B # This updated version mostly follows Debian script by Andrew Pollock e= =74 al. =2B make_resolv_conf() { =2B local new_resolv_conf =2B+ new_resolv_conf=3D$(mktemp) =2B=20 =2B # DHCPv4 =2B if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] || =2B- [ -n "$new_domain_name_servers" ]; then =2B- new_resolv_conf=3D/etc/resolv.conf.dhclient-new =2B+ [ -n "$new_domain_name_servers" ]; then =2B rm -f $new_resolv_conf =2B=20 =2B if [ -n "$new_domain_name" ]; then =2B@@ -70,17 +70,12 @@ =2B echo nameserver $nameserver >>$new_resolv_conf =2B done =2B else # keep 'old' nameservers =2B- sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc= =2Fresolv.conf >>$new_resolv_conf =2B+ resolvconf -l "$interface.dhcp" | sed -n /^\w*[Nn][Aa][Mm][= =45e][Ss][Ee][Rr][Vv][Ee][Rr]/p >>$new_resolv_conf =2B fi =2B=20 =2B- if [ -f /etc/resolv.conf ]; then =2B- chown --reference=3D/etc/resolv.conf $new_resolv_conf =2B- chmod --reference=3D/etc/resolv.conf $new_resolv_conf =2B- fi =2B- mv -f $new_resolv_conf /etc/resolv.conf =2B+ resolvconf -a "$interface.dhpc" <"$new_resolv_conf" =2B # DHCPv6 =2B elif [ -n "$new_dhcp6_domain_search" ] || [ -n "$new_dhcp6_name_ser= =76ers" ]; then =2B- new_resolv_conf=3D/etc/resolv.conf.dhclient-new =2B rm -f $new_resolv_conf =2B=20 =2B if [ -n "$new_dhcp6_domain_search" ]; then =2B@@ -97,14 +92,10 @@ =2B echo nameserver $nameserver >>$new_resolv_conf =2B done =2B else # keep 'old' nameservers =2B- sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc= =2Fresolv.conf >>$new_resolv_conf =2B+ resolvconf -l "$interface.dhcp6" | sed -n /^\w*[Nn][Aa][Mm]= =5BEe][Ss][Ee][Rr][Vv][Ee][Rr]/p >>$new_resolv_conf =2B fi =2B=20 =2B- if [ -f /etc/resolv.conf ]; then =2B- chown --reference=3D/etc/resolv.conf $new_resolv_conf =2B- chmod --reference=3D/etc/resolv.conf $new_resolv_conf =2B- fi =2B- mv -f $new_resolv_conf /etc/resolv.conf =2B+ resolvconf -a "$interface.dhpc6" <"$new_resolv_conf" =2B fi =2B } =2B=20 =2D-=20 =32.45.2 =0A= ------_=_1a0f869b58f81bf57f260f57_=_-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 12 06:39:12 2024 Received: (at 72072) by debbugs.gnu.org; 12 Jul 2024 10:39:12 +0000 Received: from localhost ([127.0.0.1]:53293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSDgF-00025F-Uv for submit@debbugs.gnu.org; Fri, 12 Jul 2024 06:39:12 -0400 Received: from m42-5.mailgun.net ([69.72.42.5]:35899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSDg9-00024g-Vk for 72072@debbugs.gnu.org; Fri, 12 Jul 2024 06:39:10 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.wilsonb.com; q=dns/txt; s=krs; t=1720780740; x=1720787940; h=Content-Type: MIME-Version: From: From: Subject: Subject: To: To: Date: Message-ID: Sender: Sender; bh=5QVawNSk39Aj3B6Z2Shi3AeyW8E4LmJurDzDbPD//ho=; b=CbmlrMMqz6qdUd+0hffWw61sgZQ7TwerPmYMDqxQ/Pjk2N74TYRq/aPJgtlHK9PFwm9DY0g2gdhXDhUGjGYNspIaXQxG2cOm73rsBi/PnLbUA1dLAus1aGOKLhrRrm2/055Wn7SS204tyN1YjSmM9smidr9erThYEwIBc/HqwhXPu/gTSgbX16sCvr6O2LKSMWGs5PxBkVFEQy/3kPTEEK5e39JeTGd/HW7eMtz7kmqEhkK9YBlgdRrjXHv64DG7hlWavs0EmySnJlLamNe0mAHQduQS48oBB+QGpwmMQgnuvu/Eg2BGp1NZWUm+kRrT2r/TB4jkki8b2LauhvRXWw== X-Mailgun-Sending-Ip: 69.72.42.5 X-Mailgun-Sid: WyI1OTNiOCIsIjcyMDcyQGRlYmJ1Z3MuZ251Lm9yZyIsIjA4NTQ3YSJd Received: from wilsonb.com (wilsonb.com [104.199.203.42]) by 45eea559954c with SMTP id 669107c37fe86a720c259a09 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Fri, 12 Jul 2024 10:38:59 GMT Received: from localhost (p1267142-ipngn3402fukuhanazo.fukushima.ocn.ne.jp [125.174.241.142]) by wilsonb.com (Postfix) with ESMTPSA id 1E953A1BC3 for <72072@debbugs.gnu.org>; Fri, 12 Jul 2024 10:38:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wilsonb.com; s=201703; t=1720780737; bh=5QVawNSk39Aj3B6Z2Shi3AeyW8E4LmJurDzDbPD//ho=; h=Date:To:Subject:From:From; b=YqRKS+6Aqmr52yUphOnIpi2/zRCxiDT4AN72h+5L+Nx3rlhExSqfrmRFu8/v4gmnl MlSZ9IDFO46DZAJwfC5XzlrWKU5pe5o4vMRm39Xn9fSbVL0NDHBplmLM+TUJou1aUl OStjOVESViZoBxTmRH+zhsGf0MPmoBDc8CVMiZJM0DtjX+HYQBdtSTyzCW1LiAcg70 aEgTLw1XKcpqW2wPTzYnByxutT24n4z6tV19lTOjGG4e9/nBpWIC948cG9ujFfZegM CJRV+ph6ZHEhPTFnp9ObHSw5WsCzhkLXiyc7B5TZDRAPmwJcvsof4EqJaaGBWf6Noa yMg0Uz1ZbJAeMhh3U1+qpelRaQ2E9lzNTkvSUmehieRdEqakH/a8JujV4fM1Oj/U8G 96r2lczVRU6j0y9V5N1Wp3vocKIqf425BrzS0aMNfh8lChWKQC6VvuhvT9EgzAkFob KKbR+itUc3I9BIbVV4v51tWax0f8pKixGJ5aiHdOkxaL0q+rMOd4J6EfGTufmLD+W1 C7etYWEd7atit8UmBPi1wJE1830KyRcenA8CKxVdcBDex7mzjyhC6k1ynLmpj2f3la rzAitmja4IciToEysgHci6d+wIMS2CHom+klWQspMF4gYqdQXGXk8vnHzozDd05ksd iyq0osbLIjR8kCJcsW/AXVcs= Message-ID: <0085c46d51165168bc28ae8c10affab7@wilsonb.com> Date: Fri, 12 Jul 2024 19:38:55 +0900 To: 72072@debbugs.gnu.org Subject: Re: gnu: isc-dhcp: Patch dhclient to support resolvconf. From: "B. Wilson" User-Agent: mblaze/1.2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----_=_48c23e8d6c07a46f4225f579_=_" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72072 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 (-) This is a multipart message in MIME format. ------_=_48c23e8d6c07a46f4225f579_=_ Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The attachment in the original message seems to have the incorrect mime typ= e. Trying again. ------_=_48c23e8d6c07a46f4225f579_=_ Content-Disposition: attachment; filename*0*=UTF-8''0001-gnu-isc-dhcp-Patch-dhclient-to-support-resolvcon; filename*1*=f.patch Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable =46rom c96e6489117b2087db86161cc2b3fe0e813ac09f Mon Sep 17 00:00:00 2001 =46rom: "B. Wilson" =44ate: Fri, 12 Jul 2024 18:03:48 +0900 =53ubject: [PATCH] gnu: isc-dhcp: Patch dhclient to support resolvconf. =0A* gnu/packages/patches/dhclient-script-resolvconf-support.patch: New pat= =63h. =2A gnu/local.mk (dist_patch_DATA): Add it. =2A gnu/packages/admin.scm (isc-dhcp): Patch dhclient-script and update wra= =70per. =2D-- =20gnu/local.mk | 1 + =20gnu/packages/admin.scm | 21 ++++--- =20.../dhclient-script-resolvconf-support.patch | 58 +++++++++++++++++++ =203 files changed, 72 insertions(+), 8 deletions(-) =20create mode 100644 gnu/packages/patches/dhclient-script-resolvconf-suppo= =72t.patch =0Adiff --git a/gnu/local.mk b/gnu/local.mk =69ndex ea4cc251ae..e574154ef3 100644 =2D-- a/gnu/local.mk =2B++ b/gnu/local.mk =40@ -1116,6 +1116,7 @@ dist_patch_DATA =3D \ =20 %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ =20 %D%/packages/patches/dee-vapi.patch \ =20 %D%/packages/patches/dfu-programmer-fix-libusb.patch \ =2B %D%/packages/patches/dhclient-script-resolvconf-support.patch \ =20 %D%/packages/patches/diffutils-fix-signal-processing.patch \ =20 %D%/packages/patches/directfb-davinci-glibc-228-compat.patch \ =20 %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ =64iff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm =69ndex f0aa6adc85..509dfaba20 100644 =2D-- a/gnu/packages/admin.scm =2B++ b/gnu/packages/admin.scm =40@ -1477,7 +1477,9 @@ (define-public isc-dhcp =20 version "/dhcp-" version ".tar.gz"))= =0A (sha256 =20 (base32 =2D "1ivkvhhvqxap6c51cli7pa6xn76ngxri1zbl45ishz4ranxidi0a"= =29))) =2B "1ivkvhhvqxap6c51cli7pa6xn76ngxri1zbl45ishz4ranxidi0a"= =29) =2B (patches (search-patches =2B "dhclient-script-resolvconf-support.patch")))= =29 =20 (build-system gnu-build-system) =20 (arguments =20 `(#:parallel-build? #f =40@ -1571,12 +1573,13 @@ (define-public isc-dhcp =20 (lambda* (#:key inputs outputs #:allow-other-keys) =20 ;; Install the dhclient script for GNU/Linux and make sur= =65 =20 ;; if finds all the programs it needs. =2D (let* ((out (assoc-ref outputs "out")) =2D (libexec (string-append out "/libexec")) =2D (coreutils (assoc-ref inputs "coreutils*")) =2D (inetutils (assoc-ref inputs "inetutils")) =2D (grep (assoc-ref inputs "grep*")) =2D (sed (assoc-ref inputs "sed*")) =2B (let* ((out (assoc-ref outputs "out")) =2B (libexec (string-append out "/libexec")) =2B (coreutils (assoc-ref inputs "coreutils*")) =2B (inetutils (assoc-ref inputs "inetutils")) =2B (grep (assoc-ref inputs "grep*")) =2B (resolvconf (assoc-ref inputs "resolvconf*")) =2B (sed (assoc-ref inputs "sed*")) =20 (debianutils (assoc-ref inputs "debianutils"))) =20 (substitute* "client/scripts/linux" =20 (("/sbin/ip") =40@ -1592,7 +1595,8 @@ (define-public isc-dhcp =20 ,(map (lambda (dir) =20 (string-append dir "/bin:" =20 dir "/sbin")) =2D (list inetutils coreutils grep sed debianutil= =73)))))))))) =2B (list inetutils coreutils grep sed resolvconf= =0A+ debianutils)))))))))) =20= =20 (native-inputs =20 (list config perl file)) =40@ -1621,6 +1625,7 @@ (define-public isc-dhcp =20= =20 ("coreutils*" ,coreutils) =20 ("grep*" ,grep) =2B ("resolvconf*" ,openresolv) =20 ("sed*" ,sed))) =20= =20 (home-page "https://www.isc.org/dhcp/") =64iff --git a/gnu/packages/patches/dhclient-script-resolvconf-support.patc= =68 b/gnu/packages/patches/dhclient-script-resolvconf-support.patch =6Eew file mode 100644 =69ndex 0000000000..e4fd8f649e =2D-- /dev/null =2B++ b/gnu/packages/patches/dhclient-script-resolvconf-support.patch =40@ -0,0 +1,58 @@ =2BImplement resolvconf support =2B =2BDue to the potential for multiple sources contenting for /etc/resol.conf= =0A+control, this patch replaces direct file munging with resolvconf indire= =63tion. =2B =2B--- a/client/scripts/linux 1970-01-01 09:00:01.000000000 +0900 =2B+++ b/client/scripts/linux 1970-01-01 09:00:01.000000000 +0900 =2B@@ -36,11 +36,11 @@ =2B # This updated version mostly follows Debian script by Andrew Pollock e= =74 al. =2B make_resolv_conf() { =2B local new_resolv_conf =2B+ new_resolv_conf=3D$(mktemp) =2B=20 =2B # DHCPv4 =2B if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] || =2B- [ -n "$new_domain_name_servers" ]; then =2B- new_resolv_conf=3D/etc/resolv.conf.dhclient-new =2B+ [ -n "$new_domain_name_servers" ]; then =2B rm -f $new_resolv_conf =2B=20 =2B if [ -n "$new_domain_name" ]; then =2B@@ -70,17 +70,12 @@ =2B echo nameserver $nameserver >>$new_resolv_conf =2B done =2B else # keep 'old' nameservers =2B- sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc= =2Fresolv.conf >>$new_resolv_conf =2B+ resolvconf -l "$interface.dhcp" | sed -n /^\w*[Nn][Aa][Mm][= =45e][Ss][Ee][Rr][Vv][Ee][Rr]/p >>$new_resolv_conf =2B fi =2B=20 =2B- if [ -f /etc/resolv.conf ]; then =2B- chown --reference=3D/etc/resolv.conf $new_resolv_conf =2B- chmod --reference=3D/etc/resolv.conf $new_resolv_conf =2B- fi =2B- mv -f $new_resolv_conf /etc/resolv.conf =2B+ resolvconf -a "$interface.dhpc" <"$new_resolv_conf" =2B # DHCPv6 =2B elif [ -n "$new_dhcp6_domain_search" ] || [ -n "$new_dhcp6_name_ser= =76ers" ]; then =2B- new_resolv_conf=3D/etc/resolv.conf.dhclient-new =2B rm -f $new_resolv_conf =2B=20 =2B if [ -n "$new_dhcp6_domain_search" ]; then =2B@@ -97,14 +92,10 @@ =2B echo nameserver $nameserver >>$new_resolv_conf =2B done =2B else # keep 'old' nameservers =2B- sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc= =2Fresolv.conf >>$new_resolv_conf =2B+ resolvconf -l "$interface.dhcp6" | sed -n /^\w*[Nn][Aa][Mm]= =5BEe][Ss][Ee][Rr][Vv][Ee][Rr]/p >>$new_resolv_conf =2B fi =2B=20 =2B- if [ -f /etc/resolv.conf ]; then =2B- chown --reference=3D/etc/resolv.conf $new_resolv_conf =2B- chmod --reference=3D/etc/resolv.conf $new_resolv_conf =2B- fi =2B- mv -f $new_resolv_conf /etc/resolv.conf =2B+ resolvconf -a "$interface.dhpc6" <"$new_resolv_conf" =2B fi =2B } =2B=20 =2D-=20 =32.45.2 =0A= ------_=_48c23e8d6c07a46f4225f579_=_-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 18 18:24:40 2025 Received: (at 72072-done) by debbugs.gnu.org; 18 Jan 2025 23:24:40 +0000 Received: from localhost ([127.0.0.1]:44102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZIBD-0006QM-Ll for submit@debbugs.gnu.org; Sat, 18 Jan 2025 18:24:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38382) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tZIBB-0006Q5-4v for 72072-done@debbugs.gnu.org; Sat, 18 Jan 2025 18:24:37 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tZIB4-0007Lw-OA; Sat, 18 Jan 2025 18:24:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=zKOwXVgoVV3OzujHcAJvrQrg+uM5buQ5pz1RoTXPzvY=; b=Bg2CkB6LuCTRjthRcZkR e6Y3MMSEfLxm83dPD0lYg6hHTXueIOn/UcyR1Ba2Meus0kO2c54XATQiBxzimdzb9TsHCWYrrFllm O+GnOx3XPNEOHhJcAzMmgLNvhiQ8PcORTOjimQpPAF91dxd84jARmfkA9C8kvO2U2iAVCqAkbZOIc ZTq8ht70i4oQ97jgHQzgyPQUIiu+lvsyfeIJcWjclpzurKYfZtYStmAFdug4MWyZjtFxWjqU1rbjd 2ezsdbVqT4z6lGPtUKKQ2yKqSGJBYlinwDchabIPDDjrK/5uxINVuFdHDyG5M8gXkgnfLtGDnrddr YSN44KfbZ2iqPQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: "B. Wilson" Subject: Re: bug#72072: gnu: isc-dhcp: Patch dhclient to support resolvconf. In-Reply-To: <0085c46d51165168bc28ae8c10affab7@wilsonb.com> (B. Wilson's message of "Fri, 12 Jul 2024 19:38:55 +0900") References: <2PLKK1GND1Y65.3DPU3DJOTRHJH@wilsonb.com> <0085c46d51165168bc28ae8c10affab7@wilsonb.com> Date: Sun, 19 Jan 2025 00:24:27 +0100 Message-ID: <87a5bnso2c.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72072-done Cc: 72072-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: -3.3 (---) Hi, "B. Wilson" skribis: > From c96e6489117b2087db86161cc2b3fe0e813ac09f Mon Sep 17 00:00:00 2001 > From: "B. Wilson" > Date: Fri, 12 Jul 2024 18:03:48 +0900 > Subject: [PATCH] gnu: isc-dhcp: Patch dhclient to support resolvconf. > > * gnu/packages/patches/dhclient-script-resolvconf-support.patch: New patc= h. > * gnu/local.mk (dist_patch_DATA): Add it. > * gnu/packages/admin.scm (isc-dhcp): Patch dhclient-script and update wra= pper. Finally applied, thanks! Ludo=E2=80=99. From unknown Sat Aug 16 11:41:05 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 16 Feb 2025 12:24:12 +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