forked from pool/python312
- Remove CVE-2023-52425-libexpat-2.6.0-backport-15.6.patch as
well. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python312?expand=0&rev=111
This commit is contained in:
@@ -1,61 +0,0 @@
|
|||||||
---
|
|
||||||
Lib/test/test_pyexpat.py | 4 ++++
|
|
||||||
Lib/test/test_sax.py | 3 +++
|
|
||||||
Lib/test/test_xml_etree.py | 8 ++++++++
|
|
||||||
3 files changed, 15 insertions(+)
|
|
||||||
|
|
||||||
Index: Python-3.12.10/Lib/test/test_pyexpat.py
|
|
||||||
===================================================================
|
|
||||||
--- Python-3.12.10.orig/Lib/test/test_pyexpat.py 2025-04-29 21:02:30.964709964 +0200
|
|
||||||
+++ Python-3.12.10/Lib/test/test_pyexpat.py 2025-04-29 21:02:36.657887054 +0200
|
|
||||||
@@ -794,6 +794,10 @@
|
|
||||||
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, _):
|
|
||||||
Index: Python-3.12.10/Lib/test/test_sax.py
|
|
||||||
===================================================================
|
|
||||||
--- Python-3.12.10.orig/Lib/test/test_sax.py 2025-04-29 21:02:30.996541490 +0200
|
|
||||||
+++ Python-3.12.10/Lib/test/test_sax.py 2025-04-29 21:02:36.657990211 +0200
|
|
||||||
@@ -1240,6 +1240,9 @@
|
|
||||||
|
|
||||||
self.assertEqual(result.getvalue(), start + b"<doc></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):
|
|
||||||
result = BytesIO()
|
|
||||||
xmlgen = XMLGenerator(result)
|
|
||||||
Index: Python-3.12.10/Lib/test/test_xml_etree.py
|
|
||||||
===================================================================
|
|
||||||
--- Python-3.12.10.orig/Lib/test/test_xml_etree.py 2025-04-29 21:02:31.411981100 +0200
|
|
||||||
+++ Python-3.12.10/Lib/test/test_xml_etree.py 2025-04-29 21:09:12.065075743 +0200
|
|
||||||
@@ -138,6 +138,11 @@
|
|
||||||
return mock.patch.object(cls, "__eq__", autospec=True, wraps=eq)
|
|
||||||
|
|
||||||
|
|
||||||
+IS_SLE_15_6 = os.environ.get("SLE_VERSION", "") == "0150600"
|
|
||||||
+fails_with_expat_2_6_0 = (unittest.expectedFailure
|
|
||||||
+ # 2.4 version patched in SLE
|
|
||||||
+ if IS_SLE_15_6 and pyexpat.version_info >= (2, 4, 0) else
|
|
||||||
+ lambda test: test)
|
|
||||||
def checkwarnings(*filters, quiet=False):
|
|
||||||
def decorator(test):
|
|
||||||
def newtest(*args, **kwargs):
|
|
||||||
@@ -1668,6 +1673,9 @@
|
|
||||||
|
|
||||||
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'))
|
|
||||||
|
|
||||||
@@ -165,6 +165,8 @@ Tue Apr 29 19:26:57 UTC 2025 - Matej Cepl <mcepl@suse.com>
|
|||||||
ignorable.
|
ignorable.
|
||||||
- New libexpat doesn’t need expectedFailure, it doesn't fail any
|
- New libexpat doesn’t need expectedFailure, it doesn't fail any
|
||||||
more.
|
more.
|
||||||
|
- Remove CVE-2023-52425-libexpat-2.6.0-backport-15.6.patch as
|
||||||
|
well.
|
||||||
- doc-py38-to-py36.patch needs to substantially extended.
|
- doc-py38-to-py36.patch needs to substantially extended.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
|
|||||||
@@ -177,11 +177,6 @@ Patch34: skip-test_pyobject_freed_is_freed.patch
|
|||||||
# PATCH-FIX-SLE fix_configure_rst.patch bpo#43774 mcepl@suse.com
|
# PATCH-FIX-SLE fix_configure_rst.patch bpo#43774 mcepl@suse.com
|
||||||
# remove duplicate link targets and make documentation with old Sphinx in SLE
|
# remove duplicate link targets and make documentation with old Sphinx in SLE
|
||||||
Patch35: fix_configure_rst.patch
|
Patch35: fix_configure_rst.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
|
# 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.
|
# Skip some failing tests in test_compile for i586 arch in 15.6.
|
||||||
Patch40: fix-test-recursion-limit-15.6.patch
|
Patch40: fix-test-recursion-limit-15.6.patch
|
||||||
|
|||||||
Reference in New Issue
Block a user