From 76c2691041e02abb048a7c562dd7afb07d1efc61 Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann.dupont@univ-nantes.fr>
Date: Tue, 18 Oct 2022 12:12:07 +0200
Subject: [PATCH 1/2] fido2 and cbor are now defined upstream

---
 glicid/packages/ssh.scm | 90 ++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/glicid/packages/ssh.scm b/glicid/packages/ssh.scm
index b810e2c..b694283 100644
--- a/glicid/packages/ssh.scm
+++ b/glicid/packages/ssh.scm
@@ -53,52 +53,52 @@
 
 (define-public libcbor-latest libcbor-0.9.0)
 
-(define-public libfido2-1.8.0
-  (package
-    (name "libfido2")
-    (version "1.8.0")
-    (source 
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz"))
-        (sha256 (base32 "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm"))
-      )
-    )
-    (build-system cmake-build-system)
-    (arguments '(
-      #:tests? #f
-    ))
-    (inputs `(
-      ("libcbor",libcbor-latest)
-      ("openssl",openssl)
-      ("zlib", zlib)
-      ("pkg-config", pkg-config)
-      ("eudev", eudev)
-    ))
-    (synopsis "libfido2")
-    (description "Todo")
-    (home-page "toto")
-    (license license:gpl2+)
-  )
-)
+;(define-public libfido2-1.8.0
+;  (package
+;    (name "libfido2")
+;    (version "1.8.0")
+;    (source 
+;      (origin
+;        (method url-fetch)
+;        (uri (string-append "https://developers.yubico.com/libfido2/Releases/libfido2-" version ".tar.gz"))
+;        (sha256 (base32 "07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm"))
+;      )
+;    )
+;    (build-system cmake-build-system)
+;    (arguments '(
+;      #:tests? #f
+;    ))
+;    (inputs `(
+;      ("libcbor",libcbor-latest)
+;      ("openssl",openssl)
+;      ("zlib", zlib)
+;      ("pkg-config", pkg-config)
+;      ("eudev", eudev)
+;    ))
+;    (synopsis "libfido2")
+;    (description "Todo")
+;    (home-page "toto")
+;    (license license:gpl2+)
+;  )
+;)
 
-(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"))
-        (sha256 (base32 "1ln2b0zfvl35r03kn2k1i2aw1k3ypvivc71xmp4dzlin6ypy6fds"))
-      )
-    )
-  )
-)
+;(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"))
+;        (sha256 (base32 "1ln2b0zfvl35r03kn2k1i2aw1k3ypvivc71xmp4dzlin6ypy6fds"))
+;      )
+;    )
+;  )
+;)
 
-(define libfido2-latest libfido2-1.9.0) 
+;(define libfido2-latest libfido2-1.9.0) 
 
-(define-public openssh-with-fido2
+(define-public openssh-with-fido2 ;; this is has to be worked again
   (package
     (inherit openssh)
     (name "openssh-with-fido2")
@@ -172,8 +172,8 @@
         )
     ))
     (inputs `(
-      ("libfido2", libfido2-latest)
-      ("libcbor", libcbor-latest)
+      ("libfido2", libfido2)
+      ("libcbor", libcbor)
       ,@(package-inputs openssh)
     ))
   )

From 7d1a1db48fad0841f6becc97164da38bb4e95d55 Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Wed, 19 Oct 2022 16:00:15 +0200
Subject: [PATCH 2/2] podman 4.3.0

---
 glicid/packages/containers.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/glicid/packages/containers.scm b/glicid/packages/containers.scm
index 4d0016b..5dee58e 100644
--- a/glicid/packages/containers.scm
+++ b/glicid/packages/containers.scm
@@ -6,6 +6,21 @@
 )
 
 (define-public podman
+  (package
+    (inherit gnu:podman)
+    (name "podman")
+    (version "4.3.0")
+    (source (origin
+      (method url-fetch)
+      (uri (list
+        (string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz")
+      ))
+      (sha256 (base32 "0d5zfi6drac23vb2la2v5s2g27hbz9wgiyvlxfm7hgzjh2ds18sm"))
+    ))
+  )
+)
+
+(define-public podman-4.2.1
   (package
     (inherit gnu:podman)
     (name "podman")