From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 1/2] gnu: libssh2: Update to 1.7.0. Date: Tue, 23 Feb 2016 18:32:14 -0500 Message-ID: <8142c0d66dc27f92a2be5e25a8c5e4e8acb2189b.1456270087.git.leo@famulari.name> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYMRL-0000dD-7a for guix-devel@gnu.org; Tue, 23 Feb 2016 18:32:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYMRG-0002HZ-QV for guix-devel@gnu.org; Tue, 23 Feb 2016 18:32:23 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:41661) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYMRG-0002HP-Mo for guix-devel@gnu.org; Tue, 23 Feb 2016 18:32:18 -0500 Received: from jasmine.lan (c-69-249-5-231.hsd1.pa.comcast.net [69.249.5.231]) by mail.messagingengine.com (Postfix) with ESMTPA id 20913C0001B for ; Tue, 23 Feb 2016 18:32:18 -0500 (EST) In-Reply-To: In-Reply-To: References: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org Partially fixes CVE-2016-7087. libssh2-1.4 is for temporary use by curl, while all packages affected by CVE-2016-7087 are rebuilt. Once they are rebuilt, curl should be updated to use libssh2-1.7.0, and libssh2-1.4 should be removed. * gnu/packages/ssh.scm (libssh2): Update to 1.7.0. (libssh2-1.4): New variable. * gnu/packages/curl.scm (curl)[inputs]: Temporarily specify dependency on libssh2-1.4 while rebuilding. --- gnu/packages/curl.scm | 2 +- gnu/packages/ssh.scm | 28 ++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 222910b..0187a0b 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -54,7 +54,7 @@ (inputs `(("gnutls" ,gnutls) ("gss" ,gss) ("libidn" ,libidn) - ("libssh2" ,libssh2) + ("libssh2" ,libssh2-1.4) ("openldap" ,openldap) ("zlib" ,zlib))) (native-inputs diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index d4bf29c..2b0693b 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2015 Efraim Flashner +;;; Copyright © 2016 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -85,14 +86,15 @@ remote applications.") (define-public libssh2 (package (name "libssh2") - (version "1.4.3") + (version "1.7.0") (source (origin (method url-fetch) (uri (string-append - "http://www.libssh2.org/download/libssh2-" + "https://www.libssh2.org/download/libssh2-" version ".tar.gz")) - (sha256 (base32 - "0vdr478dbhbdgnniqmirawjb7mrcxckn4slhhrijxnzrkmgziipa")))) + (sha256 + (base32 + "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4")))) (build-system gnu-build-system) ;; The installed libssh2.pc file does not include paths to libgcrypt and ;; zlib libraries, so we need to propagate the inputs. @@ -108,6 +110,24 @@ a server that supports the SSH-2 protocol.") (license license:bsd-3) (home-page "http://www.libssh2.org/"))) +;;; This is a temporary package for use only by curl. Once we have +;;; rebuilt all packages affected by CVE-2016-0787, this package should +;;; be removed. +;;; +;;; 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") -- 2.7.1