diff options
| author | Léo Le Bouter <lle-bout@zaclys.net> | 2021-04-02 13:13:48 +0200 |
|---|---|---|
| committer | Léo Le Bouter <lle-bout@zaclys.net> | 2021-04-02 13:14:23 +0200 |
| commit | 2e0b1b62e94b926041ca9af70537dd9b3ab64edf (patch) | |
| tree | 4474fa75589505e718d2b7ffd0f41bb02b28cb49 /gnu/packages | |
| parent | c5dd10b24ca2d55a1e97b8379aa3c3ebd13d7d0a (diff) | |
| download | guix-patches-2e0b1b62e94b926041ca9af70537dd9b3ab64edf.tar guix-patches-2e0b1b62e94b926041ca9af70537dd9b3ab64edf.tar.gz | |
gnu: curl: Update to 7.76.0 [security fixes].
Fixes CVE-2021-22876 and CVE-2021-22890.
* gnu/packages/curl.scm (curl): Update to 7.76.0.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/curl.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/curl-use-ssl-cert-env.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index f1dc5aeed4..17bee2e4ab 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -53,14 +53,14 @@ (define-public curl (package (name "curl") - (version "7.74.0") + (version "7.76.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr")) + "1j2g04m6als6hmqzvddv84c31m0x90bfgyz3bjrwdkarbkby40k3")) (patches (search-patches "curl-use-ssl-cert-env.patch")))) (build-system gnu-build-system) (outputs '("out" diff --git a/gnu/packages/patches/curl-use-ssl-cert-env.patch b/gnu/packages/patches/curl-use-ssl-cert-env.patch index c8e80b4445..24be6e31d9 100644 --- a/gnu/packages/patches/curl-use-ssl-cert-env.patch +++ b/gnu/packages/patches/curl-use-ssl-cert-env.patch @@ -47,14 +47,14 @@ diff -ur curl-7.66.0.orig/lib/url.c curl-7.66.0/lib/url.c + extern char * Curl_ssl_cert_dir; + extern char * Curl_ssl_cert_file; + if(Curl_ssl_cert_dir) { -+ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_ORIG], Curl_ssl_cert_dir)) ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH], Curl_ssl_cert_dir)) + return result; + if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], Curl_ssl_cert_dir)) + return result; + } + + if(Curl_ssl_cert_file) { -+ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_ORIG], Curl_ssl_cert_file)) ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE], Curl_ssl_cert_file)) + return result; + if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], Curl_ssl_cert_file)) + return result; |