ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 21:49:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openssh: Update to 8.8p1 [security fixes].

Browse source 
The securities fixed did not affect the default installation.

* gnu/packages/ssh.scm (openssh): Update to 8.8p1.
[arguments]: Don't explicitly return #t from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2021-10-04 01:19:28 +02:00
parent 4736b077ce
commit 3235a54cd7
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/ssh.scm
View file

@ -186,7 +186,7 @@ (define-public libssh2
(define-public openssh (define-public openssh
(package (package
(name "openssh") (name "openssh")
(version "8.7p1") (version "8.8p1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://openbsd/OpenSSH/portable/" (uri (string-append "mirror://openbsd/OpenSSH/portable/"
@ -194,7 +194,7 @@ (define-public openssh
(patches (search-patches "openssh-hurd.patch")) (patches (search-patches "openssh-hurd.patch"))
(sha256 (sha256
(base32 (base32
"090yxpi03pxxzb4ppx8g8hdpw7c4nf8p0avr6c7ybsaana5lp8vw")))) "1s8z6f7mi1pwsl79cqai8cr350m5lf2ifcxff57wx6mvm478k425"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("groff" ,groff) (native-inputs `(("groff" ,groff)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
@ -244,8 +244,7 @@ (define-public openssh
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "Makefile" (substitute* "Makefile"
(("PRIVSEP_PATH=/var/empty") (("PRIVSEP_PATH=/var/empty")
(string-append "PRIVSEP_PATH=" out "/var/empty"))) (string-append "PRIVSEP_PATH=" out "/var/empty"))))))
#t)))
(add-before 'check 'patch-tests (add-before 'check 'patch-tests
(lambda _ (lambda _
(substitute* "regress/test-exec.sh" (substitute* "regress/test-exec.sh"
@ -255,8 +254,7 @@ (define-public openssh
(substitute* (list "Makefile" (substitute* (list "Makefile"
"regress/Makefile") "regress/Makefile")
(("^(tests:.*) t-exec(.*)" all pre post) (("^(tests:.*) t-exec(.*)" all pre post)
(string-append pre post))) (string-append pre post)))))
#t))
(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. ;; Install without host keys and system configuration files.
@ -268,8 +266,7 @@ (define-public openssh
"/bin/ssh-copy-id") #o555) "/bin/ssh-copy-id") #o555)
(install-file "contrib/ssh-copy-id.1" (install-file "contrib/ssh-copy-id.1"
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/share/man/man1/")) "/share/man/man1/")))))))
#t)))))
(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