[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - external/curl

[Christian Lohmaier]

 external/curl/UnpackedTarball_curl.mk |    6 ++++++
 external/curl/curl-nss.patch.1        |   12 ++++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit 573b39bb034254502d9ce3504462e03691095d52
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sun Mar 13 15:33:08 2016 +0100

    tdf#98416 fix curl's configure check for nss (missing -lnssutil3)
    
    without -lnssutil3, the configure check for nss fails when using
    internal nss:
    configure:24028: checking for SSL_VersionRangeSet in -lnss3
    […]
    …/UnpackedTarball/nss/dist/out/lib/libnss3.so: undefined reference to
    `NSSUTIL_ArgParseModuleSpecEx at NSSUTIL_3.21'
    
    causing curl to build without ssl support:
    SSL support:  no (--with-{ssl,gnutls,nss,polarssl,cyassl,axtls,winssl,darwinssl} )
    
    This makes gdrive and other remote file methods fail
    
    Change-Id: I098feb10a760c2f80a474d9205d6f1e403477efd
    (cherry picked from commit 98d48dad9e807a4a40f4c3d1b5280d9e5156cb18)
    Reviewed-on: https://gerrit.libreoffice.org/23189
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
index 2e4d4cc..8e236b4 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -25,6 +25,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
 	external/curl/curl-7.26.0_win-proxy.patch \
 ))
 
+ifeq ($(SYSTEM_NSS),)
+$(eval $(call gb_UnpackedTarball_add_patches,curl,\
+	external/curl/curl-nss.patch.1 \
+))
+endif
+
 ifeq ($(OS),ANDROID)
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
 	external/curl/curl-android.patch \
diff --git a/external/curl/curl-nss.patch.1 b/external/curl/curl-nss.patch.1
new file mode 100644
index 0000000..69fde5f
--- /dev/null
+++ b/external/curl/curl-nss.patch.1
@@ -0,0 +1,12 @@
+diff -ur curl.org/configure curl/configure
+--- curl.org/configure	2016-03-13 15:14:07.177000076 +0100
++++ curl/configure	2016-03-13 15:16:44.132000076 +0100
+@@ -24009,7 +24009,7 @@
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using hard-wired libraries and compilation flags for NSS." >&5
+ $as_echo "$as_me: WARNING: Using hard-wired libraries and compilation flags for NSS." >&2;}
+       addld="-L$OPT_NSS/lib"
+-      addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4"
++      addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lnssutil3"
+       addcflags="-I$OPT_NSS/include"
+       version="unknown"
+       nssprefix=$OPT_NSS