mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
cb151051d79a7ec176e769a33a56e7d906fc1425
libreoffice/external/curl/curl-msvc.patch.1

28 lines
1.1 KiB
Groff
Raw Normal View History

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>
2017-10-23 17:43:21 +02:00
MSVC: using SOLARINC
curl: upgrade to version 7.33.0 - from curl-7.26.0.patch: * drop ADDCFLAGS stuff, must be some dmake relic * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000 which is unsupported (and ws2_32.lib is linked anyway...) * split out curl-freebsd.patch.1 - curl-7.26.0_win.patch: * drop the library renaming stuff - can be handled in Package and RepositoryExternal.mk without patch * rename the rest to curl-msvc.patch.1 - drop curl-aix.patch: presumably don't need special check for V7BETA since it's released now - drop curl-7.26.0_strlcat.patch (obsolete) Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0 Reviewed-on: https://gerrit.libreoffice.org/6642 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-11 14:42:13 +01:00
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>
2017-10-23 17:43:21 +02:00
--- 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
curl: upgrade to version 7.33.0 - from curl-7.26.0.patch: * drop ADDCFLAGS stuff, must be some dmake relic * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000 which is unsupported (and ws2_32.lib is linked anyway...) * split out curl-freebsd.patch.1 - curl-7.26.0_win.patch: * drop the library renaming stuff - can be handled in Package and RepositoryExternal.mk without patch * rename the rest to curl-msvc.patch.1 - drop curl-aix.patch: presumably don't need special check for V7BETA since it's released now - drop curl-7.26.0_strlcat.patch (obsolete) Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0 Reviewed-on: https://gerrit.libreoffice.org/6642 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-11 14:42:13 +01:00
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>
2017-10-23 17:43:21 +02:00
LFLAGS = /nologo /machine:$(MACHINE)
@@ -300,11 +300,11 @@
# CURL_XX macros are for the curl.exe command
curl: upgrade to version 7.33.0 - from curl-7.26.0.patch: * drop ADDCFLAGS stuff, must be some dmake relic * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000 which is unsupported (and ws2_32.lib is linked anyway...) * split out curl-freebsd.patch.1 - curl-7.26.0_win.patch: * drop the library renaming stuff - can be handled in Package and RepositoryExternal.mk without patch * rename the rest to curl-msvc.patch.1 - drop curl-aix.patch: presumably don't need special check for V7BETA since it's released now - drop curl-7.26.0_strlcat.patch (obsolete) Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0 Reviewed-on: https://gerrit.libreoffice.org/6642 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-11 14:42:13 +01:00
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>
2017-10-23 17:43:21 +02:00
!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
Reference in New Issue Copy Permalink