From da4483f3790a70058caeb7d208651b18d560ad60 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Jan 2021 10:14:33 +0200 Subject: gnu: openssh: Build without pam for the Hurd. * gnu/packages/ssh.scm (openssh)[inputs]: Only add linux-pam when not building for the Hurd. [arguments]: Adjust configure flag to only use pam when not building for the Hurd. --- gnu/packages/ssh.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 0f2434d7c5..0afd8ed2b2 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 ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2015, 2016, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2019 Leo Famulari ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Christopher Allan Webber @@ -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) @@ -200,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' @@ -223,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 -- cgit v1.2.3 From f43a652d4cfa080a2c14bc10b55047cf92b7cb10 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Jan 2021 17:53:56 +0100 Subject: gnu: sshpass: Update to 1.09. * gnu/packages/ssh.scm (sshpass): Update to 1.09. Re-order fields. --- gnu/packages/ssh.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 146177f7f3..90f32c135d 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015, 2016, 2018, 2019 Efraim Flashner ;;; Copyright © 2016, 2019 Leo Famulari -;;; Copyright © 2016 Nicolas Goaziou +;;; Copyright © 2016, 2021 Nicolas Goaziou ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Stefan Reichör @@ -665,18 +665,17 @@ manipulating key files.") (define-public sshpass (package (name "sshpass") - (version "1.06") - (synopsis "Non-interactive password authentication with SSH") - (home-page "https://sourceforge.net/projects/sshpass/") + (version "1.09") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sshpass/sshpass/" version "/sshpass-" version ".tar.gz")) (sha256 - (base32 - "0q7fblaczb7kwbsz0gdy9267z0sllzgmf0c7z5c9mf88wv74ycn6")))) + (base32 "1dwzqknpswa8vjlbwsx9rcq1j2a7px9h9i2anh09pzkz0mg6wx3i")))) (build-system gnu-build-system) + (home-page "https://sourceforge.net/projects/sshpass/") + (synopsis "Non-interactive password authentication with SSH") (description "sshpass is a tool for non-interactively performing password authentication with SSH's so-called @dfn{interactive keyboard password authentication}.") -- cgit v1.2.3