From patchwork Sat Feb 25 18:57:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47335 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 71E5116B96; Sat, 25 Feb 2023 19:05:21 +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.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 996A216AF4 for ; Sat, 25 Feb 2023 19:05:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVzqz-0004te-3X; Sat, 25 Feb 2023 14:05: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 1pVzqx-0004ss-6c for guix-patches@gnu.org; Sat, 25 Feb 2023 14:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVzqw-0002Kt-Po for guix-patches@gnu.org; Sat, 25 Feb 2023 14:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVzqw-0008Dz-Kx for guix-patches@gnu.org; Sat, 25 Feb 2023 14:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61789] [PATCH 13/27] services: ssh: Deprecate 'dropbear-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 19:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61789 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61789@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61789-submit@debbugs.gnu.org id=B61789.167735187231560 (code B ref 61789); Sat, 25 Feb 2023 19:05:02 +0000 Received: (at 61789) by debbugs.gnu.org; 25 Feb 2023 19:04:32 +0000 Received: from localhost ([127.0.0.1]:41551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzqR-0008Cw-TH for submit@debbugs.gnu.org; Sat, 25 Feb 2023 14:04:32 -0500 Received: from smtpm6.myservices.hosting ([185.26.105.207]:37098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzqP-0008Ci-Id for 61789@debbugs.gnu.org; Sat, 25 Feb 2023 14:04:30 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm6.myservices.hosting (Postfix) with ESMTP id 23EE920D46 for <61789@debbugs.gnu.org>; Sat, 25 Feb 2023 20:04:28 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id DAB19800A1; Sat, 25 Feb 2023 19:58:22 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id i8aF-s3EGx8o; Sat, 25 Feb 2023 19:58:22 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 0A2408009F; Sat, 25 Feb 2023 19:58:20 +0100 (CET) From: Bruno Victal Date: Sat, 25 Feb 2023 18:57:59 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 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 * doc/guix.texi (Networking Services): Replace 'dropbear-service' with 'dropbear-service-type'. * gnu/services/ssh.scm (dropbear-service): Deprecate procedure. --- doc/guix.texi | 17 ++++++++--------- gnu/services/ssh.scm | 6 ++++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 50ac49e65f..9f6f1f8794 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20998,19 +20998,18 @@ Networking Services @end table @end deftp -@deffn {Scheme Procedure} dropbear-service [@var{config}] -Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH -daemon} with the given @var{config}, a @code{} -object. +@defvar dropbear-service-type +Type of the service that runs the +@url{https://matt.ucc.asn.au/dropbear/dropbear.html, Dropbear SSH daemon}, +whose value is a @code{} object. -For example, to specify a Dropbear service listening on port 1234, add -this call to the operating system's @code{services} field: +For example, to specify a Dropbear service listening on port 1234: @lisp -(dropbear-service (dropbear-configuration - (port-number 1234))) +(service dropbear-service-type (dropbear-configuration + (port-number 1234))) @end lisp -@end deffn +@end defvar @deftp {Data Type} dropbear-configuration This data type represents the configuration of a Dropbear SSH daemon. diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index 3baa55731d..b76544c1a8 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -52,7 +52,7 @@ (define-module (gnu services ssh) dropbear-configuration dropbear-configuration? dropbear-service-type - dropbear-service + dropbear-service ; deprecated autossh-configuration autossh-configuration? @@ -717,7 +717,9 @@ (define dropbear-service-type dropbear-activation))) (default-value (dropbear-configuration)))) -(define* (dropbear-service #:optional (config (dropbear-configuration))) +(define-deprecated (dropbear-service #:optional + (config (dropbear-configuration))) + dropbear-service-type "Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH daemon} with the given @var{config}, a @code{} object."