me
/
guix
Archived
1
0
Fork 0
Code

gnu: openssh: Remove empty /var/empty. 

* gnu/packages/ssh.scm (openssh)[arguments]: Delete /var/empty after
‘make install’.  Make the rest less repetitive—no functional changes.
master
Tobias Geerinckx-Rice 2021-10-04 02:06:49 +02:00
parent 3235a54cd7
commit ec7bcdc35a
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/ssh.scm
View File

@ -256,17 +256,19 @@ a server that supports the SSH-2 protocol.")
(("^(tests:.*) t-exec(.*)" all pre post) (("^(tests:.*) t-exec(.*)" all pre post)
(string-append pre post))))) (string-append pre post)))))
(replace 'install (replace 'install
(lambda* (#:key outputs (make-flags '()) #:allow-other-keys) (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
;; Install without host keys and system configuration files. (let ((out (assoc-ref outputs "out")))
(apply invoke "make" "install-nosysconf" make-flags) ;; Install without host keys and system configuration files.
(install-file "contrib/ssh-copy-id" (apply invoke "make" "install-nosysconf" make-flags)
(string-append (assoc-ref outputs "out") (with-directory-excursion out
"/bin/")) (rmdir "var/empty")
(chmod (string-append (assoc-ref outputs "out") (rmdir "var"))
"/bin/ssh-copy-id") #o555) (with-directory-excursion "contrib"
(install-file "contrib/ssh-copy-id.1" (chmod "ssh-copy-id" #o555)
(string-append (assoc-ref outputs "out") (install-file "ssh-copy-id"
"/share/man/man1/"))))))) (string-append out "/bin/"))
(install-file "ssh-copy-id.1"
(string-append out "/share/man/man1/")))))))))
(synopsis "Client and server for the secure shell (ssh) protocol") (synopsis "Client and server for the secure shell (ssh) protocol")
(description (description
"The SSH2 protocol implemented in OpenSSH is standardised by the "The SSH2 protocol implemented in OpenSSH is standardised by the