commit libxml2 for openSUSE:Factory
Hello community, here is the log from the commit of package libxml2 for openSUSE:Factory checked in at Tue Nov 2 16:07:06 CET 2010. -------- --- libxml2/libxml2.changes 2010-10-31 00:50:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/libxml2/libxml2.changes 2010-11-01 11:08:16.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 1 10:00:04 UTC 2010 - puzel@novell.com + +- add libxml2-xpath-ns-attr-axis.patch (bnc#648277) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libxml2-xpath-ns-attr-axis.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxml2-python.spec ++++++ --- /var/tmp/diff_new_pack.SjMcDw/_old 2010-11-02 16:06:58.000000000 +0100 +++ /var/tmp/diff_new_pack.SjMcDw/_new 2010-11-02 16:06:58.000000000 +0100 @@ -25,7 +25,7 @@ AutoReqProv: on Summary: Python Bindings for libxml2 Version: 2.7.7 -Release: 8 +Release: 9 Source: libxml2-%{version}.tar.bz2 Source1: libxml2-python-rpmlintrc %py_requires ++++++ libxml2.spec ++++++ --- /var/tmp/diff_new_pack.SjMcDw/_old 2010-11-02 16:06:58.000000000 +0100 +++ /var/tmp/diff_new_pack.SjMcDw/_new 2010-11-02 16:06:58.000000000 +0100 @@ -25,10 +25,11 @@ Summary: A Library to Manipulate XML Files Url: http://xmlsoft.org Version: 2.7.7 -Release: 8 +Release: 9 Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf Patch1: noxref.patch +Patch2: libxml2-xpath-ns-attr-axis.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # bug437293 %ifarch ppc64 @@ -101,6 +102,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %configure --disable-static \ ++++++ libxml2-xpath-ns-attr-axis.patch ++++++
From 91d19754d46acd4a639a8b9e31f50f31c78f8c9c Mon Sep 17 00:00:00 2001 From: Daniel Veillard
Date: Fri, 15 Oct 2010 14:30:52 +0200 Subject: [PATCH] Fix the semantic of XPath axis for namespace/attribute context nodes
The processing of namespace and attributes nodes was not compliant to the XPath-1.0 specification --- xpath.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) Index: libxml2-2.7.7/xpath.c =================================================================== --- libxml2-2.7.7.orig/xpath.c +++ libxml2-2.7.7/xpath.c @@ -8106,9 +8106,17 @@ xmlXPathNextPrecedingSibling(xmlXPathPar xmlNodePtr xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); - if (cur != NULL && cur->children != NULL) - return cur->children ; - if (cur == NULL) cur = ctxt->context->node; + if ((cur != NULL) && (cur->type != XML_ATTRIBUTE_NODE) && + (cur->type != XML_NAMESPACE_DECL) && (cur->children != NULL)) + return(cur->children); + + if (cur == NULL) { + cur = ctxt->context->node; + if (cur->type == XML_NAMESPACE_DECL) + return(NULL); + if (cur->type == XML_ATTRIBUTE_NODE) + cur = cur->parent; + } if (cur == NULL) return(NULL) ; /* ERROR */ if (cur->next != NULL) return(cur->next) ; do { @@ -8162,8 +8170,13 @@ xmlNodePtr xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt, xmlNodePtr cur) { if ((ctxt == NULL) || (ctxt->context == NULL)) return(NULL); - if (cur == NULL) + if (cur == NULL) { cur = ctxt->context->node; + if (cur->type == XML_NAMESPACE_DECL) + return(NULL); + if (cur->type == XML_ATTRIBUTE_NODE) + return(cur->parent); + } if (cur == NULL) return (NULL); if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) @@ -8208,7 +8221,7 @@ xmlXPathNextPrecedingInternal(xmlXPathPa if (cur == NULL) return (NULL); if (cur->type == XML_NAMESPACE_DECL) - cur = (xmlNodePtr)((xmlNsPtr)cur)->next; + return (NULL); ctxt->ancestor = cur->parent; } if ((cur->prev != NULL) && (cur->prev->type == XML_DTD_NODE)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de