libxml2: updated to 2.9.9

v2.9.9:
Security:
CVE-2018-9251 CVE-2018-14567 Fix infinite loop in LZMA decompression
CVE-2018-14404 Fix nullptr deref with XPath logic ops

Documentation:
reader: Fix documentation comment

Portability:
Fix MSVC build with lzma
Variables need 'extern' in static lib on Cygwin
Really declare dllexport/dllimport for Cygwin
Merge branch 'patch-2' into 'master'
Change dir to $THEDIR after ACLOCAL_PATH check autoreconf creates aclocal.m4 in $srcdir
Improve error message if pkg.m4 couldn't be found
NaN and Inf fixes for pre-C99 compilers

Bug Fixes:
Revert "Support xmlTextReaderNextSibling w/o preparsed doc"
Fix building relative URIs
Problem with data in interleave in RelaxNG validation
Fix memory leak in xmlSwitchInputEncodingInt error path
Set doc on element obtained from freeElems
Fix HTML serialization with UTF-8 encoding
Use actual doc in xmlTextReaderRead*Xml
Unlink node before freeing it in xmlSAX2StartElement
Check return value of nodePush in xmlSAX2StartElement
Free input buffer in xmlHaltParser
Reset HTML parser input pointers on encoding failure
Don't run icu_parse_test if EUC-JP is unsupported
Fix xmlSchemaValidCtxtPtr reuse memory leak
Fix xmlTextReaderNext with preparsed document
Remove stray character from comment
Remove a misleading line from xmlCharEncOutput
HTML noscript should not close p
Don't change context node in xmlXPathRoot
Stop using XPATH_OP_RESET
Revert "Change calls to xmlCharEncInput to set flush false"

Improvements:
Fix "Problem with data in interleave in RelaxNG validation"
cleanup: remove some unreachable code
add --relative to testURI
Remove redefined starts and defines inside include elements
Allow choice within choice in nameClass in RELAX NG
Look inside divs for starts and defines inside include
Add compile and libxml2-config.cmake to .gitignore
Stop using doc->charset outside parser code
Add newlines to 'xmllint --xpath' output
Don't include SAX.h from globals.h
Support xmlTextReaderNextSibling w/o preparsed doc
Don't instruct user to run make when autogen.sh failed
Run Travis ASan tests with "sudo: required"
Improve restoring of context size and position
Simplify and harden nodeset filtering
Avoid unnecessary backups of the context node
Fix inconsistency in xmlXPathIsInf

12 files changed, 20 insertions, 145 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index ba1aab870d8..ff4b964e83c 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.151 2018/11/09 15:31:46 leot Exp $
+# $NetBSD: Makefile,v 1.152 2019/01/09 19:09:02 adam Exp $
 
 .include "../../textproc/libxml2/Makefile.common"
 
-PKGREVISION=	4
-
 COMMENT=	XML parser library from the GNOME project
 LICENSE=	modified-bsd
 
@@ -34,8 +32,8 @@ TEST_TARGET=	check
 SUBST_CLASSES+=		cat
 SUBST_STAGE.cat=	pre-configure
 SUBST_FILES.cat=	catalog.c xmlcatalog.c
-SUBST_SED.cat=	-e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g"
-SUBST_SED.cat+=	-e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g"
+SUBST_SED.cat=		-e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g"
+SUBST_SED.cat+=		-e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g"
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Werror=format=2
 
diff --git a/textproc/libxml2/Makefile.common b/textproc/libxml2/Makefile.common
index 0d6e6d2cd42..b719b95e99d 100644
--- a/textproc/libxml2/Makefile.common
+++ b/textproc/libxml2/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.11 2018/03/11 17:49:53 wiz Exp $
+# $NetBSD: Makefile.common,v 1.12 2019/01/09 19:09:02 adam Exp $
 #
 # used by textproc/libxml2/Makefile
 # used by textproc/py-libxml2/Makefile
 
