The attached patch upgrades the version of curl that we bundle in trunk
from 7.50.1 to 7.61.0. The old version has quite a few CVEs.
Fortunately we don't use curl for much in OpenOffice.
Index: main/external_deps.lst
===================================================================
--- main/external_deps.lst (revision 1839273)
+++ main/external_deps.lst (working copy)
@@ -224,8 +224,8 @@
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_CURL != YES)
- MD5 = c264788f2e4313a05140d712c1ec90c2
- name = curl-7.50.1.tar.gz
+ MD5 = ef343f64daab4691f528697b58a2d984
+ name = curl-7.61.0.tar.gz
URL1 = https://curl.haxx.se/download/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
Index: main/curl/curl-7.50.1_win.patch
===================================================================
--- main/curl/curl-7.50.1_win.patch (revision 1839273)
+++ main/curl/curl-7.50.1_win.patch (nonexistent)
@@ -1,35 +0,0 @@
-diff -ur misc/curl-7.50.1/winbuild/Makefile.msvc.names misc/build/curl-7.50.1/winbuild/Makefile.msvc.names
---- misc/curl-7.50.1/winbuild/Makefile.msvc.names 2016-03-22 00:15:38.000000000 -0700
-+++ misc/build/curl-7.50.1/winbuild/Makefile.msvc.names 2016-07-19 15:35:28.465823000 -0700
-@@ -43,7 +43,7 @@
- !ENDIF
-
- !IF !DEFINED(LIB_NAME_STA_DBG) || "$(LIB_NAME_STA_DBG)" == ""
--LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)d
-+LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)
- !ENDIF
-
- !IF !DEFINED(LIB_NAME_DYN_REL) || "$(LIB_NAME_DYN_REL)" == ""
-@@ -51,7 +51,7 @@
- !ENDIF
-
- !IF !DEFINED(LIB_NAME_DYN_DBG) || "$(LIB_NAME_DYN_DBG)" == ""
--LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)d
-+LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)
- !ENDIF
-
- # --------------------------------------------
-@@ -59,11 +59,11 @@
- # --------------------------------------------
-
- !IF !DEFINED(LIB_NAME_IMP_REL) || "$(LIB_NAME_IMP_REL)" == ""
--LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)_imp
-+LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)
- !ENDIF
-
- !IF !DEFINED(LIB_NAME_IMP_DBG) || "$(LIB_NAME_IMP_DBG)" == ""
--LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)_imp
-+LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)
- !ENDIF
-
- # --------------------------------------
Index: main/curl/makefile.mk
===================================================================
--- main/curl/makefile.mk (revision 1839273)
+++ main/curl/makefile.mk (working copy)
@@ -37,21 +37,10 @@
# --- Files --------------------------------------------------------
-TARFILE_NAME=curl-7.50.1
-TARFILE_MD5=c264788f2e4313a05140d712c1ec90c2
+TARFILE_NAME=curl-7.61.0
+TARFILE_MD5=ef343f64daab4691f528697b58a2d984
PATCH_FILES=
-.IF "$(GUI)"=="WNT"
- PATCH_FILES+=curl-7.50.1_win.patch
-# .IF "$(COM)"=="GCC"
-# PATCH_FILES+=curl-7.19.7_mingw.patch
-# .ENDIF
-.ENDIF
-
-
-#CONVERTFILES= \
- lib$/Makefile.vc6
-
#ADDITIONAL_FILES= lib$/config-os2.h lib$/Makefile.os2
.IF "$(GUI)"=="UNX"
@@ -113,15 +102,15 @@
curl_MACHINE:="X64"
.ENDIF
-BUILD_DIR=.$/lib
+BUILD_DIR=.$/winbuild
.IF "$(debug)"==""
-BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE)
+BUILD_ACTION=CC="cl.exe" nmake -f Makefile.vc mode=dll VC=9 EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE)
.ELSE
-BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE)
+BUILD_ACTION=CC="cl.exe" nmake -f Makefile.vc mode=dll VC=9 DEBUG=yes EXCFLAGS=$(EXCFLAGS) MACHINE=$(curl_MACHINE)
.ENDIF
-OUT2BIN=$(BUILD_DIR)$/libcurl.dll
-OUT2LIB=$(BUILD_DIR)$/libcurl.lib
+OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.dll
+OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ipv6-sspi-winssl-obj-lib/libcurl.lib
.ENDIF
.ENDIF # "$(GUI)"=="WNT"
@@ -150,9 +139,9 @@
include$/curl$/typecheck-gcc.h \
include$/curl$/stdcheaders.h \
include$/curl$/mprintf.h \
- include$/curl$/curlbuild.h \
- include$/curl$/curlrules.h
+ include$/curl$/system.h
+
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
Index: main/curl/prj/d.lst
===================================================================
--- main/curl/prj/d.lst (revision 1839273)
+++ main/curl/prj/d.lst (working copy)
@@ -6,8 +6,7 @@
..\%__SRC%\inc\multi.h %_DEST%\inc%_EXT%\external\curl\multi.h
..\%__SRC%\inc\stdcheaders.h %_DEST%\inc%_EXT%\external\curl\stdcheaders.h
..\%__SRC%\inc\typecheck-gcc.h %_DEST%\inc%_EXT%\external\curl\typecheck-gcc.h
-..\%__SRC%\inc\curlbuild.h %_DEST%\inc%_EXT%\external\curl\curlbuild.h
-..\%__SRC%\inc\curlrules.h %_DEST%\inc%_EXT%\external\curl\curlrules.h
+..\%__SRC%\inc\system.h %_DEST%\inc%_EXT%\external\curl\system.h
..\%__SRC%\bin\libcurl*.dll %_DEST%\bin%_EXT%\*.dll
..\%__SRC%\lib\libcurl.* %_DEST%\lib%_EXT%\libcurl.*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
