From 16ae2d732c8bb1b98c5d235fd31761dfd3f6d622 Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Tue, 13 Dec 2022 15:25:47 +0100
Subject: [PATCH 1/4] rewrite openldap.scm

---
 glicid/packages/openldap.scm | 271 +++++++++++++++--------------------
 1 file changed, 118 insertions(+), 153 deletions(-)

diff --git a/glicid/packages/openldap.scm b/glicid/packages/openldap.scm
index e68468b..6c8e12f 100644
--- a/glicid/packages/openldap.scm
+++ b/glicid/packages/openldap.scm
@@ -1,162 +1,127 @@
 (define-module (glicid packages openldap)
- #:use-module (guix build-system gnu)
- #:use-module (guix download)
- #:use-module ((guix licenses) #:prefix license:)
- #:use-module (guix packages)
- #:use-module (guix utils)
- #:use-module (gnu packages autotools)
- #:use-module (gnu packages compression)
- #:use-module (gnu packages cyrus-sasl)
- #:use-module (gnu packages databases)
- #:use-module (gnu packages dbm)
- #:use-module (gnu packages gnupg)
- #:use-module (gnu packages groff)
- #:use-module (gnu packages kerberos)
- #:use-module (gnu packages libevent)
- #:use-module (gnu packages linux)
- #:use-module ((gnu packages openldap) #:prefix gnu:)
- #:use-module (gnu packages password-utils)
- #:use-module (gnu packages perl)
- #:use-module (gnu packages python)
- #:use-module (gnu packages pkg-config)
- #:use-module (gnu packages tls)
-)
+               #:use-module (guix build-system gnu)
+               #:use-module (guix download)
+               #:use-module ((guix licenses) #:prefix license:)
+               #:use-module (guix packages)
+               #:use-module (guix utils)
+               #:use-module (gnu packages autotools)
+               #:use-module (gnu packages compression)
+               #:use-module (gnu packages cyrus-sasl)
+               #:use-module (gnu packages databases)
+               #:use-module (gnu packages dbm)
+               #:use-module (gnu packages gnupg)
+               #:use-module (gnu packages groff)
+               #:use-module (gnu packages kerberos)
+               #:use-module (gnu packages libevent)
+               #:use-module (gnu packages linux)
+               #:use-module ((gnu packages openldap) #:prefix gnu:)
+               #:use-module (gnu packages password-utils)
+               #:use-module (gnu packages perl)
+               #:use-module (gnu packages python)
+               #:use-module (gnu packages pkg-config)
+               #:use-module (gnu packages tls))
 
 (define-public openldap
-  (package
-    (name "openldap")
-    (version "2.6.3")
-    (source (origin
-      (method url-fetch)
-      (uri (list
-        (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")
-      ))
-      (sha256 (base32 "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj"))
-      )
-    )
-    (build-system gnu-build-system)
-    (inputs (list argon2 cyrus-sasl libevent libgcrypt libltdl lz4 openssl perl snappy unixodbc wiredtiger zlib))
-    (native-inputs (list bdb groff libtool pkg-config))
-    (arguments '(
-      ; this is needed because the make check does not work inside guix
-      #:tests? #f
-      #:configure-flags '(
-        "--enable-debug"
-        "--enable-dynamic"
-        "--enable-syslog"
-        "--enable-ipv6"
-        "--enable-local"
-        "--enable-slapd"
-        "--enable-dynacl"
-        "--enable-aci"
-        "--enable-cleartext"
-        "--enable-crypt"
-        "--enable-spasswd"
-        "--enable-modules"
-        "--enable-rlookups"
-        "--enable-slapi"
-        "--enable-backends=mod"
-        "--enable-overlays=mod"
-        "--enable-argon2"
-        "--enable-balancer"
-        "--disable-static"
-        "--enable-shared"
-        "--with-tls=openssl"
-      )
-      #:make-flags '("STRIP=")
-      #:phases (modify-phases %standard-phases
-        (add-before 'build 'make-depend
-          (lambda* (#:key input #:allow-other-keys)
-            (invoke "make" "depend")
-          )
-        )
-      )
-    ))
-    (synopsis "Implementation of the Lightweight Directory Access Protocol")
-    (description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.")
-    (license license:openldap2.8)
-    (home-page "https://www.openldap.org/")
-  )
-)
+               (package
+                 (name "openldap")
+                 (version "2.6.3")
+                 (source (origin
+                           (method url-fetch)
+                           (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")))
+                           (sha256 (base32 "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj"))))
+                 (build-system gnu-build-system)
+                 (inputs (list argon2 cyrus-sasl libevent libgcrypt libltdl lz4 openssl perl snappy unixodbc wiredtiger zlib))
+                 (native-inputs (list bdb groff libtool pkg-config))
+                 (arguments '(
+                              ; this is needed because the make check does not work inside guix
+                              #:tests? #f
+                              #:configure-flags '(
+                                                  "--enable-debug"
+                                                  "--enable-dynamic"
+                                                  "--enable-syslog"
+                                                  "--enable-ipv6"
+                                                  "--enable-local"
+                                                  "--enable-slapd"
+                                                  "--enable-dynacl"
+                                                  "--enable-aci"
+                                                  "--enable-cleartext"
+                                                  "--enable-crypt"
+                                                  "--enable-spasswd"
+                                                  "--enable-modules"
+                                                  "--enable-rlookups"
+                                                  "--enable-slapi"
+                                                  "--enable-backends=mod"
+                                                  "--enable-overlays=mod"
+                                                  "--enable-argon2"
+                                                  "--enable-balancer"
+                                                  "--disable-static"
+                                                  "--enable-shared"
+                                                  "--with-tls=openssl"
+                                                  )
+                              #:make-flags '("STRIP=")
+                              #:phases (modify-phases %standard-phases
+                                                      (add-before 'build 'make-depend
+                                                                  (lambda* (#:key input #:allow-other-keys)
+                                                                           (invoke "make" "depend"))))))
+                 (synopsis "Implementation of the Lightweight Directory Access Protocol")
+                 (description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.")
+                 (license license:openldap2.8)
+                 (home-page "https://www.openldap.org/")))
 
 (define-public openldap-2.4.59
-  (package
-    (inherit openldap)
-    (name "openldap")
-    (version "2.4.59")
-    (source (origin
-      (method url-fetch)
-      (uri (list
-        (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")
-      ))
-      (sha256 (base32 "0d1gw898gbkv46mw0gll3q0w2j2y9midlzh6f320d0nq8xkpvwwr"))
-      )
-    )
-  )
-)
+               (package
+                 (inherit openldap)
+                 (name "openldap")
+                 (version "2.4.59")
+                 (source (origin
+                           (method url-fetch)
+                           (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")))
+                           (sha256 (base32 "0d1gw898gbkv46mw0gll3q0w2j2y9midlzh6f320d0nq8xkpvwwr"))))))
 
 (define-public openldap-2.5.13
-  (package
-    (inherit openldap)
-    (name "openldap")
-    (version "2.5.13")
-    (source (origin
-      (method url-fetch)
-      (uri (list
-        (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")
-      ))
-      (sha256 (base32 "13007pv1vpp31dvnf9xzzcknqv9p75rqq412nrbprf7p9q646g7f"))
-      )
-    )
-  )
-)
+               (package
+                 (inherit openldap)
+                 (name "openldap")
+                 (version "2.5.13")
+                 (source (origin
+                           (method url-fetch)
+                           (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")))
+                           (sha256 (base32 "13007pv1vpp31dvnf9xzzcknqv9p75rqq412nrbprf7p9q646g7f"))))))
 
 (define-public nss-pam-ldapd
-  (package
-    (name "nss-pam-ldapd")
-    (version "0.9.12")
-    (source (origin
-      (method url-fetch)
-      (uri (string-append "https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-" version ".tar.gz"))
-      (sha256 (base32 "050fzcmxmf6y15dlcffc4gxr3wkk7fliqqwhlwqzbjwk8vkn3mn6"))
-    ))
-    (build-system gnu-build-system)
-    (arguments
-     `(
-        #:configure-flags
-        (list (string-append
-          "--with-pam-seclib-dir=" (assoc-ref %outputs "out") "/lib/security/")
-          "--with-ldap-conf-file=/etc/nslcd.conf"
-        )
-        #:phases
-        (modify-phases %standard-phases
-          (add-after 'unpack 'override-nslcd.conf-install-path
-            (lambda* (#:key outputs #:allow-other-keys)
-              (substitute* "Makefile.in"
-                (
-                  ("\\$\\(DESTDIR\\)\\$\\(NSLCD_CONF_PATH\\)")
-                  (string-append (assoc-ref outputs "out") "/etc/nslcd.conf.example")
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-    (inputs `(
-      ("linux-pam", linux-pam)
-      ("mit-krb5", mit-krb5)
-      ("openldap", openldap)
-      ("python", python)
-    ))
-    (home-page "https://arthurdejong.org/nss-pam-ldapd")
-    (synopsis "NSS and PAM modules for LDAP")
-    (description "nss-pam-ldapd provides a @dfn{Name Service Switch} (NSS)
-module that allows your LDAP server to provide user account, group, host name,
-alias, netgroup, and basically any other information that you would normally
-get from @file{/etc} flat files or NIS.  It also provides a @dfn{Pluggable
-Authentication Module} (PAM) to do identity and authentication management with
-an LDAP server.")
-    (license license:lgpl2.1+)
-  )
-)
+               (package
+                 (name "nss-pam-ldapd")
+                 (version "0.9.12")
+                 (source (origin
+                           (method url-fetch)
+                           (uri (string-append "https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-" version ".tar.gz"))
+                           (sha256 (base32 "050fzcmxmf6y15dlcffc4gxr3wkk7fliqqwhlwqzbjwk8vkn3mn6"))))
+                 (build-system gnu-build-system)
+                 (arguments
+                   `(
+                     #:configure-flags
+                     (list (string-append
+                             "--with-pam-seclib-dir=" (assoc-ref %outputs "out") "/lib/security/")
+                           "--with-ldap-conf-file=/etc/nslcd.conf" )
+                     #:phases
+                     (modify-phases %standard-phases
+                                    (add-after 'unpack 'override-nslcd.conf-install-path
+                                               (lambda* (#:key outputs #:allow-other-keys)
+                                                        (substitute* "Makefile.in"
+                                                                     (
+                                                                      ("\\$\\(DESTDIR\\)\\$\\(NSLCD_CONF_PATH\\)")
+                                                                      (string-append (assoc-ref outputs "out") "/etc/nslcd.conf.example"))))))))
+                 (inputs `(
+                           ("linux-pam", linux-pam)
+                           ("mit-krb5", mit-krb5)
+                           ("openldap", openldap)
+                           ("python", python)))
+                 (home-page "https://arthurdejong.org/nss-pam-ldapd")
+                 (synopsis "NSS and PAM modules for LDAP")
+                 (description "nss-pam-ldapd provides a @dfn{Name Service Switch} (NSS)
+                              module that allows your LDAP server to provide user account, group, host name,
+                              alias, netgroup, and basically any other information that you would normally
+                              get from @file{/etc} flat files or NIS. It also provides a @dfn{Pluggable
+                              Authentication Module} (PAM) to do identity and authentication management with
+                              an LDAP server.")
+                              (license license:lgpl2.1+)))

From 92b9df92b07fc58be764332098044887e649c719 Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Tue, 13 Dec 2022 15:31:30 +0100
Subject: [PATCH 2/4] rewrite virtualization.scm

---
 glicid/packages/virtualization.scm | 129 +++++++++--------------------
 1 file changed, 40 insertions(+), 89 deletions(-)

diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm
index c7e823f..2172a50 100644
--- a/glicid/packages/virtualization.scm
+++ b/glicid/packages/virtualization.scm
@@ -1,99 +1,50 @@
 (define-module (glicid packages virtualization)
-  #:use-module (guix packages)
-  #:use-module (guix gexp)
-  #:use-module (gnu packages)
-  #:use-module (guix utils)
-  #:use-module (gnu packages virtualization)
-  #:use-module (gnu packages storage)
-  #:use-module (guix download)
-  #:use-module (glicid utils)
-;  #:use-module (glicid packages storage)
-)
+               #:use-module (guix packages)
+               #:use-module (guix gexp)
+               #:use-module (gnu packages)
+               #:use-module (guix utils)
+               #:use-module (gnu packages virtualization)
+               #:use-module (gnu packages storage)
+               #:use-module (guix download)
+               #:use-module (glicid utils))
 
-
-
-;(define local-qemu qemu-7.0-upstream)
-
-;(define qemu-latest (latest-version local-qemu qemu))
-
-;(define local-qemu-minimal qemu-minimal-7.0-upstream)
-
-;(define qemu-minimal-latest (latest-version local-qemu-minimal qemu-minimal))
-
-;; current guix version is latest.
 (define-public qemu-latest qemu)
 (define-public qemu-minimal-latest qemu-minimal)
 
-
 (define-public qemu-with-rbd
-  (package
-    (inherit qemu-latest) 
-    (name "qemu-with-rbd")
-
-    (arguments
-     (substitute-keyword-arguments (package-arguments qemu)
-       ((#:tests? _ #f)
-        ;; FIXME: To run the test suite, fix all the instances where scripts
-        ;; generates "#! /bin/sh" shebangs.
-        #f)
-      )
-    )    
-
-    (inputs `(
-      ("ceph:lib", ceph "lib")
-      ,@(package-inputs qemu)
-    ))
-  )
-)
-
-
-;(define-public qemu-with-rbd
-;  (package
-;    (inherit qemu-latest) 
-;    (name "qemu-with-rbd")
-;    (arguments
-;      (substitute-keyword-arguments `(
-;        #:tests? #f
-;        ,@(package-arguments qemu)
-;      ))
-;    ) 
-;    (inputs `(
-;      ("ceph:lib", ceph "lib")
-;      ,@(package-inputs qemu)
-;    ))
-;  )
-;)
-
+               (package
+                 (inherit qemu-latest) 
+                 (name "qemu-with-rbd")
+                 (arguments
+                   (substitute-keyword-arguments
+                     (package-arguments qemu)
+                     ((#:tests? _ #f)
+                      #f))) 
+                 (inputs `(
+                           ("ceph:lib", ceph "lib")
+                           ,@(package-inputs qemu)))))
 
 (define-public qemu-minimal-with-rbd
-  (package
-    (inherit qemu-minimal-latest) 
-    (name "qemu-minimal-with-rbd")
-    (arguments
-      (substitute-keyword-arguments `(
-        #:tests? #f
-        ,@(package-arguments qemu-minimal)
-      ))
-    ) 
-    (inputs `(
-      ("ceph:lib", ceph "lib" )
-      ,@(package-inputs qemu-minimal)
-    ))
-  )
-)
+               (package
+                 (inherit qemu-minimal-latest) 
+                 (name "qemu-minimal-with-rbd")
+                 (arguments
+                   (substitute-keyword-arguments
+                     `(
+                       #:tests? #f
+                       ,@(package-arguments qemu-minimal)))) 
+                 (inputs `(
+                           ("ceph:lib", ceph "lib" )
+                           ,@(package-inputs qemu-minimal)))))
 
 (define-public libvirt-8.5
-  (package
-    (inherit libvirt)
-    (name "libvirt")
-    (version "8.5.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz"))
-        (sha256 (base32 "0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0"))
-        (patches (search-patches "glicid/packages/patches/glicid-libvirt-add-install-prefix.patch"))
-      )
-    )
-  )
-)
+               (package
+                 (inherit libvirt)
+                 (name "libvirt")
+                 (version "8.5.0")
+                 (source
+                   (origin
+                     (method url-fetch)
+                     (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz"))
+                     (sha256 (base32 "0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0"))
+                     (patches (search-patches "glicid/packages/patches/glicid-libvirt-add-install-prefix.patch"))))))

From 854eb4590ab93bba2bda066bf8ae881af9aa8987 Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Tue, 13 Dec 2022 15:33:44 +0100
Subject: [PATCH 3/4] rewrite ssh.scm

---
 glicid/packages/ssh.scm | 262 ++++++++++++++--------------------------
 1 file changed, 89 insertions(+), 173 deletions(-)

diff --git a/glicid/packages/ssh.scm b/glicid/packages/ssh.scm
index 742e88a..6cf22db 100644
--- a/glicid/packages/ssh.scm
+++ b/glicid/packages/ssh.scm
@@ -1,181 +1,97 @@
 (define-module (glicid packages ssh)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system cmake)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages ssh)
-  #:use-module (gnu packages hurd)
-  #:use-module (gnu packages tls)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages security-token)
-)
+               #:use-module (guix packages)
+               #:use-module (guix download)
+               #:use-module (guix git-download)
+               #:use-module (guix build-system gnu)
+               #:use-module (guix build-system cmake)
+               #:use-module ((guix licenses) #:prefix license:)
+               #:use-module (gnu packages ssh)
+               #:use-module (gnu packages hurd)
+               #:use-module (gnu packages tls)
+               #:use-module (gnu packages compression)
+               #:use-module (gnu packages pkg-config)
+               #:use-module (gnu packages linux)
+               #:use-module (gnu packages security-token)
+               )
 (define-public libcbor-0.8.0
-  (package
-    (name "libcbor")
-    (version "0.8.0")
-    (source 
-      (origin
-        (method url-fetch)
-        (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
-        (sha256 (base32 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031"))
-      )
-    )
-    (build-system cmake-build-system)
-    (arguments
-      `(#:configure-flags (list
-         "-DCMAKE_CXX_FLAGS=-fPIE"
-         "-DCMAKE_C_FLAGS=-fPIE"
-       ))
-    )
-    (synopsis "libfido2")
-    (description "Todo")
-    (home-page "toto")
-    (license license:gpl2+)
-  )
-)
+               (package
+                 (name "libcbor")
+                 (version "0.8.0")
+                 (source 
+                   (origin
+                     (method url-fetch)
+                     (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
+                     (sha256 (base32 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031"))))
+                 (build-system cmake-build-system)
+                 (arguments
+                   `(#:configure-flags (list
+                                         "-DCMAKE_CXX_FLAGS=-fPIE"
+                                         "-DCMAKE_C_FLAGS=-fPIE" )))
+                 (synopsis "libfido2")
+                 (description "Todo")
+                 (home-page "toto")
+                 (license license:gpl2+)))
 
 (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 "1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs"))
-      )
-    )
-  )
-)
+               (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 "1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs"))))))
 
 (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.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-public openssh-with-fido2 ;; this is has to be worked again
-  (package
-    (inherit openssh)
-    (name "openssh-with-fido2")
-    (arguments `(
-      #:test-target "tests"
-      ;; Otherwise, the test scripts try to use a nonexistent directory and
-      ;; fail.
-      #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"")
-      #:configure-flags `(
-        "--sysconfdir=/etc/ssh"
-        ;; Default value of 'PATH' used by sshd.
-        "--with-default-path=/run/current-system/profile/bin"
-        ;; configure needs to find krb5-config.
-        ,(string-append "--with-kerberos5=" (assoc-ref %build-inputs "mit-krb5") "/bin")
-        ;; libedit is needed for sftp completion.
-        "--with-libedit"
-        ;; for u2f
-        "--with-security-key-builtin"
-        ;; Enable PAM support in sshd.
-        ,,@(if (hurd-target?)
-          '()
-          '("--with-pam")
-        )
-        ;; "make install" runs "install -s" by default,
-        ;; which doesn't work for cross-compiled binaries
-        ;; because it invokes 'strip' instead of
-        ;; 'TRIPLET-strip'.Work around this.
-        ,,@(if (%current-target-system)
-          '("--disable-strip")
-          '()
-        )
-      )
-      #:phases
-        (modify-phases %standard-phases
-          (add-after 'configure 'reset-/var/empty
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((out (assoc-ref outputs "out")))
-                (substitute*
-                  "Makefile"
-                  (("PRIVSEP_PATH=/var/empty") (string-append "PRIVSEP_PATH=" out "/var/empty"))
-                )
-                #t
-              )
-            )
-          )
-          (add-before 'check 'patch-tests
-            (lambda _
-              (substitute* "regress/test-exec.sh" (("/bin/sh") (which "sh")))
-              ;; Remove 't-exec' regress target which requires user 'sshd'.
-              (substitute*
-                (list "Makefile" "regress/Makefile")
-                (("^(tests:.*) t-exec(.*)" all pre post) (string-append pre post))
-              )
-              #t
-            )
-          )
-          (replace 'install
-            (lambda*
-              (
-                #:key outputs (make-flags '())
-                #:allow-other-keys
-              )
-              ;; Install without host keys and system configuration files.
-              (apply invoke "make" "install-nosysconf" make-flags)
-              (install-file "contrib/ssh-copy-id" (string-append (assoc-ref outputs "out") "/bin/"))
-              (chmod (string-append (assoc-ref outputs "out") "/bin/ssh-copy-id") #o555)
-              (install-file "contrib/ssh-copy-id.1" (string-append (assoc-ref outputs "out") "/share/man/man1/"))
-              #t
-            )
-          )
-        )
-    ))
-    (inputs `(
-      ("libfido2", libfido2)
-      ("libcbor", libcbor)
-      ,@(package-inputs openssh)
-    ))
-  )
-)
+               (package
+                 (inherit openssh)
+                 (name "openssh-with-fido2")
+                 (arguments `(
+                              #:test-target "tests"
+                              #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"")
+                              #:configure-flags `(
+                                                  "--sysconfdir=/etc/ssh"
+                                                  "--with-default-path=/run/current-system/profile/bin"
+                                                  ,(string-append "--with-kerberos5=" (assoc-ref %build-inputs "mit-krb5") "/bin")
+                                                  "--with-libedit"
+                                                  "--with-security-key-builtin"
+                                                  ,,@(if (hurd-target?)
+                                                       '()
+                                                       '("--with-pam"))
+                                                  ,,@(if (%current-target-system)
+                                                       '("--disable-strip")
+                                                       '()))
+                              #:phases
+                              (modify-phases %standard-phases
+                                             (add-after 'configure 'reset-/var/empty
+                                                        (lambda* (#:key outputs #:allow-other-keys)
+                                                                 (let ((out (assoc-ref outputs "out")))
+                                                                   (substitute*
+                                                                     "Makefile"
+                                                                     (("PRIVSEP_PATH=/var/empty") (string-append "PRIVSEP_PATH=" out "/var/empty"))
+                                                                     )
+                                                                   #t )))
+                                             (add-before 'check 'patch-tests
+                                                         (lambda _
+                                                           (substitute* "regress/test-exec.sh" (("/bin/sh") (which "sh")))
+                                                           (substitute*
+                                                             (list "Makefile" "regress/Makefile")
+                                                             (("^(tests:.*) t-exec(.*)" all pre post) (string-append pre post)))
+                                                           #t ))
+                                             (replace 'install
+                                                      (lambda*
+                                                        (
+                                                         #:key outputs (make-flags '())
+                                                         #:allow-other-keys
+                                                         )
+                                                        (apply invoke "make" "install-nosysconf" make-flags)
+                                                        (install-file "contrib/ssh-copy-id" (string-append (assoc-ref outputs "out") "/bin/"))
+                                                        (chmod (string-append (assoc-ref outputs "out") "/bin/ssh-copy-id") #o555)
+                                                        (install-file "contrib/ssh-copy-id.1" (string-append (assoc-ref outputs "out") "/share/man/man1/"))
+                                                        #t )))))
+                 (inputs `(
+                           ("libfido2", libfido2)
+                           ("libcbor", libcbor)
+                           ,@(package-inputs openssh)))))

From 14e35583b8b61595233257c9596205813a732b5d Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Tue, 13 Dec 2022 15:35:59 +0100
Subject: [PATCH 4/4] rewrite admin.scm

---
 glicid/packages/admin.scm | 151 +++++++++++++++++---------------------
 1 file changed, 68 insertions(+), 83 deletions(-)

diff --git a/glicid/packages/admin.scm b/glicid/packages/admin.scm
index 20abf0c..41a34bc 100644
--- a/glicid/packages/admin.scm
+++ b/glicid/packages/admin.scm
@@ -1,92 +1,77 @@
 (define-module (glicid packages admin)
-  #:use-module ((gnu packages admin) #:prefix gnu:)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages cyrus-sasl)
-  #:use-module (gnu packages groff)
-  #:use-module (gnu packages hurd)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages openldap)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages tls)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system python)
-  #:use-module (guix download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (glicid packages python)
-)
-
+               #:use-module ((gnu packages admin) #:prefix gnu:)
+               #:use-module (gnu packages base)
+               #:use-module (gnu packages compression)
+               #:use-module (gnu packages cyrus-sasl)
+               #:use-module (gnu packages groff)
+               #:use-module (gnu packages hurd)
+               #:use-module (gnu packages linux)
+               #:use-module (gnu packages openldap)
+               #:use-module (gnu packages pkg-config)
+               #:use-module (gnu packages tls)
+               #:use-module (guix build-system gnu)
+               #:use-module (guix build-system python)
+               #:use-module (guix download)
+               #:use-module ((guix licenses) #:prefix license:)
+               #:use-module (guix packages)
+               #:use-module (guix utils)
+               #:use-module (glicid packages python)
+               )
 
 (define-public shadow
-  (package
-    (inherit gnu:shadow)
-    (name "shadow")
-    (version "4.11.1")
-    (source (origin
-      (method url-fetch)
-      (uri (list
-        (string-append "https://github.com/shadow-maint/shadow/releases/download/v" version "/shadow-" version ".tar.xz")
-      ))
-      (sha256 (base32 "15bwf2krh4crj4w2frkzw9pkxiwbq7h56m8wk8w5zbmjb3797w21"))
-    ))
-  )
-)
+               (package
+                 (inherit gnu:shadow)
+                 (name "shadow")
+                 (version "4.13")
+                 (source (origin
+                           (method url-fetch)
+                           (uri (list (string-append "https://github.com/shadow-maint/shadow/releases/download/v" version "/shadow-" version ".tar.xz")))
+                           (sha256 (base32 "0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls"))))))
 
 (define-public sudo
-  (let* ((sudo-minimal gnu:sudo))
-    (package
-      (inherit sudo-minimal)
-      (name (string-append (package-name sudo-minimal) "-with-ldap"))
-      (arguments
-       (substitute-keyword-arguments (package-arguments sudo-minimal)
-         ((#:configure-flags flags)
-          `(append (list
-                     "--enable-sasl"
-                     "--with-ldap"
-                     "--enable-openssl"
-                     "--with-nsswitch")
-                   ,flags))))
-      (inputs (modify-inputs (package-inputs sudo-minimal)
-                (append openldap
-                        openssl
-                        cyrus-sasl)))
-      (native-inputs (modify-inputs (package-native-inputs sudo-minimal)
-                       (append pkg-config))))))
+               (let* ((sudo-minimal gnu:sudo))
+                 (package
+                   (inherit sudo-minimal)
+                   (name (string-append (package-name sudo-minimal) "-with-ldap"))
+                   (arguments
+                     (substitute-keyword-arguments (package-arguments sudo-minimal)
+                                                   ((#:configure-flags flags)
+                                                    `(append (list
+                                                               "--enable-sasl"
+                                                               "--with-ldap"
+                                                               "--enable-openssl"
+                                                               "--with-nsswitch")
+                                                             ,flags))))
+                   (inputs (modify-inputs (package-inputs sudo-minimal)
+                                          (append openldap
+                                                  openssl
+                                                  cyrus-sasl)))
+                   (native-inputs (modify-inputs (package-native-inputs sudo-minimal)
+                                                 (append pkg-config))))))
 
 (define-public ansible
-  (package
-    (inherit gnu:ansible)
-    (name "ansible")
-    (version "6.3.0")
-    (source (origin
-      (method url-fetch)
-      (uri (pypi-uri name version))
-      (sha256 (base32 "09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm"))
-    ))
-    (propagated-inputs (list ansible-core))
-  )
-)
+               (package
+                 (inherit gnu:ansible)
+                 (name "ansible")
+                 (version "6.3.0")
+                 (source (origin
+                           (method url-fetch)
+                           (uri (pypi-uri name version))
+                           (sha256 (base32 "09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm"))))
+                 (propagated-inputs (list ansible-core))))
 
 (define-public ansible-core
-  (package
-    (inherit gnu:ansible-core)
-    (name "ansible-core")
-    (version "2.13.3")
-    (source (origin
-      (method url-fetch)
-      (uri (pypi-uri name version))
-      (sha256 (base32 "120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf"))
-    ))
-    (arguments
-      `(
-        #:tests? #f
-        #:phases
-        (modify-phases %standard-phases
-          (delete 'sanity-check)
-        )
-      )
-    )
-  )
-)
+               (package
+                 (inherit gnu:ansible-core)
+                 (name "ansible-core")
+                 (version "2.13.3")
+                 (source (origin
+                           (method url-fetch)
+                           (uri (pypi-uri name version))
+                           (sha256 (base32 "120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf"))))
+                 (arguments
+                   `(
+                     #:tests? #f
+                     #:phases
+                     (modify-phases %standard-phases
+                                    (delete 'sanity-check))))))