Author: truckman
Date: Thu Aug 11 17:48:11 2016
New Revision: 1756017
URL: http://svn.apache.org/viewvc?rev=1756017&view=rev
Log:
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.
Added:
openoffice/trunk/main/curl/curl-7.50.1_win.patch
- copied, changed from r1756016,
openoffice/trunk/main/curl/curl-7.49.1_win.patch
Removed:
openoffice/trunk/main/curl/curl-7.49.1_win.patch
Modified:
openoffice/trunk/main/curl/makefile.mk
openoffice/trunk/main/external_deps.lst
Copied: openoffice/trunk/main/curl/curl-7.50.1_win.patch (from r1756016,
openoffice/trunk/main/curl/curl-7.49.1_win.patch)
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/curl/curl-7.50.1_win.patch?p2=openoffice/trunk/main/curl/curl-7.50.1_win.patch&p1=openoffice/trunk/main/curl/curl-7.49.1_win.patch&r1=1756016&r2=1756017&rev=1756017&view=diff
==============================================================================
--- openoffice/trunk/main/curl/curl-7.49.1_win.patch (original)
+++ openoffice/trunk/main/curl/curl-7.50.1_win.patch Thu Aug 11 17:48:11 2016
@@ -1,6 +1,6 @@
-diff -ur misc/curl-7.49.1/winbuild/Makefile.msvc.names
misc/build/curl-7.49.1/winbuild/Makefile.msvc.names
---- misc/curl-7.49.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
+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
Modified: openoffice/trunk/main/curl/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/curl/makefile.mk?rev=1756017&r1=1756016&r2=1756017&view=diff
==============================================================================
--- openoffice/trunk/main/curl/makefile.mk (original)
+++ openoffice/trunk/main/curl/makefile.mk Thu Aug 11 17:48:11 2016
@@ -37,12 +37,12 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=curl-7.49.1
-TARFILE_MD5=2feb3767b958add6a177c6602ff21e8c
+TARFILE_NAME=curl-7.50.1
+TARFILE_MD5=c264788f2e4313a05140d712c1ec90c2
PATCH_FILES=
.IF "$(GUI)"=="WNT"
- PATCH_FILES+=curl-7.49.1_win.patch
+ PATCH_FILES+=curl-7.50.1_win.patch
# .IF "$(COM)"=="GCC"
# PATCH_FILES+=curl-7.19.7_mingw.patch
# .ENDIF
Modified: openoffice/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1756017&r1=1756016&r2=1756017&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Thu Aug 11 17:48:11 2016
@@ -227,9 +227,9 @@ if (SYSTEM_EXPAT != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_CURL != YES)
- MD5 = 2feb3767b958add6a177c6602ff21e8c
- name = curl-7.49.1.tar.gz
- URL1 = http://curl.haxx.se/download/curl-7.49.1.tar.gz
+ MD5 = c264788f2e4313a05140d712c1ec90c2
+ name = curl-7.50.1.tar.gz
+ URL1 = http://curl.haxx.se/download/${name}
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (WITH_CATA_FONTS == YES)