-DISTNAME=	libxml2-2.9.8
+DISTNAME=	libxml2-2.9.9
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/
 MASTER_SITES+=	http://xmlsoft.org/sources/
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 79986a8faeb..3ac758b4394 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,20 +1,16 @@
-$NetBSD: distinfo,v 1.129 2019/01/09 13:40:50 wiz Exp $
+$NetBSD: distinfo,v 1.130 2019/01/09 19:09:02 adam Exp $
 
-SHA1 (libxml2-2.9.8.tar.gz) = 66bcefd98a6b7573427cf66f9d3841b59eb5b8c3
-RMD160 (libxml2-2.9.8.tar.gz) = a3bf30ed652cfa2e06c64ae62c95a5ebd889c7a7
-SHA512 (libxml2-2.9.8.tar.gz) = 28903282c7672206effa1362fd564cbe4cf5be44264b083a7d14e383f73bccd1b81bcafb5f4f2f56f5e7e05914c660e27668c9ce91b1b9f256ef5358d55ba917
-Size (libxml2-2.9.8.tar.gz) = 5469097 bytes
-SHA1 (patch-aa) = e687eaa9805b855b0c8a944ec5c597bd34954472
-SHA1 (patch-ab) = a0df60b1a8609c185ed7d45a015eafdbfb6d6b41
-SHA1 (patch-ac) = 34afe787f6012b460a85be993048e133907a1621
-SHA1 (patch-ad) = d65b7e3be9694147e96ce4bb70a1739e2279ba81
-SHA1 (patch-ae) = 4eede9719724f94402e850ee6d6043a74aaf62b2
+SHA1 (libxml2-2.9.9.tar.gz) = 96686d1dd9fddf3b35a28b1e2e4bbacac889add3
+RMD160 (libxml2-2.9.9.tar.gz) = a7d5f9ca4a24db329108f4bfb6bd4eed0f61ab21
+SHA512 (libxml2-2.9.9.tar.gz) = cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810
+Size (libxml2-2.9.9.tar.gz) = 5476717 bytes
+SHA1 (patch-Makefile.in) = e687eaa9805b855b0c8a944ec5c597bd34954472
+SHA1 (patch-catalog.c) = 34afe787f6012b460a85be993048e133907a1621
+SHA1 (patch-configure) = a0df60b1a8609c185ed7d45a015eafdbfb6d6b41
+SHA1 (patch-doc_examples_Makefile.in) = 4eede9719724f94402e850ee6d6043a74aaf62b2
 SHA1 (patch-encoding.c) = 6cf0a7d421828b9f40a4079ee85adb791c54d096
-SHA1 (patch-parser.c) = ea27ffe37b8a47d08a2e2a0220ec5592c9980190
 SHA1 (patch-python_libxml.c) = cfa07b4f3dfddb501c2ba210bb32b8ee14e3df9d
 SHA1 (patch-python_libxml.py) = 869a72ae5ba2e27e6d46552878890acb22337675
 SHA1 (patch-python_libxml2.py) = 209d105b0f3aedb834091390a7c6819705108e34
 SHA1 (patch-python_setup.py) = 7771fd02ee6779463f1d3321f099d7e6d19cd1b1
-SHA1 (patch-result_errors_759573.xml.err) = b6fc7ac6fa72e6a3b927f5938917c74a1258600c
-SHA1 (patch-xpath.c) = 9b9832e36e947598d8f5dade80181e82bff54a5c
-SHA1 (patch-xzlib.c) = a9b4de24d844b9fee30988ae4dbdee950797fd0d
+SHA1 (patch-xmlcatalog.c) = d65b7e3be9694147e96ce4bb70a1739e2279ba81
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-Makefile.in
index 6573c530585..2279fb18b24 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.29 2016/05/24 12:00:08 he Exp $
+$NetBSD: patch-Makefile.in,v 1.1 2019/01/09 19:09:03 adam Exp $
 
 Move EXAMPLES_DIR to fit pkgsrc.
 
