curl: upgrade to version 7.33.0

- from curl-7.26.0.patch:
  * drop ADDCFLAGS stuff, must be some dmake relic
  * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000
    which is unsupported (and ws2_32.lib is linked anyway...)
  * split out curl-freebsd.patch.1
- curl-7.26.0_win.patch:
  * drop the library renaming stuff - can be handled in Package and
    RepositoryExternal.mk without patch
  * rename the rest to curl-msvc.patch.1
- drop curl-aix.patch:
  presumably don't need special check for V7BETA since it's released now
- drop curl-7.26.0_strlcat.patch (obsolete)

Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0
Reviewed-on: https://gerrit.libreoffice.org/6642
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

12 files changed, 77 insertions, 185 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3dcca01391c5..97d4bbf12311 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2025,7 +2025,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,curl)/lib/libcurl.lib \
+	$(call gb_UnpackedTarball_get_dir,curl)/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d)_imp.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/download.lst b/download.lst
index 757ddc2b1a43..ee63b4da18d9 100644
--- a/download.lst
+++ b/download.lst
@@ -37,7 +37,7 @@ export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.
 export CMIS_TARBALL := 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 export CPPUNIT_TARBALL := ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz
 export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-export CURL_TARBALL := 3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz
+export CURL_TARBALL := 57409d6bf0bd97053b8378dbe0cadcef-curl-7.33.0.tar.bz2
 export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index fa8b3251c045..6e3c7fd83c8a 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -16,11 +16,11 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifeq ($(OS)$(COM),WNTGCC)
 $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/.libs/libcurl.dll))
 else ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/libcurl.dll))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll,lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
 else ifeq ($(OS),AIX)
 $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4))
 else
-$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.3.0))
 endif
 
 endif # $(DISABLE_DYNLOADING)
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
index 2e75f38821ab..0516a31e70c9 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -14,20 +14,20 @@ $(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
-	Makefile.msvc.names \
 	lib/Makefile.vc9 \
 ))
+
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
-	external/curl/curl-7.26.0.patch \
-	external/curl/curl-aix.patch \
-	external/curl/curl-7.26.0_win.patch \
+	external/curl/curl-freebsd.patch.1 \
+	external/curl/curl-msvc.patch.1 \
 	external/curl/curl-7.26.0_mingw.patch \
 	external/curl/curl-7.26.0_win-proxy.patch \
-	external/curl/curl-7.26.0_strlcat.patch \
 ))
+
 ifeq ($(OS),ANDROID)
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
 	external/curl/curl-android.patch \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/curl/curl-7.26.0.patch b/external/curl/curl-7.26.0.patch
deleted file mode 100644
index 6cebdc17bbd7..000000000000
--- a/external/curl/curl-7.26.0.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -ur curl-7.26.0/configure misc/build/curl-7.26.0/configure
---- curl-7.26.0/configure	2012-07-02 13:28:51.327994494 +0200
-+++ misc/build/curl-7.26.0/configure	2012-07-02 13:32:38.754006822 +0200
-@@ -2693,8 +2693,8 @@
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
-@@ -3855,8 +3855,8 @@
-   ac_save_CPPFLAGS="$CPPFLAGS"
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-@@ -4506,15 +4506,15 @@
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
-+    CFLAGS="$ADDCFLAGS -g -O2"
-   else
--    CFLAGS="-g"
-+    CFLAGS="$ADDCFLAGS -g"
-   fi
- else
-   if test "$GCC" = yes; then
--    CFLAGS="-O2"
-+    CFLAGS="$ADDCFLAGS -O2"
-   else
--    CFLAGS=
-+    CFLAGS="$ADDCFLAGS"
-   fi
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-diff -ur curl-7.26.0/lib/setup.h misc/build/curl-7.26.0/lib/setup.h
---- curl-7.26.0/lib/setup.h	2012-07-02 13:28:51.322994494 +0200
-+++ misc/build/curl-7.26.0/lib/setup.h	2012-07-02 13:41:15.652034841 +0200
-@@ -231,6 +231,7 @@
- #    include <winsock2.h>
- #    ifdef HAVE_WS2TCPIP_H
- #       include <ws2tcpip.h>
-+#       include <wspiapi.h>
- #    endif
- #  else
- #    ifdef HAVE_WINSOCK_H
-diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh
---- curl-7.26.0/ltmain.sh	2012-07-02 13:28:51.298994493 +0200
-+++ misc/build/curl-7.26.0/ltmain.sh	2012-07-02 13:42:46.511039769 +0200
-@@ -7334,13 +7334,13 @@
- 	  #
- 	  case $version_type in
- 	  # correct linux to gnu/linux during the next big refactor
--	  darwin|linux|osf|windows|none)
-+	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf|none)
- 	    func_arith $number_major + $number_minor
- 	    current=$func_arith_result
- 	    age="$number_minor"
- 	    revision="$number_revision"
- 	    ;;
--	  freebsd-aout|freebsd-elf|qnx|sunos)
-+	  qnx|sunos)
- 	    current="$number_major"
- 	    revision="$number_minor"
- 	    age="0"
-@@ -7420,8 +7420,8 @@
- 	  ;;
- 
- 	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current"
-+	  major=.`expr $current - $age`
-+	  versuffix="$major"
- 	  ;;
- 
- 	irix | nonstopux)
diff --git a/external/curl/curl-7.26.0_mingw.patch b/external/curl/curl-7.26.0_mingw.patch
index 79318732a69b..be9a20cac358 100644
--- a/external/curl/curl-7.26.0_mingw.patch
+++ b/external/curl/curl-7.26.0_mingw.patch
@@ -1,5 +1,5 @@
---- curl-7.26.0/lib/setup.h	2009-10-29 05:21:58.000000000 +0900
-+++ misc/build/curl-7.26.0/lib/setup.h	2010-03-02 06:03:10.009500000 +0900
+--- a/lib/curl_setup.h	2009-10-29 05:21:58.000000000 +0900
++++ b/lib/curl_setup.h	2010-03-02 06:03:10.009500000 +0900
 @@ -40,6 +40,21 @@
  
  #include "curl_config.h"
