From patchwork Fri Jan 5 10:56:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 58365 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 116D027BBE9; Fri, 5 Jan 2024 10:57:06 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 3BB7C27BBE2 for ; Fri, 5 Jan 2024 10:57:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLhsp-0003cs-BV; Fri, 05 Jan 2024 05:56:59 -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 1rLhso-0003b7-A7 for guix-patches@gnu.org; Fri, 05 Jan 2024 05:56:58 -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 1rLhso-0002w1-1W for guix-patches@gnu.org; Fri, 05 Jan 2024 05:56:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLhss-0002BW-7K for guix-patches@gnu.org; Fri, 05 Jan 2024 05:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68258] [PATCH 1/7] services: openssh: Add dependency on =?utf-8?b?4oCYbmV0d29ya2luZ+KAmS4=?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 10:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68258@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17044522058375 (code B ref -1); Fri, 05 Jan 2024 10:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jan 2024 10:56:45 +0000 Received: from localhost ([127.0.0.1]:56449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhsb-0002B0-BQ for submit@debbugs.gnu.org; Fri, 05 Jan 2024 05:56:45 -0500 Received: from lists.gnu.org ([2001:470:142::17]:54160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhsY-0002An-T8 for submit@debbugs.gnu.org; Fri, 05 Jan 2024 05:56:44 -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 1rLhsM-0003aC-8Y for guix-patches@gnu.org; Fri, 05 Jan 2024 05:56:30 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLhsL-0002uI-0l; Fri, 05 Jan 2024 05:56:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=go5KpJ7nTJLjPUVxYSrPzPEck+dV0BFS62ecSjW9YgU=; b=rNi3oPw8vNvCye/2tOv+ 3g4DEm9yj+tR+K1Sex9cxEeWDVqzyVjZoX3XaBouBXWLP5bolufLyWGtEwWuEMV5Rj1mcTgHZOHPZ BllLvCz8bomutboqgpWvr38r/mZNjtUakfD3e8p6yATVmcYXAElS/MJaq9jWgwYKvM0F/LgsArrKY B/3WnJWrPqMzYK9HPhNh+I7+6h4tOWdFPksVDG2NgGGiWO7oHCaZKwqwwOSWc1lQTTUls75sbQLa1 uH6ccPB6CMfLr8gUddm1lGJQ17ID4CTo+vnrglMNjHgbjSxcLFinbKkhaKbbQ5rmCqEFjulb6iAVN b5YYoBM7Xbz6sw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 5 Jan 2024 11:56:19 +0100 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/services/ssh.scm (openssh-shepherd-service): Add ‘networking’ to ‘requirement’. Change-Id: I14c48fe40cce86810a544de6bb7f925bc360653a --- gnu/services/ssh.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index 0abecd6b42..f759c5cf6e 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2019, 2022, 2023 Ludovic Courtès +;;; Copyright © 2014-2019, 2022-2024 Ludovic Courtès ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Julien Lepiller ;;; Copyright © 2017 Clément Lassieur @@ -592,7 +592,10 @@ (define (openssh-shepherd-service config) (list (shepherd-service (documentation "OpenSSH server.") - (requirement '(pam syslogd loopback)) + + ;; On the Hurd, this can only be started after pfinet is up, hence + ;; the dependency on 'networking'. + (requirement '(pam syslogd loopback networking)) (provision '(ssh-daemon ssh sshd)) (start #~(if #$inetd-style? From patchwork Fri Jan 5 10:59:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 58367 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 9087027BBE9; Fri, 5 Jan 2024 11:01:13 +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=-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 5B25327BBE2 for ; Fri, 5 Jan 2024 11:01:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLhwj-0004zk-FH; Fri, 05 Jan 2024 06:01:01 -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 1rLhwg-0004uP-Hf for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:59 -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 1rLhwg-00055K-8t for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLhwk-0004C9-BC for guix-patches@gnu.org; Fri, 05 Jan 2024 06:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68258] [PATCH 2/7] tests: childhurd: Increase SSH connection timeout. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 11:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68258@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 68258-submit@debbugs.gnu.org id=B68258.17044524069236 (code B ref 68258); Fri, 05 Jan 2024 11:01:02 +0000 Received: (at 68258) by debbugs.gnu.org; 5 Jan 2024 11:00:06 +0000 Received: from localhost ([127.0.0.1]:56463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvp-0002NO-H5 for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvn-0002Fz-AY for 68258@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:04 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLhvd-0004ef-Pu; Fri, 05 Jan 2024 05:59:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=daT1TZq8m/31e006yZGBrd5I792X03X3b9UtBZWAZmE=; b=gY3323MN8ZSduPpu08tB hIoUNSOOWLgZdPDQEiYk247IC6Th+0+oKydrtAqT2BFnD+ILIHhecAyQKLiiiqCx7+VjJ2X9n5y5M PS4JEJspXZH5X8AFE6q0ouI34UyQyNfTey9vT+cCcn6TCS2Ozd6cPbSJAT/2AXyxs9g1m4lsAR5HW NU8ScSmLUBShB4MNOQr3gSn28AaO5nxdS8/+cjio3grYHZR6zKKrizmmZIDYBIGfd5TfPEYO/qR+G IVI70gyIiCfXcKksCRWBaDzHcn84uCr18rX+HhZbVSDKLMJvRWs73dTR1CBDaip9IHK8gYveGkSAU hZxdJBMyN0SYpQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 5 Jan 2024 11:59:29 +0100 Message-ID: <5d5cb5abef77d7fd13d4a3aa2a0eb8b4f7593f05.1704451578.git.ludo@gnu.org> 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/tests/virtualization.scm (run-childhurd-test)[run-command-over-ssh]: Pass #:timeout. Change-Id: I44bb3673457275fe3a8ec0af2e364292727f53a8 --- gnu/tests/virtualization.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index f3655f1d8a..6ca88cbacd 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Christopher Baines -;;; Copyright © 2020-2023 Ludovic Courtès +;;; Copyright © 2020-2024 Ludovic Courtès ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Pierre Langlois ;;; Copyright © 2022 Marius Bakke @@ -277,6 +277,7 @@ (define (run-childhurd-test) (let ((session (make-session #:user "test" #:port 10022 #:host "localhost" + #:timeout 120 #:log-verbosity 'rare))) (match (connect! session) ('ok From patchwork Fri Jan 5 10:59:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 58366 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 3AE2027BBEA; Fri, 5 Jan 2024 11:01:13 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 0172727BBE9 for ; Fri, 5 Jan 2024 11:01:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLhwl-00050C-1O; Fri, 05 Jan 2024 06:01:04 -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 1rLhwg-0004v0-OC for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:59 -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 1rLhwg-00055S-Ft for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLhwk-0004D0-NE for guix-patches@gnu.org; Fri, 05 Jan 2024 06:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68258] [PATCH 3/7] DRAFT gnu: shepherd: Update to 0.10.3. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 11:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68258@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 68258-submit@debbugs.gnu.org id=B68258.17044524079326 (code B ref 68258); Fri, 05 Jan 2024 11:01:02 +0000 Received: (at 68258) by debbugs.gnu.org; 5 Jan 2024 11:00:07 +0000 Received: from localhost ([127.0.0.1]:56465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvq-0002Oq-AL for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvo-0002G1-Iu for 68258@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:05 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLhvf-0004gJ-1u; Fri, 05 Jan 2024 05:59:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=/+oKvBrxGu43G8Zf3g8+nQ8J4GnVPLUlsKGSOzlrICs=; b=GUwRhMVDYey3iinM+ESR mp3qe9Ff+DkxzGYrzu7xBLHGdQCbuv9U2Yf6UaZq2Wetc8p5YEzK5p2rboRdm9dPtzKzoDSuz/jNG MWPx42sFmgFmF6uDbj8fza28YhqIQML0BrkyoyrSHdeCx+psT/MNuITanA/OvnnYixqmtCJ6zjUpU nyqYOZ5WG/qESb6KKURBeLwKCgn1d3V2B+QmPgxSJ1N9CnLQ/xEkcK9QFIRWZefB9Cm13dctn2/5z 6caLyXJkNRnWEWoIviLKFfumb8IhNURsPCQKpLNhC4/MX7+rQcfGjhkx6YKxVLpAGetJ1Qs+K8t6T sYW++xnQ1Vs2rg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 5 Jan 2024 11:59:30 +0100 Message-ID: <87cbd38f480207f3cbe5ce4ae1d7c63f92d4f4a6.1704451578.git.ludo@gnu.org> 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 DRAFT: Update to the actual release. * gnu/packages/admin.scm (shepherd-0.10): Update to 0.10.3. Change-Id: I6b14a41c22a18bcf0c5bd380d7f118276d0f761c --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 377caf8793..e4de0c25d4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -373,14 +373,14 @@ (define-public shepherd-0.9 (define-public shepherd-0.10 (package (inherit shepherd-0.9) - (version "0.10.2") + (version "0.10.3rc1") (source (origin (method url-fetch) - (uri (string-append "mirror://gnu/shepherd/shepherd-" + (uri (string-append "https://alpha.gnu.org/gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "0v9ld9gbqdp5ya380fbkdsxa0iqr90gi6yk004ccz3n792nq6wlj")))) + "05zjaqh2xzc929vlk5qvl8h6w7irm56j3nx8cw1z4fra6mmsgdgh")))) (native-inputs (modify-inputs (package-native-inputs shepherd-0.9) (replace "guile-fibers" ;; Work around From patchwork Fri Jan 5 10:59:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 58370 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 D648A27BBEA; Fri, 5 Jan 2024 11:01:39 +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=-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 3B41A27BBE2 for ; Fri, 5 Jan 2024 11:01:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLhwn-00054J-F9; Fri, 05 Jan 2024 06:01:05 -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 1rLhwh-0004w5-4Q for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:59 -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 1rLhwg-00055a-Rc for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLhwl-0004Dt-2i for guix-patches@gnu.org; Fri, 05 Jan 2024 06:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68258] [PATCH 4/7] system: hurd: Use the Shepherd 0.10.x. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 11:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68258@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 68258-submit@debbugs.gnu.org id=B68258.170445241110140 (code B ref 68258); Fri, 05 Jan 2024 11:01:03 +0000 Received: (at 68258) by debbugs.gnu.org; 5 Jan 2024 11:00:11 +0000 Received: from localhost ([127.0.0.1]:56473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvv-0002bz-35 for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvp-0002G3-Fr for 68258@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:06 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLhvf-0004gd-Ul; Fri, 05 Jan 2024 05:59:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=qPFrfqaJWjugSXLagfFjc+033j9R5eqtwLMJ+4h+NqI=; b=MybMUcDAI5zoAFAiqDPB YXlpVHP3u3rqgfsIOJ1nMqOSXYyVZ3t5i2sE0HPOq9RBGq4Y19l8Stsx/2mOrIhMpsrroCAG59cnn syg8tnfMzvRLJUu+rlaMHXZglPZvEt1vti90WfUkyS5+f23UnrXPtWlBRZzS9F3nIStB5/wdWnpo/ 8tQBcAHgWPMTIQB6aV7Zq+G3lLsY4gNduYTI1nSt1su1i4WHhqHe3XRQhMVgQBCz6TJXGpB8NWgPd uR+ARxCspABE9nBgOtW/WR9NhKsQ+fsPQCRaXZgV/J6eUetwnmJHclBeeMLrzw0tjr0TWpY2Oa48Z yY1hwly7EG7caw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 5 Jan 2024 11:59:31 +0100 Message-ID: <2f608c034d3daad42311eb88a62b80e06bcc018f.1704451578.git.ludo@gnu.org> 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/system.scm (hurd-default-essential-services): Remove reference to ‘shepherd-0.8’. * gnu/system/hurd.scm (%base-packages/hurd): Replace ‘shepherd-0.8’ with ‘shepherd-0.10’. Change-Id: I9f1800693cda456286450d3d0bb6f7e3da85d55e --- gnu/system.scm | 4 +--- gnu/system/hurd.scm | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 279b9df5c0..be15615879 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -804,9 +804,7 @@ (define (hurd-default-essential-services os) %boot-service %hurd-startup-service %activation-service - (service shepherd-root-service-type - (shepherd-configuration - (shepherd shepherd-0.8))) ;no Fibers + (service shepherd-root-service-type) (service user-processes-service-type) (account-service (append (operating-system-accounts os) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 3b138bef65..cbe0081382 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020-2022 Ludovic Courtès +;;; Copyright © 2020-2023 Ludovic Courtès ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -70,7 +70,7 @@ (define %base-packages/hurd ;; Note: the Shepherd comes before the Hurd, not just because its duty is to ;; shepherd the herd, but also because we want its 'halt' and 'reboot' ;; commands to take precedence. - (list shepherd-0.8 hurd netdde bash coreutils file findutils grep sed + (list shepherd-0.10 hurd netdde bash coreutils file findutils grep sed diffutils patch gawk tar gzip bzip2 xz lzip guile-3.0-latest guile-colorized guile-readline net-base nss-certs inetutils less procps shadow sudo which From patchwork Fri Jan 5 10:59:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 58371 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 73A3C27BBE9; Fri, 5 Jan 2024 11:01:41 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 6CFC527BBE2 for ; Fri, 5 Jan 2024 11:01:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLhwn-00053O-3t; Fri, 05 Jan 2024 06:01:05 -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 1rLhwh-0004xD-I1 for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:59 -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 1rLhwh-00055g-8j for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLhwl-0004Ej-Eu for guix-patches@gnu.org; Fri, 05 Jan 2024 06:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68258] [PATCH 5/7] services: shepherd: Use the 0.10.x GOOPS-less interface. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 11:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68258@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 68258-submit@debbugs.gnu.org id=B68258.170445241210210 (code B ref 68258); Fri, 05 Jan 2024 11:01:03 +0000 Received: (at 68258) by debbugs.gnu.org; 5 Jan 2024 11:00:12 +0000 Received: from localhost ([127.0.0.1]:56475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvv-0002dR-KH for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvq-0002GS-Ci for 68258@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:07 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLhvg-0004gu-Rp; Fri, 05 Jan 2024 05:59:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=qTorgKTfZnBv2huM+HKuw8xi27FcXGE4BNOAgWLL1hc=; b=Bn8kw2HcFy2B49hYlLPT I60to2PJIY/pzBndjGN/1JnEwItIG9mhH0pSOLSUalebDm3z7nII1FhS9dsm4+/c4LfpZAJZC99Eo mN3yySy6SSEQHY9Oq0CKU0NXwu5gSXRp8BkCSrgoSYrrNZ6DOODvaKekbKWwYPHtMeyQdR265PVfe nh+fUDVS2vfTLB4tY6xc9hiXrJlp3XhX0OyynHvvfXH30oMqRzHrTXihhzaMMO66W/M5rPNX0viIL kgu3JWahgWns26JDKntdpZ/9nr7m19bEl4S1mwHp5bP5Zam8fWT+8S2biMKBCbjyH5Ax0UeE31o2l w2M4sVgCYTOzEw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 5 Jan 2024 11:59:32 +0100 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/services/shepherd.scm (%default-modules): Remove (oop goops). (shepherd-service-file): Use (service …) instead of (make …). Use ‘actions’ instead of ‘make-actions’. (scm->go): Remove use of (oop goops). (shepherd-configuration-file): Pass ‘register-services’ a list. Use ‘start-in-the-background’ unconditionally. Change-Id: I0ad1ba32e339c56ee31e59f160b53d3581277d97 --- gnu/services/shepherd.scm | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 8e122f1aab..5ebac129ce 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -183,7 +183,6 @@ (define %default-imported-modules (define %default-modules ;; Default set of modules visible in a service's file. `((shepherd service) - (oop goops) ((guix build utils) #:hide (delete)) (guix build syscalls))) @@ -300,10 +299,10 @@ (define (shepherd-service-file service) #~(begin (use-modules #$@(shepherd-service-modules service)) - (make - #:docstring '#$(shepherd-service-documentation service) - #:provides '#$(shepherd-service-provision service) - #:requires '#$(shepherd-service-requirement service) + (service + '#$(shepherd-service-provision service) + #:documentation '#$(shepherd-service-documentation service) + #:requirement '#$(shepherd-service-requirement service) ;; The 'one-shot?' slot is new in Shepherd 0.6.0. ;; Older versions ignore it. @@ -313,7 +312,7 @@ (define (shepherd-service-file service) #:start #$(shepherd-service-start service) #:stop #$(shepherd-service-stop service) #:actions - (make-actions + (actions #$@(map (match-lambda (($ name proc doc) #~(#$name #$doc #$proc))) @@ -338,7 +337,6 @@ (define (scm->go file shepherd) ;; Do the same as the Shepherd's 'load-in-user-module'. (let ((env (make-fresh-user-module))) - (module-use! env (resolve-interface '(oop goops))) (module-use! env (resolve-interface '(shepherd service))) (with-target #$(or target #~%host-type) (lambda _ @@ -401,25 +399,17 @@ (define (shepherd-configuration-file services shepherd) ;; than a kernel panic. (call-with-error-handling (lambda () - (apply register-services - (parameterize ((current-warning-port - (%make-void-port "w"))) - (map load-compiled '#$(map scm->go files)))))) + (register-services + (parameterize ((current-warning-port + (%make-void-port "w"))) + (map load-compiled '#$(map scm->go files)))))) (format #t "starting services...~%") (let ((services-to-start '#$(append-map shepherd-service-provision (filter shepherd-service-auto-start? services)))) - (if (defined? 'start-in-the-background) - (start-in-the-background services-to-start) - (for-each (lambda (service) ;pre-0.9.0 compatibility - (guard (c ((service-error? c) - (format (current-error-port) - "failed to start service '~a'~%" - service))) - (start service))) - services-to-start)) + (start-in-the-background services-to-start) ;; Hang up stdin. At this point, we assume that 'start' methods ;; that required user interaction on the console (e.g., From patchwork Fri Jan 5 10:59:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 58369 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 CAE9F27BBEA; Fri, 5 Jan 2024 11:01:32 +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=-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 3947B27BBE2 for ; Fri, 5 Jan 2024 11:01:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLhwn-000547-C5; Fri, 05 Jan 2024 06:01:05 -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 1rLhwh-0004xb-Sg for guix-patches@gnu.org; Fri, 05 Jan 2024 06:01:00 -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 1rLhwh-00055p-Jf for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLhwl-0004Fe-Qr for guix-patches@gnu.org; Fri, 05 Jan 2024 06:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68258] [PATCH 6/7] home: services: shepherd: Use the 0.10.x interface. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 11:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68258@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , ( , Andrew Tropin , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: ( , Andrew Tropin , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 68258-submit@debbugs.gnu.org id=B68258.170445241210253 (code B ref 68258); Fri, 05 Jan 2024 11:01:03 +0000 Received: (at 68258) by debbugs.gnu.org; 5 Jan 2024 11:00:12 +0000 Received: from localhost ([127.0.0.1]:56477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvw-0002eZ-B6 for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvr-0002HJ-94 for 68258@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:08 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLhvh-0004h4-O1; Fri, 05 Jan 2024 05:59:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=i6PJGg6e8XpPz2KWf9m7OTn+QkMgOuEj2ZrzfsQUCb0=; b=F1siMQbsTWOHgYrN5dCE FYvdgHoP/O9i8xY+92VDPKaeeFVGqDXYdOJJxUpDWE0eGcjHUqyjuvjxx/3QWstF4Wm/gk4L8yNTS dSFlw53jVlJo0gr3PGxFA2HnoBF7iKgwtrI37rlyFkWTuf67sNRKzFfUoKppCX5F7XOobohms/JIb AbaV/loZbCmU/WvRvxdanCIvd3OUqLXnHSOoadt2Z78X6BsbrQx3OZlSCjkrKHVqdbiDiYOpN2rc9 u3Y6q51nQmejKcggE5w+w7++EjmmjyY+qujp4XoRNGtBuwEYwokBZIrk0VFA2xbS+L2WZlUNSC+fa KMX2lOOGm1ur+g==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 5 Jan 2024 11:59:33 +0100 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/home/services/shepherd.scm (home-shepherd-configuration-file): Pass ‘register-services’ a list. Call ‘start-in-the-background’ unconditionally. Change-Id: Id7ba005949653a9ac065c47eddb425df4f4792aa --- gnu/home/services/shepherd.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/home/services/shepherd.scm b/gnu/home/services/shepherd.scm index bd068c37fc..176f4575cb 100644 --- a/gnu/home/services/shepherd.scm +++ b/gnu/home/services/shepherd.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021, 2023 Andrew Tropin ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2024 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,11 +76,8 @@ (define (home-shepherd-configuration-file config) #~(begin (use-modules (srfi srfi-34) (system repl error-handling)) - (apply - register-services - (map - (lambda (file) (load file)) - '#$files)) + + (register-services (map load '#$files)) #$@(if daemonize? `((action 'root 'daemonize)) @@ -90,9 +88,7 @@ (define (home-shepherd-configuration-file config) '#$(append-map shepherd-service-provision (filter shepherd-service-auto-start? services)))) - (if (defined? 'start-in-the-background) - (start-in-the-background services-to-start) - (for-each start services-to-start)) + (start-in-the-background services-to-start) (redirect-port (open-input-file "/dev/null") (current-input-port))))) From patchwork Fri Jan 5 10:59:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 58368 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 0860727BBEA; Fri, 5 Jan 2024 11:01:20 +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=-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 F1A7027BBE2 for ; Fri, 5 Jan 2024 11:01:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLhwn-00054h-MP; Fri, 05 Jan 2024 06:01:05 -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 1rLhwi-0004xl-8C for guix-patches@gnu.org; Fri, 05 Jan 2024 06:01:00 -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 1rLhwh-00055u-Vh for guix-patches@gnu.org; Fri, 05 Jan 2024 06:00:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLhwm-0004GV-69 for guix-patches@gnu.org; Fri, 05 Jan 2024 06:01:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68258] [PATCH 7/7] services: bitlbee: Use =?utf-8?q?=E2=80=98m?= =?utf-8?q?ake-inetd-constructor=E2=80=99?= unconditionally. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 11:01:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68258@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 68258-submit@debbugs.gnu.org id=B68258.170445241310312 (code B ref 68258); Fri, 05 Jan 2024 11:01:04 +0000 Received: (at 68258) by debbugs.gnu.org; 5 Jan 2024 11:00:13 +0000 Received: from localhost ([127.0.0.1]:56479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvw-0002fI-Qi for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLhvs-0002Ii-6F for 68258@debbugs.gnu.org; Fri, 05 Jan 2024 06:00:08 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLhvi-0004hI-Ks; Fri, 05 Jan 2024 05:59:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=cTv0rQyPvcwh7kZbn9heLzb9hq7IT5k/cTixw8W9oWE=; b=GBLxP22OaSLKKz7EJ1Sw Gdj7DsWrqM7YxbT8HqmaXY3knwarVxnGLEMapbeMic4uUkkUgwnGGQaMMpnDjD6kckfQQdMvIQdE3 pQ3w5PExMJWC4A9Qng6tTuLM6oLSVcGAfCngCSFUffLR6sSBN0lGmi5qjtRHGIxe65iL8OgNAYZWC sztO+WdmggyH3vtZ2d99B3hOUZxuznZGx6LBDfb+e4sTZNBZa7ehMRm9lPxAL2vJDhgy8SFepLUAN J11qnZKqJ1rR4l9jrbT7TYUjxuUPzzt411SCN8R4uxO7PFMdh2D1ijHSAX4RMCn7SRDMNSLkI02c3 kW+/BFhVdbdzEw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 5 Jan 2024 11:59:34 +0100 Message-ID: <0b95b9f23a3d09919a9d49d2c297abfe826b1eda.1704451578.git.ludo@gnu.org> 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 This construct was introduced in Shepherd 0.9.0. * gnu/services/messaging.scm (bitlbee-shepherd-service): Use ‘make-inetd-constructor’ unconditionally. Change-Id: Id1b79077d60609c7f95439ee0d097dfe6e66dd2e --- gnu/services/messaging.scm | 51 ++++++++++++++------------------------ 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 7505810e7c..9702170b3e 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2015, 2017-2020, 2022, 2023 Ludovic Courtès +;;; Copyright © 2015, 2017-2020, 2022-2024 Ludovic Courtès ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; ;;; This file is part of GNU Guix. @@ -857,39 +857,24 @@ (define bitlbee-shepherd-service ;; on 'networking'. (requirement '(user-processes networking)) - (start #~(if (defined? 'make-inetd-constructor) + (start #~(make-inetd-constructor + (list #$bitlbee* "-I" "-c" #$conf) + (list (endpoint + (addrinfo:addr + (car (getaddrinfo #$interface + #$(number->string port) + (logior AI_NUMERICHOST + AI_NUMERICSERV)))))) + #:requirements '#$requirement + #:service-name-stem "bitlbee" + #:user "bitlbee" #:group "bitlbee" - (make-inetd-constructor - (list #$bitlbee* "-I" "-c" #$conf) - (list (endpoint - (addrinfo:addr - (car (getaddrinfo #$interface - #$(number->string port) - (logior AI_NUMERICHOST - AI_NUMERICSERV)))))) - #:requirements '#$requirement - #:service-name-stem "bitlbee" - #:user "bitlbee" #:group "bitlbee" - - ;; Allow 'bitlbee-purple' to use libpurple plugins. - #:environment-variables - (list (string-append "PURPLE_PLUGIN_PATH=" - #$plugins "/lib/purple-2") - "GUIX_LOCPATH=/run/current-system/locale")) - - (make-forkexec-constructor - (list #$(file-append bitlbee "/sbin/bitlbee") - "-n" "-F" "-u" "bitlbee" "-c" #$conf) - - ;; Allow 'bitlbee-purple' to use libpurple plugins. - #:environment-variables - (list (string-append "PURPLE_PLUGIN_PATH=" - #$plugins "/lib/purple-2")) - - #:pid-file "/var/run/bitlbee.pid"))) - (stop #~(if (defined? 'make-inetd-destructor) - (make-inetd-destructor) - (make-kill-destructor))))))))) + ;; Allow 'bitlbee-purple' to use libpurple plugins. + #:environment-variables + (list (string-append "PURPLE_PLUGIN_PATH=" + #$plugins "/lib/purple-2") + "GUIX_LOCPATH=/run/current-system/locale"))) + (stop #~(make-inetd-destructor)))))))) (define %bitlbee-accounts ;; User group and account to run BitlBee.