openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From truck...@apache.org
Subject svn commit: r1800568 - in /openoffice/trunk/main: expat/expat-2.2.0.patch expat/expat-2.2.1.patch expat/expat-winapi.patch expat/makefile.mk expat/prj/d.lst external_deps.lst
Date Sun, 02 Jul 2017 17:00:29 GMT
Author: truckman
Date: Sun Jul  2 17:00:29 2017
New Revision: 1800568

URL: http://svn.apache.org/viewvc?rev=1800568&view=rev
Log:
#i127461#: Update bundled expat to version 2.2.1

Version 2.2.0 that is bundled in trunk has vulnerabilities CVE-2017-9233
and CVE-2016-9063 and other potential problems.  It is not known whether
these impact OpenOffice.

The patch for <https://sourceforge.net/p/expat/bugs/539/> is included so
we no longer need a local patch for that.  We do need a new patch to
work around the lack of <stdint.h> in MS Visual Studio 9.0.


Added:
    openoffice/trunk/main/expat/expat-2.2.1.patch
      - copied, changed from r1800567, openoffice/trunk/main/expat/expat-2.2.0.patch
Removed:
    openoffice/trunk/main/expat/expat-2.2.0.patch
Modified:
    openoffice/trunk/main/expat/expat-winapi.patch
    openoffice/trunk/main/expat/makefile.mk
    openoffice/trunk/main/expat/prj/d.lst
    openoffice/trunk/main/external_deps.lst

Copied: openoffice/trunk/main/expat/expat-2.2.1.patch (from r1800567, openoffice/trunk/main/expat/expat-2.2.0.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/expat/expat-2.2.1.patch?p2=openoffice/trunk/main/expat/expat-2.2.1.patch&p1=openoffice/trunk/main/expat/expat-2.2.0.patch&r1=1800567&r2=1800568&rev=1800568&view=diff
==============================================================================
--- openoffice/trunk/main/expat/expat-2.2.0.patch (original)
+++ openoffice/trunk/main/expat/expat-2.2.1.patch Sun Jul  2 17:00:29 2017
@@ -1,5 +1,5 @@
---- misc/expat-2.2.0/lib/makefile.mk	Wed Aug 20 14:33:55 2008
-+++ misc/build/expat-2.2.0/lib/makefile.mk	Wed Aug 20 14:26:42 2008
+--- misc/expat-2.2.1/lib/makefile.mk	Wed Aug 20 14:33:55 2008
++++ misc/build/expat-2.2.1/lib/makefile.mk	Wed Aug 20 14:26:42 2008
 @@ -1 +1,83 @@
 -dummy
 +#**************************************************************
@@ -85,32 +85,19 @@
 +.INCLUDE :  set_wntx64.mk
 +.INCLUDE :	target.mk
 +.INCLUDE :  tg_wntx64.mk
---- misc/expat-2.2.0/lib/xmltok.c	2016-06-21 05:58:38.000000000 -0700
-+++ misc/build/expat-2.2.0/lib/xmltok.c	2016-08-05 10:08:54.265761000 -0700
-@@ -402,7 +402,7 @@
-     case BT_LEAD2:
-       if (fromLim - from < 2) {
-         res = XML_CONVERT_INPUT_INCOMPLETE;
--        break;
-+        goto after;
-       }
-       *to++ = (unsigned short)(((from[0] & 0x1f) << 6) | (from[1] & 0x3f));
-       from += 2;
-@@ -410,7 +410,7 @@
-     case BT_LEAD3:
-       if (fromLim - from < 3) {
-         res = XML_CONVERT_INPUT_INCOMPLETE;
--        break;
-+        goto after;
-       }
-       *to++ = (unsigned short)(((from[0] & 0xf) << 12)
-                                | ((from[1] & 0x3f) << 6) | (from[2] & 0x3f));
-@@ -441,6 +441,8 @@
-       break;
-     }
-   }
-+  if (from < fromLim)
-+    res = XML_CONVERT_OUTPUT_EXHAUSTED;
- after:
-   *fromP = from;
-   *toP = to;
+--- misc/expat-2.2.1/lib/siphash.h	Sat Jun 17  09:07:38 2017
++++ misc/build/expat-2.2.1/lib/siphash.h	Fri Jun 30  15:45:22 2017
+@@ -76,7 +76,13 @@
+ #define SIPHASH_H
+ 
+ #include <stddef.h> /* size_t */
++#if defined(_MSC_VER) && _MSC_VER < 1600
++typedef unsigned __int64 uint64_t;
++typedef unsigned __int32 uint32_t;
++typedef unsigned __int8 uint8_t;
++#else
+ #include <stdint.h> /* uint64_t uint32_t uint8_t */
++#endif
+ 
+ 
+ #define SIP_ROTL(x, b) (uint64_t)(((x) << (b)) | ( (x) >> (64 - (b))))