diff --git a/textproc/libxml2/patches/patch-ac b/textproc/libxml2/patches/patch-catalog.c
index 5a988fad232..1f1339f2897 100644
--- a/textproc/libxml2/patches/patch-ac
+++ b/textproc/libxml2/patches/patch-catalog.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.9 2016/05/24 12:00:08 he Exp $
+$NetBSD: patch-catalog.c,v 1.1 2019/01/09 19:09:03 adam Exp $
 
 Parametrize XML and SGML catalog directories.
 
diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-configure
index 3be47459d43..a980d819c89 100644
--- a/textproc/libxml2/patches/patch-ab
+++ b/textproc/libxml2/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.31 2017/11/06 16:16:53 prlw1 Exp $
+$NetBSD: patch-configure,v 1.1 2019/01/09 19:09:03 adam Exp $
 
 Various configure fixes:
  * Add run-path to XML_LIBDIR
diff --git a/textproc/libxml2/patches/patch-ae b/textproc/libxml2/patches/patch-doc_examples_Makefile.in
index 2ec1375d717..aff40822b80 100644
--- a/textproc/libxml2/patches/patch-ae
+++ b/textproc/libxml2/patches/patch-doc_examples_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.15 2016/05/24 12:00:08 he Exp $
+$NetBSD: patch-doc_examples_Makefile.in,v 1.1 2019/01/09 19:09:03 adam Exp $
 
 Don't install html files.
 
diff --git a/textproc/libxml2/patches/patch-parser.c b/textproc/libxml2/patches/patch-parser.c
deleted file mode 100644
index 2c30f41ce52..00000000000
--- a/textproc/libxml2/patches/patch-parser.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-parser.c,v 1.5 2018/11/09 15:31:46 leot Exp $
-
-Fixes CVE-2017-8872.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=775200
-https://gitlab.gnome.org/GNOME/libxml2/issues/26
-https://gitlab.gnome.org/GNOME/libxml2/commit/123234f2cfcd9e9b9f83047eee1dc17b4c3f4407
-
---- parser.c.orig	2018-01-25 06:44:40.000000000 +0000
-+++ parser.c
-@@ -12462,7 +12462,12 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) {
- 	    ctxt->input->free((xmlChar *) ctxt->input->base);
- 	    ctxt->input->free = NULL;
- 	}
-+        if (ctxt->input->buf != NULL) {
-+            xmlFreeParserInputBuffer(ctxt->input->buf);
-+            ctxt->input->buf = NULL;
-+        }
- 	ctxt->input->cur = BAD_CAST"";
-+        ctxt->input->length = 0;
- 	ctxt->input->base = ctxt->input->cur;
-         ctxt->input->end = ctxt->input->cur;
-     }
diff --git a/textproc/libxml2/patches/patch-result_errors_759573.xml.err b/textproc/libxml2/patches/patch-result_errors_759573.xml.err
deleted file mode 100644
index 5c994791dfb..00000000000
--- a/textproc/libxml2/patches/patch-result_errors_759573.xml.err
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-result_errors_759573.xml.err,v 1.1 2018/11/09 15:31:46 leot Exp $
-
-Test output adjustment for CVE-2017-8872 fix.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=775200
-https://gitlab.gnome.org/GNOME/libxml2/issues/26
-https://gitlab.gnome.org/GNOME/libxml2/commit/123234f2cfcd9e9b9f83047eee1dc17b4c3f4407
-
---- result/errors/759573.xml.err.orig  2017-07-23 05:10:06.000000000 +0000
-+++ result/errors/759573.xml.err
-@@ -21,14 +21,11 @@ Entity: line 1:
-             ^
- ./test/errors/759573.xml:1: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
- 
--<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
--     ^
-+
-+^
- ./test/errors/759573.xml:1: parser error : DOCTYPE improperly terminated
--<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
--     ^
--./test/errors/759573.xml:1: parser error : StartTag: invalid element name
--<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
--      ^
--./test/errors/759573.xml:1: parser error : Extra content at the end of the document
--<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
--      ^
-+
-+^
-+./test/errors/759573.xml:1: parser error : Start tag expected, '<' not found
-+
-+^
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-xmlcatalog.c
index 812399cd405..ad071353a44 100644
--- a/textproc/libxml2/patches/patch-ad
+++ b/textproc/libxml2/patches/patch-xmlcatalog.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.19 2016/05/24 12:00:08 he Exp $
+$NetBSD: patch-xmlcatalog.c,v 1.1 2019/01/09 19:09:03 adam Exp $
 
 Parametrize SGML catalog directory.
 
