ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cURL: Incorporate grafted changes.

Browse source 
* gnu/packages/curl.scm (curl): Update to 7.84.0.
[replacement]: Remove.
[source](patches): Add "curl-easy-lock.patch".
[arguments]: Add phase to reduce test requirements.
(curl-7.84.0): Remove variable.
This commit is contained in:
Marius Bakke 2022-07-22 01:24:04 +02:00
parent 9044b086dd
commit d9f2076dd1
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 10 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gnu/packages/curl.scm
View file

@ -63,16 +63,16 @@ (define-module (gnu packages curl)
(define-public curl
(package
(name "curl")
(version "7.82.0")
(replacement curl-7.84.0)
(version "7.84.0")
(source (origin
(method url-fetch)
(uri (string-append "https://curl.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
"0g2qibjxq3397myjkw3asyxqvhym1pl3qw7jaii9dc04ppbi5aha"))
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
"1f2xgj0wvys9xw50h7vcbaraavjr9rxx9n06x2xfbgs7ym1qn49d"))
(patches (search-patches "curl-use-ssl-cert-env.patch"
"curl-easy-lock.patch"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.2 MiB of man3 pages
@ -103,6 +103,12 @@ (define-public curl
"--disable-static")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'tweak-lib3026-test
(lambda _
;; Have that test create a hundred threads, not a thousand.
(substitute* "tests/libtest/lib3026.c"
(("NUM_THREADS .*$")
"NUM_THREADS 100\n"))))
(add-after 'unpack 'do-not-record-configure-flags
(lambda _
;; Do not save the configure options to avoid unnecessary references.
@ -141,35 +147,6 @@ (define-public curl
"See COPYING in the distribution."))
(home-page "https://curl.haxx.se/")))
;; Replacement package with fixes for multiple vulnerabilities.
;; See <https://curl.se/docs/security.html>.
(define curl-7.84.0
(package
(inherit curl)
(version "7.84.0")
(source (origin
(inherit (package-source curl))
(uri (string-append "https://curl.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
"1f2xgj0wvys9xw50h7vcbaraavjr9rxx9n06x2xfbgs7ym1qn49d"))
(patches (append (origin-patches (package-source curl))
(search-patches "curl-easy-lock.patch")))))
(arguments (substitute-keyword-arguments (package-arguments curl)
((#:phases phases)
(cond
((not (target-64bit?))
#~(modify-phases #$phases
(add-after 'unpack 'tweak-lib3026-test
(lambda _
;; Have that test create a hundred threads, not a
;; thousand.
(substitute* "tests/libtest/lib3026.c"
(("NUM_THREADS .*$")
"NUM_THREADS 100\n"))))))
(else phases)))))))
(define-public curl-minimal
(deprecated-package "curl-minimal" curl))