From patchwork Sat Jun 6 09:15:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 22566 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 7F33527BBE1; Sat, 6 Jun 2020 10:17:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id EED0C27BBE3 for ; Sat, 6 Jun 2020 10:17:08 +0100 (BST) Received: from localhost ([::1]:36898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhUwu-0004tT-H1 for patchwork@mira.cbaines.net; Sat, 06 Jun 2020 05:17:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhUwo-0004tH-Uh for guix-patches@gnu.org; Sat, 06 Jun 2020 05:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39180) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhUwo-0001Z2-M7 for guix-patches@gnu.org; Sat, 06 Jun 2020 05:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jhUwo-0007jd-HU for guix-patches@gnu.org; Sat, 06 Jun 2020 05:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41735] [PATCH 1/2] gnu: Add openssh-no-x. References: <20200606091428.32138-1-othacehe@gnu.org> In-Reply-To: <20200606091428.32138-1-othacehe@gnu.org> Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Jun 2020 09:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41735 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41735@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 41735-submit@debbugs.gnu.org id=B41735.159143496429655 (code B ref 41735); Sat, 06 Jun 2020 09:17:02 +0000 Received: (at 41735) by debbugs.gnu.org; 6 Jun 2020 09:16:04 +0000 Received: from localhost ([127.0.0.1]:50724 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhUvs-0007iF-Fv for submit@debbugs.gnu.org; Sat, 06 Jun 2020 05:16:04 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:41699) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhUvr-0007hF-1p for 41735@debbugs.gnu.org; Sat, 06 Jun 2020 05:16:03 -0400 Received: by mail-wr1-f49.google.com with SMTP id j10so12079090wrw.8 for <41735@debbugs.gnu.org>; Sat, 06 Jun 2020 02:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XXKc1CPuxv7f1Z2sc0mxRjJGugnTdmacPXRWX8NMzM0=; b=liVfOdAaTSXHBZzHydeCcYmcXn4glH/P1tP3/UI1bnlJhO0LK06pXldUi/WvhsuX9N D284uFlrHiFyN1rJSGB3RpJL0IA+PRlsYnaXXwHnqKpMH6SHhytXSEhgS9EUHId+qXQh d14hcXn33bYimlsEmHxwGKfsCnkr3xTHRgj5ftmDctF0+mie7JVlLCsukt6iANWg932Z IAocf9F7+medgETygBV/zbODbq5gMF8KVIOkPhRViW97WH/0v2DcTG0HcrU0t0TBxUMN K2zegbEx/E4pJH6e5rIQu1f2+/yP2UrYzdWXt/Cow3TRKWh/cTEMNw8OSh22zD7+uHzu g4qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XXKc1CPuxv7f1Z2sc0mxRjJGugnTdmacPXRWX8NMzM0=; b=mp3b1ZBB/BVkWW306Bnxndtjt/bzuWEBleXJ/Zbl8/tcsN6fliO5pAMEetydf4Gy1a 7oFUaMBFnkAaeXv3Hf4amnQr3zQBbONLx/iAlfRPZYi7tMx/jhO/XtL54S4095OkJzen +a/qBtbhs2/nO+f3T7tvbr5JI8LUYQsQpcEhgYpy0aGEW92s5ib3kPUWL2hfmafJpoWk oNjz8xL/fS9jYpv55zv9LTFPNW/+ExrKKgsmco5+/sy4l6QMGKCgm7RMZs1gD2E+Q/3b 5p+cDc7UmP1RCLuVeAb/AkZ0qmkwKGqaz96/DMChSqKU72RT8jTM+VJRRvkUKBpqxWNV PpnQ== X-Gm-Message-State: AOAM5318M/fiM3Bsc5OC4EdrkEvxdl2FKJEHZYCUvsxqCBrY4P12tMAz 2iFBmXWMxoJoRdwrdeXHlB8/gaU1dvw= X-Google-Smtp-Source: ABdhPJwqjZjYETRSjgjmqzK20MkViUDerBk5pk7bltSLQMQV0uZiwz49WUUj9YnHdzG0rAc1e/eO3g== X-Received: by 2002:a05:6000:4c:: with SMTP id k12mr13462340wrx.215.1591434957132; Sat, 06 Jun 2020 02:15:57 -0700 (PDT) Received: from meru.fronius.com ([2a01:e0a:fa:a50:809b:e323:9e90:279b]) by smtp.gmail.com with ESMTPSA id t129sm15871451wmf.41.2020.06.06.02.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jun 2020 02:15:56 -0700 (PDT) From: Mathieu Othacehe X-Google-Original-From: Mathieu Othacehe Date: Sat, 6 Jun 2020 11:15:51 +0200 Message-Id: <20200606091552.32625-1-othacehe@gnu.org> X-Mailer: git-send-email 2.26.2 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ssh.scm (openssh-no-x): New variable. --- gnu/packages/ssh.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 73841db6b5..13cf305695 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -239,6 +239,14 @@ Additionally, various channel-specific options can be negotiated.") "See LICENSE in the distribution.")) (home-page "https://www.openssh.com/"))) +;; OpenSSH without X support. This allows to use OpenSSH without dragging X +;; libraries to the closure. +(define-public openssh-no-x + (package + (inherit openssh) + (name "openssh-no-x") + (inputs (alist-delete "xauth" (package-inputs openssh))))) + (define-public guile-ssh (package (name "guile-ssh") From patchwork Sat Jun 6 09:15:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 22567 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 2CC5527BBE3; Sat, 6 Jun 2020 10:17:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E7E3A27BBE1 for ; Sat, 6 Jun 2020 10:17:09 +0100 (BST) Received: from localhost ([::1]:36932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhUwv-0004uc-Fu for patchwork@mira.cbaines.net; Sat, 06 Jun 2020 05:17:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhUwp-0004tN-BS for guix-patches@gnu.org; Sat, 06 Jun 2020 05:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39181) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhUwp-0001Z6-2w for guix-patches@gnu.org; Sat, 06 Jun 2020 05:17:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jhUwo-0007jk-VL for guix-patches@gnu.org; Sat, 06 Jun 2020 05:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41735] [PATCH 2/2] system: bare-bones: Remove dependency to X libraries. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Jun 2020 09:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41735 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41735@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 41735-submit@debbugs.gnu.org id=B41735.159143496529664 (code B ref 41735); Sat, 06 Jun 2020 09:17:02 +0000 Received: (at 41735) by debbugs.gnu.org; 6 Jun 2020 09:16:05 +0000 Received: from localhost ([127.0.0.1]:50726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhUvt-0007iO-Mb for submit@debbugs.gnu.org; Sat, 06 Jun 2020 05:16:05 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:40552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhUvr-0007hH-SU for 41735@debbugs.gnu.org; Sat, 06 Jun 2020 05:16:04 -0400 Received: by mail-wm1-f53.google.com with SMTP id r15so11325380wmh.5 for <41735@debbugs.gnu.org>; Sat, 06 Jun 2020 02:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oAVTEZ/naic3ffL46YuQ4dcJuXPedaTTWzwxW4M4XB4=; b=RGBJT3KZImaXdiAv6+hFF5/91ZVds2117kddfX5EAwcs6nZIZY+TOQ2fhG7LZ9XW/Q cTCSR5ujgFTuAf3DsXc6AWD3hMi1pC2M9qBi952VJEJt6fHFa9l8HG4mMOeqwqwRmCDB NWh2eVfZSEYFHWjqrNaxQ8JFI8G1GNzUf5IHSFpSop+k+PdLV61TfbF9FV3QQM4fG1A5 pG0qo7doveqTUBolWGoJPNjWf117fSCRJL28Q9yIDYUd2NhQFkOKJbyPegpaZ232dSs+ Aprmn1sWDtGJ5tyYr/spbWFWlBstsibatLJc5+xsUHlSKKnGoUnaBYt5DLJjJO2MrJrk Fnpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oAVTEZ/naic3ffL46YuQ4dcJuXPedaTTWzwxW4M4XB4=; b=m+xKa+oL+9QCEAwdQRHrQqWpILGU9P5TKRse9XcBeOETPwTPq+vqG6/FrNXy3L4tYE Zfg+59uxeyQ2NSb6NKjGAoLj0qHPokG0Itoh8/zcqDd4MTXzRh+Ihq10YjlCFaSPpdM9 tqnJagANHz6yYCrhYmQsjpnHgmgWlkmG09Ey7j9Q/Mu3mwombjPvBlhVzyoTgFcZjELK CFW4+pQpU6eCqlC3QVbVmaBohJcprdJt4Kug7mQx/x/sEPNuSFYo/jYZ7Oc9lWetNAF+ SBLh3Gh2Tk5FWRSWZkNK0G4Zv7UfaRfK8m3SSS3RIldnP40zg2I9PauYj/bKpP4iSrmx Fgtw== X-Gm-Message-State: AOAM533OKdibSmHBnOiNF2UqRIpRvgxAyYB/Ed/PPIcQ2KfktUmAm/sa EzK+wWwpYb1Zg+SVRg6xd2rCRvqjP/c= X-Google-Smtp-Source: ABdhPJwRMVbibC4DL/H2sS1z9q1HziWzVAOL1S2mkvAAOkLfgAdNoa8em+zZl3JMEQqDDc8KILk9JQ== X-Received: by 2002:a1c:bad7:: with SMTP id k206mr6540110wmf.11.1591434958105; Sat, 06 Jun 2020 02:15:58 -0700 (PDT) Received: from meru.fronius.com ([2a01:e0a:fa:a50:809b:e323:9e90:279b]) by smtp.gmail.com with ESMTPSA id t129sm15871451wmf.41.2020.06.06.02.15.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jun 2020 02:15:57 -0700 (PDT) From: Mathieu Othacehe X-Google-Original-From: Mathieu Othacehe Date: Sat, 6 Jun 2020 11:15:52 +0200 Message-Id: <20200606091552.32625-2-othacehe@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606091552.32625-1-othacehe@gnu.org> References: <20200606091552.32625-1-othacehe@gnu.org> 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" X-getmail-retrieved-from-mailbox: Patches Use "openssh-no-x" to prevent the inclusion of X libraries to the bare-bones system closure. * gnu/system/examples/bare-bones.tmpl (operating-system)[services]: Use openssh-no-x instead of openssh. --- gnu/system/examples/bare-bones.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl index 4f30a5b756..deed3c6c7a 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl @@ -3,7 +3,7 @@ (use-modules (gnu)) (use-service-modules networking ssh) -(use-package-modules screen) +(use-package-modules screen ssh) (operating-system (host-name "komputilo") @@ -46,5 +46,6 @@ (services (append (list (service dhcp-client-service-type) (service openssh-service-type (openssh-configuration + (openssh openssh-no-x) (port-number 2222)))) %base-services)))