GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-30 06:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rewrite ssh.scm

Browse source
This commit is contained in:
Jean-François GUILLAUME 2022-12-13 15:33:44 +01:00
parent 92b9df92b0
commit 854eb4590a
Signed by: Jean-François GUILLAUME
GPG key ID: 38751DAE145EFB5A
1 changed files with 89 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
glicid/packages/ssh.scm
View file

@ -12,7 +12,7 @@
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages security-token) #:use-module (gnu packages security-token)
) )
(define-public libcbor-0.8.0 (define-public libcbor-0.8.0
(package (package
(name "libcbor") (name "libcbor")
@ -21,22 +21,16 @@
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz")) (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
(sha256 (base32 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031")) (sha256 (base32 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031"))))
)
)
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list `(#:configure-flags (list
"-DCMAKE_CXX_FLAGS=-fPIE" "-DCMAKE_CXX_FLAGS=-fPIE"
"-DCMAKE_C_FLAGS=-fPIE" "-DCMAKE_C_FLAGS=-fPIE" )))
))
)
(synopsis "libfido2") (synopsis "libfido2")
(description "Todo") (description "Todo")
(home-page "toto") (home-page "toto")
(license license:gpl2+) (license license:gpl2+)))
)
)
(define-public libcbor-0.9.0 (define-public libcbor-0.9.0
(package (package
@ -46,92 +40,29 @@
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz")) (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz"))
(sha256 (base32 "1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs")) (sha256 (base32 "1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs"))))))
)
)
)
)
(define-public libcbor-latest libcbor-0.9.0) (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 (define-public openssh-with-fido2 ;; this is has to be worked again
(package (package
(inherit openssh) (inherit openssh)
(name "openssh-with-fido2") (name "openssh-with-fido2")
(arguments `( (arguments `(
#:test-target "tests" #:test-target "tests"
;; Otherwise, the test scripts try to use a nonexistent directory and
;; fail.
#:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"") #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"")
#:configure-flags `( #:configure-flags `(
"--sysconfdir=/etc/ssh" "--sysconfdir=/etc/ssh"
;; Default value of 'PATH' used by sshd.
"--with-default-path=/run/current-system/profile/bin" "--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") ,(string-append "--with-kerberos5=" (assoc-ref %build-inputs "mit-krb5") "/bin")
;; libedit is needed for sftp completion.
"--with-libedit" "--with-libedit"
;; for u2f
"--with-security-key-builtin" "--with-security-key-builtin"
;; Enable PAM support in sshd.
,,@(if (hurd-target?) ,,@(if (hurd-target?)
'() '()
'("--with-pam") '("--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) ,,@(if (%current-target-system)
'("--disable-strip") '("--disable-strip")
'() '()))
)
)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'configure 'reset-/var/empty (add-after 'configure 'reset-/var/empty
@ -141,41 +72,26 @@
"Makefile" "Makefile"
(("PRIVSEP_PATH=/var/empty") (string-append "PRIVSEP_PATH=" out "/var/empty")) (("PRIVSEP_PATH=/var/empty") (string-append "PRIVSEP_PATH=" out "/var/empty"))
) )
#t #t )))
)
)
)
(add-before 'check 'patch-tests (add-before 'check 'patch-tests
(lambda _ (lambda _
(substitute* "regress/test-exec.sh" (("/bin/sh") (which "sh"))) (substitute* "regress/test-exec.sh" (("/bin/sh") (which "sh")))
;; Remove 't-exec' regress target which requires user 'sshd'.
(substitute* (substitute*
(list "Makefile" "regress/Makefile") (list "Makefile" "regress/Makefile")
(("^(tests:.*) t-exec(.*)" all pre post) (string-append pre post)) (("^(tests:.*) t-exec(.*)" all pre post) (string-append pre post)))
) #t ))
#t
)
)
(replace 'install (replace 'install
(lambda* (lambda*
( (
#:key outputs (make-flags '()) #:key outputs (make-flags '())
#:allow-other-keys #:allow-other-keys
) )
;; Install without host keys and system configuration files.
(apply invoke "make" "install-nosysconf" make-flags) (apply invoke "make" "install-nosysconf" make-flags)
(install-file "contrib/ssh-copy-id" (string-append (assoc-ref outputs "out") "/bin/")) (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) (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/")) (install-file "contrib/ssh-copy-id.1" (string-append (assoc-ref outputs "out") "/share/man/man1/"))
#t #t )))))
)
)
)
))
(inputs `( (inputs `(
("libfido2", libfido2) ("libfido2", libfido2)
("libcbor", libcbor) ("libcbor", libcbor)
,@(package-inputs openssh) ,@(package-inputs openssh)))))
))
)
)