From patchwork Fri Apr 19 06:30:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 63151 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 0CB5027BBEB; Fri, 19 Apr 2024 07:32:37 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 B842727BBEA for ; Fri, 19 Apr 2024 07:32:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxhn3-0005lV-Mq; Fri, 19 Apr 2024 02:32:05 -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 1rxhmn-0005kr-2P for guix-patches@gnu.org; Fri, 19 Apr 2024 02:31:50 -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 1rxhmm-0007om-QP for guix-patches@gnu.org; Fri, 19 Apr 2024 02:31:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rxhn0-0006Br-Lw for guix-patches@gnu.org; Fri, 19 Apr 2024 02:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70469] [PATCH] gnu: isc-dhcp: Make dhclien-script hooks work. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Apr 2024 06:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70469 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70469@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171350831123733 (code B ref -1); Fri, 19 Apr 2024 06:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Apr 2024 06:31:51 +0000 Received: from localhost ([127.0.0.1]:57054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxhmp-0006Aj-8l for submit@debbugs.gnu.org; Fri, 19 Apr 2024 02:31:51 -0400 Received: from lists.gnu.org ([2001:470:142::17]:48896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxhmn-00069f-BX for submit@debbugs.gnu.org; Fri, 19 Apr 2024 02:31:50 -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 1rxhmK-0005jM-R1 for guix-patches@gnu.org; Fri, 19 Apr 2024 02:31:23 -0400 Received: from mail.mmer.org ([178.22.65.174]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rxhmI-0007bC-VM for guix-patches@gnu.org; Fri, 19 Apr 2024 02:31:20 -0400 Received: from mail.mmer.org (localhost [127.0.0.1]) by mail.mmer.org (OpenSMTPD) with ESMTP id 7ac4b5a5 for ; Fri, 19 Apr 2024 06:31:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=mmer.org; h=from:to :subject:date:message-id:mime-version:content-transfer-encoding; s=dkim; bh=vJRL8Pk48QA6+UAco3AyJgqmigc/8VkUYwYd5C8GrEc=; b=i5ir RYo0zSp5O+lXq3v3XJ3sLh02sM+mZVV9reJ1FzHqW86sVL8cFUW+sHqyCCwKjtOt ge+qAoD9G1RRVLziAxoBKD7qZyX83M4shtY5H7WLEVEL82sIt0EIya1kY2Vjdxi/ LR7+EVpD1eIN7KKdJEN+cjJFtFjkuiSGYxtzUeU= Received: from delta (13-208-98-95.ftth.glasoperator.nl [95.98.208.13]) by mail.mmer.org (OpenSMTPD) with ESMTPSA id b5b7bc11 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 19 Apr 2024 06:31:13 +0000 (UTC) Date: Fri, 19 Apr 2024 08:30:38 +0200 Message-ID: <20240419063038.21727-1-levenson@mmer.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=178.22.65.174; envelope-from=levenson@mmer.org; helo=mail.mmer.org 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Alexey Abramov X-ACL-Warn: , Alexey Abramov via Guix-patches X-Patchwork-Original-From: Alexey Abramov via Guix-patches via From: Alexey Abramov 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 dhclient provides a hook mechanism for users. In order to run these hooks, dhclient-script uses run-parts to run all the executable files found in requested directory. run-parts is part of debianutils packages. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Add "debianutils" to provide access to run-parts. --- gnu/packages/admin.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b60857b264..0bf96af835 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -122,6 +122,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages datastructures) + #:use-module (gnu packages debian) #:use-module (gnu packages dns) #:use-module (gnu packages elf) #:use-module (gnu packages file) @@ -1563,7 +1564,8 @@ (define-public isc-dhcp (coreutils (assoc-ref inputs "coreutils*")) (inetutils (assoc-ref inputs "inetutils")) (grep (assoc-ref inputs "grep*")) - (sed (assoc-ref inputs "sed*"))) + (sed (assoc-ref inputs "sed*")) + (debianutils (assoc-ref inputs "debianutils"))) (substitute* "client/scripts/linux" (("/sbin/ip") (search-input-file inputs "/sbin/ip"))) @@ -1578,7 +1580,7 @@ (define-public isc-dhcp ,(map (lambda (dir) (string-append dir "/bin:" dir "/sbin")) - (list inetutils coreutils grep sed)))))))))) + (list inetutils coreutils grep sed debianutils)))))))))) (native-inputs (list config perl file)) @@ -1589,6 +1591,10 @@ (define-public isc-dhcp '() `(("iproute" ,iproute))) + ;; dhclient-script provides hooks to users and uses run-parts in + ;; order to list users defined hooks. + ("debianutils" ,debianutils) + ;; isc-dhcp bundles a copy of BIND, which has proved vulnerable ;; in the past. Use a BIND-VERSION of our choosing instead. ("bind-source-tarball"