diff --git a/.gitignore b/.gitignore index d6b6170..70e2bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/lxml-4.6.3.tar.gz +SOURCES/lxml-4.6.5.tar.gz diff --git a/.python-lxml.metadata b/.python-lxml.metadata index b35ee12..fcf7f24 100644 --- a/.python-lxml.metadata +++ b/.python-lxml.metadata @@ -1 +1 @@ -a14e8b1cb38f3ed425e2d9b22950ce64c63500ef SOURCES/lxml-4.6.3.tar.gz +04a3ed4d33a511b5796880461b0edb6f3b144547 SOURCES/lxml-4.6.5.tar.gz diff --git a/SOURCES/852ed1092b.patch b/SOURCES/852ed1092b.patch deleted file mode 100644 index 26778f6..0000000 --- a/SOURCES/852ed1092b.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 852ed1092bd80b6b9a51db24371047ec88843031 Mon Sep 17 00:00:00 2001 -From: Stefan Behnel -Date: Tue, 18 May 2021 22:02:02 +0200 -Subject: [PATCH] Adapt a test to a behavioural change in libxml2 2.9.11+. - ---- - src/lxml/tests/test_etree.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py -index 9cf70604b..42613dcbe 100644 ---- a/src/lxml/tests/test_etree.py -+++ b/src/lxml/tests/test_etree.py -@@ -3036,7 +3036,10 @@ def test_subelement_nsmap(self): - def test_html_prefix_nsmap(self): - etree = self.etree - el = etree.HTML('aa').find('.//page-description') -- self.assertEqual({'hha': None}, el.nsmap) -+ if etree.LIBXML_VERSION < (2, 9, 11): -+ self.assertEqual({'hha': None}, el.nsmap) -+ else: -+ self.assertEqual({}, el.nsmap) - - def test_getchildren(self): - Element = self.etree.Element diff --git a/SPECS/python-lxml.spec b/SPECS/python-lxml.spec index 82e111a..5557151 100644 --- a/SPECS/python-lxml.spec +++ b/SPECS/python-lxml.spec @@ -1,8 +1,8 @@ %global modname lxml Name: python-%{modname} -Version: 4.6.3 -Release: 5%{?dist} +Version: 4.6.5 +Release: 1%{?dist} Summary: XML processing library combining libxml2/libxslt with the ElementTree API # The lxml project is licensed under BSD @@ -13,9 +13,6 @@ License: BSD and MIT and zlib URL: https://github.com/lxml/lxml Source0: %{pypi_source %{modname}} -# Adapt a test to a behavioural change in libxml2 2.9.11+ -Patch1: %{url}/commit/852ed1092b.patch - BuildRequires: gcc BuildRequires: libxml2-devel BuildRequires: libxslt-devel @@ -68,6 +65,11 @@ cp -a build/lib.%{python3_platform}-%{python3_version}/* src/ %{python3_sitearch}/%{modname}-*.egg-info/ %changelog +* Thu Jan 06 2022 Charalampos Stratakis - 4.6.5-1 +- Update to 4.6.5 +- Fixes CVE-2021-43818 +- Resolves: rhbz#2032569 + * Fri Nov 26 2021 Miro HronĨok - 4.6.3-5 - Run the tests during build - Resolves: rhbz#2026941