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.