bump curl to 7.50.0

Change-Id: I368a18f70dfac51770afeb1f9e84ff83c19f0989
Reviewed-on: https://gerrit.libreoffice.org/27671
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 20 insertions, 53 deletions

diff --git a/download.lst b/download.lst
index bd340397e1b6..6f716d0f21aa 100644
--- a/download.lst
+++ b/download.lst
@@ -24,8 +24,8 @@ export COLLADA2GLTF_TARBALL := 4b87018f7fff1d054939d19920b751a0-collada2gltf-mas
 export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01
 export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz
 export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_MD5SUM := 11bddbb452a8b766b932f859aaeeed39
-export CURL_TARBALL := curl-7.43.0.tar.bz2
+export CURL_MD5SUM := 03940d7d4fcea1521fbbf07c1cf16f5e
+export CURL_TARBALL := curl-7.50.0.tar.gz
 export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
 export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index ed5589212dad..2de52db1b741 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dyli
 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.3.0))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.4.0))
 endif
 
 endif # $(DISABLE_DYNLOADING)
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
index 154263ce914f..4cde155df66f 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
-	external/curl/curl-freebsd.patch.1 \
 	external/curl/curl-msvc.patch.1 \
 	external/curl/curl-msvc-schannel.patch.1 \
 	external/curl/curl-7.26.0_mingw.patch \
diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch
index 81ccc65aab53..dff1e375d99a 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -1,18 +1,18 @@
 --- curl-7.26.0/lib/Makefile.vc10
 +++ misc/build/curl-7.26.0/lib/Makefile.vc10
-@@ -116,7 +116,7 @@ LFLAGS     = /nologo /machine:$(MACHINE)
- SSLLIBS      = libeay32.lib ssleay32.lib
+@@ -118,7 +118,7 @@
+ WINSSLLIBS   = crypt32.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
++WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib winhttp.lib crypt32.lib
  CFLAGS       = $(CFLAGS) $(EXCFLAGS)
  
  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);
- int curl_win32_idn_to_ascii(const char *in, char **out);
+@@ -78,6 +78,10 @@
+ bool curl_win32_idn_to_ascii(const char *in, char **out);
  #endif  /* USE_LIBIDN */
  
 +#ifdef _WIN32
@@ -22,20 +22,20 @@
  #include "urldata.h"
  #include "netrc.h"
  
-@@ -4111,6 +4115,21 @@ static bool check_noproxy(const char* name, const char* no_proxy)
+@@ -4586,6 +4590,21 @@
    return FALSE;
  }
  
 +#ifdef _WIN32
-+static char* wstrToCstr( LPWSTR wStr )
++static char* wstrToCstr(LPWSTR wStr)
 +{
 +  int bufSize;
 +  char* out = NULL;
 +  if(wStr != NULL) {
 +    bufSize = WideCharToMultiByte(
-+      CP_ACP,  0, wStr, -1, NULL, 0, NULL, NULL );
-+    out = ( char* )malloc( bufSize * sizeof(char));
-+    WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL );
++      CP_ACP,  0, wStr, -1, NULL, 0, NULL, NULL);
++    out = (char*)malloc(bufSize * sizeof(char));
++    WideCharToMultiByte(CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL);
 +  }
 +  return out;
 +}
@@ -44,7 +44,7 @@
  /****************************************************************
  * Detect what (if any) proxy to use. Remember that this selects a host
  * name and is not limited to HTTP proxies only.
-@@ -4119,6 +4138,7 @@ static bool check_noproxy(const char* name, const char* no_proxy)
+@@ -4594,6 +4613,7 @@
  static char *detect_proxy(struct connectdata *conn)
  {
    char *proxy = NULL;
@@ -52,7 +52,7 @@
  
  #ifndef CURL_DISABLE_HTTP
    /* If proxy was not specified, we check for default proxy environment
-@@ -4138,7 +4158,63 @@ static char *detect_proxy(struct connectdata *conn)
+@@ -4613,7 +4633,63 @@
     * For compatibility, the all-uppercase versions of these variables are
     * checked if the lowercase versions don't exist.
     */
@@ -93,7 +93,7 @@
 +            do {
 +              if(strncmp(tok, "http=", 5) == 0) {
 +                /* We found HTTP proxy value, then use it */
-+                proxy = strdup( tok + 5 );
++                proxy = strdup(tok + 5);
 +              }
 +              tok = strtok(NULL, ";");
 +            }
@@ -109,15 +109,15 @@
 +      /* TODO Handle the Proxy config Auto Detection case */
 +    }
 +
-+    GlobalFree( ieProxyConfig->lpszAutoConfigUrl );
-+    GlobalFree( ieProxyConfig->lpszProxy );
-+    GlobalFree( ieProxyConfig->lpszProxyBypass );
++    GlobalFree(ieProxyConfig->lpszAutoConfigUrl);
++    GlobalFree(ieProxyConfig->lpszProxy);
++    GlobalFree(ieProxyConfig->lpszProxyBypass);
 +  }
 +#else /* !WIN32 */
    char proxy_env[128];
  
    no_proxy=curl_getenv("no_proxy");
-@@ -4189,6 +4265,7 @@ static char *detect_proxy(struct connectdata *conn)
+@@ -4663,6 +4739,7 @@
      }
    } /* if(!check_noproxy(conn->host.name, no_proxy)) - it wasn't specified
         non-proxy */
diff --git a/external/curl/curl-freebsd.patch.1 b/external/curl/curl-freebsd.patch.1
deleted file mode 100644
index b1d7cb845845..000000000000
--- a/external/curl/curl-freebsd.patch.1
+++ /dev/null
@@ -1,32 +0,0 @@
-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)