me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Léo Le Bouter 2021-04-02 13:13:48 +02:00
parent c5dd10b24c
commit 2e0b1b62e9
No known key found for this signature in database
GPG Key ID: 45A8B1E86BCD10A6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/curl.scm
View File

@ -53,14 +53,14 @@
(define-public curl (define-public curl
(package (package
(name "curl") (name "curl")
(version "7.74.0") (version "7.76.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
"12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr")) "1j2g04m6als6hmqzvddv84c31m0x90bfgyz3bjrwdkarbkby40k3"))
(patches (search-patches "curl-use-ssl-cert-env.patch")))) (patches (search-patches "curl-use-ssl-cert-env.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"

4
gnu/packages/patches/curl-use-ssl-cert-env.patch
View File

@ -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_dir;
+ extern char * Curl_ssl_cert_file; + extern char * Curl_ssl_cert_file;
+ if(Curl_ssl_cert_dir) { + 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; + return result;
+ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], Curl_ssl_cert_dir)) + if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], Curl_ssl_cert_dir))
+ return result; + return result;
+ } + }
+ +
+ if(Curl_ssl_cert_file) { + 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; + return result;
+ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], Curl_ssl_cert_file)) + if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], Curl_ssl_cert_file))
+ return result; + return result;