diff --git a/CVE-2023-52425-libexpat-2.6.0-backport-15.6.patch b/CVE-2023-52425-libexpat-2.6.0-backport-15.6.patch deleted file mode 100644 index 1fcc621..0000000 --- a/CVE-2023-52425-libexpat-2.6.0-backport-15.6.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- - Lib/test/test_pyexpat.py | 4 ++++ - Lib/test/test_sax.py | 3 +++ - Lib/test/test_xml_etree.py | 10 ++++++++++ - 3 files changed, 17 insertions(+) - ---- a/Lib/test/test_pyexpat.py -+++ b/Lib/test/test_pyexpat.py -@@ -791,6 +791,10 @@ class ReparseDeferralTest(unittest.TestC - self.assertEqual(started, ['doc']) - - def test_reparse_deferral_disabled(self): -+ if expat.version_info < (2, 6, 0): -+ self.skipTest(f'Expat {expat.version_info} does not ' -+ 'support reparse deferral') -+ - started = [] - - def start_element(name, _): ---- a/Lib/test/test_sax.py -+++ b/Lib/test/test_sax.py -@@ -1240,6 +1240,9 @@ class ExpatReaderTest(XmlTestBase): - - self.assertEqual(result.getvalue(), start + b"") - -+ @unittest.skipIf(pyexpat.version_info < (2, 6, 0), -+ f'Expat {pyexpat.version_info} does not ' -+ 'support reparse deferral') - def test_flush_reparse_deferral_disabled(self): - result = BytesIO() - xmlgen = XMLGenerator(result) ---- a/Lib/test/test_xml_etree.py -+++ b/Lib/test/test_xml_etree.py -@@ -121,6 +121,11 @@ ATTLIST_XML = """\ - - """ - -+IS_SLE_15_7 = os.environ.get("SLE_VERSION", "") == "0150700" -+fails_with_expat_2_6_0 = (unittest.expectedFailure -+ # 2.4 version patched in SLE -+ if IS_SLE_15_7 and pyexpat.version_info >= (2, 4, 0) else -+ lambda test: test) - def checkwarnings(*filters, quiet=False): - def decorator(test): - def newtest(*args, **kwargs): -@@ -1504,9 +1509,11 @@ class XMLPullParserTest(unittest.TestCas - self.assert_event_tags(parser, [('end', 'root')]) - self.assertIsNone(parser.close()) - -+ @fails_with_expat_2_6_0 - def test_simple_xml_chunk_1(self): - self.test_simple_xml(chunk_size=1, flush=True) - -+ @fails_with_expat_2_6_0 - def test_simple_xml_chunk_5(self): - self.test_simple_xml(chunk_size=5, flush=True) - -@@ -1731,6 +1738,9 @@ class XMLPullParserTest(unittest.TestCas - - self.assert_event_tags(parser, [('end', 'doc')]) - -+ @unittest.skipIf(pyexpat.version_info < (2, 6, 0), -+ f'Expat {pyexpat.version_info} does not ' -+ 'support reparse deferral') - def test_flush_reparse_deferral_disabled(self): - parser = ET.XMLPullParser(events=('start', 'end')) - diff --git a/python313-rpmlintrc b/python313-rpmlintrc index 5b35f34..2a18978 100644 --- a/python313-rpmlintrc +++ b/python313-rpmlintrc @@ -1,3 +1,4 @@ addFilter("pem-certificate.*/usr/lib.*/python.*/test/*.pem") addFilter("devel-file-in-non-devel-package.*/usr/lib.*/python.*/tests/*.c") +addFilter("devel-file-in-non-devel-package.*/usr/lib.*/python.*/test/*.c") addFilter("devel-file-in-non-devel-package.*/usr/lib.*/python.*/test/*.cpp") diff --git a/python313.changes b/python313.changes index 48fc6e1..00e3ab0 100644 --- a/python313.changes +++ b/python313.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 29 12:14:59 UTC 2024 - Daniel Garcia + +- Drop CVE-2023-52425-libexpat-2.6.0-backport-15.6.patch, not needed + anymore because libexpat is updated to 2.6 in SP7. bsc#1233777 + ------------------------------------------------------------------- Fri Nov 15 11:25:06 UTC 2024 - Dominique Leuenberger diff --git a/python313.spec b/python313.spec index 51cd4b9..e475157 100644 --- a/python313.spec +++ b/python313.spec @@ -203,11 +203,6 @@ Patch07: bpo-31046_ensurepip_honours_prefix.patch # PATCH-FIX-SLE skip-test_pyobject_freed_is_freed.patch mcepl@suse.com # skip a test failing on SLE-15 Patch09: skip-test_pyobject_freed_is_freed.patch -# PATCH-FIX-OPENSUSE CVE-2023-52425-libexpat-2.6.0-backport-15.6.patch -# This problem on libexpat is patched on 15.6 without version -# update, this patch changes the tests to match the libexpat provided -# by SUSE -Patch39: CVE-2023-52425-libexpat-2.6.0-backport-15.6.patch # PATCH-FIX-OPENSUSE fix-test-recursion-limit-15.6.patch gh#python/cpython#115083 # Skip some failing tests in test_compile for i586 arch in 15.6. Patch40: fix-test-recursion-limit-15.6.patch