From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 6I7OABYIkWbUUwAAqHPOHw:P1 (envelope-from ) for ; Fri, 12 Jul 2024 10:40:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 6I7OABYIkWbUUwAAqHPOHw (envelope-from ) for ; Fri, 12 Jul 2024 12:40:22 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mg.wilsonb.com header.s=krs header.b=CbmlrMMq; dkim=fail ("headers rsa verify failed") header.d=wilsonb.com header.s=201703 header.b=YqRKS+6A; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720780821; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=5QVawNSk39Aj3B6Z2Shi3AeyW8E4LmJurDzDbPD//ho=; b=KSMNctJ6IMrHxLnhQIq4h6NNn5QjcYFZzvRf+AzafP53holL6D0pOArsQMetK+1yHKemcd DKSbXBelbp8Bd7cwmEgD55qbzxb5g8MrDc7qNeO3wCMlqvOIEFPgP/FR1wexYHlj49vD3R f6Nezxqk9DxVSuD0rHH0z02sG6iVXQ24i50tl3Lkb+nmu7dCvqyev48ZwYgIkSYd38RY5Q 9l/MHy5bR27nFh898FcpF675PPxYDWSMcsf/JHpbIBaHmmCkwTJdvKHnUG8zlcNwg3c4iw OKhfLjsZbuLtxnlwmtFKkrqxgnPxAlRyq49eoBcfL7/gCtHXwTBNpeIvNYBLqA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mg.wilsonb.com header.s=krs header.b=CbmlrMMq; dkim=fail ("headers rsa verify failed") header.d=wilsonb.com header.s=201703 header.b=YqRKS+6A; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720780821; a=rsa-sha256; cv=none; b=dX2EgLJX9PYGgtk2lcXwz1+en5CSU2oF9/7EBKckeSILgYt/cew1hR1PMfTecacyUgwNXa zXBGU1cXeRJSs1XQthQy4evuuD2LzhiiMDMRISHCj8NEGeFIODCVt2fTwiLf329qW5MohJ Y0nSfByunKvESFvKOiq+WZC6XqsJhtJ4vJ9O5rh2v5NxJ99GlQonT0TOVERXu26m/9HGHZ a+dN/ygQYnHzBzjrY1eoj43tM4h6r7VGtdMMAnDBENaoZFlZA0RuM4Ndj0pM1HxL/oCyHq sAFJS2WA5fxnWGOmrmmST6WbubNtle36JFQSjnGE/MRSrII8SzC8ayryJDYFJw== 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 B3A28115E3 for ; Fri, 12 Jul 2024 12:40:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSDh6-0000ub-3d; Fri, 12 Jul 2024 06:40:04 -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 1sSDh4-0000uE-GB for guix-patches@gnu.org; Fri, 12 Jul 2024 06:40:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sSDh4-00060m-6z for guix-patches@gnu.org; Fri, 12 Jul 2024 06:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSDh4-00026Z-5Z for guix-patches@gnu.org; Fri, 12 Jul 2024 06:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72072] gnu: isc-dhcp: Patch dhclient to support resolvconf. References: <2PLKK1GND1Y65.3DPU3DJOTRHJH@wilsonb.com> In-Reply-To: <2PLKK1GND1Y65.3DPU3DJOTRHJH@wilsonb.com> Resent-From: "B. Wilson" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Jul 2024 10:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72072 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 72072@debbugs.gnu.org Received: via spool by 72072-submit@debbugs.gnu.org id=B72072.17207807528018 (code B ref 72072); Fri, 12 Jul 2024 10:40:02 +0000 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 User-Agent: mblaze/1.2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----_=_48c23e8d6c07a46f4225f579_=_" 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: , Reply-to: "B. Wilson" X-ACL-Warn: , "B. Wilson via Guix-patches" From: "B. Wilson via Guix-patches" via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: B3A28115E3 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.90 X-Spam-Score: -6.90 X-TUID: c/Yracyrhx/4 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_=_--