From c891c3ca47bb7b71dbf57261d2a81911d832bf7b Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sun, 14 Dec 2014 16:01:35 -0500
Subject: [PATCH] Upgrade to libxml2-2.9.2

---
 config/packages-list                          |  2 +-
 stage3/hv-install-1                           |  2 +-
 .../common/libxml2-2.9.2-fix-xmlcatalog.patch | 21 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 stage3/patches/common/libxml2-2.9.2-fix-xmlcatalog.patch

diff --git a/config/packages-list b/config/packages-list
index cf1abe5..07f32c7 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -252,7 +252,7 @@ LIBUSB="libusb-1.0.19"
 LIBUSB_COMPAT="libusb-compat-0.1.4"
 LIBWNCK="libwnck-2.30.7"
 LIBXKLAVIER="libxklavier-5.2.1"
-LIBXML2="libxml2-2.8.0"
+LIBXML2="libxml2-2.9.2"
 LIBXSLT="libxslt-1.1.26"
 LIBX264="x264-snapshot-20130416-2245"
 LIGHTTPD="lighttpd-1.4.32"
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 772d000..1c21acd 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -116,7 +116,7 @@ ipkg -m acnb ${OPENJADE} "--enable-splibdir=/usr/lib"
 ipkg -m noac ${DOCBOOK_DSSSL}
 ipkg -m noac ${SGML_SPM}
 ipkg ${DOCBOOK_UTILS}
-ipkg -m acnb ${LIBXML2}
+ipkg -m acnb ${LIBXML2} "--disable-static --with-history"
 ipkg -m acnb ${LIBXSLT}
 ipkg -m noac ${DOCBOOK_XML}
 ipkg -m noac ${DOCBOOK_XSL}
diff --git a/stage3/patches/common/libxml2-2.9.2-fix-xmlcatalog.patch b/stage3/patches/common/libxml2-2.9.2-fix-xmlcatalog.patch
new file mode 100644
index 0000000..652cc24
--- /dev/null
+++ b/stage3/patches/common/libxml2-2.9.2-fix-xmlcatalog.patch
@@ -0,0 +1,21 @@
+diff -Naur libxml2-2.9.2.orig/parser.c libxml2-2.9.2.new/parser.c
+--- libxml2-2.9.2.orig/parser.c	2014-10-16 01:57:40.000000000 -0400
++++ libxml2-2.9.2.new/parser.c	2014-12-23 14:36:56.870905830 -0500
+@@ -7235,7 +7235,8 @@
+      * far more secure as the parser will only process data coming from
+      * the document entity by default.
+      */
+-    if ((ent->checked == 0) &&
++    if (((ent->checked == 0) ||
++          ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) &&
+         ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) ||
+          (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) {
+ 	unsigned long oldnbent = ctxt->nbentities;
+@@ -14831,7 +14832,6 @@
+ 	xmlXPathInit();
+ #endif
+ #ifdef LIBXML_CATALOG_ENABLED
+-        xmlInitializeCatalog();
+ #endif
+ 	xmlParserInitialized = 1;
+ #ifdef LIBXML_THREAD_ENABLED
-- 
2.20.1