external/curl/ExternalProject_curl.mk | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 0f567d9316941f0fcca4c260ad1e92fbe1a0df2d
Author: Giuseppe Castagno <giuseppe.casta...@acca-esse.eu>
Date: Thu Mar 10 14:54:28 2016 +0100
tdf#98416: Explicitly disable curl hardcoded CA certificate store
Add --without-ca-bundle --without-ca-path options to curl configure
in Linux, to explicitly disable the hardcoded curl CA certificate
store.
If the store is not disabled, curl configure will try to find
one suitable for the Linux distro on which it's being built, leading
to possible problems when building on a Linux distro type while
targeting another Linux distro type (e.g. building on Red Hat
derivative targeting Debian derivative).
Change-Id: Id1ddf1d74e33bc66e4f7187e376d7379f5c4f36a
Reviewed-on: https://gerrit.libreoffice.org/23141
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 30b9c6a457de61f3c94431ecc75716f866c3379e)
Reviewed-on: https://gerrit.libreoffice.org/23245
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index 4222419..dc12c4b 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -52,6 +52,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--without-librtmp --disable-ldaps --disable-tftp
--disable-pop3 \
--disable-imap --disable-smtp --disable-manual
--without-metalink \
--without-nghttp2 \
+ $(if $(filter LINUX,$(OS)),--without-ca-bundle
--without-ca-path) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(filter
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
