From patchwork Mon Feb 25 13:08:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?G=C3=A1bor_Boskovits?= X-Patchwork-Id: 1239 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 4E42016C5F; Mon, 25 Feb 2019 13:10:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A690416C5F for ; Mon, 25 Feb 2019 13:10:09 +0000 (GMT) Received: from localhost ([127.0.0.1]:37244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyG1J-0006C7-4g for patchwork@mira.cbaines.net; Mon, 25 Feb 2019 08:10:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyG1E-0006Bp-L8 for guix-patches@gnu.org; Mon, 25 Feb 2019 08:10:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyG1D-00064O-PO for guix-patches@gnu.org; Mon, 25 Feb 2019 08:10:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37382) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gyG1C-00060D-2U for guix-patches@gnu.org; Mon, 25 Feb 2019 08:10:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gyG1B-0001dH-Ps for guix-patches@gnu.org; Mon, 25 Feb 2019 08:10:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34646] [PATCH] gnu: openssh: Add libedit support. Resent-From: =?utf-8?b?R8OhYm9y?= Boskovits Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Feb 2019 13:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34646 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34646@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15511001546204 (code B ref -1); Mon, 25 Feb 2019 13:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Feb 2019 13:09:14 +0000 Received: from localhost ([127.0.0.1]:50924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gyG0Q-0001c0-A3 for submit@debbugs.gnu.org; Mon, 25 Feb 2019 08:09:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gyG0O-0001bm-A1 for submit@debbugs.gnu.org; Mon, 25 Feb 2019 08:09:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:33452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyG0J-0005Dt-2M for submit@debbugs.gnu.org; Mon, 25 Feb 2019 08:09:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyG0H-0005hY-0M for guix-patches@gnu.org; Mon, 25 Feb 2019 08:09:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyG0F-0005Bb-1I for guix-patches@gnu.org; Mon, 25 Feb 2019 08:09:04 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:34906) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gyG0B-00058y-6k for guix-patches@gnu.org; Mon, 25 Feb 2019 08:09:00 -0500 Received: by mail-wm1-x335.google.com with SMTP id y15so8017585wma.0 for ; Mon, 25 Feb 2019 05:08:53 -0800 (PST) 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=7u3B1FPoHHDU1He5o6K0QO9U8bYFDhbIE01m4U1Xsko=; b=oi6gOPrjUA8svWufS4CcmpT8OUvNrpp6BgUMCsxBy3eQ95U40keMjnA+VlkHrKI2Hl uuvD3JBvAMpBQCm1S/f30iDYcp5o0YR8q8Ai7OBIUuDHYvZ36KED59WIXmMSFugJ8jUH jsa9L6N63XmUAxE4UDoEvVn/UBMJOeZHQ0wH6sNCzY9q+ID3LU9CNI/nu1skTPTt4Z4w NS/wYgOjcv3TUHsZ4rivt1sXwyCNHYklQxrIgFj2A1jibILvxl4eh3iOetOiWXD52Mzn Bp+2XenIBmbZGOQYvuHuncRDlxhTQyrwezs9cDFndE5e9IVnh+qMETCMWq6QQ0vTa/Vi 68pA== 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=7u3B1FPoHHDU1He5o6K0QO9U8bYFDhbIE01m4U1Xsko=; b=AETTldN+Wpe6bN+edmeBL/FH4ACK/m0GwOs7yXWyzq6bo7Tpj57F6A6Ye/dQwtOWBx wy3PtiDoDaNjX1xxbJXE5hpZX9B4a67wQG2tZcH4KPAEBxGCmAN160dAPi6Y0TE5qWTQ vCE4jV/0EjoRU06i1qp6nhA57aNvfBNLX8q/ctBFmTZnFFoihHqIgcrk8zetHZ4Wt7oy s6k7NNzAh91BuSX/4JEcrZ77mkqLUwvrkJ2o7k39c0lWzOOv7Ls0Z2TKpwAKE7Bqq2+j MSsv3+biorDG5rPZxBWB89PW/CaSbFOmaUCAhWhb2fowrRnvZJu08ytuaQRcdu+ZTiNy JBmA== X-Gm-Message-State: AHQUAuY9GTNg7jcUGplxgI9eCzgnv3IEFwPK4S+6XeX/SgBkE2NW5h4v m1GvX09NkliN7ka25ykJ24pREidJEg== X-Google-Smtp-Source: AHgI3IYK9boj6Brn07brWDkVs5EjkTRzPMjjDV3FGoVbP3zQ82GAD9vJF698OwfzcOYssAeoxFpzPw== X-Received: by 2002:a1c:c187:: with SMTP id r129mr8881852wmf.107.1551100132045; Mon, 25 Feb 2019 05:08:52 -0800 (PST) Received: from localhost.localdomain (dsl54011DE2.fixip.t-online.hu. [84.1.29.226]) by smtp.gmail.com with ESMTPSA id q6sm5619875wmq.4.2019.02.25.05.08.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 05:08:51 -0800 (PST) From: =?utf-8?b?R8OhYm9y?= Boskovits Date: Mon, 25 Feb 2019 14:08:46 +0100 Message-Id: <20190225130846.7982-1-boskovits@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?R8OhYm9y?= Boskovits 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)[native-inputs]: Add pkg-config. [inputs]: Add libedit. [arguments](configure-flags): Add --with-libedit. --- gnu/packages/ssh.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 1928ea7634..968118ad19 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2018 Manuel Graf +;;; Copyright © 2019 Gábor Boskovits ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +40,7 @@ #:use-module (gnu packages gperf) #:use-module (gnu packages groff) #:use-module (gnu packages guile) + #:use-module (gnu packages libedit) #:use-module (gnu packages linux) #:use-module (gnu packages logging) #:use-module (gnu packages m4) @@ -154,8 +156,10 @@ a server that supports the SSH-2 protocol.") (base32 "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb")))) (build-system gnu-build-system) - (native-inputs `(("groff" ,groff))) - (inputs `(("openssl" ,openssl) + (native-inputs `(("groff" ,groff) + ("pkg-config" ,pkg-config))) + (inputs `(("libedit" ,libedit) + ("openssl" ,openssl) ("pam" ,linux-pam) ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) @@ -175,6 +179,9 @@ a server that supports the SSH-2 protocol.") (assoc-ref %build-inputs "mit-krb5") "/bin") + ;; libedit needed for sftp completion + "--with-libedit" + ;; Enable PAM support in sshd. "--with-pam")