From unknown Sat Aug 16 15:56:32 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#71165 <71165@debbugs.gnu.org> To: bug#71165 <71165@debbugs.gnu.org> Subject: Status: [PATCH 0/1] gnu: openresolv: Update to 3.13.2. Reply-To: bug#71165 <71165@debbugs.gnu.org> Date: Sat, 16 Aug 2025 22:56:32 +0000 retitle 71165 [PATCH 0/1] gnu: openresolv: Update to 3.13.2. reassign 71165 guix-patches submitter 71165 Sergey Trofimov severity 71165 normal tag 71165 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri May 24 02:43:38 2024 Received: (at submit) by debbugs.gnu.org; 24 May 2024 06:43:38 +0000 Received: from localhost ([127.0.0.1]:35269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAOeP-0004UL-QM for submit@debbugs.gnu.org; Fri, 24 May 2024 02:43:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:39632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAOeL-0004UE-Sq for submit@debbugs.gnu.org; Fri, 24 May 2024 02:43:36 -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 1sAOeE-0003Qb-Jz for guix-patches@gnu.org; Fri, 24 May 2024 02:43:26 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sAOeC-0007Kx-4z for guix-patches@gnu.org; Fri, 24 May 2024 02:43:26 -0400 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-574ea5184abso13162705a12.3 for ; Thu, 23 May 2024 23:43:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1716532999; x=1717137799; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hkfZKYmYzzQ4EWIB5chf702ToW2Nn2ZDU0z8YAKJgXM=; b=aMHeHZNjV1jppa0xJtOpQYF9daamPxTwZYdtWCYuQGxMnwqvrwX5SjbRr3a53bTWXo 8s1ce5rZ6q8uY9bsjfSv064xrRlsKFodKKQQi1VQ+UmxwoCJ/2oRnQPbcLrMFmnGxshX 3zQJBV1YrwS1py7v/S98OjZzux1mBHjC6R/Hw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716532999; x=1717137799; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hkfZKYmYzzQ4EWIB5chf702ToW2Nn2ZDU0z8YAKJgXM=; b=EDkpJTHoU0mFdh6wJnKPwuyGPPTVfumVVSEfAsTbkEYDu/tRH7e9ooJ2rNThveyTAf gShJPGT4FsJBv62OyGrgSTU30qGysGNtKXMyYkDI//mvgGk8mb82Zin7kQilIpvBMPJw tZzdTBc7Kq90EvmOdU7p0u+Nd/PACrSR72SYlTpjDYBwgk4uaV2PuWVsQnI12ugkysLC 1SJZlqFp8SWSaUdsKSL77MrTyW/aOIOZl4jic4gctUE5STNrKp91+6uJms0DifaInmqW EToaChrRYQ6xVtiTXx+vDTZfN9OSaQTs/CXmXOKLfAGYurlWMnRY2xR4EnJXICwsNMxJ wN1w== X-Gm-Message-State: AOJu0YyqwuLZ+ivcs7o5NWW6LsCf5VGE/uE11yGc6XbijWYDfLEp3w7o ar/3nojv02TxlSOhz58qMISdQdZWsMnJU9yPoz4rHeSRe3jGHuX9s0AQLtlE5/O6DGFoTV2phze FX44= X-Google-Smtp-Source: AGHT+IHpBnLYiTp8sYTntLHPRdPz2lBF1i0NcACmtsA+XF+InK3JLSjXLoqo0KQuraf+1DEI5HSmGQ== X-Received: by 2002:a17:906:310b:b0:a59:9d4c:eb09 with SMTP id a640c23a62f3a-a62641bb952mr97791266b.27.1716532999323; Thu, 23 May 2024 23:43:19 -0700 (PDT) Received: from localhost ([2a02:2454:a09d:d000:3f1e:a87:ccd2:4aec]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a626cc4fedesm76535666b.118.2024.05.23.23.43.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 23:43:18 -0700 (PDT) From: Sergey Trofimov To: guix-patches@gnu.org Subject: [PATCH 0/1] gnu: openresolv: Update to 3.13.2. Date: Fri, 24 May 2024 08:43:04 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2a00:1450:4864:20::532; envelope-from=sarg@sarg.org.ru; helo=mail-ed1-x532.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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, SPF_HELO_NONE=0.001, SPF_NONE=0.001, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit Cc: Sergey Trofimov 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 (--) `resolvconf` can't be configured as the conf-file is read from `/gnu/store/...-openresolv-3.12.0/etc` I've adjusted the package to make `resolvconf` read configuration file from `/etc`. Sergey Trofimov (1): gnu: openresolv: Update to 3.13.2. gnu/packages/dns.scm | 60 ++++++++++--------- .../patches/openresolv-restartcmd-guix.patch | 12 ++-- 2 files changed, 39 insertions(+), 33 deletions(-) base-commit: 9901416233867233192b63fde7f616751127b189 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 24 02:51:49 2024 Received: (at 71165) by debbugs.gnu.org; 24 May 2024 06:51:49 +0000 Received: from localhost ([127.0.0.1]:35317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAOmK-0004Zo-Jr for submit@debbugs.gnu.org; Fri, 24 May 2024 02:51:49 -0400 Received: from mail-ed1-f46.google.com ([209.85.208.46]:42376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAOmI-0004Zg-7I for 71165@debbugs.gnu.org; Fri, 24 May 2024 02:51:47 -0400 Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-57847c08e0cso2198966a12.1 for <71165@debbugs.gnu.org>; Thu, 23 May 2024 23:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1716533433; x=1717138233; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C8u8yGcDL3YZ+jcZyGlX27M6NTgzyldve9mP2YPnCTA=; b=aOwQQHsSLsLRpAQ/5iu7ieIfFkEnexJSEcoJ3hAwUNlhuD0G+wdvVXLjaFhzUGkDwI WSJu7ZZOORatzRxqlPx3KLvEVD+rKX2pQSsI4WLMEQTFKyihM6Vu91GSugTuJkWXx0KI tP9wLfFRcnF2wDbJ4PyTrhzTRcgBCQoBD4oGU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716533433; x=1717138233; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C8u8yGcDL3YZ+jcZyGlX27M6NTgzyldve9mP2YPnCTA=; b=Sl1IHz7+xK5IrqhBi7hfHRYtyCNcjznWCzPLVftTe/CI0sF0a4nBaE4IlATInKH0Gz WHZ0S0rs44+G7n2uPUgxeneA67qZg9ehK+YLRnnpaOo8a2KJD67zDuWTS6XALso7Bs1r hrO8NIp34yRqHQMsm24GiGz/k/9Kc+ezJ6WfEtkuN04vYA9wT8TA2jC4KcTjDeKE0UQs P/QQcHtdDTETxXft00YV318fN630S0hXAcyMrs8BJHPeSRZFjmWMC7f45jXyThatKJw8 Q42uWbXIiBKT6FqdDF0xVuipPTJJPfQzJjMLPNya7Ewnp0N4EXXWqiBmqLlh2a8CJMYz VJ9Q== X-Gm-Message-State: AOJu0Yx8fhLK6HsobjAVyaxWQ3h+M2d5MsWX/fdPzQNecWi954AG7DM2 mEdNpwgqu4WGgj7qh/fki9SUXiQcVRmalcI9QW+eRWkN8/MhvTDJQtaCn+RRGtNO4zAQbI39aRK 9a94= X-Google-Smtp-Source: AGHT+IHojmebOBBPf49JbxBXyrSZ9GnZYYmByKYUzT6yUT7PQPUMFpbRA9755J5E2qQt7A637TiFzA== X-Received: by 2002:a50:9505:0:b0:572:a4eb:6678 with SMTP id 4fb4d7f45d1cf-57843f2d31fmr4086174a12.19.1716533432898; Thu, 23 May 2024 23:50:32 -0700 (PDT) Received: from localhost ([2a02:2454:a09d:d000:3f1e:a87:ccd2:4aec]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5785238cf06sm1087543a12.29.2024.05.23.23.50.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 23:50:32 -0700 (PDT) From: Sergey Trofimov To: 71165@debbugs.gnu.org Subject: [PATCH 1/1] gnu: openresolv: Update to 3.13.2. Date: Fri, 24 May 2024 08:50:22 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: 71165 Cc: Sergey Trofimov 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: -0.3 (/) * gnu/packages/dns.scm (openresolv): Update to 3.13.2. * gnu/packages/patches/openresolv-restartcmd-guix.patch: Adjust. --- gnu/packages/dns.scm | 60 ++++++++++--------- .../patches/openresolv-restartcmd-guix.patch | 12 ++-- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 36d3eb8b7e..e29a376d66 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -1228,35 +1228,41 @@ (define-public maradns (define-public openresolv (package (name "openresolv") - (version "3.12.0") - (source (origin - (method url-fetch) - (uri (string-append "https://roy.marples.name/downloads/openresolv/" - "openresolv-" version ".tar.xz")) - (sha256 - (base32 - "15qvp5va2yrqpz0ba54clvn8cbc66v4sl7k3bi9ji8jpx040bcs2")) - (patches - (search-patches "openresolv-restartcmd-guix.patch")))) + (version "3.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/NetworkConfiguration/openresolv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03m8n0j0kxxm5kpl66gz4lxr1qqgrp8zlkaq9j8fz27fih0g75xf")) + (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")) - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (coreutils (assoc-ref inputs "coreutils-minimal"))) - (substitute* (string-append out "/sbin/resolvconf") - (("RESOLVCONF=\"\\$0\"") - (format #f "\ -RESOLVCONF=\"$0\" -PATH=~a/bin:$PATH" - coreutils))))))))) + (list #:tests? #f ; No test suite + + #:configure-flags + #~(list (string-append "--prefix=" #$output:out) + "--sysconfdir=/etc" + "--rundir=/run") + + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install" + (string-append "SYSCONFDIR=" #$output "/etc") + make-flags))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (string-append #$output "/sbin/resolvconf") + (("RESOLVCONF=\"\\$0\"") + (format #f "RESOLVCONF=\"$0\"\nPATH=~a/bin:$PATH" + (assoc-ref inputs "coreutils-minimal"))))))))) (inputs (list coreutils-minimal)) (home-page "https://roy.marples.name/projects/openresolv/") diff --git a/gnu/packages/patches/openresolv-restartcmd-guix.patch b/gnu/packages/patches/openresolv-restartcmd-guix.patch index ad70ebd6f2..29a91fe595 100644 --- a/gnu/packages/patches/openresolv-restartcmd-guix.patch +++ b/gnu/packages/patches/openresolv-restartcmd-guix.patch @@ -1,4 +1,4 @@ -From 7f0ce36828ec1e130bee857b8236ca091e4d8a2c Mon Sep 17 00:00:00 2001 +From 439266671bbd790b3cb339c157c87db382e85c96 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. @@ -12,13 +12,13 @@ to do it on Guix System by using shepherd. 1 file changed, 7 insertions(+) diff --git a/resolvconf.in b/resolvconf.in -index 3cad04d..5ef5294 100644 +index aa77ffe..921882e 100644 --- a/resolvconf.in +++ b/resolvconf.in -@@ -369,6 +369,13 @@ detect_init() - then - /etc/rc.d/$1 restart +@@ -375,6 +375,13 @@ detect_init() fi' + elif [ -d /etc/dinit.d ] && command -v dinitctl >/dev/null 2>&1; then + RESTARTCMD='dinitctl --quiet restart --ignore-unstarted $1' + elif [ -e /gnu/store ] && [ -e /run/current-system/profile ]; then + # Guix System + RESTARTCMD=' @@ -30,5 +30,5 @@ index 3cad04d..5ef5294 100644 for x in /etc/init.d/rc.d /etc/rc.d /etc/init.d; do [ -d $x ] || continue -- -2.26.0 +2.41.0 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 23:05:39 2024 Received: (at 71165-done) by debbugs.gnu.org; 24 Jun 2024 03:05:40 +0000 Received: from localhost ([127.0.0.1]:35259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLa1T-0008NF-J4 for submit@debbugs.gnu.org; Sun, 23 Jun 2024 23:05:39 -0400 Received: from mail-qk1-f174.google.com ([209.85.222.174]:54664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLa1Q-0008Mz-BY for 71165-done@debbugs.gnu.org; Sun, 23 Jun 2024 23:05:37 -0400 Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-7955ddc6516so284765685a.1 for <71165-done@debbugs.gnu.org>; Sun, 23 Jun 2024 20:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719198269; x=1719803069; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=EbjIMjYX/kxMiyot2C2ldw7NMKwSkjehcdZeTC29tLY=; b=WVTUf6FnAw8LI614VFNOmcz6I/sU3+0ir3aKjJwGoziz86Os/I6qgIyFwZjDfBfJI3 92jEUvOpmLMxhRu8PqQwTgvzTbeXJ3N1OTPS2cpWBAFWnYBS1mWhoxZsfC4pJtl4yBxT QjpwqvEzMiVXwqoSPbKVRfD7Uulq6cqb80nkshcFI8+gFmF0ys++9bQd+D175Pqqnd7J rhXOlaYy5V9JemZ4cgBUbO1M+ssfq62H9WDVuwxnCDUWqePXMDPjda87Wh9XHkJd6QgE oO86sarpJUolbHK8U8W0QfLwoR+DCbTC8EG3Gs59OkjieC6+0zsDzRVWz8GxsT4+n5eN Sahw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719198269; x=1719803069; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EbjIMjYX/kxMiyot2C2ldw7NMKwSkjehcdZeTC29tLY=; b=k4G9GHtzdyy08EHIWVX2OqzfW7k9CNEJIUSre8dz0J3TIesbjKDleaTKp2T/v0WUjn +qIXBcFMDO56V4h2PPovfML2u/3Kz5zUwU3DLSWE9ugHvvpT50XRF6cD9woavZWqyE95 bhzp8MuWipUKuVJDm0uPjkchebRMzndsLj3ZvjaQNhJQYxppUAeRFjXgSP6/+2ABJYW+ 0khfue5M5pGu1NgsQ/fEJlPUfXf8WDIOjHy86z9DiyJoK8MB3W5VwHKWoMR/ImbjujOJ ON3BzSgShPPVVg9Qwq7h/eHwUtVyqejDABz+pckM1SBGEFoAi53wBmT3cBE3ZEuMKERD JzkA== X-Gm-Message-State: AOJu0YzZoK8+cc4aqKvW+nZDNiKeJiYPhCim99kHr92Xj4WrbwtUJerT KJ+ob7LT5dPjIja/sHH3HMvufGO9zuHixX+KJ3ssJM2xui/4mdM99I/bv6CsaQI= X-Google-Smtp-Source: AGHT+IHFLJibwJ5nw1xQg6whpPPDEg5/6eMis7Z9UotWSOEbimLOtq9clEo0MLas6QcV3xOCIvGiAg== X-Received: by 2002:a05:620a:2717:b0:794:d988:521a with SMTP id af79cd13be357-79be6d00f36mr535391785a.7.1719198268950; Sun, 23 Jun 2024 20:04:28 -0700 (PDT) Received: from hurd (dsl-205-233-124-241.b2b2c.ca. [205.233.124.241]) by smtp.gmail.com with ESMTPSA id af79cd13be357-79bf657c4a2sm20415185a.36.2024.06.23.20.04.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 20:04:28 -0700 (PDT) From: Maxim Cournoyer To: Sergey Trofimov Subject: Re: [bug#71165] [PATCH 1/1] gnu: openresolv: Update to 3.13.2. In-Reply-To: (Sergey Trofimov's message of "Fri, 24 May 2024 08:50:22 +0200") References: Date: Sun, 23 Jun 2024 23:04:27 -0400 Message-ID: <878qyv59dw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71165-done Cc: 71165-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.0 (-) Hi, Sergey Trofimov writes: > * gnu/packages/dns.scm (openresolv): Update to 3.13.2. > * gnu/packages/patches/openresolv-restartcmd-guix.patch: Adjust. Looks reasonable. Applied! -- Thanks, Maxim From unknown Sat Aug 16 15:56:32 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 22 Jul 2024 11:24:23 +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