diff options
author | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
commit | 09ec508a4c14d1bc09622d98f796548d79ab0552 (patch) | |
tree | 86cc5a2a67d35ad796bfa33d67869d670d65822e /gnu/packages/ssh.scm | |
parent | 2dbed47f5c09347c9af42c5f5bacfccbc1ab4aff (diff) | |
parent | 71cafa0472a15f2234e24d3c6d8019ebb38685b0 (diff) | |
download | patches-09ec508a4c14d1bc09622d98f796548d79ab0552.tar patches-09ec508a4c14d1bc09622d98f796548d79ab0552.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/ssh.scm')
-rw-r--r-- | gnu/packages/ssh.scm | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 081c7cbe32..d7f2f363a8 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -112,28 +112,10 @@ a server that supports the SSH-2 protocol.") (license license:bsd-3) (home-page "http://www.libssh2.org/"))) -;;; XXX This is a temporary package for use only by curl, to allow most users -;;; of libssh2 to get the security update sooner while postponing the large -;;; number of rebuilds entailed by updating curl. -;;; -;;; XXX This package is vulnerable to CVE-2016-7087. -;;; -;;; https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2016-0787 -(define-public libssh2-1.4 - (package (inherit libssh2) - (version "1.4.3") - (source (origin - (method url-fetch) - (uri (string-append "https://www.libssh2.org/download/libssh2-" - version ".tar.gz")) - (sha256 - (base32 - "0vdr478dbhbdgnniqmirawjb7mrcxckn4slhhrijxnzrkmgziipa")))))) - (define-public openssh (package (name "openssh") - (version "7.1p2") + (version "7.2p2") (source (origin (method url-fetch) (uri (let ((tail (string-append name "-" version ".tar.gz"))) @@ -144,7 +126,7 @@ a server that supports the SSH-2 protocol.") (string-append "http://ftp2.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/" tail)))) (sha256 (base32 - "1gbbvszz74lkc7b2mqr3ccgpm65zj0k5h7a2ssh0c7pjvhjg0xfx")))) + "132lh9aanb0wkisji1d6cmsxi520m8nh7c7i9wi6m1s3l38q29x7")))) (build-system gnu-build-system) (inputs `(("groff" ,groff) ("openssl" ,openssl) @@ -354,7 +336,7 @@ especially over Wi-Fi, cellular, and long-distance links.") (define-public dropbear (package (name "dropbear") - (version "2015.71") + (version "2016.72") (source (origin (method url-fetch) (uri (string-append @@ -362,7 +344,7 @@ especially over Wi-Fi, cellular, and long-distance links.") name "-" version ".tar.bz2")) (sha256 (base32 - "1bw3lzmisn6gs6zy9vcqbfnicl437ydskqcayklpw60fkhb18qip")))) + "10fnlaf6rm537v3rml1gnd58d42plv2q5cp7svbrysap69npc8wk")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; There is no "make check" or anything similar (inputs `(("zlib" ,zlib))) |