diff options
Diffstat (limited to 'gnu/packages/patches/cmake-curl-certificates-3.24.patch')
| -rw-r--r-- | gnu/packages/patches/cmake-curl-certificates-3.24.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/gnu/packages/patches/cmake-curl-certificates-3.24.patch b/gnu/packages/patches/cmake-curl-certificates-3.24.patch deleted file mode 100644 index ca29c9001e..0000000000 --- a/gnu/packages/patches/cmake-curl-certificates-3.24.patch +++ /dev/null @@ -1,21 +0,0 @@ -Submitted upstream at https://gitlab.kitware.com/cmake/cmake/-/merge_requests/7670. - -diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx -index 28ee24dfe9..fc5405213a 100644 ---- a/Source/cmCurl.cxx -+++ b/Source/cmCurl.cxx -@@ -38,6 +38,14 @@ std::string cmCurlSetCAInfo(::CURL* curl, const std::string& cafile) - ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile.c_str()); - check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); - } -+ /* Honor the user-configurable OpenSSL environment variables. */ -+ else if (cmSystemTools::GetEnv("SSL_CERT_FILE", e)) { -+ ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, e.c_str()); -+ check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); -+ } else if (cmSystemTools::GetEnv("SSL_CERT_DIR", e)) { -+ ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAPATH, e.c_str()); -+ check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); -+ } - #ifdef CMAKE_FIND_CAFILE - # define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt" - else if (cmSystemTools::FileExists(CMAKE_CAFILE_FEDORA, true)) { |