diff options
| author | drochner <drochner@pkgsrc.org> | 2014-10-28 18:55:56 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2014-10-28 18:55:56 +0000 |
| commit | 2ce909fd07d941a50d3491b5915e68987f34fd01 (patch) | |
| tree | 599f462b01260ca9972c979757ee5ff3de83b2aa /textproc | |
| parent | a146cd856facab934a47f16fe95a13df1d1ad7d9 (diff) | |
| download | pkgsrc-2ce909fd07d941a50d3491b5915e68987f34fd01.tar.gz | |
pull in two patches from upstream to fix regressions:
-catalog initialization problem
-problem with entity expansion
This hopefully fixes build failures in KDE3 packages, reported by Joerg.
bump PKGREV
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/libxml2/Makefile | 3 | ||||
| -rw-r--r-- | textproc/libxml2/distinfo | 3 | ||||
| -rw-r--r-- | textproc/libxml2/patches/patch-ba | 27 |
3 files changed, 31 insertions, 2 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 7ca32ecea12..9bcb415e055 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.132 2014/10/17 15:46:47 drochner Exp $ +# $NetBSD: Makefile,v 1.133 2014/10/28 18:55:56 drochner Exp $ DISTNAME= libxml2-2.9.2 +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index be4bb51597e..dbfa9851ca7 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.104 2014/10/17 15:46:47 drochner Exp $ +$NetBSD: distinfo,v 1.105 2014/10/28 18:55:56 drochner Exp $ SHA1 (libxml2-2.9.2.tar.gz) = f46a37ea6d869f702e03f393c376760f3cbee673 RMD160 (libxml2-2.9.2.tar.gz) = 969b4ed8782f455fd4a6ca1c1b4ffa7651090070 @@ -10,4 +10,5 @@ SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177 SHA1 (patch-ae) = 2823276343f65c7d244d22e548faa6a517445819 SHA1 (patch-ag) = 19afd69713298ecbd247ba733a7c0c13464ae572 SHA1 (patch-aj) = 988c30b4b09a1cbaf9e7db02bb8981da0f1beaa7 +SHA1 (patch-ba) = 78097bb871cc614c8d95a53d825542d23e113192 SHA1 (patch-threads.c) = 70bb0a779dff6611f755128d609f82360a492f9a diff --git a/textproc/libxml2/patches/patch-ba b/textproc/libxml2/patches/patch-ba new file mode 100644 index 00000000000..fb01607cd0a --- /dev/null +++ b/textproc/libxml2/patches/patch-ba @@ -0,0 +1,27 @@ +$NetBSD: patch-ba,v 1.3 2014/10/28 18:55:56 drochner Exp $ + +https://git.gnome.org/browse/libxml2/commit/?id=f65128f38289d77ff322d63aef2858cc0a819c34 +https://git.gnome.org/browse/libxml2/commit/?id=72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 + +--- parser.c.orig 2014-10-16 05:57:40.000000000 +0000 ++++ parser.c +@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) + * 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; +@@ -14830,9 +14831,6 @@ xmlInitParser(void) { + #ifdef LIBXML_XPATH_ENABLED + xmlXPathInit(); + #endif +-#ifdef LIBXML_CATALOG_ENABLED +- xmlInitializeCatalog(); +-#endif + xmlParserInitialized = 1; + #ifdef LIBXML_THREAD_ENABLED + } |