From 78ff6e46e1997b4df590d9d80e24c7127c9acc99ea615627390166934d2c159c Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Thu, 21 Mar 2024 18:48:55 +0000
Subject: [PATCH] - libexpat260.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python310?expand=0&rev=121
---
 libexpat260.patch | 47 -----------------------------------------------
 python310.changes |  1 +
 python310.spec    |  3 ---
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 libexpat260.patch

diff --git a/libexpat260.patch b/libexpat260.patch
deleted file mode 100644
index dfe0780..0000000
--- a/libexpat260.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f2eebf3c38eae77765247791576b437ec25ccfe2 Mon Sep 17 00:00:00 2001
-From: Serhiy Storchaka <storchaka@gmail.com>
-Date: Sun, 11 Feb 2024 12:08:39 +0200
-Subject: [PATCH] gh-115133: Fix tests for XMLPullParser with Expat 2.6.0
- (GH-115164)
-
-Feeding the parser by too small chunks defers parsing to prevent
-CVE-2023-52425. Future versions of Expat may be more reactive.
-(cherry picked from commit 4a08e7b3431cd32a0daf22a33421cd3035343dc4)
-
-Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
----
- Lib/test/test_xml_etree.py                                              |    6 ++++++
- Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst |    2 ++
- 2 files changed, 8 insertions(+)
- create mode 100644 Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst
-
---- a/Lib/test/test_xml_etree.py
-+++ b/Lib/test/test_xml_etree.py
-@@ -121,6 +121,10 @@ ATTLIST_XML = """\
- </foo>
- """
- 
-+fails_with_expat_2_6_0 = (unittest.expectedFailure
-+                        if pyexpat.version_info >= (2, 6, 0) else
-+                        lambda test: test)
-+
- def checkwarnings(*filters, quiet=False):
-     def decorator(test):
-         def newtest(*args, **kwargs):
-@@ -1420,9 +1424,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)
- 
---- /dev/null
-+++ b/Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst
-@@ -0,0 +1,2 @@
-+Fix tests for :class:`~xml.etree.ElementTree.XMLPullParser` with Expat
-+2.6.0.
diff --git a/python310.changes b/python310.changes
index 2b4f508..c302080 100644
--- a/python310.changes
+++ b/python310.changes
@@ -29,6 +29,7 @@ Thu Mar 21 07:38:15 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
     across multiple threads
 - Remove upstreamed patches:
   - CVE-2023-6597-TempDir-cleaning-symlink.patch
+  - libexpat260.patch
 - Readjust patches:
   -  F00251-change-user-install-location.patch
   -  fix_configure_rst.patch
diff --git a/python310.spec b/python310.spec
index ade03e6..e6fd506 100644
--- a/python310.spec
+++ b/python310.spec
@@ -192,9 +192,6 @@ Patch20:        CVE-2023-27043-email-parsing-errors.patch
 # * gh#python/cpython#104221
 # * gh#python/cpython#107246
 Patch21:        fix-sphinx-72.patch
-# PATCH-FIX-UPSTREAM libexpat260.patch gh#python/cpython#115289
-# Fix tests for XMLPullParser with Expat 2.6.0
-Patch22:        libexpat260.patch
 BuildRequires:  autoconf-archive
 BuildRequires:  automake
 BuildRequires:  fdupes