From 2fb272b6d6263864113e15aa1fd13ca242b48d71 Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann@objoo.org>
Date: Tue, 23 Nov 2021 22:32:00 +0100
Subject: [PATCH 1/4] new libfido2

---
 glicid/packages/ssh.scm | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/glicid/packages/ssh.scm b/glicid/packages/ssh.scm
index 59f2f46..8b799b0 100644
--- a/glicid/packages/ssh.scm
+++ b/glicid/packages/ssh.scm
@@ -152,10 +152,10 @@
 ))
 
 
-(define-public glicid-libfido2
+(define-public libfido2-1.8.0
  (package
 
-  (name "glicid-libfido2")
+  (name "libfido2")
   (version "1.8.0")
   (source 
    (origin
@@ -193,6 +193,23 @@
 )
 
 
+(define-public libfido2-1.9.0
+ (package
+  (inherit libfido2-1.8.0)
+  (version "1.9.0")
+  (source
+   (origin
+    (method url-fetch)
+    (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz"))
+;    (file-name (string-append name "-" version ".tar.gz"))
+    (sha256 (base32 "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm"))
+   )
+  )
+ )
+)
+
+(define libfido2-latest libfido2-1.9.0)   
+
 (define-public glicid-specific-openssh
   (package
     (inherit openssh)
@@ -273,7 +290,7 @@
 )
    )
 
-(inputs `(("glicid-libfido2", glicid-libfido2)
+(inputs `(("libfido2", libfido2-latest)
           ("glicid-libcbor", glicid-libcbor)
       ,@(package-inputs openssh)))
 

From d2471f225cdef1f927adca0ca286ddb9d8f63c89 Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann@objoo.org>
Date: Tue, 23 Nov 2021 22:43:53 +0100
Subject: [PATCH 2/4] new ssh packages

---
 glicid/packages/ssh.scm | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/glicid/packages/ssh.scm b/glicid/packages/ssh.scm
index 8b799b0..888efea 100644
--- a/glicid/packages/ssh.scm
+++ b/glicid/packages/ssh.scm
@@ -121,9 +121,9 @@
 (use-modules ((guix licenses) #:prefix license:))
 
 
-(define-public glicid-libcbor
+(define-public libcbor-0.8.0
  (package
-  (name "glicid-libcbor")
+  (name "libcbor")
   (version "0.8.0")
 (source 
    (origin
@@ -152,6 +152,23 @@
 ))
 
 
+(define-public libcbor-0.9.0
+ (package
+  (inherit libcbor-0.8.0)
+  (version "0.9.0")
+  (source 
+   (origin
+
+    (method url-fetch)
+    (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
+    (sha256 (base32 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031"))
+   )
+  )
+ )
+)
+
+(define-public libcbor-latest libcbor-0.9.0)
+
 (define-public libfido2-1.8.0
  (package
 
@@ -176,7 +193,7 @@
 
 
 (inputs `(
-          ("glicid-libcbor",glicid-libcbor)
+          ("libcbor",libcbor-latest)
           ("openssl",openssl)
           ("zlib", zlib)
           ("pkg-config", pkg-config) ; or cmake won't find zlib !
@@ -210,10 +227,10 @@
 
 (define libfido2-latest libfido2-1.9.0)   
 
-(define-public glicid-specific-openssh
+(define-public openssh-with-fido2
   (package
     (inherit openssh)
-    (name "glicid-specific-openssh")
+    (name "openssh-with-fido2")
 (arguments
 
       `(#:test-target "tests"
@@ -291,7 +308,7 @@
    )
 
 (inputs `(("libfido2", libfido2-latest)
-          ("glicid-libcbor", glicid-libcbor)
+          ("libcbor", libcbor-latest)
       ,@(package-inputs openssh)))
 
 

From 51c2809c93dbb1edbcd09c622c877e3303ff703f Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann@objoo.org>
Date: Tue, 23 Nov 2021 22:52:48 +0100
Subject: [PATCH 3/4] checksum change

---
 glicid/packages/ssh.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glicid/packages/ssh.scm b/glicid/packages/ssh.scm
index 888efea..47a048b 100644
--- a/glicid/packages/ssh.scm
+++ b/glicid/packages/ssh.scm
@@ -219,7 +219,7 @@
     (method url-fetch)
     (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz"))
 ;    (file-name (string-append name "-" version ".tar.gz"))
-    (sha256 (base32 "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm"))
+    (sha256 (base32 "1ln2b0zfvl35r03kn2k1i2aw1k3ypvivc71xmp4dzlin6ypy6fds"))
    )
   )
  )

From e5d25505acf2429a090b7302adf025c7eb39e9b6 Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann@objoo.org>
Date: Tue, 23 Nov 2021 22:55:52 +0100
Subject: [PATCH 4/4] checksum change

---
 glicid/packages/ssh.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glicid/packages/ssh.scm b/glicid/packages/ssh.scm
index 47a048b..f4b247d 100644
--- a/glicid/packages/ssh.scm
+++ b/glicid/packages/ssh.scm
@@ -161,7 +161,7 @@
 
     (method url-fetch)
     (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
-    (sha256 (base32 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031"))
+    (sha256 (base32 "1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs"))
    )
   )
  )