diff --git a/external/curl/curl-7.26.0_strlcat.patch b/external/curl/curl-7.26.0_strlcat.patch
deleted file mode 100644
index c5536f822641..000000000000
--- a/external/curl/curl-7.26.0_strlcat.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- curl-7.26.0/lib/strequal.h
-+++ misc/build/curl-7.26.0/strequal.h
-@@ -30,6 +30,5 @@
- #ifndef HAVE_STRLCAT
- #define strlcat(x,y,z) Curl_strlcat(x,y,z)
- #endif
--size_t strlcat(char *dst, const char *src, size_t siz);
- 
- #endif
diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch
index e3beb4004885..addb47e4c8c9 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -1,14 +1,14 @@
 --- curl-7.26.0/lib/Makefile.vc9
 +++ misc/build/curl-7.26.0/lib/Makefile.vc9
 @@ -116,7 +116,7 @@ LFLAGS     = /nologo /machine:$(MACHINE)
- SSLLIBS    = libeay32.lib ssleay32.lib
- ZLIBLIBSDLL= zdll.lib
- ZLIBLIBS   = zlib.lib
--WINLIBS    = ws2_32.lib wldap32.lib
-+WINLIBS    = ws2_32.lib wldap32.lib winhttp.lib
- CFLAGS     = $(CFLAGS) $(EXCFLAGS)
+ SSLLIBS      = libeay32.lib ssleay32.lib
+ ZLIBLIBSDLL  = zdll.lib
+ ZLIBLIBS     = zlib.lib
+-WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib
++WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib winhttp.lib
+ CFLAGS       = $(CFLAGS) $(EXCFLAGS)
  
- CFGSET     = FALSE
+ CFGSET       = FALSE
 --- curl-7.26.0/lib/url.c
 +++ misc/build/curl-7.26.0/lib/url.c
 @@ -80,6 +80,10 @@ void idn_free (void *ptr);
