diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-22 18:14:04 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-22 18:14:04 +0200 |
| commit | 233df51ebc162bf95dfadf914914cbfbc6984651 (patch) | |
| tree | 06fa8d78bbe97619450a88d8a38d01dc3775655b /gnu/packages/ssh.scm | |
| parent | 43cec3fb1ea54dedee8a5f613c833958c76892f4 (diff) | |
| parent | 180a8986e57a6cfb65a8cddabcb430f23801832b (diff) | |
| download | patches-233df51ebc162bf95dfadf914914cbfbc6984651.tar patches-233df51ebc162bf95dfadf914914cbfbc6984651.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index faa09e94c3..0d9bd5a119 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -153,6 +153,7 @@ a server that supports the SSH-2 protocol.") (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" name "-" version ".tar.gz")) + (patches (search-patches "openssh-CVE-2018-15473.patch")) (sha256 (base32 "13vbbrvj3mmfhj83qyrg5c0ipr6bzw5s65dy4k8gr7p9hkkfffyp")))) @@ -237,7 +238,7 @@ Additionally, various channel-specific options can be negotiated.") (define-public guile-ssh (package (name "guile-ssh") - (version "0.11.2") + (version "0.11.3") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin ;; ftp://memory-heap.org/software/guile-ssh/guile-ssh-VERSION.tar.gz @@ -249,11 +250,14 @@ Additionally, various channel-specific options can be negotiated.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1w0k5s09xj5xycb7lbp5b7rm0xncclms3jwl98lwj8fxwngi1s90")))) + "1g2jzcg1p25zrkx06j160qb8bgcwa3001ys4q02496xs61pvywqk")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - '(#:phases (modify-phases %standard-phases + '(;; It makes no sense to build libguile-ssh.a. + #:configure-flags '("--disable-static") + + #:phases (modify-phases %standard-phases (add-after 'unpack 'autoreconf (lambda* (#:key inputs #:allow-other-keys) (invoke "autoreconf" "-vfi"))) |