Author: pfg
Date: Thu Dec 20 21:48:42 2012
New Revision: 1424721
URL: http://svn.apache.org/viewvc?rev=1424721&view=rev
Log:
i121528 - Update internal libxml2 to version 2.7.8.
Despite not being the latest version, 2.7.8 has been relatively well
tested and introduces no API changes.
The last update to our internal XML C parser was done in Oct 6 2009,
so the list of enhancements is quite big:
http://xmlsoft.org/news.html
In addition to the normal updates we include a couple of vulnerability
fixes from FreeBSD.
Added:
openoffice/trunk/main/libxml2/libxml2-fixes.patch
Removed:
openoffice/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
openoffice/trunk/main/libxml2/libxml2-gnome599717.patch
openoffice/trunk/main/libxml2/libxml2-xpath.patch
Modified:
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/libxml2/libxml2-configure.patch
openoffice/trunk/main/libxml2/libxml2-global-symbols.patch
openoffice/trunk/main/libxml2/libxml2-long-path.patch
openoffice/trunk/main/libxml2/libxml2-mingw.patch
openoffice/trunk/main/libxml2/libxml2-runtest.patch
openoffice/trunk/main/libxml2/libxml2-testapi.patch
openoffice/trunk/main/libxml2/makefile.mk
Modified: openoffice/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1424721&r1=1424720&r2=1424721&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Thu Dec 20 21:48:42 2012
@@ -187,9 +187,9 @@ if ( true )
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXML != YES)
- MD5 = 7740a8ec23878a2f50120e1faa2730f2
- name = libxml2-2.7.6.tar.gz
- URL1 = ftp://xmlsoft.org/libxml2/libxml2-2.7.6.tar.gz
+ MD5 = 8127a65e8c3b08856093099b52599c86
+ name = libxml2-2.7.8.tar.gz
+ URL1 = ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXSLT != YES)
Modified: openoffice/trunk/main/libxml2/libxml2-configure.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxml2/libxml2-configure.patch?rev=1424721&r1=1424720&r2=1424721&view=diff
==============================================================================
--- openoffice/trunk/main/libxml2/libxml2-configure.patch (original)
+++ openoffice/trunk/main/libxml2/libxml2-configure.patch Thu Dec 20 21:48:42
2012
@@ -1,6 +1,6 @@
---- misc/libxml2-2.7.6/ltmain.sh 2009-10-06 17:39:54.000000000 +0100
-+++ misc/build/libxml2-2.7.6/ltmain.sh 2009-12-17 11:43:56.000000000 +0000
-@@ -6271,8 +6271,8 @@
+--- misc/libxml2-2.7.8/ltmain.sh 2009-10-06 17:39:54.000000000 +0100
++++ misc/build/libxml2-2.7.8/ltmain.sh 2009-12-17 11:43:56.000000000 +0000
+@@ -6599,8 +6599,8 @@
;;
freebsd-elf)
@@ -11,8 +11,8 @@
;;
irix | nonstopux)
---- misc/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17
11:45:19.000000000 +0000
-+++ misc/build/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17
11:45:36.000000000 +0000
+--- misc/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17
11:45:19.000000000 +0000
++++ misc/build/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17
11:45:36.000000000 +0000
@@ -264,7 +264,7 @@
*
* Whether iconv support is available
@@ -22,7 +22,7 @@
#define LIBXML_ICONV_ENABLED
#endif
-@@ -282,7 +282,7 @@
+@@ -291,7 +291,7 @@
*
* Whether Debugging module is configured in
*/
@@ -31,7 +31,7 @@
#define LIBXML_DEBUG_ENABLED
#endif
-@@ -291,7 +291,7 @@
+@@ -300,7 +300,7 @@
*
* Whether the memory debugging is configured in
*/
@@ -40,7 +40,7 @@
#define DEBUG_MEMORY_LOCATION
#endif
-@@ -300,7 +300,7 @@
+@@ -309,7 +309,7 @@
*
* Whether the runtime debugging is configured in
*/
@@ -49,8 +49,8 @@
#define LIBXML_DEBUG_RUNTIME
#endif
---- misc/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:20.000000000 +0000
-+++ misc/build/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:36.000000000
+0000
+--- misc/libxml2-2.7.8/xml2-config.in 2009-12-17 11:45:20.000000000 +0000
++++ misc/build/libxml2-2.7.8/xml2-config.in 2009-12-17 11:45:36.000000000
+0000
@@ -1,9 +1,14 @@
#! /bin/sh
Added: openoffice/trunk/main/libxml2/libxml2-fixes.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxml2/libxml2-fixes.patch?rev=1424721&view=auto
==============================================================================
--- openoffice/trunk/main/libxml2/libxml2-fixes.patch (added)
+++ openoffice/trunk/main/libxml2/libxml2-fixes.patch Thu Dec 20 21:48:42 2012
@@ -0,0 +1,41 @@
+diff -ru misc/libxml2-2.7.8/parser.c misc/build/libxml2-2.7.8/parser.c
+--- misc/libxml2-2.7.8/parser.c 2010-11-04 10:55:45.000000000 -0500
++++ misc/build/libxml2-2.7.8/parser.c 2012-12-20 14:53:03.000000000 -0500
+@@ -2709,7 +2709,7 @@
+
+ buffer[nbchars++] = '&';
+ if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
+- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
++ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);
+ }
+ for (;i > 0;i--)
+ buffer[nbchars++] = *cur++;
+diff -ru misc/libxml2-2.7.8/xpointer.c misc/build/libxml2-2.7.8/xpointer.c
+--- misc/libxml2-2.7.8/xpointer.c 2010-10-12 01:25:33.000000000 -0500
++++ misc/build/libxml2-2.7.8/xpointer.c 2012-12-20 14:53:03.000000000
-0500
+@@ -1007,21 +1007,14 @@
+ NEXT;
+ break;
+ }
+- *cur++ = CUR;
+ } else if (CUR == '(') {
+ level++;
+- *cur++ = CUR;
+ } else if (CUR == '^') {
+- NEXT;
+- if ((CUR == ')') || (CUR == '(') || (CUR == '^')) {
+- *cur++ = CUR;
+- } else {
+- *cur++ = '^';
+- *cur++ = CUR;
+- }
+- } else {
+- *cur++ = CUR;
++ if ((NXT(1) == ')') || (NXT(1) == '(') || (NXT(1) == '^')) {
++ NEXT;
++ }
+ }
++ *cur++ = CUR;
+ NEXT;
+ }
+ *cur = 0;
Modified: openoffice/trunk/main/libxml2/libxml2-global-symbols.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxml2/libxml2-global-symbols.patch?rev=1424721&r1=1424720&r2=1424721&view=diff
==============================================================================
--- openoffice/trunk/main/libxml2/libxml2-global-symbols.patch (original)
+++ openoffice/trunk/main/libxml2/libxml2-global-symbols.patch Thu Dec 20
21:48:42 2012
@@ -1,5 +1,5 @@
---- misc/libxml2-2.7.6/libxml2.syms Tue Oct 6 18:31:35 2009
-+++ misc/build/libxml2-2.7.6/libxml2.syms Wed Jul 7 15:43:17 2010
+--- misc/libxml2-2.7.8/libxml2.syms Tue Oct 6 18:31:35 2009
++++ misc/build/libxml2-2.7.8/libxml2.syms Wed Jul 7 15:43:17 2010
@@ -2184,10 +2184,10 @@
} LIBXML2_2.6.27;
Modified: openoffice/trunk/main/libxml2/libxml2-long-path.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxml2/libxml2-long-path.patch?rev=1424721&r1=1424720&r2=1424721&view=diff
==============================================================================
--- openoffice/trunk/main/libxml2/libxml2-long-path.patch (original)
+++ openoffice/trunk/main/libxml2/libxml2-long-path.patch Thu Dec 20 21:48:42
2012
@@ -1,5 +1,5 @@
---- misc/libxml2-2.7.6/uri.c 2009-10-02 17:28:55.000000000 +0200
-+++ misc/build/libxml2-2.7.6/uri.c 2011-02-24 13:47:19.349299000 +0100
+--- misc/libxml2-2.7.8/uri.c 2009-10-02 17:28:55.000000000 +0200
++++ misc/build/libxml2-2.7.8/uri.c 2011-02-24 13:47:19.349299000 +0100
@@ -2479,7 +2479,16 @@
if (path == NULL)
return(NULL);
@@ -18,8 +18,8 @@
if ((path[0] == '/') && (path[1] == '/') && (path[2] != '/'))
path++;
---- misc/libxml2-2.7.6/xmlIO.c 2009-09-24 17:32:00.000000000 +0200
-+++ misc/build/libxml2-2.7.6/xmlIO.c 2011-02-24 13:47:26.163762000 +0100
+--- misc/libxml2-2.7.8/xmlIO.c 2009-09-24 17:32:00.000000000 +0200
++++ misc/build/libxml2-2.7.8/xmlIO.c 2011-02-24 13:47:26.163762000 +0100
@@ -772,6 +772,11 @@
#ifdef HAVE_STAT
Modified: openoffice/trunk/main/libxml2/libxml2-mingw.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxml2/libxml2-mingw.patch?rev=1424721&r1=1424720&r2=1424721&view=diff
==============================================================================
--- openoffice/trunk/main/libxml2/libxml2-mingw.patch (original)
+++ openoffice/trunk/main/libxml2/libxml2-mingw.patch Thu Dec 20 21:48:42 2012
@@ -1,6 +1,6 @@
---- misc/libxml2-2.7.6/configure 2008-01-11 17:01:56.000000000 +0900
-+++ misc/build/libxml2-2.7.6/configure 2009-09-07 20:48:47.656250000 +0900
-@@ -19914,6 +19914,8 @@
+--- misc/libxml2-2.7.8/configure 2008-01-11 17:01:56.000000000 +0900
++++ misc/build/libxml2-2.7.8/configure 2009-09-07 20:48:47.656250000 +0900
+@@ -13566,6 +13566,8 @@
if test "$with_modules" != "no" ; then
case "$host" in
@@ -8,8 +8,8 @@
+ ;;
*-*-cygwin*)
MODULE_EXTENSION=".dll"
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5
-@@ -20632,11 +20636,10 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lcygwin"
>&5
+@@ -13868,11 +13868,10 @@
fi
case $host_os in
@@ -22,8 +22,8 @@
;;
*cygwin*) THREAD_LIBS=""
;;
---- misc/libxml2-2.7.6/libxml.h 2007-11-23 19:47:23.000000000 +0900
-+++ misc/build/libxml2-2.7.6/libxml.h 2009-07-10 14:37:34.988250000 +0900
+--- misc/libxml2-2.7.8/libxml.h 2007-11-23 19:47:23.000000000 +0900
++++ misc/build/libxml2-2.7.8/libxml.h 2009-07-10 14:37:34.988250000 +0900
@@ -30,6 +30,10 @@
#include <libxml/xmlversion.h>
#else
@@ -34,15 +34,4 @@
+#endif
#include <libxml/xmlversion.h>
#endif
-
---- misc/libxml2-2.7.6/include/libxml/xmlexports.h 2009-09-25
00:31:59.000000000 +0900
-+++ misc/build/libxml2-2.7.6/include/libxml/xmlexports.h 2010-06-06
11:15:54.160750000 +0900
-@@ -113,7 +113,7 @@
- * _imp__xmlFree listed as missing. Try to workaround the problem
- * by also making that declaration when compiling client code.
- */
-- #if !defined(LIBXML_STATIC)
-+ #if defined(IN_LIBXML) && !defined(LIBXML_STATIC)
- #define XMLPUBFUN __declspec(dllexport)
- #define XMLPUBVAR __declspec(dllexport)
- #else
+
\ No newline at end of file
Modified: openoffice/trunk/main/libxml2/libxml2-runtest.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxml2/libxml2-runtest.patch?rev=1424721&r1=1424720&r2=1424721&view=diff
==============================================================================
--- openoffice/trunk/main/libxml2/libxml2-runtest.patch (original)
+++ openoffice/trunk/main/libxml2/libxml2-runtest.patch Thu Dec 20 21:48:42 2012
@@ -1,5 +1,5 @@
---- misc/libxml2-2.7.6/runtest.c 2009-09-24 23:32:00.000000000 +0800
-+++ misc/build/libxml2-2.7.6/runtest.c 2012-05-29 14:17:16.852600200 +0800
+--- misc/libxml2-2.7.8/runtest.c 2009-09-24 23:32:00.000000000 +0800
++++ misc/build/libxml2-2.7.8/runtest.c 2012-05-29 14:17:16.852600200 +0800
@@ -2728,7 +2728,7 @@
"file:///path/to/a%20b.html",
"/path/to/a b.html",
Modified: openoffice/trunk/main/libxml2/libxml2-testapi.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxml2/libxml2-testapi.patch?rev=1424721&r1=1424720&r2=1424721&view=diff
==============================================================================
--- openoffice/trunk/main/libxml2/libxml2-testapi.patch (original)
+++ openoffice/trunk/main/libxml2/libxml2-testapi.patch Thu Dec 20 21:48:42 2012
@@ -1,5 +1,5 @@
---- misc/libxml2-2.7.6/testapi.c 2009-09-24 23:32:00.000000000 +0800
-+++ misc/build/libxml2-2.7.6/testapi.c 2012-05-29 14:17:00.868020600 +0800
+--- misc/libxml2-2.7.8/testapi.c 2009-09-24 23:32:00.000000000 +0800
++++ misc/build/libxml2-2.7.8/testapi.c 2012-05-29 14:17:00.868020600 +0800
@@ -291,7 +291,7 @@
static xmlChar gen_xmlChar(int no, int nr ATTRIBUTE_UNUSED) {
if (no == 0) return('a');
Modified: openoffice/trunk/main/libxml2/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxml2/makefile.mk?rev=1424721&r1=1424720&r2=1424721&view=diff
==============================================================================
--- openoffice/trunk/main/libxml2/makefile.mk (original)
+++ openoffice/trunk/main/libxml2/makefile.mk Thu Dec 20 21:48:42 2012
@@ -38,16 +38,15 @@ all:
# --- Files --------------------------------------------------------
-LIBXML2VERSION=2.7.6
+LIBXML2VERSION=2.7.8
TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
-TARFILE_MD5=7740a8ec23878a2f50120e1faa2730f2
+TARFILE_MD5=8127a65e8c3b08856093099b52599c86
# libxml2-global-symbols: #i112480#: Solaris ld won't export non-listed symbols
PATCH_FILES=libxml2-configure.patch \
libxml2-mingw.patch \
- libxml2-gnome599717.patch \
- libxml2-xpath.patch \
+ libxml2-fixes.patch \
libxml2-global-symbols.patch \
libxml2-testapi.patch \
libxml2-runtest.patch
