[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/18: gnu: curl: Absorb grafted replacement.
From: |
guix-commits |
Subject: |
14/18: gnu: curl: Absorb grafted replacement. |
Date: |
Sun, 6 Jun 2021 15:26:58 -0400 (EDT) |
lfam pushed a commit to branch wip-ungrafting
in repository guix.
commit 594c71558e1b37a840b7f75278e5be0d3fc391c2
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Sun Jun 6 14:11:43 2021 -0400
gnu: curl: Absorb grafted replacement.
* gnu/packages/curl.scm (curl): Update to 7.77.0
[replacement]: Remove field.
(curl-7.77.0): Remove variable.
* gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch: Rename to ...
* gnu/packages/patches/curl-use-ssl-cert-env.patch: ... this.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
gnu/local.mk | 1 -
gnu/packages/curl.scm | 19 +------
.../patches/curl-7.76-use-ssl-cert-env.patch | 64 ----------------------
gnu/packages/patches/curl-use-ssl-cert-env.patch | 4 +-
4 files changed, 4 insertions(+), 84 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index c51d8a8..0ada7b0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -927,7 +927,6 @@ dist_patch_DATA =
\
%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/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 76b9b98..c566f8e 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.74.0")
+ (version "7.77.0")
(source (origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
- "12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr"))
+ "0jsrc97vbghvljic997r9nypc9qqddcil2lzvv032br8ahn5hr0g"))
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
(build-system gnu-build-system)
(outputs '("out"
@@ -152,20 +151,6 @@ tunneling, and so on.")
(name "curl-minimal")
(inputs (alist-delete "openldap" (package-inputs 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;
diff --git a/gnu/packages/patches/curl-use-ssl-cert-env.patch
b/gnu/packages/patches/curl-use-ssl-cert-env.patch
index c8e80b4..24be6e3 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;
- 06/18: gnu: libtiff: Absorb grafted replacement., (continued)
- 06/18: gnu: libtiff: Absorb grafted replacement., guix-commits, 2021/06/06
- 07/18: gnu: c-ares: Absorb grafted replacement., guix-commits, 2021/06/06
- 08/18: gnu: unzip: Absorb grafted replacement., guix-commits, 2021/06/06
- 12/18: gnu: python-pygments: Absorb grafted replacement., guix-commits, 2021/06/06
- 13/18: gnu: SQLite: Absorb grafted replacement., guix-commits, 2021/06/06
- 04/18: gnu: zziplib: Absorb grafted replacement., guix-commits, 2021/06/06
- 11/18: gnu: python-urllib3: Absorb grafted replacement., guix-commits, 2021/06/06
- 09/18: gnu: MariaDB: Absorb grafted replacement., guix-commits, 2021/06/06
- 17/18: gnu: libx11: Absorb grafted replacement., guix-commits, 2021/06/06
- 10/18: gnu: Graphviz: Absorb grafted replacement., guix-commits, 2021/06/06
- 14/18: gnu: curl: Absorb grafted replacement.,
guix-commits <=
- 15/18: gnu: OpenSSL: Absorb grafted replacement., guix-commits, 2021/06/06
- 16/18: gnu: expat: Absorb grafted replacement., guix-commits, 2021/06/06
- 18/18: gnu: GnuTLS: Absorb grafted replacement., guix-commits, 2021/06/06