[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/14: gnu: curl: Absorb replacement.
From: |
guix-commits |
Subject: |
05/14: gnu: curl: Absorb replacement. |
Date: |
Sat, 12 Jun 2021 19:05:07 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 1dec7fa83d4e89f98bc887211b1cfb78aa74f98d
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jun 6 22:15:58 2021 +0200
gnu: curl: Absorb replacement.
* gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/curl.scm (curl): Update to 7.77.0.
[replacement]: Remove.
(source)[patches]: Adjust for new patch.
---
gnu/local.mk | 3 +-
gnu/packages/curl.scm | 19 +------
.../patches/curl-7.76-use-ssl-cert-env.patch | 64 ----------------------
3 files changed, 3 insertions(+), 83 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 09b8f57..ce4bcf2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -930,8 +930,7 @@ dist_patch_DATA =
\
%D%/packages/patches/crda-optional-gcrypt.patch \
%D%/packages/patches/clucene-contribs-lib.patch \
%D%/packages/patches/cube-nocheck.patch \
- %D%/packages/patches/curl-use-ssl-cert-env.patch \
- %D%/packages/patches/curl-7.76-use-ssl-cert-env.patch \
+ %D%/packages/patches/curl-use-ssl-cert-env.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
%D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 1075fe9..e389d53 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -53,15 +53,14 @@
(define-public curl
(package
(name "curl")
- (replacement curl-7.77.0)
- (version "7.76.1")
+ (version "7.77.0")
(source (origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
- "0icicyg8bk1471955p62lsgvn71f0pck0zh7gp04024zqf455fv4"))
+ "0jsrc97vbghvljic997r9nypc9qqddcil2lzvv032br8ahn5hr0g"))
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
(build-system gnu-build-system)
(outputs '("out"
@@ -146,20 +145,6 @@ tunneling, and so on.")
(define-public curl-minimal
(deprecated-package "curl-minimal" curl))
-(define-public curl-7.77.0
- (package
- (inherit curl)
- (version "7.77.0")
- (source
- (origin
- (inherit (package-source curl))
- (uri (string-append "https://curl.haxx.se/download/curl-"
- version ".tar.xz"))
- (patches (search-patches "curl-7.76-use-ssl-cert-env.patch"))
- (sha256
- (base32
- "0jsrc97vbghvljic997r9nypc9qqddcil2lzvv032br8ahn5hr0g"))))))
-
(define-public kurly
(package
(name "kurly")
diff --git a/gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch
b/gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch
deleted file mode 100644
index 24be6e3..0000000
--- a/gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Make libcurl respect the SSL_CERT_{DIR,FILE} variables by default. The
variables
-are fetched during initialization to preserve thread-safety
(curl_global_init(3)
-must be called when no other threads exist).
-
-This fixes network functionality in rust:cargo, and probably removes the need
-for other future workarounds.
-===================================================================
---- curl-7.66.0.orig/lib/easy.c 2020-01-02 15:43:11.883921171 +0100
-+++ curl-7.66.0/lib/easy.c 2020-01-02 16:18:54.691882797 +0100
-@@ -134,6 +134,9 @@
- # pragma warning(default:4232) /* MSVC extension, dllimport identity */
- #endif
-
-+char * Curl_ssl_cert_dir = NULL;
-+char * Curl_ssl_cert_file = NULL;
-+
- /**
- * curl_global_init() globally initializes curl given a bitwise set of the
- * different features of what to initialize.
-@@ -155,6 +158,9 @@
- #endif
- }
-
-+ Curl_ssl_cert_dir = curl_getenv("SSL_CERT_DIR");
-+ Curl_ssl_cert_file = curl_getenv("SSL_CERT_FILE");
-+
- if(!Curl_ssl_init()) {
- DEBUGF(fprintf(stderr, "Error: Curl_ssl_init failed\n"));
- return CURLE_FAILED_INIT;
-@@ -260,6 +266,9 @@
- Curl_ssl_cleanup();
- Curl_resolver_global_cleanup();
-
-+ free(Curl_ssl_cert_dir);
-+ free(Curl_ssl_cert_file);
-+
- #ifdef WIN32
- Curl_win32_cleanup(init_flags);
- #endif
-diff -ur curl-7.66.0.orig/lib/url.c curl-7.66.0/lib/url.c
---- curl-7.66.0.orig/lib/url.c 2020-01-02 15:43:11.883921171 +0100
-+++ curl-7.66.0/lib/url.c 2020-01-02 16:21:11.563880346 +0100
-@@ -524,6 +524,21 @@
- if(result)
- return result;
- #endif
-+ 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],
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],
Curl_ssl_cert_file))
-+ return result;
-+ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY],
Curl_ssl_cert_file))
-+ return result;
-+ }
- }
-
- set->wildcard_enabled = FALSE;
- branch core-updates updated (8ceff70 -> a6c292a), guix-commits, 2021/06/12
- 02/14: gnu: postgresql: Remove replacement., guix-commits, 2021/06/12
- 01/14: gnu: OpenSSL: Remove replacement., guix-commits, 2021/06/12
- 03/14: gnu: libx11: Update to 1.7.1., guix-commits, 2021/06/12
- 04/14: gnu: expat: Remove replacement., guix-commits, 2021/06/12
- 06/14: gnu: GCC: Switch to GCC 10., guix-commits, 2021/06/12
- 08/14: gnu: graphviz: Update to 2.47.1., guix-commits, 2021/06/12
- 05/14: gnu: curl: Absorb replacement.,
guix-commits <=
- 10/14: gnu: pango: Update to 1.48.4., guix-commits, 2021/06/12
- 11/14: gnu: poppler: Update to 21.05.0., guix-commits, 2021/06/12
- 07/14: gnu: python-attrs: Update to 21.2.0., guix-commits, 2021/06/12
- 09/14: gnu: harfbuzz: Update to 2.8.1., guix-commits, 2021/06/12
- 13/14: gnu: glib: Add "static" output., guix-commits, 2021/06/12
- 12/14: gnu: python-magic: Update to 0.4.22., guix-commits, 2021/06/12
- 14/14: gnu: expat: Install the static library., guix-commits, 2021/06/12