nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: openssh: Update to 6.8p1. 

* gnu/packages/ssh.scm (openssh): Update to 6.8p1.  Make 'patch-tests'
  substitution more robust.
This commit is contained in:
Mark H Weaver 2015-03-25 23:09:22 -04:00
parent a31a6d22d6
commit e4160d0585
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/ssh.scm
View File

@ -122,7 +122,7 @@ a server that supports the SSH-2 protocol.")
(define-public openssh (define-public openssh
(package (package
(name "openssh") (name "openssh")
(version "6.7p1") (version "6.8p1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((tail (string-append name "-" version ".tar.gz"))) (uri (let ((tail (string-append name "-" version ".tar.gz")))
@ -131,7 +131,7 @@ a server that supports the SSH-2 protocol.")
(string-append "ftp://ftp2.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/" (string-append "ftp://ftp2.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/"
tail)))) tail))))
(sha256 (base32 (sha256 (base32
"01smf9pvn2sk5qs80gkmc9acj07ckawi1b3xxyysp3c5mr73ky5j")))) "03hnrqvjq6ghg1mp3gkarfxh6g3x1n1vjrzpbc5lh9717vklrxiz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("groff" ,groff) (inputs `(("groff" ,groff)
("openssl" ,openssl) ("openssl" ,openssl)
@ -149,9 +149,10 @@ a server that supports the SSH-2 protocol.")
(alist-cons-before (alist-cons-before
'check 'patch-tests 'check 'patch-tests
(lambda _ (lambda _
;; remove tests that require the user sshd ;; remove 't-exec' regress target which requires user 'sshd'
(substitute* "regress/Makefile" (substitute* "regress/Makefile"
(("t10 t-exec") "t10"))) (("^(REGRESS_TARGETS=.*) t-exec(.*)" all pre post)
(string-append pre post))))
(alist-replace (alist-replace
'install 'install
(lambda* (#:key (make-flags '()) #:allow-other-keys) (lambda* (#:key (make-flags '()) #:allow-other-keys)