Modified: openoffice/trunk/main/expat/expat-winapi.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/expat/expat-winapi.patch?rev=1800568&r1=1800567&r2=1800568&view=diff
==============================================================================
--- openoffice/trunk/main/expat/expat-winapi.patch (original)
+++ openoffice/trunk/main/expat/expat-winapi.patch Sun Jul  2 17:00:29 2017
@@ -1,6 +1,6 @@
-diff -ur misc/expat-2.2.0/lib/expat_external.h misc/build/expat-2.2.0/lib/expat_external.h
---- misc/expat-2.2.0/lib/expat_external.h	2016-06-21 05:58:38.000000000 -0700
-+++ misc/build/expat-2.2.0/lib/expat_external.h	2016-07-31 17:10:53.551556000 -0700
+diff -ur misc/expat-2.2.1/lib/expat_external.h misc/build/expat-2.2.0/lib/expat_external.h
+--- misc/expat-2.2.1/lib/expat_external.h	2016-06-21 05:58:38.000000000 -0700
++++ misc/build/expat-2.2.1/lib/expat_external.h	2016-07-31 17:10:53.551556000 -0700
 @@ -7,10 +7,6 @@
  
  /* External API definitions */

Modified: openoffice/trunk/main/expat/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/expat/makefile.mk?rev=1800568&r1=1800567&r2=1800568&view=diff
==============================================================================
--- openoffice/trunk/main/expat/makefile.mk (original)
+++ openoffice/trunk/main/expat/makefile.mk Sun Jul  2 17:00:29 2017
@@ -38,8 +38,8 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=expat-2.2.0
-TARFILE_MD5=2f47841c829facb346eb6e3fab5212e2
+TARFILE_NAME=expat-2.2.1
+TARFILE_MD5=d9c3baeab58774cefc2f04faf29f2cf8
 ADDITIONAL_FILES=lib$/makefile.mk
 PATCH_FILES=$(TARFILE_NAME).patch \
             expat-winapi.patch

Modified: openoffice/trunk/main/expat/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/expat/prj/d.lst?rev=1800568&r1=1800567&r2=1800568&view=diff
==============================================================================
--- openoffice/trunk/main/expat/prj/d.lst (original)
+++ openoffice/trunk/main/expat/prj/d.lst Sun Jul  2 17:00:29 2017
@@ -1,7 +1,7 @@
 mkdir: %_DEST%\inc%_EXT%\external\expat
 mkdir: %_DEST%\lib%_EXT%\x64
-..\%__SRC%\misc\build\expat-2.2.0\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
-..\%__SRC%\misc\build\expat-2.2.0\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
+..\%__SRC%\misc\build\expat-2.2.1\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
+..\%__SRC%\misc\build\expat-2.2.1\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
 ..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib
 ..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib
 ..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib

Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1800568&r1=1800567&r2=1800568&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Sun Jul  2 17:00:29 2017
@@ -218,9 +218,9 @@ if (SYSTEM_VIGRA != YES)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_EXPAT != YES)
-    MD5 = 2f47841c829facb346eb6e3fab5212e2
-    name = expat-2.2.0.tar.bz2
-    URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.0/expat-2.2.0.tar.bz2
+    MD5 = d9c3baeab58774cefc2f04faf29f2cf8
+    name = expat-2.2.1.tar.bz2
+    URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.1/expat-2.2.1.tar.bz2
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_CURL != YES)



Mime
View raw message