aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/cmake-curl-certificates-3.24.patch
blob: ca29c9001e2983375505475c07a1c99c17cca0c9 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
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)) {
-utils. Maxim Cournoyer 2021-01-29gnu: fontconfig-with-documentation: New variable....In what will become fontconfig 2.14, the complete documentation of fontconfig requires multiple dependencies that would be problematic to add to this core package; instead, keep the 'fontconfig' variable package lean and create a new 'fontconfig-with-documentation' package that will be known as "fontconfig" to the users. * gnu/packages/fontutils.scm (fontconfig): Hide package. [outputs]: Remove doc output. [configure-flags]: Add "--disable-docs" argument. [phases]{remove-pdf-files}: Remove phase. {move-man-sections}: Move to... (fontconfig-with-documentation): ... this new variable with a doc output. Maxim Cournoyer 2021-01-13Merge branch 'staging' into 'core-updates'....Conflicts: gnu/local.mk gnu/packages/cmake.scm gnu/packages/curl.scm gnu/packages/gl.scm gnu/packages/glib.scm gnu/packages/guile.scm gnu/packages/node.scm gnu/packages/openldap.scm gnu/packages/package-management.scm gnu/packages/python-xyz.scm gnu/packages/python.scm gnu/packages/tls.scm gnu/packages/vpn.scm gnu/packages/xorg.scm Maxim Cournoyer 2020-12-29gnu: fontconfig: Use 'font-dejavu' and remove replacement....* gnu/packages/fontutils.scm (fontconfig)[replacement]: Remove. [inputs]: Replace GS-FONTS by FONT-DEJAVU. [arguments]: Adjust accordingly. (fontconfig/font-dejavu): Remove. Ludovic Courtès 2020-12-29Merge branch 'master' into ungraftingMarius Bakke 2020-12-22gnu: fcft: Update to 2.3.2....* gnu/packages/fontutils.scm (fcft): Update to 2.3.2. Tobias Geerinckx-Rice 2020-12-08gnu: libspiro: Update source URI....This is a follow-up to commit 7101691676a5441d2985bbb8cd58f8b74be0f9ef. * gnu/packages/fontutils.scm (libspiro)[source](uri): Adjust. Marius Bakke 2020-12-08gnu: libspiro: Update to 20200505 and remove replacement....* gnu/packages/fontutils.scm (libspiro): Update to 20200505. [replacement]: Remove. (libspiro-20200505): Remove. Efraim Flashner 2020-12-08gnu: fontconfig: Use 'font-dejavu' and remove replacement....* gnu/packages/fontutils.scm (fontconfig)[replacement]: Remove. [inputs]: Replace GS-FONTS by FONT-DEJAVU. [arguments]: Adjust accordingly. (fontconfig/font-dejavu): Remove. Ludovic Courtès 2020-12-08gnu: freetype: Update to 2.10.4 and remove replacement....* gnu/packages/fontutils.scm (freetype): Update to 2.10.4. [replacement]: Remove. (freetype/fixed): Remove. Ludovic Courtès 2020-12-06gnu: Add fcft....* gnu/packages/fontutils.scm (fcft): New public variable. Marius Bakke 2020-12-06gnu: Sort module imports in (gnu packages fontutils)....* gnu/packages/fontutils.scm: Sort (gnu ...) module imports. Marius Bakke 2020-11-29Merge remote-tracking branch 'origin/master' into core-updatesChristopher Baines 2020-11-23gnu: libraqm: Update to 0.7.1....* gnu/packages/fontutils.scm (libraqm): Update to 0.7.1. Tobias Geerinckx-Rice 2020-11-19gnu: Don't append '.git' to GitHub uris....* gnu/packages/admin.scm (nmrpflash)[source]: Remove '.git' from URI. * gnu/packages/aidc.scm (zxing-cpp), * gnu/packages/assembly.scm (mbuild), * gnu/packages/audio.scm (opensles, wildmidi, tinyalsa), * gnu/packages/browser-extensions.scm (ublock-origin-chromium), * gnu/packages/check.scm (mutest), * gnu/packages/compression.scm (unshield), * gnu/packages/coq.scm (subset), * gnu/packages/dictionaries.scm (translate-shell), * gnu/packages/disk.scm (memkind), * gnu/packages/documentation.scm (latex2html), * gnu/packages/emacs-xyz.scm (emacs-chronometrist, emacs-flycheck-ledger, emacs-counsel-notmuch, emacs-spaceline, emacs-org-generate), * gnu/packages/embedded.scm (ebusd, ebusd-configuration), * gnu/packages/enchant.scm (nuspell), * gnu/packages/fontutils.scm (woff2), * gnu/packages/geo.scm (memphis), * gnu/packages/gimp.scm (mrg), * gnu/packages/gnome-xyz.scm (gnome-shell-extension-appindicator), * gnu/packages/gnome.scm (parlatype), * gnu/packages/golang.scm (go-github-com-tv42-httpunix, go-github-com-ayufan-golang-kardianos-service), * gnu/packages/graphics.scm (eglexternalplatform, egl-wayland, mmm, directfb, flux), * gnu/packages/gstreamer.scm (openni2, ccextractor, libvisual, graphene), * gnu/packages/guile-xyz.scm (guile-srfi-180, guile-torrent), * gnu/packages/image.scm (openjpeg-data), * gnu/packages/java.scm (javacc), * gnu/packages/language.scm (liblouis, liblouisutdml), * gnu/packages/linux.scm (pamela, ttyebus), * gnu/packages/lxqt.scm (lxqt-connman-applet), * gnu/packages/mail.scm (libetpan), * gnu/packages/man.scm (ronn), * gnu/packages/music.scm (tascam-gtk, artyfx), * gnu/packages/networking.scm (srt, lksctp-tools, nng, nanomsg), * gnu/packages/python-crypto.scm (pure-python-otr), * gnu/packages/qt.scm (qtspell), * gnu/packages/raspberry-pi.scm (raspi-gpio, raspi-open-firmware), * gnu/packages/rdp.scm (freerdp), * gnu/packages/ruby.scm (ruby-prawn-templates, ruby-treetop, ruby-gimme, ruby-standard, ruby-rubocop-ast, ruby-rexml, ruby-range-compressor, ruby-regexp-property-values, ruby-regexp-parser, ruby-rubocop, ruby-pdf-reader, ruby-pdf-inspector, ruby-prawn), * gnu/packages/syncthing.scm (syncthing-gtk), * gnu/packages/video.scm (svt-hevc, mediasdk, libvideogfx, libde265, tslib), * gnu/packages/xml.scm (libxmlb, libxmlplusplus)[source]: Same. Efraim Flashner 2020-11-08gnu: fontutils: Remove PDF files from the "doc" output....* gnu/packages/fontutils.scm (fontconfig)[arguments]: Add 'remove-pdf-files' phase. Ludovic Courtès 2020-11-08gnu: fontconfig: Add "doc" output....* gnu/packages/fontutils.scm (fontconfig)[outputs]: New field. [arguments]: Add 'move-man-sections'. Ludovic Courtès 2020-11-08gnu: woff-tools: End all phases in #t....* gnu/packages/fontutils.scm (woff-tools)[arguments]: End custom 'install phase with #t. Efraim Flashner 2020-11-08gnu: woff-tools: Fix cross building....* gnu/packages/fontutils.scm (woff-tools)[arguments]: Don't hardcode gcc. Efraim Flashner 2020-10-30gnu: Add lcdf-typetools....* gnu/packages/fontutils.scm (lcdf-typetools): New variable. Julien Lepiller 2020-10-22gnu: freetype: Replace with 2.10.4 [fixes CVE-2020-15999]....* gnu/packages/fontutils.scm (freetype)[replacement]: New field, set to... (freetype/fixed): ...this new variable. Tobias Geerinckx-Rice 2020-10-19Merge branch 'staging'...Conflicts: gnu/packages/admin.scm gnu/packages/commencement.scm gnu/packages/gdb.scm gnu/packages/llvm.scm gnu/packages/package-management.scm gnu/packages/tls.scm Maxim Cournoyer 2020-09-28gnu: libspiro: Replace with 20200505 [fixes CVE-2019-19847]....* gnu/packages/fontutils.scm (libspiro)[replacement]: New field. (libspiro-20200505): New variable. Marius Bakke 2020-09-23gnu: Fix typoes in package descriptions....* gnu/packages/audio.scm (caps-plugins-lv2)[synopsis]: Fix typo. * gnu/packages/bioconductor.scm (r-karyoploter, r-anota, r-gcrma) (r-bigmemoryextras)[description]: Likewise. * gnu/packages/cran.scm (r-geometry)[synopsis]: Likewise. (r-stringdist, r-patchwork, r-depth, r-tea)[description]: Likewise. * gnu/packages/crates-io.scm (rust-assert-fs-0.11, rust-notify-4) (rust-tokio-fs-0.1)[synopsis, description]: Likewise. (rust-blas-sys-0.7)[description]: Likewise. (rust-fs-extra-1.1, rust-xattr-0.2)[synopsis]: Likewise. * gnu/packages/databases.scm (perl-mysql-config)[description]: Likewise. * gnu/packages/disk.scm (hddtemp)[description]: Likewise. * gnu/packages/django.scm (python-djangorestframework)[description]: Likewise. * gnu/packages/documentation.scm (doc++)[description]: Likewise. * gnu/packages/emacs-xyz.scm (emacs-kakoune, emacs-pyim-basedict, eless) (emacs-scpaste)[description]: Likewise. * gnu/packages/file-systems.scm (dbxfs)[description]: Likewise. * gnu/packages/finance.scm (python-stdnum)[description]: Likewise. * gnu/packages/fontutils.scm (woff2)[description]: Likewise. * gnu/packages/games.scm (openttd-opengfx)[description]: Likewise. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-topicons-redux) [description]: Likewise. * gnu/packages/gnome.scm (libgrss)[description]: Likewise. * gnu/packages/golang.scm (go-github-com-mitchellh-reflectwalk) [description]: Likewise. (go-github-com-go-git-go-billy)[synopsis, description]: Likewise. * gnu/packages/haskell-check.scm (ghc-inspection-testing)[description]: Likewise. * gnu/packages/haskell-web.scm (ghc-yesod-form)[description]: Likewise. * gnu/packages/haskell-xyz.scm (ghc-hex)[description]: Likewise. * gnu/packages/hyperledger.scm (hyperledger-iroha-ed25519)[description]: Likewise. * gnu/packages/java.scm (java-mail)[synopsis]: Likewise. (java-native-access-platform)[description]: Likewise. * gnu/packages/kde-frameworks.scm (kactivities-stats)[description]: Likewise. * gnu/packages/kde-utils.scm (krusader)[description]: Likewise. * gnu/packages/language.scm (praat)[description]: Likewise. * gnu/packages/linux.scm (light)[description]: Likewise. * gnu/packages/lisp-xyz.scm (sbcl-hu.dwim.defclass-star)[description]: Likewise. * gnu/packages/mail.scm (dovecot-trees, sieve-connect)[description]: Likewise. * gnu/packages/ocaml.scm (ocaml-opam-file-format, ocaml-cppo) (ocaml4.07-ppx-variants-conv)[description]: Likewise. * gnu/packages/perl.scm (perl-convert-binhex)[description]: Likewise. * gnu/packages/python-crypto.scm (python-ecdsa)[description]: Likewise. * gnu/packages/python-web.scm (python-html5lib)[synopsis, description]: Likewise. (python-venusian)[synopsis]: Likewise. * gnu/packages/python-xyz.scm (python-readlike, python-gssapi) (python-flufl-i18n)[description]: Likewise. (python-pox, python-watchdog, python-xattr)[synopsis, description]: Likewise. * gnu/packages/ruby.scm (ruby-sorcerer)[description]: Likewise. * gnu/packages/rust-apps.scm (watchexec)[description]: Likewise. * gnu/packages/rust.scm (mrustc)[synopsis]: Likewise. * gnu/packages/shells.scm (s-shell)[description]: Likewise. * gnu/packages/ssh.scm (sshpass)[description]: Likewise. * gnu/packages/terminals.scm (beep)[description]: Likewise. * gnu/packages/web.scm (perl-lwp-useragent-cached)[description]: Likewise. * gnu/packages/wv.scm (wv)[description]: Likewise. Tobias Geerinckx-Rice 2020-09-14Merge remote-tracking branch 'origin/master' into core-updatesMaxim Cournoyer 2020-09-01gnu: ttfautohint: Don't build static library....* gnu/packages/fontutils.scm (ttfautohint)[arguments]: Add configure-flag to not build static library. Efraim Flashner 2020-09-01gnu: ttfautohint: Update to 1.8.3....* gnu/packages/fontutils.scm (ttfautohint): Update to 1.8.3. [source]: Remove patch. * gnu/packages/patches/ttfautohint-source-date-epoch.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Efraim Flashner 2020-08-26Merge remote-tracking branch 'origin/master' into core-updatesMathieu Othacehe 2020-08-19gnu: woff2: Update package definition....* gnu/packages/fontutils.scm (woff2): Update package definition. [outputs]: New output "bin". [arguments]<#:configure-flags>[-DCMAKE_INSTALL_BINDIR]: New flag. [-DCMAKE_INSTALL_INCLUDEDIR]: New flag. [-DCMAKE_INSTALL_LIBDIR]: New flag. [-DBUILD_SHARED_LIBS]: Remove flag. <#:phases>['patch-installation]: New phase. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Change to expat. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org> Raghav Gururajan 2020-07-23Merge branch 'master' into core-updates...Conflicts: gnu/packages/ruby.scm Jakub Kądziołka