diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-27 10:23:11 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-27 10:23:11 +0200 |
| commit | 425fd7eb6a5f07eb9b854a5a29488e6f0b0acf3c (patch) | |
| tree | 44479010890dd9aaf8bc52cab73f7c241a2fd9ea /gnu/packages/curl.scm | |
| parent | fe9f2d150019b9fc17f08f5a002d7ca932fc3eb0 (diff) | |
| parent | 88dbef3b9868a565da1eba37c9d409cce972becc (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/curl.scm')
| -rw-r--r-- | gnu/packages/curl.scm | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 48d7dd40bd..bf93639716 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -52,6 +52,7 @@ (package (name "curl") (version "7.69.1") + (replacement curl-7.71.0) (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" @@ -168,6 +169,31 @@ tunneling, and so on.") (name "curl-minimal") (inputs (alist-delete "openldap" (package-inputs curl)))))) +;; Replacement package to fix CVE-2020-8169 and CVE-2020-8177. +(define curl-7.71.0 + (package + (inherit curl) + (version "7.71.0") + (source (origin + (inherit (package-source curl)) + (uri (string-append "https://curl.haxx.se/download/curl-" + version ".tar.xz")) + (sha256 + (base32 + "0wlppmx9iry8slh4pqcxj7lwc6fqwnlhh9ri2pcym2rx76a8gwfd")))) + (arguments + (substitute-keyword-arguments (package-arguments curl) + ((#:phases phases) + `(modify-phases ,phases + (replace 'check + (lambda _ + ;; Test 1510 is now disabled upstream, and the test runner + ;; complains that it can not disable a non-existing test. + ;; Thus, override the phase to not delete the test. + (substitute* "tests/runtests.pl" + (("/bin/sh") (which "sh"))) + (invoke "make" "-C" "tests" "test"))))))))) + (define-public kurly (package (name "kurly") |