diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-10-23 17:43:21 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-10-24 10:09:07 +0200 |
| commit | 89b08e23180c242a058653e246ace2ca47b56a3a (patch) | |
| tree | a9143a6e318fe2d95943966fbca8d09b2e29ec3f /external/curl/curl-msvc.patch.1 | |
| parent | 3168ba6c6eb995060842614a11c7bc5a780812d3 (diff) | |
curl: upgrade to release 7.56.1
- fixes a very minor CVE: CVE-2017-1000254
- the Windows nmakefiles we were previously using have been
removed, so we use the *other* Windows nmake build system now
- /EHs override is pointless, default /EHsc should work fine
- the macros defined in ExternalProject are not needed any more
- curl-msvc-schannel.patch.1: drop, not needed with new makefiles
- curl-osx.patch.1: none of it applies, presumably fixed upstream
Change-Id: I15c71b9c82c31d286d935b57543a1b0216123b66
Reviewed-on: https://gerrit.libreoffice.org/43724
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/curl/curl-msvc.patch.1')
| -rw-r--r-- | external/curl/curl-msvc.patch.1 | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1 index 57a292bb69a3..80160958c99d 100644 --- a/external/curl/curl-msvc.patch.1 +++ b/external/curl/curl-msvc.patch.1 @@ -1,27 +1,27 @@ -MSVC: using SOLARINC and EXCFLAGS +MSVC: using SOLARINC ---- 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 - WINLIBS = ws2_32.lib wldap32.lib advapi32.lib --CFLAGS = $(CFLAGS) -+CFLAGS = $(CFLAGS) $(EXCFLAGS) +--- curl/winbuild/MakefileBuild.vc.orig 2017-10-23 16:36:07.713550851 +0200 ++++ curl/winbuild/MakefileBuild.vc 2017-10-23 16:38:19.301547594 +0200 +@@ -60,7 +60,7 @@ + !ELSE + CC_NODEBUG = $(CC) /O2 /DNDEBUG + CC_DEBUG = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd +-CFLAGS = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL ++CFLAGS = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC) + !ENDIF - CFGSET = FALSE + LFLAGS = /nologo /machine:$(MACHINE) +@@ -300,11 +300,11 @@ + # CURL_XX macros are for the curl.exe command -@@ -620,11 +620,11 @@ - debug-dll-ssl-dll\libcurl.res \ - debug-dll-zlib-dll\libcurl.res \ - debug-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc -- rc /dDEBUGBUILD=1 /Fo $@ libcurl.rc -+ rc $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ libcurl.rc - - release-dll\libcurl.res \ - release-dll-ssl-dll\libcurl.res \ - release-dll-zlib-dll\libcurl.res \ - release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc -- rc /dDEBUGBUILD=0 /Fo $@ libcurl.rc -+ rc $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ libcurl.rc - !ENDIF # End of case where a config was provided. + !IF "$(DEBUG)"=="yes" +-RC_FLAGS = /dDEBUGBUILD=1 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc ++RC_FLAGS = $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc + CURL_CC = $(CC_DEBUG) $(RTLIB_DEBUG) + CURL_RC_FLAGS = /i../include /dDEBUGBUILD=1 /Fo $@ $(CURL_SRC_DIR)\curl.rc + !ELSE +-RC_FLAGS = /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc ++RC_FLAGS = $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc + CURL_CC = $(CC_NODEBUG) $(RTLIB) + CURL_RC_FLAGS = /i../include /dDEBUGBUILD=0 /Fo $@ $(CURL_SRC_DIR)\curl.rc + !ENDIF |