diff options
| author | Leo Famulari <leo@famulari.name> | 2021-02-01 14:18:38 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-02-01 14:18:38 -0500 |
| commit | 75b775e81b5a81a59656eeba8811b42f45d503da (patch) | |
| tree | f6783bcb867634f97008d6fe02592e791f9418ba /gnu/packages/ssh.scm | |
| parent | 847c816ddd3a38c865da460cb7b22cf665db162f (diff) | |
| parent | 0981f872cb1fb94fcdf3f4d00bd08c6a6b61ed8d (diff) | |
| download | guix-patches-75b775e81b5a81a59656eeba8811b42f45d503da.tar guix-patches-75b775e81b5a81a59656eeba8811b42f45d503da.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 90f32c135d..04c8c6ceaa 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2015, 2016, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> @@ -44,6 +44,7 @@ #:use-module (gnu packages gperf) #:use-module (gnu packages groff) #:use-module (gnu packages guile) + #:use-module (gnu packages hurd) #:use-module (gnu packages libedit) #:use-module (gnu packages linux) #:use-module (gnu packages logging) @@ -165,7 +166,8 @@ applications.") version ".tar.gz")) (sha256 (base32 - "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym")))) + "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym")) + (patches (search-patches "libssh2-CVE-2019-17498.patch")))) (build-system gnu-build-system) ;; The installed libssh2.pc file does not include paths to libgcrypt and ;; zlib libraries, so we need to propagate the inputs. @@ -199,7 +201,9 @@ a server that supports the SSH-2 protocol.") ("pkg-config" ,pkg-config))) (inputs `(("libedit" ,libedit) ("openssl" ,openssl) - ("pam" ,linux-pam) + ,@(if (hurd-target?) + '() + `(("pam" ,linux-pam))) ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) ("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y' @@ -222,7 +226,9 @@ a server that supports the SSH-2 protocol.") "--with-libedit" ;; Enable PAM support in sshd. - "--with-pam" + ,,@(if (hurd-target?) + '() + '("--with-pam")) ;; "make install" runs "install -s" by default, ;; which doesn't work for cross-compiled binaries |