From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#34646] [PATCH] gnu: openssh: Add libedit support. Resent-Message-ID: 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) From: =?UTF-8?Q?G=C3=A1bor?= Boskovits Date: Mon, 25 Feb 2019 14:08:46 +0100 Message-Id: <20190225130846.7982-1-boskovits@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34646@debbugs.gnu.org Cc: =?UTF-8?Q?G=C3=A1bor?= Boskovits * 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") -- 2.20.1