[gentoo-commits] gentoo-x86 commit in dev-libs/libxml2/files: libxml2-2.9.0-rand_seed.patch libxml2-2.9.0-streaming-validation.patch libxml2-2.9.0-large-file-parse.patch libxml2-2.9.0-nsclean.patch libxml2-2.9.0-thread-alloc.patch libxml2-2.9.0-disable_static_modules.patch libxml2-2.9.0-thread-portability.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    12/11/27 05:43:54

  Added:                libxml2-2.9.0-rand_seed.patch
                        libxml2-2.9.0-streaming-validation.patch
                        libxml2-2.9.0-large-file-parse.patch
                        libxml2-2.9.0-nsclean.patch
                        libxml2-2.9.0-thread-alloc.patch
                        libxml2-2.9.0-disable_static_modules.patch
                        libxml2-2.9.0-thread-portability.patch
  Log:
  Version bump featuring improved push parser and XPath evaluation (bug #444290). Update to EAPI5, always install docs in a devhelp-compatible location following current gnome team style guidelines, and run a more complete test suite.
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

Revision  Changes    Path
1.1                  dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch?rev=1.1&content-type=text/plain

Index: libxml2-2.9.0-rand_seed.patch
===================================================================
From e7715a5963afebfb027120db6914926ec9a7373d Mon Sep 17 00:00:00 2001
From: Wouter Van Rooy <rooywo@×××××.com>
Date: Fri, 14 Sep 2012 14:39:42 +0800
Subject: [PATCH] rand_seed should be static in dict.c

For https://bugzilla.gnome.org/show_bug.cgi?id=683933
rand_seed should be a static variable in dict.c

We ran into a problem with another library that exports rand_seed as a
function. Combined with 2.7.8 this was not a problem but later versions
have this problem.
---
 dict.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dict.c b/dict.c
index 9935a25..164c7f2 100644
--- a/dict.c
+++ b/dict.c
@@ -143,7 +143,7 @@ static int xmlDictInitialized = 0;
 /*
  * Internal data for random function, protected by xmlDictMutex
  */
-unsigned int rand_seed = 0;
+static unsigned int rand_seed = 0;
 #endif
 #endif
 
-- 
1.8.0




1.1                  dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch?rev=1.1&content-type=text/plain

Index: libxml2-2.9.0-streaming-validation.patch
===================================================================
From 6c91aa384f48ff6d406553a6dd47fd556c1ef2e6 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@××××××.com>
Date: Thu, 25 Oct 2012 15:33:59 +0800
Subject: [PATCH] Fix a regression in 2.9.0 breaking validation while
 streaming

https://bugzilla.gnome.org/show_bug.cgi?id=684774
with help from Kjell Ahlstedt <kjell.ahlstedt@××××××××.net>
---
 SAX2.c   | 2 +-
 parser.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/SAX2.c b/SAX2.c
index a24abc8..3eea39a 100644
--- a/SAX2.c
+++ b/SAX2.c
@@ -2202,7 +2202,7 @@ xmlSAX2StartElementNs(void *ctx,
 	  (ctxt->myDoc->intSubset->elements == NULL) &&
 	  (ctxt->myDoc->intSubset->attributes == NULL) &&
 	  (ctxt->myDoc->intSubset->entities == NULL)))) {
-	xmlErrValid(ctxt, XML_ERR_NO_DTD,
+	xmlErrValid(ctxt, XML_DTD_NO_DTD,
 	  "Validation failed: no DTD found !", NULL, NULL);
 	ctxt->validate = 0;
     }
diff --git a/parser.c b/parser.c
index 28b0d80..19f1217 100644
--- a/parser.c
+++ b/parser.c
@@ -11633,7 +11633,7 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) {
 			    "PP: Parsing internal subset\n");
 #endif
 		    ctxt->inSubset = 1;
-                    ctxt->progressive = 1;
+                    ctxt->progressive = 0;
 		    ctxt->checkIndex = 0;
 		    xmlParseDocTypeDecl(ctxt);
 		    if (RAW == '[') {
@@ -12219,7 +12219,10 @@ xmldecl_done:
 	}
 	ctxt->instate = XML_PARSER_EOF;
     }
