diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-08-09 21:04:04 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-10 00:15:35 +0200 |
| commit | 79d9525071634cae21bd7606abe8486fdb7f9ce7 (patch) | |
| tree | 342bfd64fc7be819a5f7ae814b752a2f83f3d9f0 | |
| parent | 2e8c61fcf015ca4ef1c12d9fe56b8b9c0986932b (diff) | |
| download | guix-79d9525071634cae21bd7606abe8486fdb7f9ce7.tar.gz | |
gnu: curl: Update replacement to 7.55.0. [security fixes]
Fixes CVE-2017-1000099, CVE-2017-1000100, and CVE-2017-100101. See <https://curl.haxx.se/docs/security.html> for details. * gnu/packages/curl.scm (curl)[replacement]: Update to 7.55.0. (curl-7.54.1): Rename to ... (curl-7.55.0): ... this. [source]: Update source URI to match upstream compression method change. [arguments]: Add 'fix-Makefile' phase.
| -rw-r--r-- | gnu/packages/curl.scm | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index a9f219b621..d6e32e4389 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> +;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) @@ -40,7 +42,7 @@ (define-public curl (package (name "curl") - (replacement curl-7.54.1) + (replacement curl-7.55.0) (version "7.53.0") (source (origin (method url-fetch) @@ -121,15 +123,27 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define curl-7.54.1 +(define-public curl-7.55.0 (package (inherit curl) - (version "7.54.1") + (version "7.55.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.lzma")) + version ".tar.xz")) (sha256 (base32 - "0vnv3cz0s1l5cjby86hm0x6pgzqijmdm97qa9q5px200956z6yib")))))) + "1785vxi0jamiv9d1wr1l45g0fm9ircxdfyfzf7ld8zv0z0i8bmfd")))) + (arguments + `(,@(substitute-keyword-arguments (package-arguments curl) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'install 'fix-Makefile + ;; Fix a regression in 7.55.0 where docs are not installed. + ;; https://github.com/curl/curl/commit/a7bbbb7c368c6096802007f61f19a02e9d75285b + (lambda _ + (substitute* "Makefile" + (("install-data-hook:\n") + "install-data-hook:\n\tcd docs/libcurl && $(MAKE) install\n")) + #t))))))))) |