From patchwork Sun Aug 6 21:07:28 2023 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: 15639 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 536B427BBE9; Sun, 6 Aug 2023 22:08:35 +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 308E227BBEA for ; Sun, 6 Aug 2023 22:08:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSkyq-0006ub-Kq; Sun, 06 Aug 2023 17:08:04 -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 1qSkyp-0006uJ-3S for guix-patches@gnu.org; Sun, 06 Aug 2023 17:08:03 -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 1qSkyo-0001Si-Rm for guix-patches@gnu.org; Sun, 06 Aug 2023 17:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSkyo-0005i7-M0 for guix-patches@gnu.org; Sun, 06 Aug 2023 17:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65119] [PATCH 1/8] services: dicod: Remove Shepherd < 0.9.0 compatibility layer. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Aug 2023 21:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65119 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65119@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 65119-submit@debbugs.gnu.org id=B65119.169135607921902 (code B ref 65119); Sun, 06 Aug 2023 21:08:02 +0000 Received: (at 65119) by debbugs.gnu.org; 6 Aug 2023 21:07:59 +0000 Received: from localhost ([127.0.0.1]:60113 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSkyk-0005hA-VN for submit@debbugs.gnu.org; Sun, 06 Aug 2023 17:07:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54102) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSkyj-0005gh-1H for 65119@debbugs.gnu.org; Sun, 06 Aug 2023 17:07:57 -0400 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 1qSkyd-0001KF-Bg; Sun, 06 Aug 2023 17:07:51 -0400 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=f0S4euUQyfFc7dsUsVwhlg2qZBLmprMXarjNkyW8rFM=; b=WBEDwVTD0K3Y/mj8y1vv bhoIybbpzZb3SOlVuGDkwv0I+clb2uHQ6ynG1FJxrRpxC6nd7zGYR0F/1qyIbKMFHxWRdNPmxhzLu G/9X4Cl/PhlRBJot5PRaPsgoymnJOrAK4/6fc2CXI3s3RfnJcH3jQ68ANVrahAz5y/pHXBLJvwR6S +r1gQgIaOCtaX0O1h/FLFoaJ4pJrnj/2CSqmvrhG2Av6Qc+1SwQYZmpd5wW8baBOu9oBzI6fDh0/j hsKodjPNI45jqmQskybjDLWVTnQsLt6F/hfzCuyw1AKLpRkXyoAT9SDJxNuuhizvEBKOv2Gp3SNvO 6qYgBQnmNh406w==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 6 Aug 2023 23:07:28 +0200 Message-ID: <5301257cba680ba2d4ab7115c1712090276a1f46.1691355218.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/services/dict.scm (dicod-shepherd-service): Use 'make-inetd-constructor' and 'make-inetd-destructor' unconditionally. --- gnu/services/dict.scm | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm index 23e1d36364..7d48953ef1 100644 --- a/gnu/services/dict.scm +++ b/gnu/services/dict.scm @@ -167,25 +167,18 @@ (define (dicod-shepherd-service config) (provision '(dicod)) (requirement '(user-processes)) (documentation "Run the dicod daemon.") - (start #~(if (defined? 'make-inetd-constructor) - (make-inetd-constructor - (list #$dicod "--inetd" "--foreground" - (string-append "--config=" #$dicod.conf)) - (map (lambda (interface) - (endpoint - (addrinfo:addr - (car (getaddrinfo interface "dict"))))) - '#$interfaces) - #:requirements '#$requirement - #:user "dicod" #:group "dicod" - #:service-name-stem "dicod") - (make-forkexec-constructor - (list #$dicod "--foreground" - (string-append "--config=" #$dicod.conf)) - #:user "dicod" #:group "dicod"))) - (stop #~(if (defined? 'make-inetd-destructor) - (make-inetd-destructor) - (make-kill-destructor))) + (start #~(make-inetd-constructor + (list #$dicod "--inetd" "--foreground" + (string-append "--config=" #$dicod.conf)) + (map (lambda (interface) + (endpoint + (addrinfo:addr + (car (getaddrinfo interface "dict"))))) + '#$interfaces) + #:requirements '#$requirement + #:user "dicod" #:group "dicod" + #:service-name-stem "dicod")) + (stop #~(make-inetd-destructor)) (actions (list (shepherd-configuration-action dicod.conf))))))) (define dicod-service-type