From 511a8f8d468ad64ec8e117c827573f58552fdceb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 27 Nov 2021 22:36:49 +0100
Subject: gnu: clustershell: Fetch sources from Git.

* gnu/packages/ssh.scm (clustershell)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
---
 gnu/packages/ssh.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/ssh.scm')

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 00bcdb63ab..c8a1dbbe47 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -827,12 +827,13 @@ framework.")
     (version "1.8.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/cea-hpc/clustershell/releases"
-                           "/download/v" version
-                           "/ClusterShell-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cea-hpc/clustershell")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1qdcgh733szwj9r1gambrgfkizvbjci0bnnkds9a8mnyb3sasnan"))))
+        (base32 "128v3gc6gj9622sp41az1jkcqnkbsdzvb2jpk12fpm1mmjcfgfvc"))))
     (build-system python-build-system)
     (inputs `(("openssh" ,openssh)))
     (propagated-inputs `(("python-pyyaml" ,python-pyyaml)))
-- 
cgit v1.2.3


From f43a7838716b80e439d1d94c00da6880d6f2893f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 27 Nov 2021 22:47:44 +0100
Subject: gnu: clustershell: Update to 1.8.4.

* gnu/packages/ssh.scm (clustershell): Update to 1.8.4.
[arguments]: Don't explicitly return #t from phases.
---
 gnu/packages/ssh.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/ssh.scm')

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index c8a1dbbe47..a681945f8e 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -824,7 +824,7 @@ framework.")
 (define-public clustershell
   (package
     (name "clustershell")
-    (version "1.8.3")
+    (version "1.8.4")
     (source
      (origin
        (method git-fetch)
@@ -833,7 +833,7 @@ framework.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "128v3gc6gj9622sp41az1jkcqnkbsdzvb2jpk12fpm1mmjcfgfvc"))))
+        (base32 "11b87vyamcw4rvgxz74jxwkr9ly0h9ldp2wqsi5wc19p0r06la5j"))))
     (build-system python-build-system)
     (inputs `(("openssh" ,openssh)))
     (propagated-inputs `(("python-pyyaml" ,python-pyyaml)))
@@ -845,8 +845,7 @@ framework.")
                         (substitute* "lib/ClusterShell/Worker/Ssh.py"
                           (("info\\(\"ssh_path\"\\) or \"ssh\"")
                            (string-append "info(\"ssh_path\") or \""
-                                          ssh "/bin/ssh\"")))
-                        #t))))))
+                                          ssh "/bin/ssh\"")))))))))
     (home-page "https://cea-hpc.github.io/clustershell/")
     (synopsis "Scalable event-driven Python framework for cluster administration")
     (description
-- 
cgit v1.2.3


From 8cc099b4250589c0d23fc6762868f6542433f143 Mon Sep 17 00:00:00 2001
From: Ahmad Jarara <git@ajarara.io>
Date: Fri, 5 Nov 2021 14:12:56 -0400
Subject: gnu: openssh: Add support for ecdsa-sk, ed25519-sk ssh keys.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ssh.scm (openssh)[inputs]: Add LIBFIDO2.
[arguments]: Pass "--with-security-key-builtin".

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/ssh.scm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gnu/packages/ssh.scm')

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index a681945f8e..616f6dc915 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -63,6 +63,7 @@
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages security-token)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xorg)
@@ -199,6 +200,7 @@ a server that supports the SSH-2 protocol.")
    (native-inputs `(("groff" ,groff)
                     ("pkg-config" ,pkg-config)))
    (inputs `(("libedit" ,libedit)
+             ("libfido2" ,libfido2)
              ("openssl" ,openssl)
              ,@(if (hurd-target?)
                  '()
@@ -229,6 +231,9 @@ a server that supports the SSH-2 protocol.")
                                '()
                                '("--with-pam"))
 
+                          ;; supports creation and use of ecdsa-sk, ed25519-sk keys
+                          "--with-security-key-builtin"
+
                           ;; "make install" runs "install -s" by default,
                           ;; which doesn't work for cross-compiled binaries
                           ;; because it invokes 'strip' instead of
-- 
cgit v1.2.3