Kaydet (Commit) 60eac6bc authored tarafından Don Lewis's avatar Don Lewis

Upgrade bundled curl to version 7.50.1 to fix:

CVE-2016-5419
CVE-2016-5420
CVE-2016-5421
Whether any of these affect the OpenOffice usage of curl is not known.
OpenOffice only uses curl to access ftp:// URLs, which is likely to be
only rarely done.
üst 031996fd
diff -ur misc/curl-7.49.1/winbuild/Makefile.msvc.names misc/build/curl-7.49.1/winbuild/Makefile.msvc.names diff -ur misc/curl-7.50.1/winbuild/Makefile.msvc.names misc/build/curl-7.50.1/winbuild/Makefile.msvc.names
--- misc/curl-7.49.1/winbuild/Makefile.msvc.names 2016-03-22 00:15:38.000000000 -0700 --- misc/curl-7.50.1/winbuild/Makefile.msvc.names 2016-03-22 00:15:38.000000000 -0700
+++ misc/build/curl-7.49.1/winbuild/Makefile.msvc.names 2016-07-19 15:35:28.465823000 -0700 +++ misc/build/curl-7.50.1/winbuild/Makefile.msvc.names 2016-07-19 15:35:28.465823000 -0700
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
!ENDIF !ENDIF
......
...@@ -37,12 +37,12 @@ all: ...@@ -37,12 +37,12 @@ all:
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
TARFILE_NAME=curl-7.49.1 TARFILE_NAME=curl-7.50.1
TARFILE_MD5=2feb3767b958add6a177c6602ff21e8c TARFILE_MD5=c264788f2e4313a05140d712c1ec90c2
PATCH_FILES= PATCH_FILES=
.IF "$(GUI)"=="WNT" .IF "$(GUI)"=="WNT"
PATCH_FILES+=curl-7.49.1_win.patch PATCH_FILES+=curl-7.50.1_win.patch
# .IF "$(COM)"=="GCC" # .IF "$(COM)"=="GCC"
# PATCH_FILES+=curl-7.19.7_mingw.patch # PATCH_FILES+=curl-7.19.7_mingw.patch
# .ENDIF # .ENDIF
......
...@@ -227,9 +227,9 @@ if (SYSTEM_EXPAT != YES) ...@@ -227,9 +227,9 @@ if (SYSTEM_EXPAT != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_CURL != YES) if (SYSTEM_CURL != YES)
MD5 = 2feb3767b958add6a177c6602ff21e8c MD5 = c264788f2e4313a05140d712c1ec90c2
name = curl-7.49.1.tar.gz name = curl-7.50.1.tar.gz
URL1 = http://curl.haxx.se/download/curl-7.49.1.tar.gz URL1 = http://curl.haxx.se/download/${name}
URL2 = $(OOO_EXTRAS)$(MD5)-$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (WITH_CATA_FONTS == YES) if (WITH_CATA_FONTS == YES)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment