[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - external/curl

[Giuseppe Castagno]

 external/curl/ExternalProject_curl.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 347577cb687ee7c30b52fdca3dee831d78ec55cd
Author: Giuseppe Castagno <giuseppe.castagno at 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 <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 30b9c6a457de61f3c94431ecc75716f866c3379e)
    Reviewed-on: https://gerrit.libreoffice.org/23149
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index e31f5d6..9dd4a07 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -51,6 +51,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) \