From 1dec7fa83d4e89f98bc887211b1cfb78aa74f98d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 6 Jun 2021 22:15:58 +0200 Subject: 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/packages/curl.scm | 19 +------ .../patches/curl-7.76-use-ssl-cert-env.patch | 64 ---------------------- 2 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch (limited to 'gnu/packages') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 1075fe9448..e389d53bc7 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 24be6e31d9..0000000000 --- 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; -- cgit v1.2.3 sg-avail'>...* gnu/services/herd.scm (start-service)[arguments]: New optional argument. Mathieu Othacehe 2018-09-26guix system: Load all services on reconfigure, not just stopped ones....This uses the 'replacement' service slot introduced in the Shepherd version 0.5.0. * gnu/services/shepherd.scm (shepherd-service-upgrade): Return a list of services that need to be restarted to complete their upgrade. * guix/scripts/system.scm (call-with-service-upgrade-info): Rename an internal variable to reflect the change to shepherd-service-upgrade. (upgrade-shepherd-services): Call 'load-services/safe' instead of 'load-services'. Print a message about services that need to be manually restarted. * gnu/services/herd.scm (load-services/safe): New procedure. * doc/guix.texi (Invoking guix system): Document the new behaviour. Co-authored-by: Ludovic Courtès <ludo@gnu.org> Carlo Zancanaro 2018-07-13services: mcron: Add 'schedule' action....Inspired by <https://lists.gnu.org/archive/html/help-guix/2018-07/msg00035.html>. * gnu/services/mcron.scm (shepherd-schedule-action): New procedure. (mcron-shepherd-services): Add 'actions' field. * gnu/tests/base.scm (run-mcron-test)["schedule action"]: New test. * doc/guix.texi (Scheduled Job Execution): Mention 'herd schedule'. Ludovic Courtès 2018-01-21services: herd: 'with-shepherd' no longer leaves an open connection....* gnu/services/herd.scm (with-shepherd): Use 'dynamic-wind' and close CONNECTION at the end. Ludovic Courtès 2017-08-23services: herd: Actions return a list of results....Fixes a regression introduced in 0642838b2e9ab2bd988dccb64b9e1130006347bf. * gnu/services/herd.scm (invoke-action): Explain that we get a list of results. (current-services): Expect a list of result and use the first one. (unload-service, %load-file, eval-there): Likewise. Ludovic Courtès 2017-08-08services: herd: Add a stop-service procedure....* gnu/services/herd.scm (stop-service): New procedure. Christopher Baines 2017-08-08services: herd: Fix matching ok responses from shepherd service....Previously the match expression case for a successful response (where error is #f) required that the result component contained a list with a single element. As far as I see when looking at the responses from the shepherd, this is not normally the case. Therefore, to avoid treating successful responses as errors, make the match requirement more permissive, accepting any value. * gnu/services/herd.scm (invoke-action): Change match condition for ok responses. Christopher Baines 2017-05-03services: herd: Make %shepherd-socket-file a parameter and export it....* gnu/services/herd.scm (%shepherd-socket-file): Make it an exported parameter. (open-connection): Adapt. Mathieu Othacehe 2016-08-31services: herd: Provide <live-service> objects....* gnu/services/herd.scm (<live-service>): New record type. (current-services): Change to return a single value: #f or a list of <live-service>. * guix/scripts/system.scm (call-with-service-upgrade-info): Adjust accordingly. * gnu/tests/base.scm (run-basic-test)["shepherd services"]: Adjust accordingly. Ludovic Courtès