From patchwork Sat Jan 11 12:55:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 36926 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 8FA2327BBEA; Sat, 11 Jan 2025 12:59:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 A4D0527BBE2 for ; Sat, 11 Jan 2025 12:59:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tWb50-0005Bl-32; Sat, 11 Jan 2025 07:59:06 -0500 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 1tWb4x-0005BY-3a for guix-patches@gnu.org; Sat, 11 Jan 2025 07:59:03 -0500 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 1tWb4w-0002Ya-Ed for guix-patches@gnu.org; Sat, 11 Jan 2025 07:59:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=8JWzU9axLQhvC/5cqOipoNMvnDLROT3M+8pAED4Nkq0=; b=AdrwrilSgvljaN/+PUnQ7uAc/ssdlUqhilFaKPhxnNJ48rChBU/trxqKZ5gwpJs9WoXu6XInmBAymTrZPGnmT9Dcw1yvW1ZGSQNKdrECTWclbov1EZk+sz5pLB2n96FOLwZsewz5eXPCMU0fpOIrez60cgUvSYa4gZtkln9zuud9g6VuAlJ+j8Qdt6u5bJswrDK9QwMFcBdDxL5V7zzMUwou407fHsGa1DvkLJHZwR5G3+G2BovEy1pO39dNRMp2Frahq0lE9qyHva5bnODTOqTP2aBIAiNXB5ecv3pEZfokm4P0vd2cL0sglNfJ5btjZfdMMmIOaFcpJ32alcEnwA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tWb4w-0002io-3O; Sat, 11 Jan 2025 07:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75494] [PATCH] gnu: Add dhcpcd. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 11 Jan 2025 12:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75494 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75494@debbugs.gnu.org Cc: Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.173660029810372 (code B ref -1); Sat, 11 Jan 2025 12:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jan 2025 12:58:18 +0000 Received: from localhost ([127.0.0.1]:41726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWb4E-0002hD-27 for submit@debbugs.gnu.org; Sat, 11 Jan 2025 07:58:18 -0500 Received: from lists.gnu.org ([2001:470:142::17]:58522) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tWb4B-0002gm-82 for submit@debbugs.gnu.org; Sat, 11 Jan 2025 07:58:16 -0500 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 1tWb43-00058O-M2 for guix-patches@gnu.org; Sat, 11 Jan 2025 07:58:07 -0500 Received: from magnesium.8pit.net ([2001:19f0:6c01:4ae:5400:ff:fe66:af9d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tWb3x-0002UX-Bf; Sat, 11 Jan 2025 07:58:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=8JWzU9ax LQhvC/5cqOipoNMvnDLROT3M+8pAED4Nkq0=; h=date:subject:to:from; d=soeren-tempel.net; b=dIV4M8bH+CkzfISzfmjA3eg9OJEWgfqRqjzzCZ2f5Kb+KfZ CZPcwhdzS1YIUBK4M5zL5pPMFwBBMC03DROXHmnrAbeHq4WkK24+97al7w5LxCeiYy2ku9 40gRVvB9rS79p+rPMxAdeUQd9kqTGLAO/2+0iMh/HZxW+zrwsskaoI= Received: from localhost ( [2a02:560:4d3d:df00:56d:bd22:51d4:e547]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 89593f77 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sat, 11 Jan 2025 13:57:53 +0100 (CET) From: soeren@soeren-tempel.net Date: Sat, 11 Jan 2025 13:55:14 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2001:19f0:6c01:4ae:5400:ff:fe66:af9d; envelope-from=soeren@soeren-tempel.net; helo=magnesium.8pit.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, 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: , 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 From: Sören Tempel * gnu/packages/admin.scm (dhcpcd): new procedure. Signed-off-by: Sören Tempel --- This adds an alternative to isc-dhcpd which has reached its end-of-life in 2022 (i.e. three years ago!) and hasn't been maintained and patched upstream since [1]. This patch has been extracted from #68675 [2] in the hopes that it will be easier to get the package merged first and then propose either a standalone services [3] or a service integrated into dhcp-client-service-type [4] separatly afterwards. [1]: https://issues.guix.gnu.org/68619 [2]: https://issues.guix.gnu.org/68675 [3]: https://github.com/nmeum/guix-channel/blob/b1b80697a9d35ca015ce56ccf3031f91f2bf554f/src/nmeum/services/networking.scm#L130-L132 [4]: https://issues.guix.gnu.org/68675#10 gnu/packages/admin.scm | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) base-commit: bd24a13c572f1c4cf0e104adc7ca81fe71fee632 diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7fd05341993..2e9640a9e1e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1712,6 +1712,62 @@ (define-public isc-dhcp (license license:mpl2.0) (properties '((cpe-name . "dhcp")))))) +(define-public dhcpcd + (package + (name "dhcpcd") + (version "10.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/NetworkConfiguration/dhcpcd") + (commit (string-append "v" version)))) + (sha256 + (base32 "07n7d5wsmy955i6l8rkcmxhgxjygj2cxgpw79id2hx9w41fbkl5l")) + (file-name (git-file-name name version)))) + (inputs (list bash-minimal)) + (native-inputs (list eudev)) + (build-system gnu-build-system) + (arguments + (list + #:test-target "test" + #:configure-flags #~(list "--enable-ipv6" + "--enable-privsep" + "--privsepuser=dhcpcd" + (string-append "--dbdir=" "/var/db/dhcpcd") + (string-append "--rundir=" "/var/run/dhcpcd") + (string-append "CC=" #$(cc-for-target))) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-create-dbdir + (lambda _ + ;; Make sure that the Makefile doesn't attempt to create + ;; /var/db/dhcpcd for which it doesn't have permissions. + (substitute* "src/Makefile" + (("\\$\\{INSTALL\\} -m \\$\\{DBMODE\\} -d \\$\\{DESTDIR\\}\\$\\{DBDIR\\}") + "")))) + (add-before 'build 'setenv + (lambda _ + (setenv "HOST_SH" (which "sh")))) + (add-after 'install 'wrap-hooks + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libexec (string-append out "/libexec")) + (sed (search-input-file inputs "/bin/sed")) + (rm (search-input-file inputs "/bin/rm"))) + (wrap-program (string-append libexec + "/dhcpcd-run-hooks") + `("PATH" ":" suffix + (,(dirname sed) + ,(dirname rm)))))))))) + (home-page "https://roy.marples.name/projects/dhcpcd") + (synopsis "Feature-rich DHCP and DHCPv6 client") + (description + "Provides a DHCP and a DHCPv6 client. Additionally, +dhcpcd is also an IPv4LL (aka ZeroConf) client. In layperson's terms, +dhcpcd runs on your machine and silently configures your computer to work +on the attached networks without trouble and mostly without configuration.") + (license license:bsd-2))) + (define-public radvd (package (name "radvd")