Adapt to libxml2-2.9.5
The second failure in t/32xpc_variables.t is a libxml2 bug #1493613 that will be fixed in libxml2.
This commit is contained in:
parent
c02774cc07
commit
a7e8896a89
45
XML-LibXML-2.0129-Adjust-tests-to-libxml2-2.9.5.patch
Normal file
45
XML-LibXML-2.0129-Adjust-tests-to-libxml2-2.9.5.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From 14f879ec851e7f5e32f4895fc93dd391cf841eb9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Wed, 20 Sep 2017 17:17:57 +0200
|
||||
Subject: [PATCH] Adjust tests to libxml2-2.9.5
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
libxml2-2.9.5 started accepting empty strings thus
|
||||
t/48_reader_undef_warning_on_empty_str_rt106830.t test does not make
|
||||
sense anymore and reports a faluire.
|
||||
|
||||
This patch skips the test when running against libnxml2 >= 2.9.5.
|
||||
|
||||
CPAN RT#122958
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
t/48_reader_undef_warning_on_empty_str_rt106830.t | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/t/48_reader_undef_warning_on_empty_str_rt106830.t b/t/48_reader_undef_warning_on_empty_str_rt106830.t
|
||||
index 8f704c0..0f656a1 100644
|
||||
--- a/t/48_reader_undef_warning_on_empty_str_rt106830.t
|
||||
+++ b/t/48_reader_undef_warning_on_empty_str_rt106830.t
|
||||
@@ -30,9 +30,13 @@ use XML::LibXML::Reader;
|
||||
my $xml_reader = XML::LibXML::Reader->new(string => $empty_xml_doc);
|
||||
|
||||
# TEST
|
||||
- ok (scalar(!defined($xml_reader)),
|
||||
- 'xml_reader is undef',
|
||||
- );
|
||||
+ SKIP: {
|
||||
+ skip 'libxml2 accepts empty strings since 2.9.5 version', 1
|
||||
+ if (XML::LibXML::LIBXML_VERSION() >= 20905);
|
||||
+ ok (scalar(!defined($xml_reader)),
|
||||
+ 'xml_reader is undef',
|
||||
+ );
|
||||
+ }
|
||||
|
||||
# TEST
|
||||
eq_or_diff(
|
||||
--
|
||||
2.13.5
|
||||
|
@ -8,7 +8,7 @@ Name: perl-XML-LibXML
|
||||
# it might not be needed anymore
|
||||
# this module is maintained, the other is not
|
||||
Version: 2.0129
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
Epoch: 1
|
||||
Summary: Perl interface to the libxml2 library
|
||||
Group: Development/Libraries
|
||||
@ -18,6 +18,8 @@ Source0: http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/XML-LibXML-%
|
||||
# Fix CVE-2017-10672 (use-after-free by controlling the arguments to
|
||||
# a replaceChild call), bug #1470205
|
||||
Patch0: XML-LibXML-2.0129-CVE-2017-10672.patch
|
||||
# Adapt to libxml2-2.9.5, bug #1489529, CPAN RT#122958
|
||||
Patch1: XML-LibXML-2.0129-Adjust-tests-to-libxml2-2.9.5.patch
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: findutils
|
||||
BuildRequires: glibc-common
|
||||
@ -97,6 +99,7 @@ validating XML parser and the high performance DOM implementation.
|
||||
%prep
|
||||
%setup -q -n XML-LibXML-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
chmod -x *.c
|
||||
for i in Changes; do
|
||||
/usr/bin/iconv -f iso8859-1 -t utf-8 $i > $i.conv && /bin/mv -f $i.conv $i
|
||||
@ -140,6 +143,9 @@ fi
|
||||
%{_mandir}/man3/*.3*
|
||||
|
||||
%changelog
|
||||
* Wed Sep 20 2017 Petr Pisar <ppisar@redhat.com> - 1:2.0129-8
|
||||
- Adapt to libxml2-2.9.5 (bug #1489529)
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0129-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user