diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-01 00:04:32 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-03 10:21:37 +0200 |
| commit | 65327d615b64f487842e4c5d0ee7290f9c823a0f (patch) | |
| tree | 37d681d345b2067638af6c17b42e04a7463f5df7 | |
| parent | 5289e0fac00189f975f62fa6aab5166478eef0b6 (diff) | |
curl: upgrade to release 7.43.0
Change-Id: Ic16111f21625fc510e79bba8122eaa60662f7a59
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/curl/curl-7.26.0_win-proxy.patch | 9 | ||||
| -rw-r--r-- | external/curl/curl-msvc-schannel.patch.1 | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/download.lst b/download.lst index 32570252ca98..958fad6631df 100644 --- a/download.lst +++ b/download.lst @@ -28,8 +28,8 @@ export COLLADA2GLTF_TARBALL := 4b87018f7fff1d054939d19920b751a0-collada2gltf-mas export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01 export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt -export CURL_MD5SUM := e6d1f9d1b59da5062109ffe14e0569a4 -export CURL_TARBALL := curl-7.36.0.tar.bz2 +export CURL_MD5SUM := 11bddbb452a8b766b932f859aaeeed39 +export CURL_TARBALL := curl-7.43.0.tar.bz2 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/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index 26c42f7c56e7..99402a437e5a 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -117,14 +117,11 @@ char proxy_env[128]; no_proxy=curl_getenv("no_proxy"); -@@ -4189,9 +4265,9 @@ static char *detect_proxy(struct connectdata *conn) +@@ -4189,6 +4265,7 @@ static char *detect_proxy(struct connectdata *conn) } } /* if(!check_noproxy(conn->host.name, no_proxy)) - it wasn't specified non-proxy */ +#endif /* WIN32 */ - if(no_proxy) - free(no_proxy); -- - #else /* !CURL_DISABLE_HTTP */ + free(no_proxy); - (void)conn; + #else /* !CURL_DISABLE_HTTP */ diff --git a/external/curl/curl-msvc-schannel.patch.1 b/external/curl/curl-msvc-schannel.patch.1 index 68af66d6dd2f..1091a762a5e8 100644 --- a/external/curl/curl-msvc-schannel.patch.1 +++ b/external/curl/curl-msvc-schannel.patch.1 @@ -11,11 +11,11 @@ MSVC: use WNT native Schannel SSL/TLS implementation CFGSET = TRUE RESOURCE = $(DIROBJ)\libcurl.res !ENDIF -@@ -411,7 +411,7 @@ +@@ -427,7 +427,7 @@ TARGET = $(LIBCURL_DYN_LIB_DBG) DIROBJ = $(CFG) LNK = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIBCURL_IMP_LIB_DBG) /PDB:$(DIROBJ)\$(LIBCURL_DYN_LIB_PDB) --CC = $(CCDEBUG) $(RTLIBD) +-CC = $(CCDEBUG) $(RTLIBD) +CC = $(CCDEBUG) $(RTLIBD) $(CFLAGSWINSSL) CFGSET = TRUE RESOURCE = $(DIROBJ)\libcurl.res |