diff --git a/textproc/libxml2/patches/patch-xpath.c b/textproc/libxml2/patches/patch-xpath.c
deleted file mode 100644
index 44be9f6832e..00000000000
--- a/textproc/libxml2/patches/patch-xpath.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-xpath.c,v 1.3 2018/08/09 18:44:13 snj Exp $
-
-Fix CVE-2018-14404.
-
-https://gitlab.gnome.org/GNOME/libxml2/commit/a436374994c47b12d5de1b8b1d191a098fa23594
-
---- xpath.c.orig	2017-12-02 00:58:10.000000000 -0800
-+++ xpath.c	2018-08-09 11:37:59.278508181 -0700
-@@ -13297,9 +13297,8 @@ xmlXPathCompOpEval(xmlXPathParserContext
- 		return(0);
- 	    }
-             xmlXPathBooleanFunction(ctxt, 1);
--            arg1 = valuePop(ctxt);
--            arg1->boolval &= arg2->boolval;
--            valuePush(ctxt, arg1);
-+            if (ctxt->value != NULL)
-+                ctxt->value->boolval &= arg2->boolval;
- 	    xmlXPathReleaseObject(ctxt->context, arg2);
-             return (total);
-         case XPATH_OP_OR:
-@@ -13323,9 +13322,8 @@ xmlXPathCompOpEval(xmlXPathParserContext
- 		return(0);
- 	    }
-             xmlXPathBooleanFunction(ctxt, 1);
--            arg1 = valuePop(ctxt);
--            arg1->boolval |= arg2->boolval;
--            valuePush(ctxt, arg1);
-+            if (ctxt->value != NULL)
-+                ctxt->value->boolval |= arg2->boolval;
- 	    xmlXPathReleaseObject(ctxt->context, arg2);
-             return (total);
-         case XPATH_OP_EQUAL:
diff --git a/textproc/libxml2/patches/patch-xzlib.c b/textproc/libxml2/patches/patch-xzlib.c
deleted file mode 100644
index 54d93e487af..00000000000
--- a/textproc/libxml2/patches/patch-xzlib.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-xzlib.c,v 1.4 2018/10/13 09:05:42 leot Exp $
-
-Fix for CVE-2018-9251 and CVE-2018-14567, upstream commit id
-2240fbf5912054af025fb6e01e26375100275e74:
-
- <https://gitlab.gnome.org/GNOME/libxml2/commit/2240fbf5912054af025fb6e01e26375100275e74>
-
---- xzlib.c.orig	2017-12-02 08:58:10.000000000 +0000
-+++ xzlib.c
-@@ -562,6 +562,10 @@ xz_decomp(xz_statep state)
-                          "internal error: inflate stream corrupt");
-                 return -1;
-             }
-+            /*
-+             * FIXME: Remapping a couple of error codes and falling through
-+             * to the LZMA error handling looks fragile.
-+             */
-             if (ret == Z_MEM_ERROR)
-                 ret = LZMA_MEM_ERROR;
-             if (ret == Z_DATA_ERROR)
-@@ -587,6 +591,11 @@ xz_decomp(xz_statep state)
-             xz_error(state, LZMA_PROG_ERROR, "compression error");
-             return -1;
-         }
-+        if ((state->how != GZIP) &&
-+            (ret != LZMA_OK) && (ret != LZMA_STREAM_END)) {
-+            xz_error(state, ret, "lzma error");
-+            return -1;
-+        }
-     } while (strm->avail_out && ret != LZMA_STREAM_END);
- 
-     /* update available output and crc check value */