rpms/libxml2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 2.9.7

Browse Source 
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2018-01-24 06:51:55 +01:00
parent b48abf9eb2
commit 4a557f56eb
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C
4 changed files with 4 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -34,3 +34,4 @@ libxml2-2.7.7.tar.gz
/libxml2-2.9.2.tar.gz
/libxml2-2.9.3.tar.gz
/libxml2-2.9.4.tar.gz
/libxml2-2.9.7.tar.gz

54
libxml2-2.9.5-Report-undefined-XPath-variable-error-message.patch
View File

@ -1,54 +0,0 @@
From 3157cf4e53c03bc3da604472c015c63141907db8 Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Wed, 20 Sep 2017 16:13:29 +0200
Subject: [PATCH] Report undefined XPath variable error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Commit c851970 removed a redundant error message if XPath evaluation
failed. This uncovered a case where an undefined XPath variable error
wasn't reported correctly.
Thanks to Petr Pisar for the report.
Fixes bug 787941.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
xpath.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/xpath.c b/xpath.c
index 2c1b2681..94815075 100644
--- a/xpath.c
+++ b/xpath.c
@@ -13531,10 +13531,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
if (op->value5 == NULL) {
val = xmlXPathVariableLookup(ctxt->context, op->value4);
- if (val == NULL) {
- ctxt->error = XPATH_UNDEF_VARIABLE_ERROR;
- return(0);
- }
+ if (val == NULL)
+ XP_ERROR0(XPATH_UNDEF_VARIABLE_ERROR);
valuePush(ctxt, val);
} else {
const xmlChar *URI;
@@ -13549,10 +13547,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
}
val = xmlXPathVariableLookupNS(ctxt->context,
op->value4, URI);
- if (val == NULL) {
- ctxt->error = XPATH_UNDEF_VARIABLE_ERROR;
- return(0);
- }
+ if (val == NULL)
+ XP_ERROR0(XPATH_UNDEF_VARIABLE_ERROR);
valuePush(ctxt, val);
}
return (total);
--
2.13.5

8
libxml2.spec
View File

@ -1,6 +1,6 @@
Name: libxml2
Version: 2.9.5
Release: 3%{?dist}%{?extra_release}
Version: 2.9.7
Release: 1%{?dist}
Summary: Library providing XML and HTML support
License: MIT
@ -11,9 +11,6 @@ Patch1: libxml2-2.9.0-do-not-check-crc.patch
# In python3.6 _PyVerify_fd is no more
# http://bugs.python.org/issue23524
Patch2: libxml2-2.9.4-remove-pyverify_fd.patch
# Fix reporting error about undefined XPath variables, bug #1493613,
# Gnome bug #787941, fixed in upstream after 2.9.5
Patch3: libxml2-2.9.5-Report-undefined-XPath-variable-error-message.patch
BuildRequires: python2-devel
BuildRequires: python3-devel
@ -98,7 +95,6 @@ at parse time or later once the document has been modified.
# workaround for #877567 - Very weird bug gzip decompression bug in "recent" libxml2 versions
%patch1 -p1 -b .do-not-check-crc
%patch2 -p1
%patch3 -p1
mkdir py3doc
cp doc/*.py py3doc

2
sources
View File

@ -1 +1 @@
SHA512 (libxml2-2.9.5.tar.gz) = 197dbd1722e5f90eea43837323352f48d215e198aa6b95685645ef7511e2beba8aadc0dd67e099c945120c5dbe7f8c9da5f376b22f447059e9ffa941c1bfd175
SHA512 (libxml2-2.9.7.tar.gz) = da06cb7c5032ef4b7c8e902fabb9d2c74634c42c161be07a7c66a00d53a68029f89b0d4de32a6b9d4ff338c2d1d9c4e53aefb9cf50cb1c2d6c6b06b442ef42d5