diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-01-23 15:32:36 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-01-29 05:17:00 +0100 |
| commit | e9453a666468fcc0795be3859b393ee23db7e62d (patch) | |
| tree | 45bf98834b3e62fcb0864c10e80328e3be2c87b6 | |
| parent | Symstore: Also add .exe and .dlls to symstore (diff) | |
| download | core-e9453a666468fcc0795be3859b393ee23db7e62d.tar.gz core-e9453a666468fcc0795be3859b393ee23db7e62d.zip | |
curl: upgrade to version 7.52.1
- fixes some four CVEs
- and a ton of other fixes & improvements
Reviewed-on: https://gerrit.libreoffice.org/33471
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 6d9e4803806d1474039e25092a3c1ee268b0b9f8
and 2be42d9480fc831144e4d5b216b0a01ffbdb5c8f)
Change-Id: I2312f30f72c914c7e930c59ddbe44fb8a282c0a5
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/curl/curl-7.26.0_win-proxy.patch | 12 | ||||
| -rw-r--r-- | external/curl/curl-msvc.patch.1 | 8 |
3 files changed, 8 insertions, 16 deletions
diff --git a/download.lst b/download.lst index e6d01345d491..b78d0f7359e2 100644 --- a/download.lst +++ b/download.lst @@ -30,8 +30,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 := 490e19a8ccd1f4a244b50338a0eb9456 -export CURL_TARBALL := curl-7.51.0.tar.gz +export CURL_MD5SUM := 4e1ef056e117b4d25f4ec42ac609c0d4 +export CURL_TARBALL := curl-7.52.1.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/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index 580479ae4aa2..54aa746106de 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -27,14 +27,14 @@ } +#ifdef WIN32 -+static char* wstrToCstr( LPWSTR wStr ) ++static char *wstrToCstr(LPWSTR wStr) +{ + int bufSize; -+ char* out = NULL; ++ char *out = NULL; + if(wStr != NULL) { + bufSize = WideCharToMultiByte( + CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL); -+ out = (char*)malloc(bufSize * sizeof(char)); ++ out = (char *)malloc(bufSize * sizeof(char)); + WideCharToMultiByte(CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL); + } + return out; @@ -59,13 +59,13 @@ - char *no_proxy=NULL; +#ifdef WIN32 + WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *ieProxyConfig; -+ ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*) ++ ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *) + malloc(sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG)); + if(WinHttpGetIEProxyConfigForCurrentUser(ieProxyConfig)) { + if(!ieProxyConfig->fAutoDetect) { + char *ieProxy; + char *ieNoProxy; -+ char* pos; ++ char *pos; + + ieProxy = wstrToCstr(ieProxyConfig->lpszProxy); + ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass); @@ -82,7 +82,7 @@ + + if(!check_noproxy(conn->host.name, no_proxy)) { + /* Look for the http proxy setting */ -+ char* tok; ++ char *tok; + char *saveptr; + + if(NULL != ieProxy) { diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1 index 88ced0a75493..57a292bb69a3 100644 --- a/external/curl/curl-msvc.patch.1 +++ b/external/curl/curl-msvc.patch.1 @@ -11,14 +11,6 @@ MSVC: using SOLARINC and EXCFLAGS CFGSET = FALSE -@@ -632,7 +632,6 @@ - $(DIROBJ)\vtls.obj \ - $(DIROBJ)\openssl.obj \ - $(DIROBJ)\strdup.obj \ -- $(DIROBJ)\strequal.obj \ - $(DIROBJ)\strerror.obj \ - $(DIROBJ)\strtok.obj \ - $(DIROBJ)\strtoofft.obj \ @@ -620,11 +620,11 @@ debug-dll-ssl-dll\libcurl.res \ debug-dll-zlib-dll\libcurl.res \ |