-    return((xmlParserErrors) ctxt->errNo);
+    if (ctxt->wellFormed == 0)
+	return((xmlParserErrors) ctxt->errNo);
+    else
+        return(0);
 }
 
 /************************************************************************
-- 
1.8.0




1.1                  dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch?rev=1.1&content-type=text/plain

Index: libxml2-2.9.0-large-file-parse.patch
===================================================================
From 153cf15905cf4ec080612ada6703757d10caba1e Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@××××××.com>
Date: Fri, 26 Oct 2012 13:50:47 +0800
Subject: [PATCH] Fix large parse of file from memory

https://bugzilla.redhat.com/show_bug.cgi?id=862969
The new code trying to detect excessive input lookup would
just get wrong sometimes in the case of very large file parsed
directly from memory.
---
 libxml.h | 2 ++
 parser.c | 1 +
 xmlIO.c  | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/libxml.h b/libxml.h
index efe285b..7558b5f 100644
--- a/libxml.h
+++ b/libxml.h
@@ -91,6 +91,8 @@ void __xmlGlobalInitMutexDestroy(void);
 int __xmlRandom(void);
 #endif
 
+int xmlNop(void);
+
 #ifdef IN_LIBXML
 #ifdef __GNUC__
 #ifdef PIC
diff --git a/parser.c b/parser.c
index 43f53d9..0d8d7f2 100644
--- a/parser.c
+++ b/parser.c
@@ -2025,6 +2025,7 @@ static void xmlSHRINK (xmlParserCtxtPtr ctxt) {
 static void xmlGROW (xmlParserCtxtPtr ctxt) {
     if ((((ctxt->input->end - ctxt->input->cur) > XML_MAX_LOOKUP_LIMIT) ||
          ((ctxt->input->cur - ctxt->input->base) > XML_MAX_LOOKUP_LIMIT)) &&
+         ((ctxt->input->buf) && (ctxt->input->buf->readcallback != xmlNop)) &&
         ((ctxt->options & XML_PARSE_HUGE) == 0)) {
         xmlFatalErr(ctxt, XML_ERR_INTERNAL_ERROR, "Huge input lookup");
         ctxt->instate = XML_PARSER_EOF;
diff --git a/xmlIO.c b/xmlIO.c
index f8f438b..44254e4 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -800,7 +800,7 @@ xmlCheckFilename (const char *path)
     return 1;
 }
 
-static int
+int
 xmlNop(void) {
     return(0);
 }
-- 
1.8.0




1.1                  dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch?rev=1.1&content-type=text/plain

Index: libxml2-2.9.0-nsclean.patch
===================================================================
From 711b15d545713b3a34a51ce8163d1162533647c9 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@××××××.com>
Date: Thu, 25 Oct 2012 19:23:26 +0800
Subject: [PATCH] Fix a bug in the nsclean option of the parser

Raised as a side effect of:
https://bugzilla.gnome.org/show_bug.cgi?id=663844
---
 parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parser.c b/parser.c
index 19f1217..43f53d9 100644
--- a/parser.c
+++ b/parser.c
@@ -1540,7 +1540,7 @@ nsPush(xmlParserCtxtPtr ctxt, const xmlChar *prefix, const xmlChar *URL)
 {
     if (ctxt->options & XML_PARSE_NSCLEAN) {
         int i;
-	for (i = 0;i < ctxt->nsNr;i += 2) {
+	for (i = ctxt->nsNr - 2;i >= 0;i -= 2) {
 	    if (ctxt->nsTab[i] == prefix) {
 		/* in scope */
 	        if (ctxt->nsTab[i + 1] == URL)
-- 
1.8.0




1.1                  dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch?rev=1.1&content-type=text/plain

Index: libxml2-2.9.0-thread-alloc.patch
===================================================================
From 0ad948ede2b5060a144c72e4e27c38d24a272ef4 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@×××××××××.org>
Date: Mon, 29 Oct 2012 13:41:55 +1100
Subject: [PATCH] Define LIBXML_THREAD_ALLOC_ENABLED via xmlversion.h

Otherwise, direct calls to xmlFree() etc. from the application will
use a different set of allocation functions to what was used to allocate
the memory internally.
---
 configure.in                   | 4 +++-
 include/libxml/xmlversion.h.in | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 6da057c..245c033 100644
