From 9c0a8f3c4cde8fa318ca162fa06f4d5fec4ce62f4e2a5350856a2d1e17b953c0 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 17 May 2022 22:11:07 +0000 Subject: [PATCH] - Add patch support-expat-245.patch: * Support Expat >= 2.4.4 (jsc#SLE-21253) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python311?expand=0&rev=14 --- python311.changes | 2 ++ python311.spec | 4 +++ support-expat-245.patch | 75 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 support-expat-245.patch diff --git a/python311.changes b/python311.changes index 23687bb..6e6974c 100644 --- a/python311.changes +++ b/python311.changes @@ -4,6 +4,8 @@ Tue May 10 15:01:18 UTC 2022 - Matej Cepl - Refresh bluez-devel-vendor.tar.xz - Fix building with system-expat (gh#python/cpython#92875). Nope, it didn't work, worked around it. +- Add patch support-expat-245.patch: + * Support Expat >= 2.4.4 (jsc#SLE-21253) ------------------------------------------------------------------- Mon May 9 15:09:03 UTC 2022 - Matej Cepl diff --git a/python311.spec b/python311.spec index 40ce27e..42fae91 100644 --- a/python311.spec +++ b/python311.spec @@ -160,6 +160,9 @@ Patch34: skip-test_pyobject_freed_is_freed.patch # PATCH-FIX-SLE fix_configure_rst.patch bpo#43774 mcepl@suse.com # remove duplicate link targets and make documentation with old Sphinx in SLE Patch35: fix_configure_rst.patch +# PATCH-FIX-UPSTREAM support-expat-245.patch jsc#SLE-21253 mcepl@suse.com +# Makes Python resilient to changes of API of libexpat +Patch36: support-expat-245.patch BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: fdupes @@ -425,6 +428,7 @@ other applications. %patch34 -p1 %endif %patch35 -p1 +%patch36 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac diff --git a/support-expat-245.patch b/support-expat-245.patch new file mode 100644 index 0000000..f4761ee --- /dev/null +++ b/support-expat-245.patch @@ -0,0 +1,75 @@ +From d4f5bb912e67299b59b814b89a5afd9a8821a14e Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Mon, 21 Feb 2022 11:03:08 -0800 +Subject: [PATCH] bpo-46811: Make test suite support Expat >=2.4.5 (GH-31453) + (GH-31471) + +Curly brackets were never allowed in namespace URIs +according to RFC 3986, and so-called namespace-validating +XML parsers have the right to reject them a invalid URIs. + +libexpat >=2.4.5 has become strcter in that regard due to +related security issues; with ET.XML instantiating a +namespace-aware parser under the hood, this test has no +future in CPython. + +References: +- https://datatracker.ietf.org/doc/html/rfc3968 +- https://www.w3.org/TR/xml-names/ + +Also, test_minidom.py: Support Expat >=2.4.5 +(cherry picked from commit 2cae93832f46b245847bdc252456ddf7742ef45e) + +Co-authored-by: Sebastian Pipping +--- + Lib/test/test_minidom.py | 13 ++++------ + Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst + +--- a/Lib/test/test_minidom.py ++++ b/Lib/test/test_minidom.py +@@ -6,12 +6,11 @@ import io + from test import support + import unittest + +-import pyexpat ++import xml.parsers.expat + import xml.dom.minidom + + from xml.dom.minidom import parse, Node, Document, parseString + from xml.dom.minidom import getDOMImplementation +-from xml.parsers.expat import ExpatError + + + tstfile = support.findfile("test.xml", subdir="xmltestdata") +@@ -1149,10 +1148,10 @@ class MinidomTest(unittest.TestCase): + + # Verify that character decoding errors raise exceptions instead + # of crashing +- if pyexpat.version_info >= (2, 4, 5): +- self.assertRaises(ExpatError, parseString, ++ if xml.parsers.expat.version_info >= (2, 4, 4): ++ self.assertRaises(xml.parsers.expat.ExpatError, parseString, + b'') +- self.assertRaises(ExpatError, parseString, ++ self.assertRaises(xml.parsers.expat.ExpatError, parseString, + b'Comment \xe7a va ? Tr\xe8s bien ?') + else: + self.assertRaises(UnicodeDecodeError, parseString, +@@ -1617,8 +1616,8 @@ class MinidomTest(unittest.TestCase): + self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE) + + def testExceptionOnSpacesInXMLNSValue(self): +- if pyexpat.version_info >= (2, 4, 5): +- context = self.assertRaisesRegex(ExpatError, 'syntax error') ++ if xml.parsers.expat.version_info >= (2, 4, 4): ++ context = self.assertRaisesRegex(xml.parsers.expat.ExpatError, 'syntax error') + else: + context = self.assertRaisesRegex(ValueError, 'Unsupported syntax') + +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst +@@ -0,0 +1 @@ ++Make test suite support Expat >=2.4.5