aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Osipov <1983-01-06@gmx.net>2016-06-24 15:17:53 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-06-27 11:42:43 +0200
commitd61c80515aa8e4086863fcc0a9693d50d309fc50 (patch)
treedda50f9b33ab0b850039a85b8513cb41c453dd01
parent91697d22a83e274378b957ed878e62467634ff98 (diff)
acinclude.m4: improve autodetection of CA bundle on FreeBSD
The FreeBSD Port security/ca_root_nss installs the Mozilla NSS CA bundle to /usr/local/share/certs/ca-root-nss.crt. Use this bundle in the discovery process. This change also removes the former FreeBSD path that has been obsolete for 8 years since this FreeBSD ports commit: https://svnweb.freebsd.org/ports/head/security/?view=revision&revision=215953 Closes #894
-rw-r--r--acinclude.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 68a3710cd..fa621b5bd 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2565,8 +2565,8 @@ dnl regarding the paths this will scan:
dnl /etc/ssl/certs/ca-certificates.crt Debian systems
dnl /etc/pki/tls/certs/ca-bundle.crt Redhat and Mandriva
dnl /usr/share/ssl/certs/ca-bundle.crt old(er) Redhat
-dnl /usr/local/share/certs/ca-root.crt FreeBSD
-dnl /etc/ssl/cert.pem OpenBSD
+dnl /usr/local/share/certs/ca-root-nss.crt FreeBSD
+dnl /etc/ssl/cert.pem OpenBSD, FreeBSD (symlink)
dnl /etc/ssl/certs/ (ca path) SUSE
AC_DEFUN([CURL_CHECK_CA_BUNDLE], [
@@ -2640,7 +2640,7 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]),
for a in /etc/ssl/certs/ca-certificates.crt \
/etc/pki/tls/certs/ca-bundle.crt \
/usr/share/ssl/certs/ca-bundle.crt \
- /usr/local/share/certs/ca-root.crt \
+ /usr/local/share/certs/ca-root-nss.crt \
/etc/ssl/cert.pem \
"$cac"; do
if test -f "$a"; then