libxml2: add patch to fix 2 regressions introduced in 2.9.2 (via NetBSD).
- catalog initialization problem - problem with entity expansion
This commit is contained in:
parent
b85cfab121
commit
565e2aae6e
2 changed files with 28 additions and 1 deletions
27
srcpkgs/libxml2/patches/2.9.2-regressions.patch
Normal file
27
srcpkgs/libxml2/patches/2.9.2-regressions.patch
Normal file
|
@ -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
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
# Template build file for 'libxml2'.
|
||||
pkgname=libxml2
|
||||
version=2.9.2
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --with-threads --with-history"
|
||||
hostmakedepends="automake libtool gettext-devel pkg-config python-devel"
|
||||
|
|
Loading…
Add table
Reference in a new issue