mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
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.
This commit is contained in:
parent
2e8c61fcf0
commit
79d9525071
1 changed files with 19 additions and 5 deletions
|
@ -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 @@ (define-module (gnu packages curl)
|
|||
#: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-module (gnu packages curl)
|
|||
(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 @@ (define-public curl
|
|||
"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)))))))))
|
||||
|
|
Loading…
Reference in a new issue