diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:40:51 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:40:51 +0100 |
commit | f5e563e50a232492e57d609a95d96081a060ea17 (patch) | |
tree | e329bce8fcbb72eac2ab8f0176227e2e2623d475 /gnu/packages/ssh.scm | |
parent | 1130929acfff30b3f179e6bb949b1b7d78b85b69 (diff) | |
parent | 19464173bafdc42adfc8dd7277c491c40ddef66b (diff) |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/ssh.scm')
-rw-r--r-- | gnu/packages/ssh.scm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 1928ea7634..fc7a711395 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2018 Manuel Graf <graf@init.at> +;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com> ;;; ;;; 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) @@ -68,7 +70,7 @@ (define-public libssh (package (name "libssh") - (version "0.8.6") + (version "0.8.7") (source (origin (method git-fetch) (uri (git-reference @@ -76,7 +78,7 @@ (commit (string-append "libssh-" version)))) (sha256 (base32 - "0rq57gpmdawljx7hqya4ipzsfpcbr31yy60kl5qv66krc9wimqda")) + "1iqik1ba0g008k1mb1n85iih1azi7giy0c485jnlmsrjxik4q3j2")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (outputs '("out" "debug")) @@ -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") |