mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-27 04:36:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: curl: Update to 7.71.0 and remove replacement.

Browse source 
* gnu/packages/curl.scm (curl): Update to 7.71.0.
[replacement]: Remove.
This commit is contained in:
Ludovic Courtès 2020-12-08 14:10:33 +01:00
parent e19810e0a6
commit cb8569e10c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
gnu/packages/curl.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
@ -53,16 +53,14 @@ (define-module (gnu packages curl)
(define-public curl (define-public curl
(package (package
(name "curl") (name "curl")
(version "7.69.1") (version "7.71.0")
(replacement curl-7.71.0)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-" (uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0kwxh76iq9fblk7iyv4f75bmcmasarp2bcm1mm07wyvzd7kdbiq3")) "0wlppmx9iry8slh4pqcxj7lwc6fqwnlhh9ri2pcym2rx76a8gwfd"))))
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ;1.2 MiB of man3 pages "doc")) ;1.2 MiB of man3 pages
@ -126,25 +124,6 @@ (define-public curl
(substitute* "tests/runtests.pl" (substitute* "tests/runtests.pl"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
;; XXX FIXME: Test #1510 seems to work on some machines and not
;; others, possibly based on the kernel version. It works on Guix System
;; on x86_64 with linux-libre-4.1, but fails on Hydra for both i686
;; and x86_64 with the following error:
;;
;; test 1510...[HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)]
;;
;; 1510: output (log/stderr1510) FAILED:
;; --- log/check-expected 2015-06-27 07:45:53.166720834 +0000
;; +++ log/check-generated 2015-06-27 07:45:53.166720834 +0000
;; @@ -1,5 +1,5 @@
;; * Connection #0 to host server1.example.com left intact[LF]
;; * Connection #1 to host server2.example.com left intact[LF]
;; * Connection #2 to host server3.example.com left intact[LF]
;; -* Closing connection 0[LF]
;; +* Closing connection 1[LF]
;; * Connection #3 to host server4.example.com left intact[LF]
(delete-file "tests/data/test1510")
;; The top-level "make check" does "make -C tests quiet-test", which ;; The top-level "make check" does "make -C tests quiet-test", which
;; is too quiet. Use the "test" target instead, which is more ;; is too quiet. Use the "test" target instead, which is more
;; verbose. ;; verbose.
@ -171,31 +150,6 @@ (define-public curl-minimal
(name "curl-minimal") (name "curl-minimal")
(inputs (alist-delete "openldap" (package-inputs curl)))))) (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 (define-public kurly
(package (package
(name "kurly") (name "kurly")