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)) { s/?id=5fb5cbb8b4c8a87cdb49658ab86e2f4c8721c3d2'>refslogtreecommitdiff
path: root/etc/guix-publish.service.in
AgeCommit message (Expand)Author
2024-03-11etc: systemd services: switch to "journal" for output and error logging....The "syslog" method has been deprecated for years, and issues a warning: Standard output type syslog is obsolete, automatically updating to journal. Please update your unit file, and consider removing the setting altogether. Fixes: #48323 * etc/guix-daemon.service.in (StandardOutput): Use "journal" (StandardError): Likewise. * etc/guix-publish.service.in (StandardOutput): Likewise. (StandardError): Likewise. Vagrant Cascadian
2022-10-23etc: systemd services shouldn't ‘RemainAfterExit’....* etc/guix-daemon.service.in (RemainAfterExit): Don't. * etc/guix-publish.service.in (RemainAfterExit): Likewise don't. Tobias Geerinckx-Rice
2022-10-23etc: Add ‘Restart=always’ to both systemd services....* etc/guix-daemon.service.in (Restart): ‘Always’ do. * etc/guix-publish.service.in (Restart): Likewise. Tobias Geerinckx-Rice
2021-02-09etc: 'guix-publish.service' depends on 'guix-daemon.service'....Reported by Dimitri Delabroye <dimitri.delabroye@inria.fr>. * etc/guix-publish.service.in (Requires, PartOf, After): New fields. Ludovic Courtès