diff --git a/external/curl/curl-7.26.0_win.patch b/external/curl/curl-7.26.0_win.patch
deleted file mode 100644
index 0b3eed2d2eb6..000000000000
--- a/external/curl/curl-7.26.0_win.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- curl-7.26.0/Makefile.msvc.names	2011-03-19 09:17:12.000000000 -0600
-+++ misc/build/curl-7.26.0/Makefile.msvc.names	2012-07-02 07:20:39.323448800 -0600
-@@ -43,7 +43,7 @@
- !ENDIF
- 
- !IF !DEFINED(LIB_NAME_STA_DBG) || "$(LIB_NAME_STA_DBG)" == ""
--LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)d
-+LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)
- !ENDIF
- 
- !IF !DEFINED(LIB_NAME_DYN_REL) || "$(LIB_NAME_DYN_REL)" == ""
-@@ -51,7 +51,7 @@
- !ENDIF
- 
- !IF !DEFINED(LIB_NAME_DYN_DBG) || "$(LIB_NAME_DYN_DBG)" == ""
--LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)d
-+LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)
- !ENDIF
- 
- # --------------------------------------------
-@@ -59,11 +59,11 @@
- # --------------------------------------------
- 
- !IF !DEFINED(LIB_NAME_IMP_REL) || "$(LIB_NAME_IMP_REL)" == ""
--LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)_imp
-+LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)
- !ENDIF
- 
- !IF !DEFINED(LIB_NAME_IMP_DBG) || "$(LIB_NAME_IMP_DBG)" == ""
--LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)_imp
-+LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)
- !ENDIF
- 
- # --------------------------------------
---- curl/lib/Makefile.vc9	2012-05-24 12:07:02.000000000 -0400
-+++ curl/lib/Makefile.vc9	2012-10-29 11:53:44.658809300 -0400
-@@ -117,7 +117,7 @@
- ZLIBLIBSDLL= zdll.lib
- ZLIBLIBS   = zlib.lib
- WINLIBS    = ws2_32.lib wldap32.lib
--CFLAGS     = $(CFLAGS)
-+CFLAGS     = $(CFLAGS) $(EXCFLAGS)
- 
- CFGSET     = FALSE
- 
-@@ -620,11 +620,11 @@
- debug-dll-ssl-dll\libcurl.res \
- debug-dll-zlib-dll\libcurl.res \
- debug-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
--	rc /dDEBUGBUILD=1 /Fo $@ libcurl.rc
-+	rc $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ libcurl.rc
-
- release-dll\libcurl.res \
- release-dll-ssl-dll\libcurl.res \
- release-dll-zlib-dll\libcurl.res \
- release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
--	rc /dDEBUGBUILD=0 /Fo $@ libcurl.rc
-+	rc $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ libcurl.rc
- !ENDIF  # End of case where a config was provided.
diff --git a/external/curl/curl-aix.patch b/external/curl/curl-aix.patch
deleted file mode 100644
index 708411ccf1ef..000000000000
--- a/external/curl/curl-aix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur curl-7.26.0/config.guess misc/build/curl-7.26.0/config.guess
---- curl-7.26.0/config.guess	2012-07-02 13:46:52.428053096 +0200
-+++ misc/build/curl-7.26.0/config.guess	2012-07-02 13:48:13.644057499 +0200
-@@ -565,6 +565,9 @@
- 	else
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
-+	if [ "$IBM_REV" == "V7BETA" ]; then
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- 	exit ;;
-     *:AIX:*:*)
diff --git a/external/curl/curl-freebsd.patch.1 b/external/curl/curl-freebsd.patch.1
new file mode 100644
index 000000000000..b1d7cb845845
--- /dev/null
+++ b/external/curl/curl-freebsd.patch.1
@@ -0,0 +1,32 @@
+Usual patch to produce Linux-like .so files on FreeBSD
+
+diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh
+--- a/ltmain.sh	2012-07-02 13:28:51.298994493 +0200
++++ b/ltmain.sh	2012-07-02 13:42:46.511039769 +0200
+@@ -7334,13 +7334,13 @@
+ 	  #
+ 	  case $version_type in
+ 	  # correct linux to gnu/linux during the next big refactor
+-	  darwin|linux|osf|windows|none)
++	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf|none)
+ 	    func_arith $number_major + $number_minor
+ 	    current=$func_arith_result
+ 	    age="$number_minor"
+ 	    revision="$number_revision"
+ 	    ;;
+-	  freebsd-aout|freebsd-elf|qnx|sunos)
++	  qnx|sunos)
+ 	    current="$number_major"
+ 	    revision="$number_minor"
+ 	    age="0"
+@@ -7420,8 +7420,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current"
++	  major=.`expr $current - $age`
++	  versuffix="$major"
+ 	  ;;
+ 
+ 	irix | nonstopux)
diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1
new file mode 100644
index 000000000000..42970d3319ad
--- /dev/null
+++ b/external/curl/curl-msvc.patch.1
@@ -0,0 +1,27 @@
+MSVC: using SOLARINC and EXCFLAGS
+
+--- curl/lib/Makefile.vc9	2012-05-24 12:07:02.000000000 -0400
++++ curl/lib/Makefile.vc9	2012-10-29 11:53:44.658809300 -0400
+@@ -117,7 +117,7 @@
+ ZLIBLIBSDLL  = zdll.lib
+ ZLIBLIBS     = zlib.lib
+ WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib
+-CFLAGS       = $(CFLAGS)
++CFLAGS       = $(CFLAGS) $(EXCFLAGS)
+ 
+ CFGSET       = FALSE
+ 
+@@ -620,11 +620,11 @@
+ debug-dll-ssl-dll\libcurl.res \
+ debug-dll-zlib-dll\libcurl.res \
+ debug-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
+-	rc /dDEBUGBUILD=1 /Fo $@ libcurl.rc
++	rc $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ libcurl.rc
+
+ release-dll\libcurl.res \
+ release-dll-ssl-dll\libcurl.res \
+ release-dll-zlib-dll\libcurl.res \
+ release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
+-	rc /dDEBUGBUILD=0 /Fo $@ libcurl.rc
++	rc $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ libcurl.rc
+ !ENDIF  # End of case where a config was provided.