me
/
guix
Archived
1
0
Fork 0
Code

gnu: openssh: Use modify-phases syntax. 

* gnu/packages/ssh.scm (openssh)[arguments]: Use modify-phases syntax.
master
Ricardo Wurmus 2015-11-27 10:57:03 +01:00
parent 70b002aa1d
commit a9ee11d5ab
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnu/packages/ssh.scm
View File

@ -129,26 +129,25 @@ a server that supports the SSH-2 protocol.")
(arguments
`(#:test-target "tests"
#:phases
(alist-cons-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")))))
(alist-cons-before
'check 'patch-tests
(lambda _
;; remove 't-exec' regress target which requires user 'sshd'
(substitute* "regress/Makefile"
(("^(REGRESS_TARGETS=.*) t-exec(.*)" all pre post)
(string-append pre post))))
(alist-replace
'install
(lambda* (#:key (make-flags '()) #:allow-other-keys)
;; install without host keys and system configuration files
(zero? (apply system* "make" "install-nosysconf" make-flags)))
%standard-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 _
;; remove 't-exec' regress target which requires user 'sshd'
(substitute* "regress/Makefile"
(("^(REGRESS_TARGETS=.*) t-exec(.*)" all pre post)
(string-append pre post)))
#t))
(replace 'install
(lambda* (#:key (make-flags '()) #:allow-other-keys)
;; install without host keys and system configuration files
(zero? (apply system* "make" "install-nosysconf" make-flags)))))))
(synopsis "Client and server for the secure shell (ssh) protocol")
(description
"The SSH2 protocol implemented in OpenSSH is standardised by the