[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: r-curl: Fix patch to respect CURL_CA_BUNDLE.
From: |
guix-commits |
Subject: |
branch master updated: gnu: r-curl: Fix patch to respect CURL_CA_BUNDLE. |
Date: |
Fri, 27 Mar 2020 18:38:38 -0400 |
This is an automated email from the git hooks/post-receive script.
rekado pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 27c3afa gnu: r-curl: Fix patch to respect CURL_CA_BUNDLE.
27c3afa is described below
commit 27c3afa940693376fd1a2a55602f4af9f53798b6
Author: Ricardo Wurmus <address@hidden>
AuthorDate: Fri Mar 27 23:36:33 2020 +0100
gnu: r-curl: Fix patch to respect CURL_CA_BUNDLE.
Fixes <https://debbugs.gnu.org/40262>.
* gnu/packages/cran.scm (r-curl)[arguments]: Ensure CURLOPT_CAINFO actually
gets set.
---
gnu/packages/cran.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 573630f..759b926 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -677,7 +677,11 @@ LaTeX.")
(("if \\(!grepl\\(\"mingw\".*")
"if (FALSE)\n"))
(substitute* "src/handle.c"
- (("#ifdef _WIN32") "#if 1"))
+ (("/\\* Only set" m)
+ (string-append "\
+const char *_ca_bundle = getenv(\"CURL_CA_BUNDLE\");
+if(_ca_bundle != NULL) { curl_easy_setopt(handle, CURLOPT_CAINFO, _ca_bundle);
}
+" m)))
#t)))))
(inputs
`(("libcurl" ,curl)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: r-curl: Fix patch to respect CURL_CA_BUNDLE.,
guix-commits <=