--- a/configure.in
+++ b/configure.in
@@ -954,6 +954,7 @@ WITH_THREADS=0
 THREAD_CFLAGS=""
 TEST_THREADS=""
 THREADS_W32=""
+WITH_THREAD_ALLOC=0
 
 if test "$with_threads" = "no" ; then
     echo Disabling multithreaded support
@@ -1017,7 +1018,7 @@ else
     fi
 fi
 if test "$with_thread_alloc" = "yes" -a "$WITH_THREADS" = "1" ; then
-    THREAD_CFLAGS="$THREAD_CFLAGS -DLIBXML_THREAD_ALLOC_ENABLED"
+    WITH_THREAD_ALLOC=1
 fi
 
 AC_SUBST(THREAD_LIBS)
@@ -1025,6 +1026,7 @@ AC_SUBST(BASE_THREAD_LIBS)
 AC_SUBST(WITH_THREADS)
 AC_SUBST(THREAD_CFLAGS)
 AC_SUBST(TEST_THREADS)
+AC_SUBST(WITH_THREAD_ALLOC)
 AM_CONDITIONAL([THREADS_W32],[test -n "$THREADS_W32"])
 
 dnl
diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
index c98e7ca..00a836f 100644
--- a/include/libxml/xmlversion.h.in
+++ b/include/libxml/xmlversion.h.in
@@ -98,6 +98,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
 #endif
 
 /**
+ * LIBXML_THREAD_ALLOC_ENABLED:
+ *
+ * Whether the allocation hooks are per-thread
+ */
+#if @WITH_THREAD_ALLOC@
+#define LIBXML_THREAD_ALLOC_ENABLED
+#endif
+
+/**
  * LIBXML_TREE_ENABLED:
  *
  * Whether the DOM like tree manipulation API support is configured in
-- 
1.8.0




1.1                  dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch?rev=1.1&content-type=text/plain

Index: libxml2-2.9.0-disable_static_modules.patch
===================================================================
diff --git a/python/Makefile.am b/python/Makefile.am
index 4a8b5d5..b976893 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -19,13 +19,14 @@ if WITH_PYTHON
 AM_CPPFLAGS = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include	\
-	-I$(PYTHON_INCLUDES)
+	-I$(PYTHON_INCLUDES) \
+	-shared
 
 python_LTLIBRARIES = libxml2mod.la
 
 libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
 libxml2mod_la_LIBADD  = $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) -lpython$(PYTHON_VERSION)
-libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
+libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -shared
 
 BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c
 



1.1                  dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch?rev=1.1&content-type=text/plain

Index: libxml2-2.9.0-thread-portability.patch
===================================================================
From 3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e Mon Sep 17 00:00:00 2001
From: Friedrich Haubensak <hsk@×××××××××××.de>
Date: Wed, 12 Sep 2012 17:34:53 +0200
Subject: [PATCH] Fix a thread portability problem

cannot compile libxml2-2.9.0 using studio 12.1 compiler on solaris 10

I.M.O. structure initializer (as PTHREAD_ONCE_INIT) cannot be used in
a structure assignment anyway
---
 threads.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/threads.c b/threads.c
index f206149..7e85a26 100644
--- a/threads.c
+++ b/threads.c
@@ -146,6 +146,7 @@ struct _xmlRMutex {
 static pthread_key_t globalkey;
 static pthread_t mainthread;
 static pthread_once_t once_control = PTHREAD_ONCE_INIT;
+static pthread_once_t once_control_init = PTHREAD_ONCE_INIT;
 static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER;
 #elif defined HAVE_WIN32_THREADS
 #if defined(HAVE_COMPILER_TLS)
@@ -915,7 +916,7 @@ xmlCleanupThreads(void)
 #ifdef HAVE_PTHREAD_H
     if ((libxml_is_threaded)  && (pthread_key_delete != NULL))
         pthread_key_delete(globalkey);
-    once_control = PTHREAD_ONCE_INIT;
+    once_control = once_control_init;
 #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
     if (globalkey != TLS_OUT_OF_INDEXES) {
         xmlGlobalStateCleanupHelperParams *p;
-- 
1.8.0