libxml2: upgraded package to upstream

Upgraded dev-libs/libxml2 to version 2.9.2 for security fixes

BUG=chromium:431158
TEST=cbuildbot chromiumos-sdk --local

Change-Id: I83ce612d860ca90a54beead12d0cff71d0b21d29
Reviewed-on: https://chromium-review.googlesource.com/251232
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Utkarsh Sanghi <usanghi@chromium.org>
Tested-by: Utkarsh Sanghi <usanghi@chromium.org>
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index f46ae8a..bc57e91 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,4 +1,4 @@
-DIST libxml2-2.9.1.tar.gz 5172503 SHA256 fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb SHA512 7b10de749485bc2eb2108063e97d89e70d6fbb78b1bf195ab5528c8c64e79483d55223a49d95934f4e00b00e906c18bdd34344703ffe158dcf08096905a44c1b WHIRLPOOL 5d2874527b637e666ca6afe710991aecb60c490de38edbe09a703c8e80c776d3f121544cc383146c336d46c573f3a3c9a2491c6c9cd5f22c5474d66dcb8ecf9b
+DIST libxml2-2.9.2.tar.gz 5444991 SHA256 5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc SHA512 a4e3b20e2efceed39c20379b32b746d4a1cf65c0cf7719d26c9bf7483c1f04a4e5a442ae2f36dc4ae8a4d011b67cfb58d9f6d0be034fa3e897a49059c9289565 WHIRLPOOL d7a77cb6ad49533cf62f6a759668e297a60dd7f70c9e13b29f682c64dfb25ae46eb9db552500130f40e3f969897bda996001d18236a4630e3713f6dd5acbe686
 DIST xmlts20080827.tar.gz 638940 SHA256 96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d WHIRLPOOL 50835380c3ea208df0bf9ce032ed2df69c4c6cb5a53ffdd39a08fb4f1d166f311b2ef2fe0d9911ae1ebff92aeb42f6ea55e727dfe0b7a3b95e6c7240315b3eda
 DIST xsts-2002-01-16.tar.gz 6894439 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 WHIRLPOOL 84dd51959460a4f8aa582d57ad39229c546ca7fe155012c57c368b59f5d31400d8b940a343a7320058330ca611303139cacdffed514783f96406ac5366026b11
 DIST xsts-2004-01-14.tar.gz 2761085 SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe WHIRLPOOL c46a3bf7d6dd771757f4304995cc177cf51c6cdd0e9778851fc13d3809c7b984690b4f273b3e075abe018110968eb7fc78f5b83170d3e18bacf00a4ed64b213d
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch b/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch
deleted file mode 100644
index 2ebb4f0..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2a74d41325c9e8043a2beec8b957ddf66f57cfd5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 18 Dec 2012 02:09:14 -0500
-Subject: [PATCH] build/test/install python bindings manually
-
-To support building for multiple python ABIs, we want to skip checks for
-python in configure, and build/test/install python bindings manually.
----
- configure.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 3d5f48b..b467c51 100644
---- a/configure.in
-+++ b/configure.in
-@@ -748,7 +748,7 @@ PYTHON_INCLUDES=
- PYTHON_SITE_PACKAGES=
- PYTHON_TESTS=
- pythondir=
--if test "$with_python" != "no" ; then
-+if false ; then
-     if test -x "$with_python/bin/python"
-     then
-         echo Found python in $with_python/bin/python
-@@ -823,7 +823,7 @@ if test "$with_python" != "no" ; then
- else
-     PYTHON=
- fi
--AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
-+AM_CONDITIONAL(WITH_PYTHON, test "$with_python" != "no")
- if test "$PYTHON_INCLUDES" != ""
- then
-     PYTHON_SUBDIR=python
-@@ -1429,7 +1429,7 @@ else
-     echo "Enabled Schemas/Relax-NG support"
-     WITH_SCHEMAS=1
-     TEST_SCHEMAS="Schemastests Relaxtests"
--    if test "$PYTHON_INCLUDES" != "" ; then
-+    if test "$with_python" != "no" ; then
-         PYTHON_TESTS="$PYTHON_TESTS RelaxNGPythonTests SchemasPythonTests"
-     fi
-     with_regexps=yes
--- 
-1.8.0.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch b/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch
deleted file mode 100644
index 2d0d5f7..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0ad948ede2b5060a144c72e4e27c38d24a272ef4 Mon Sep 17 00:00:00 2001
-From: Tim Starling <tstarling@wikimedia.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
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch b/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch
deleted file mode 100644
index 16ea5c1..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 63588f476f2dc89d4c6ef70a474d7230fbf4d45e Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Fri, 10 May 2013 14:01:46 +0800
-Subject: [PATCH] Fix a regression in xmlGetDocCompressMode()
-
-The switch to xzlib had for consequence that the compression
-level of the input was not gathered anymore in ctxt->input->buf,
-then the parser compression flags was left to -1 and propagated
-to the resulting document.
-Fix the I/O layer to get compression detection in xzlib,
-then carry it in the input buffer and the resulting document
-
-  This should fix
-    https://lsbbugs.linuxfoundation.org/show_bug.cgi?id=3456
----
- parser.c |  4 ++++
- xmlIO.c  | 17 +++++++++++++++++
- xzlib.c  | 25 +++++++++++++++++++++++++
- xzlib.h  |  1 +
- 4 files changed, 47 insertions(+)
-
-diff --git a/parser.c b/parser.c
-index 1d478c3..4a442bb 100644
---- a/parser.c
-+++ b/parser.c
-@@ -10681,6 +10681,10 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
-         ctxt->sax->startDocument(ctxt->userData);
-     if (ctxt->instate == XML_PARSER_EOF)
- 	return(-1);
-+    if ((ctxt->myDoc != NULL) && (ctxt->input != NULL) &&
-+        (ctxt->input->buf != NULL) && (ctxt->input->buf->compressed >= 0)) {
-+	ctxt->myDoc->compression = ctxt->input->buf->compressed;
-+    }
- 
-     /*
-      * The Misc part of the Prolog
-diff --git a/xmlIO.c b/xmlIO.c
-index 847cb7e..fc4e111 100644
---- a/xmlIO.c
-+++ b/xmlIO.c
-@@ -2669,6 +2669,12 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
- #endif
- 	}
- #endif
-+#ifdef HAVE_LZMA_H
-+	if ((xmlInputCallbackTable[i].opencallback == xmlXzfileOpen) &&
-+		(strcmp(URI, "-") != 0)) {
-+            ret->compressed = __libxml2_xzcompressed(context);
-+	}
-+#endif
-     }
-     else
-       xmlInputCallbackTable[i].closecallback (context);
-@@ -3325,6 +3331,17 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
-     if (res < 0) {
- 	return(-1);
-     }
-+
-+    /*
-+     * try to establish compressed status of input if not done already
-+     */
-+    if (in->compressed == -1) {
-+#ifdef HAVE_LZMA_H
-+	if (in->readcallback == xmlXzfileRead)
-+            in->compressed = __libxml2_xzcompressed(in->context);
-+#endif
-+    }
-+
-     len = res;
-     if (in->encoder != NULL) {
-         unsigned int use;
-diff --git a/xzlib.c b/xzlib.c
-index 928bd17..150e803 100644
---- a/xzlib.c
-+++ b/xzlib.c
-@@ -182,12 +182,37 @@ xz_open(const char *path, int fd, const char *mode ATTRIBUTE_UNUSED)
-     return (xzFile) state;
- }
- 
-+static int
-+xz_compressed(xzFile f) {
-+    xz_statep state;
-+
-+    if (f == NULL)
-+        return(-1);
-+    state = (xz_statep) f;
-+    if (state->init <= 0)
-+        return(-1);
-+
-+    switch (state->how) {
-+        case COPY:
-+	    return(0);
-+	case GZIP:
-+	case LZMA:
-+	    return(1);
-+    }
-+    return(-1);
-+}
-+
- xzFile
- __libxml2_xzopen(const char *path, const char *mode)
- {
-     return xz_open(path, -1, mode);
- }
- 
-+int
-+__libxml2_xzcompressed(xzFile f) {
-+    return xz_compressed(f);
-+}
-+
- xzFile
- __libxml2_xzdopen(int fd, const char *mode)
- {
-diff --git a/xzlib.h b/xzlib.h
-index 43c75e1..29ba55e 100644
---- a/xzlib.h
-+++ b/xzlib.h
-@@ -15,4 +15,5 @@ xzFile __libxml2_xzopen(const char *path, const char *mode);
- xzFile __libxml2_xzdopen(int fd, const char *mode);
- int __libxml2_xzread(xzFile file, void *buf, unsigned len);
- int __libxml2_xzclose(xzFile file);
-+int __libxml2_xzcompressed(xzFile f);
- #endif /* LIBXML2_XZLIB_H */
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch b/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch
deleted file mode 100644
index 81f692f..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9cd1c3cfbd32655d60572c0a413e017260c854df Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 22 Apr 2014 15:30:56 +0800
-Subject: [PATCH] Do not fetch external parameter entities
-
-Unless explicitely asked for when validating or replacing entities
-with their value. Problem pointed out by Daniel Berrange <berrange@redhat.com>
----
- parser.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/parser.c b/parser.c
-index 9347ac9..c0dea05 100644
---- a/parser.c
-+++ b/parser.c
-@@ -2598,6 +2598,20 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
- 		    xmlCharEncoding enc;
- 
- 		    /*
-+		     * Note: external parsed entities will not be loaded, it is
-+		     * not required for a non-validating parser, unless the
-+		     * option of validating, or substituting entities were
-+		     * given. Doing so is far more secure as the parser will
-+		     * only process data coming from the document entity by
-+		     * default.
-+		     */
-+                    if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) &&
-+		        ((ctxt->options & XML_PARSE_NOENT) == 0) &&
-+			((ctxt->options & XML_PARSE_DTDVALID) == 0) &&
-+			(ctxt->validate == 0))
-+			return;
-+
-+		    /*
- 		     * handle the extra spaces added before and after
- 		     * c.f. http://www.w3.org/TR/REC-xml#as-PE
- 		     * this is done independently.
--- 
-1.9.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch b/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch
deleted file mode 100644
index 5766532..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 10ec19ab0a49936ca8ca0d6962d24d3f889960a5 Mon Sep 17 00:00:00 2001
-From: dcb <dcb314@hotmail.com>
-Date: Thu, 2 May 2013 16:11:46 +0800
-Subject: [PATCH] Fix missing break on last() function for attributes
-
-pointed out by cppcheck
----
- python/libxml.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/python/libxml.c b/python/libxml.c
-index 03cfb9f..3338b83 100644
---- a/python/libxml.c
-+++ b/python/libxml.c
-@@ -2683,6 +2683,7 @@ libxml_last(ATTRIBUTE_UNUSED PyObject * self, PyObject * args)
-                 xmlAttrPtr attr = (xmlAttrPtr) cur;
- 
-                 res = attr->last;
-+		break;
-             }
-         default:
-             res = NULL;
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch b/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch
deleted file mode 100644
index 51a92ad..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From dcc19503193c71596278a252064a8ce66331b3cd Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Wed, 22 May 2013 22:56:45 +0200
-Subject: [PATCH] Fix a parsing bug on non-ascii element and CR/LF usage
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698550
-
-Somehow the behaviour of the internal parser routine changed
-slightly when encountering CR/LF, which led to a bug when
-parsing document with non-ascii Names
----
- parser.c                   |  6 +++++-
- result/japancrlf.xml       |  4 ++++
- result/japancrlf.xml.rde   |  7 +++++++
- result/japancrlf.xml.rdr   |  7 +++++++
- result/japancrlf.xml.sax   | 11 +++++++++++
- result/japancrlf.xml.sax2  | 11 +++++++++++
- result/noent/japancrlf.xml |  4 ++++
- test/japancrlf.xml         |  6 ++++++
- 8 files changed, 55 insertions(+), 1 deletion(-)
- create mode 100644 result/japancrlf.xml
- create mode 100644 result/japancrlf.xml.rde
- create mode 100644 result/japancrlf.xml.rdr
- create mode 100644 result/japancrlf.xml.sax
- create mode 100644 result/japancrlf.xml.sax2
- create mode 100644 result/noent/japancrlf.xml
- create mode 100644 test/japancrlf.xml
-
-diff --git a/parser.c b/parser.c
-index 4a442bb..4739add 100644
---- a/parser.c
-+++ b/parser.c
-@@ -3404,6 +3404,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
-     int len = 0, l;
-     int c;
-     int count = 0;
-+    const xmlChar *end; /* needed because CUR_CHAR() can move cur on \r\n */
- 
- #ifdef DEBUG
-     nbParseNCNameComplex++;
-@@ -3413,6 +3414,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
-      * Handler for more complex cases
-      */
-     GROW;
-+    end = ctxt->input->cur;
-     c = CUR_CHAR(l);
-     if ((c == ' ') || (c == '>') || (c == '/') || /* accelerators */
- 	(!xmlIsNameStartChar(ctxt, c) || (c == ':'))) {
-@@ -3434,12 +3436,14 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
- 	}
- 	len += l;
- 	NEXTL(l);
-+	end = ctxt->input->cur;
- 	c = CUR_CHAR(l);
- 	if (c == 0) {
- 	    count = 0;
- 	    GROW;
-             if (ctxt->instate == XML_PARSER_EOF)
-                 return(NULL);
-+	    end = ctxt->input->cur;
- 	    c = CUR_CHAR(l);
- 	}
-     }
-@@ -3448,7 +3452,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
-         xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName");
-         return(NULL);
-     }
--    return(xmlDictLookup(ctxt->dict, ctxt->input->cur - len, len));
-+    return(xmlDictLookup(ctxt->dict, end - len, len));
- }
- 
- /**
-diff --git a/result/japancrlf.xml b/result/japancrlf.xml
-new file mode 100644
-index 0000000..60b307c
---- /dev/null
-+++ b/result/japancrlf.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0"?>
-+<入力メッセージ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+	<c8c:Ele xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"/>
-+</入力メッセージ>
-diff --git a/result/japancrlf.xml.rde b/result/japancrlf.xml.rde
-new file mode 100644
-index 0000000..0bc5af7
---- /dev/null
-+++ b/result/japancrlf.xml.rde
-@@ -0,0 +1,7 @@
-+0 1 入力メッセージ 0 0
-+1 14 #text 0 1 
-+	
-+1 1 c8c:Ele 1 0
-+1 14 #text 0 1 
-+
-+0 15 入力メッセージ 0 0
-diff --git a/result/japancrlf.xml.rdr b/result/japancrlf.xml.rdr
-new file mode 100644
-index 0000000..0bc5af7
---- /dev/null
-+++ b/result/japancrlf.xml.rdr
-@@ -0,0 +1,7 @@
-+0 1 入力メッセージ 0 0
-+1 14 #text 0 1 
-+	
-+1 1 c8c:Ele 1 0
-+1 14 #text 0 1 
-+
-+0 15 入力メッセージ 0 0
-diff --git a/result/japancrlf.xml.sax b/result/japancrlf.xml.sax
-new file mode 100644
-index 0000000..c3bbdc6
---- /dev/null
-+++ b/result/japancrlf.xml.sax
-@@ -0,0 +1,11 @@
-+SAX.setDocumentLocator()
-+SAX.startDocument()
-+SAX.startElement(入力メッセージ, xmlns='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.characters(
-+	, 2)
-+SAX.startElement(c8c:Ele, xmlns:c8c='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.endElement(c8c:Ele)
-+SAX.characters(
-+, 1)
-+SAX.endElement(入力メッセージ)
-+SAX.endDocument()
-diff --git a/result/japancrlf.xml.sax2 b/result/japancrlf.xml.sax2
-new file mode 100644
-index 0000000..878eae4
---- /dev/null
-+++ b/result/japancrlf.xml.sax2
-@@ -0,0 +1,11 @@
-+SAX.setDocumentLocator()
-+SAX.startDocument()
-+SAX.startElementNs(入力メッセージ, NULL, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 1, xmlns='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 0, 0)
-+SAX.characters(
-+	, 2)
-+SAX.startElementNs(Ele, c8c, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 1, xmlns:c8c='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 0, 0)
-+SAX.endElementNs(Ele, c8c, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.characters(
-+, 1)
-+SAX.endElementNs(入力メッセージ, NULL, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.endDocument()
-diff --git a/result/noent/japancrlf.xml b/result/noent/japancrlf.xml
-new file mode 100644
-index 0000000..60b307c
---- /dev/null
-+++ b/result/noent/japancrlf.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0"?>
-+<入力メッセージ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+	<c8c:Ele xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"/>
-+</入力メッセージ>
-diff --git a/test/japancrlf.xml b/test/japancrlf.xml
-new file mode 100644
-index 0000000..480cb2d
---- /dev/null
-+++ b/test/japancrlf.xml
-@@ -0,0 +1,6 @@
-+<入力メッセージ
-+	xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+	<c8c:Ele
-+		xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"
-+	/>
-+</入力メッセージ>
-\ No newline at end of file
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch
deleted file mode 100644
index c79709d..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 722923bc9b788f028e4221c77138fc66735a3113 Mon Sep 17 00:00:00 2001
-From: Petr Sumbera <petr.sumbera@oracle.com>
-Date: Fri, 3 May 2013 22:25:38 +0800
-Subject: [PATCH] Fix for compilation with python 2.6.8
-
-Remap PyCapsule to PyCObject based on the macro being available
-instead of using the python version
----
- python/libxml_wrap.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/libxml_wrap.h b/python/libxml_wrap.h
-index a9b9739..53a0618 100644
---- a/python/libxml_wrap.h
-+++ b/python/libxml_wrap.h
-@@ -34,11 +34,11 @@
- #define PyBytes_AsString PyString_AsString
- #define PyBytes_AS_STRING PyString_AS_STRING
- #define PyBytes_GET_SIZE PyString_GET_SIZE
--
-+#endif
-+#ifndef PyCapsule_New
- #define PyCapsule_New PyCObject_FromVoidPtrAndDesc
- #define PyCapsule_CheckExact PyCObject_Check
- #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o))
--
- #endif
- #endif
- 
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch
deleted file mode 100644
index 5c4e83d..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 927faac6113b625a9a3423eef8f144fc7d9a8547 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 10 Jul 2013 23:00:54 -0400
-Subject: [PATCH] python: fix drv_libxml2.py for python3 compatibility
-
-https://bugzilla.gnome.org/show_bug.cgi?id=703979
----
- python/drv_libxml2.py | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py
-index e43fb1d..c9075e6 100644
---- a/python/drv_libxml2.py
-+++ b/python/drv_libxml2.py
-@@ -34,12 +34,20 @@ TODO
- 
- """
- 
--__author__  = u"Stéphane Bidoul <sbi@skynet.be>"
-+__author__  = "Stéphane Bidoul <sbi@skynet.be>"
- __version__ = "0.3"
- 
-+import sys
- import codecs
--from types import StringType, UnicodeType
--StringTypes = (StringType,UnicodeType)
-+
-+if sys.version < "3":
-+    __author__  = codecs.unicode_escape_decode(__author__)[0]
-+
-+    from types import StringType, UnicodeType
-+    StringTypes = (StringType,UnicodeType)
-+
-+else:
-+    StringTypes = (str)
- 
- from xml.sax._exceptions import *
- from xml.sax import xmlreader, saxutils
-@@ -65,7 +73,7 @@ def _d(s):
- 
- try:
-     import libxml2
--except ImportError, e:
-+except ImportError as e:
-     raise SAXReaderNotAvailable("libxml2 not available: " \
-                                 "import error was: %s" % e)
- 
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch
deleted file mode 100644
index d07a1e2..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6dd7775f3506741093890d99f09c242e0b34b55f Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail..com>
-Date: Fri, 12 Jul 2013 11:18:11 +0800
-Subject: [PATCH] Another round of fixes for older versions of Python
-
----
- python/drv_libxml2.py | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py
-index c9075e6..c2ec3e2 100644
---- a/python/drv_libxml2.py
-+++ b/python/drv_libxml2.py
-@@ -40,14 +40,12 @@ __version__ = "0.3"
- import sys
- import codecs
- 
--if sys.version < "3":
-+if sys.version_info[0] < 3:
-     __author__  = codecs.unicode_escape_decode(__author__)[0]
- 
--    from types import StringType, UnicodeType
--    StringTypes = (StringType,UnicodeType)
--
-+    StringTypes = (str, unicode)
- else:
--    StringTypes = (str)
-+    StringTypes = str
- 
- from xml.sax._exceptions import *
- from xml.sax import xmlreader, saxutils
-@@ -73,9 +71,9 @@ def _d(s):
- 
- try:
-     import libxml2
--except ImportError as e:
-+except ImportError:
-     raise SAXReaderNotAvailable("libxml2 not available: " \
--                                "import error was: %s" % e)
-+                                "import error was: %s" % sys.exc_info()[1])
- 
- class Locator(xmlreader.Locator):
-     """SAX Locator adapter for libxml2.xmlTextReaderLocator"""
-@@ -142,7 +140,7 @@ class LibXml2Reader(xmlreader.XMLReader):
-         self.__parsing = 1
-         try:
-             # prepare source and create reader
--            if type(source) in StringTypes:
-+            if isinstance(source, StringTypes):
-                 reader = libxml2.newTextReaderFilename(source)
-             else:
-                 source = saxutils.prepare_input_source(source)
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch b/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch
deleted file mode 100644
index 7ce2f3b..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7c3c663e4f844aaecbb0cfc29567fe2ee9506fc4 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 16 May 2014 22:46:00 -0400
-Subject: [PATCH] xmllint: a posteriori validation needs to load exernal
- entities
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=730290
----
- xmllint.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/xmllint.c b/xmllint.c
-index 9d46ac5..b142b3b 100644
---- a/xmllint.c
-+++ b/xmllint.c
-@@ -3530,7 +3530,12 @@ main(int argc, char **argv) {
- 	xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS;
-     if (noent != 0) xmlSubstituteEntitiesDefault(1);
- #ifdef LIBXML_VALID_ENABLED
--    if (valid != 0) xmlDoValidityCheckingDefaultValue = 1;
-+    /* If we will validate only a posteriori, ensure that entities get loaded,
-+     * but suppress validation messages during initial parsing */
-+    if (postvalid != 0 && valid == 0)
-+	options |= XML_PARSE_DTDVALID | XML_PARSE_NOERROR | XML_PARSE_NOWARNING;
-+    else if (valid != 0)
-+	xmlDoValidityCheckingDefaultValue = 1;
- #endif /* LIBXML_VALID_ENABLED */
-     if ((htmlout) && (!nowrap)) {
- 	xmlGenericError(xmlGenericErrorContext,
--- 
-1.9.3
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch b/dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch
similarity index 94%
rename from dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch
rename to dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch
index ab33038..7a84fac 100644
--- a/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch
@@ -1,7 +1,7 @@
 diff --git a/configure.in b/configure.in
 index 7374564..13c8d4e 100644
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
 @@ -1444,19 +1444,11 @@ XML_LIBTOOLLIBS="libxml2.la"
  AC_SUBST(WITH_ICONV)
  
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch b/dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch
new file mode 100644
index 0000000..d98b382
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch
@@ -0,0 +1,26 @@
+From f65128f38289d77ff322d63aef2858cc0a819c34 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Fri, 17 Oct 2014 17:13:41 +0800
+Subject: Revert "Missing initialization for the catalog module"
+
+This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
+As this break xmlcatalog command
+https://bugzilla.redhat.com/show_bug.cgi?id=1153753
+
+diff --git a/parser.c b/parser.c
+index 1d93967..67c9dfd 100644
+--- a/parser.c
++++ b/parser.c
+@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
+ #ifdef LIBXML_XPATH_ENABLED
+ 	xmlXPathInit();
+ #endif
+-#ifdef LIBXML_CATALOG_ENABLED
+-        xmlInitializeCatalog();
+-#endif
+ 	xmlParserInitialized = 1;
+ #ifdef LIBXML_THREAD_ENABLED
+     }
+-- 
+cgit v0.10.1
+
diff --git a/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.2.ebuild
similarity index 88%
rename from dev-libs/libxml2/libxml2-2.9.1-r5.ebuild
rename to dev-libs/libxml2/libxml2-2.9.2.ebuild
index e6bd835..eba13c2 100644
--- a/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild,v 1.1 2014/09/03 09:51:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.2.ebuild,v 1.11 2014/12/11 11:29:32 armin76 Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -29,7 +29,8 @@
 		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
 		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
 
-COMMON_DEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+COMMON_DEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
 	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
@@ -77,27 +78,17 @@
 
 #	epunt_cxx # if we don't eautoreconf
 
-	# Important patches from 2.9.2
-	epatch "${FILESDIR}/${P}-missing-break.patch" \
-		"${FILESDIR}/${P}-python-2.6.patch" \
-		"${FILESDIR}/${P}-compression-detection.patch" \
-		"${FILESDIR}/${P}-non-ascii-cr-lf.patch" \
-		"${FILESDIR}/${PN}-2.9.1-python3.patch" \
-		"${FILESDIR}/${PN}-2.9.1-python3a.patch"
-
-	# Security fixes from 2.9.2
-	epatch "${FILESDIR}/${P}-external-param-entities.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=730290
-	epatch "${FILESDIR}/${PN}-2.9.1-xmllint-postvalid.patch"
+	# Important patches from master
+	epatch \
+		"${FILESDIR}/${PN}-2.9.2-revert-missing-initialization.patch"
 
 	# Please do not remove, as else we get references to PORTAGE_TMPDIR
 	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
 	# We now need to run eautoreconf at the end to prevent maintainer mode.
 #	elibtoolize
 
-	# Use pkgconfig to find icu to properly support multilib
-	epatch "${FILESDIR}/${PN}-2.9.1-icu-pkgconfig.patch"
+	# Use pkgconfig to find icu to properly support multilib, upstream bug #738751
+	epatch "${FILESDIR}/${PN}-2.9.2-icu-pkgconfig.patch"
 
 	eautoreconf
 }
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.1-r5 b/metadata/md5-cache/dev-libs/libxml2-2.9.2
similarity index 96%
rename from metadata/md5-cache/dev-libs/libxml2-2.9.1-r5
rename to metadata/md5-cache/dev-libs/libxml2-2.9.2
index 201c884..498a5c8 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.1-r5
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.2
@@ -8,6 +8,6 @@
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.3-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) readline? ( sys-libs/readline:= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=2
-SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
+SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.2.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	1b0fa473be98091220edff9f51d06153	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	c3131dc67d3bd39f044e92b8280505e4	libtool	eba09ed440f2692f73024ff3621a1f4b	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	prefix	21058c21ca48453d771df15500873ede	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	dcc9fbd541ee94173178e4f14dd3945c	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=34dde90e1bc0943cb54c31b09ab72244
+_md5_=13448a2d80306e176e64af42d4bfe228