From patchwork Fri May 24 06:50:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 64865 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A4FF027BBEA; Fri, 24 May 2024 07:52:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AE75827BBE2 for ; Fri, 24 May 2024 07:52:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAOmd-0000jG-BB; Fri, 24 May 2024 02:52:07 -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 1sAOmR-0000hz-5n for guix-patches@gnu.org; Fri, 24 May 2024 02:51:55 -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 1sAOmQ-0001GV-UC for guix-patches@gnu.org; Fri, 24 May 2024 02:51:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sAOmX-0004a4-Mv for guix-patches@gnu.org; Fri, 24 May 2024 02:52:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71165] [PATCH 1/1] gnu: openresolv: Update to 3.13.2. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 May 2024 06:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71165 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71165@debbugs.gnu.org Cc: Sergey Trofimov Received: via spool by 71165-submit@debbugs.gnu.org id=B71165.171653350917600 (code B ref 71165); Fri, 24 May 2024 06:52:01 +0000 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 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 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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