From 3edb365f2651848ae8bc3b85bf0b56bd00d93270 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 2 Nov 2016 11:48:21 +0100 Subject: curl: upgrade to version 7.51.0 - fixes about a dozen CVEs - tweak curl-7.26.0_win-proxy.patch: there is a "checksrc" thing now in curl that fails the build with: warning: use of strtok is banned (BANNEDFUNC) so use strtok_s instead (which is MSVC's name for standard strtok_r) - use Makefile.vc12 instead of Makefile.vc10 - remove strequal.obj from Makefile.vc12, it does not actually exist Change-Id: Ie2da64980d88c72b0c902376ffc01abf97a7bc91 Reviewed-on: https://gerrit.libreoffice.org/30484 Tested-by: Jenkins Reviewed-by: Michael Stahl --- external/curl/ExternalProject_curl.mk | 2 +- external/curl/UnpackedTarball_curl.mk | 2 +- external/curl/curl-7.26.0_win-proxy.patch | 13 +++++++------ external/curl/curl-msvc-schannel.patch.1 | 4 ++-- external/curl/curl-msvc.patch.1 | 12 ++++++++++-- 5 files changed, 21 insertions(+), 12 deletions(-) (limited to 'external/curl') diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 8446d82f4e71..76b4a4556103 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -79,7 +79,7 @@ else ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ - MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc10 \ + MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc12 \ cfg=$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \ EXCFLAGS="/EHs /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI /D_USING_V110_SDK71_ $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ ,lib) diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index f1e9209425ad..536474d4a30b 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -14,7 +14,7 @@ $(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,\ - lib/Makefile.vc10 \ + lib/Makefile.vc12 \ )) $(eval $(call gb_UnpackedTarball_add_patches,curl,\ diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index dff1e375d99a..cf41850fc865 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -1,5 +1,5 @@ ---- curl-7.26.0/lib/Makefile.vc10 -+++ misc/build/curl-7.26.0/lib/Makefile.vc10 +--- curl-7.26.0/lib/Makefile.vc12 ++++ misc/build/curl-7.26.0/lib/Makefile.vc12 @@ -118,7 +118,7 @@ WINSSLLIBS = crypt32.lib ZLIBLIBSDLL = zdll.lib @@ -13,7 +13,7 @@ +++ misc/build/curl-7.26.0/lib/url.c @@ -78,6 +78,10 @@ bool curl_win32_idn_to_ascii(const char *in, char **out); - #endif /* USE_LIBIDN */ + #endif /* USE_LIBIDN2 */ +#ifdef _WIN32 +#include @@ -52,7 +52,7 @@ #ifndef CURL_DISABLE_HTTP /* If proxy was not specified, we check for default proxy environment -@@ -4613,7 +4633,63 @@ +@@ -4613,7 +4633,64 @@ * For compatibility, the all-uppercase versions of these variables are * checked if the lowercase versions don't exist. */ @@ -83,9 +83,10 @@ + if(!check_noproxy(conn->host.name, no_proxy)) { + /* Look for the http proxy setting */ + char* tok; ++ char *saveptr; + + if(NULL != ieProxy) { -+ tok = strtok(ieProxy, ";"); ++ tok = strtok_s(ieProxy, ";", &saveptr); + if(strchr(tok, '=') == NULL) { + proxy = strdup(ieProxy); + } @@ -95,7 +96,7 @@ + /* We found HTTP proxy value, then use it */ + proxy = strdup(tok + 5); + } -+ tok = strtok(NULL, ";"); ++ tok = strtok_s(NULL, ";", &saveptr); + } + while(NULL != tok); + } diff --git a/external/curl/curl-msvc-schannel.patch.1 b/external/curl/curl-msvc-schannel.patch.1 index 1091a762a5e8..96768aa3f92c 100644 --- a/external/curl/curl-msvc-schannel.patch.1 +++ b/external/curl/curl-msvc-schannel.patch.1 @@ -1,7 +1,7 @@ MSVC: use WNT native Schannel SSL/TLS implementation ---- curl/lib/Makefile.vc10.old 2013-11-19 00:00:29.044499752 +0100 -+++ curl/lib/Makefile.vc10 2013-11-19 00:01:29.135499684 +0100 +--- curl/lib/Makefile.vc12.old 2013-11-19 00:00:29.044499752 +0100 ++++ curl/lib/Makefile.vc12 2013-11-19 00:01:29.135499684 +0100 @@ -260,7 +260,7 @@ TARGET = $(LIBCURL_DYN_LIB_REL) DIROBJ = $(CFG) diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1 index 927b3f184a78..88ced0a75493 100644 --- a/external/curl/curl-msvc.patch.1 +++ b/external/curl/curl-msvc.patch.1 @@ -1,7 +1,7 @@ MSVC: using SOLARINC and EXCFLAGS ---- curl/lib/Makefile.vc10 2012-05-24 12:07:02.000000000 -0400 -+++ curl/lib/Makefile.vc10 2012-10-29 11:53:44.658809300 -0400 +--- curl/lib/Makefile.vc12 2012-05-24 12:07:02.000000000 -0400 ++++ curl/lib/Makefile.vc12 2012-10-29 11:53:44.658809300 -0400 @@ -117,7 +117,7 @@ ZLIBLIBSDLL = zdll.lib ZLIBLIBS = zlib.lib @@ -11,6 +11,14 @@ 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 \ -- cgit