diff options
| author | Marius Bakke <marius@gnu.org> | 2022-06-27 22:13:22 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-06-27 23:48:01 +0200 |
| commit | 0b0750e83144dc59b3c01f72c98c23c890e8de5b (patch) | |
| tree | 6935f7274b6b44755106869290c30d777ee3d723 /gnu/packages/patches | |
| parent | b1fa242cb1f6a35eb4999ffa80fb574b9fb50fd3 (diff) | |
| download | guix-0b0750e83144dc59b3c01f72c98c23c890e8de5b.tar.gz guix-0b0750e83144dc59b3c01f72c98c23c890e8de5b.zip | |
gnu: CMake: Update to 3.23.2.
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.23.2.
(%preserved-third-party-files): Preserve bundled ELF header files.
* gnu/packages/patches/cmake-curl-certificates.patch: Adjust for upstream
changes.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/cmake-curl-certificates.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gnu/packages/patches/cmake-curl-certificates.patch b/gnu/packages/patches/cmake-curl-certificates.patch index 7fe2615271..8dd93de724 100644 --- a/gnu/packages/patches/cmake-curl-certificates.patch +++ b/gnu/packages/patches/cmake-curl-certificates.patch @@ -4,22 +4,23 @@ at all: <https://issues.guix.gnu.org/issue/37371>. This changes CMake such that commands honor SSL_CERT_FILE and SSL_CERT_DIR as well as /etc/ssl/certs. ---- cmake-3.13.1/Source/cmCurl.cxx 2019-09-10 17:27:36.926907260 +0200 -+++ cmake-3.13.1/Source/cmCurl.cxx 2019-09-10 17:52:35.475903919 +0200 -@@ -2,11 +2,8 @@ +diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx +index 28ee24dfe9..6b2bb09ff5 100644 +--- a/Source/cmCurl.cxx ++++ b/Source/cmCurl.cxx +@@ -2,10 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCurl.h" -#if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) && \ - !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH) # define CMAKE_FIND_CAFILE - # include "cmSystemTools.h" -#endif #include "cmStringAlgorithms.h" + #include "cmSystemTools.h" - // curl versions before 7.21.5 did not provide this error code -@@ -30,6 +27,19 @@ - ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile); +@@ -38,6 +35,19 @@ 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: "); } + |