diff --git a/.gitignore b/.gitignore index ff308ad..855cff5 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ XML-LibXML-1.70.tar.gz /XML-LibXML-2.0126.tar.gz /XML-LibXML-2.0128.tar.gz /XML-LibXML-2.0129.tar.gz +/XML-LibXML-2.0130.tar.gz diff --git a/XML-LibXML-2.0129-Adjust-tests-to-libxml2-2.9.5.patch b/XML-LibXML-2.0129-Adjust-tests-to-libxml2-2.9.5.patch deleted file mode 100644 index edbc06d..0000000 --- a/XML-LibXML-2.0129-Adjust-tests-to-libxml2-2.9.5.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 14f879ec851e7f5e32f4895fc93dd391cf841eb9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -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ř ---- - 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 - diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index ff44692..bb53c5a 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -7,8 +7,8 @@ Name: perl-XML-LibXML # https://bugzilla.redhat.com/show_bug.cgi?id=469480 # it might not be needed anymore # this module is maintained, the other is not -Version: 2.0129 -Release: 8%{?dist} +Version: 2.0130 +Release: 1%{?dist} Epoch: 1 Summary: Perl interface to the libxml2 library Group: Development/Libraries @@ -18,8 +18,6 @@ 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 @@ -99,7 +97,6 @@ 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 @@ -143,6 +140,9 @@ fi %{_mandir}/man3/*.3* %changelog +* Thu Oct 19 2017 Jitka Plesnikova - 1:2.0130-1 +- 2.0130 bump + * Wed Sep 20 2017 Petr Pisar - 1:2.0129-8 - Adapt to libxml2-2.9.5 (bug #1489529) diff --git a/sources b/sources index 2a24323..00c5db8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (XML-LibXML-2.0129.tar.gz) = f17c61052975ecc188c285ee93dbb07926c880a28e49afdd5af0c7c997e8b12be72412d0964391f1232f853935ee0ff2838cd5d62f8f3b4f52c341904069ccea +SHA512 (XML-LibXML-2.0130.tar.gz) = 43d6a62021b7a2e9efddaa6c238a873ce4f7fb43ca2985e8ead8a0cab3a54d4efd764cbd027bd4b235b4ad9b525ad075607ef4d08a42839b054715a7f55dcd16