diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-11-02 11:48:21 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-11-02 19:11:14 +0000 |
| commit | 3edb365f2651848ae8bc3b85bf0b56bd00d93270 (patch) | |
| tree | 42005cf2a6a850030f698a41ca69afe339f37aeb /external/curl/curl-msvc.patch.1 | |
| parent | 3e42714c76b1347babfdea0564009d8d82a83af4 (diff) | |
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 <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 | 12 |
1 files changed, 10 insertions, 2 deletions
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 \ |