download.lst | 4 ++-- external/curl/curl-7.26.0_win-proxy.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit b44d78b2bb34d7a285e917f97ea8302d724f4a0d Author: Thorsten Behrens <thorsten.behr...@cib.de> Date: Wed May 16 11:16:07 2018 +0200 curl: upgrade to release 7.60.0 This fixes the following CVEs: * FTP: shutdown response buffer overflow CVE-2018-1000300 * RTSP: bad headers buffer over-read CVE-2018-1000301 Reviewed-on: https://gerrit.libreoffice.org/54418 Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> Tested-by: Thorsten Behrens <thorsten.behr...@cib.de> Conflicts: download.lst Change-Id: Ic3229577083286501162aa5979a94ce934739557 diff --git a/download.lst b/download.lst index c6ffa5e994b6..d53cb9590313 100644 --- a/download.lst +++ b/download.lst @@ -2,8 +2,8 @@ ABW_MD5SUM := 40fa48e03b1e28ae0325cc34b35bc46d export ABW_TARBALL := libabw-0.0.2.tar.bz2 CDR_MD5SUM := fbcd8619fc6646f41d527c1329102998 export CDR_TARBALL := libcdr-0.0.15.tar.bz2 -CURL_MD5SUM := 7e9e9d5405c61148d53035426f162b0a -export CURL_TARBALL := curl-7.58.0.tar.gz +CURL_MD5SUM := 48eb126345d3b0f0a71a486b7f5d0307 +export CURL_TARBALL := curl-7.60.0.tar.gz EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978 export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2 ETONYEK_MD5SUM := 3c50bc60394d1f2675fbf9bd22581363 diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index e51c5d017818..5361433a917b 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -4,8 +4,8 @@ CFLAGS_LIBCURL_STATIC = /DCURL_STATICLIB --WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib -+WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib winhttp.lib +-WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib crypt32.lib ++WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib crypt32.lib winhttp.lib BASE_NAME = libcurl BASE_NAME_DEBUG = $(BASE_NAME)_debug @@ -112,9 +112,9 @@ const char *protop = conn->handler->scheme; char *envp = proxy_env; @@ -4663,6 +4739,7 @@ - if(!proxy) - proxy = curl_getenv("ALL_PROXY"); } + if(proxy) + infof(conn->data, "Uses proxy env variable %s == '%s'\n", envp, proxy); +#endif /* WIN32 */ return proxy; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits