SHA256
1
0

Accepting request 980978 from devel:languages:python:Factory

- Update to 3.11.0b2:
  - many small updates
- Add patch support-expat-245.patch:
  * Support Expat >= 2.4.4 (jsc#SLE-21253)

OBS-URL: https://build.opensuse.org/request/show/980978
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python311?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2022-06-06 09:10:39 +00:00 committed by Git OBS Bridge
commit ec126cfe78
11 changed files with 113 additions and 26 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dccac9b03dd3fe5cd10bc547579eb0be81a1d8971ec2a866b03dec5391f5ad25
size 19416160

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEz9yiRbEEPPKl+Xhl/+h0BBaL2EcFAmJ1p8MACgkQ/+h0BBaL
2Ed9aBAAqIsXqNNhL3Q8jRpWdckbyiSsTgf7k+nr/yhO6x+XD8TZE5OakOIvCI4h
NnvzAKD+QzaDQAlT+QtrOf2BFK6z8x2k0FwdLZBZGbpY1GAJWRPJhLwqPmo0k6PC
H3wU7sJoKc2Md1s6UHYwoKy1sxYF4a2SjNWPfz+1/pUZoTucR4IEHUdOpzwhCh8k
frms3eu+AlbwSWisYjDLlOsvyfpqteM5pnfSB+XeQQmhjqXkdvOyNopnIpld9yYA
ThM2DcA+uw78xJx866vj9vybBXALJJAFs7L8Ofw0ZzNm7gZdorjvPUzy6+7LI72c
a2qVOKW4ugGILZi4r65abMoL87xSokIsztPlvKN+pbynWKc3Rk46trtn6TDsV7mi
wYNrlkWaeZPg6D200G7VXfNRJ3cSoLTEW5q4bkx5JJClTWd19JpE8xdMN8xd8Cj2
M7dzkImD6/UeQ87cOmFvg2Qcs/2nRfIfjDjjUTYXMCMof/XJ1Lzrz0y1O2sdfYud
o71oSmkYbKkcO4vJ/H6pOyGjLRS6nhWYbgebRMUp1zghnIibQIXt49+ntSpTT8VZ
9HVskMUb0FzbEuEza7jfeIj33VX9NOBGrpzupgqXnJZRyqmuM+OqNnBL082/uqFU
b0eheOgImRed716X9ZmhPQp1lNBItQk3IxZktLsnDsDKoqNIdQA=
=LzMI
-----END PGP SIGNATURE-----

3
Python-3.11.0b2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e574dee6694fb255dff8036f3c0048251e5cb29a167766030b7ce3160fb4c47d
size 19529360

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEz9yiRbEEPPKl+Xhl/+h0BBaL2EcFAmKVNMAACgkQ/+h0BBaL
2EeBzA/+K18D5/KHhY4lYl5IesjZ2j0R+ChXahEP0+uItTdrB1v5UDjo18tyvn1h
3zqqI0DRIckabOceyrWl2/EsLUb6SJOXbp7iB5E5dLGQPtsaxEgqBhUwWKq5AjFT
y9aBRkms2dKqIIvekC5vrZRDmiOz2pkS+xbqBHRvFSaRwdK2CdoFWFeHpCveqHvi
icX6xndT9R43d9k3FmsK162vopIVfMRpXk1fZwSxbetqQX3bvutqoIYbDpY80zAa
lKEd27c8Cx2dbeEL0MILiEN8F6xrHM3LSOFANrV2bEakkLFUuZTdSyG11HWqzbCl
tYcSDyptJl3CbP4Pnaa1tgpoVEtH7DVC/7W4TJyeEZ2c7TAY5dawEF9T3nb3bdGG
xaUK6oDnMbWSyLq4SLUGLEN0kC7EAXbn4VnHVUKuPoFHUj5hhq9EUnv6kJdc3CA1
SF2r3hph6OMb0MoYGbztSeQ0F7XsND3kTqFMhYOwDHlt5Z1PgD6ET8sK3J3OjVi+
FjEAInq6uGlCLJpfrc4TVzErE0aT0RSBEc+kPRBhASQoO1jEw5llX4kIgRNfA2a1
ZnixuB7AfSxLHIgyoMrrPvO3/x/003BKWD3cd/DuRzUU37OG/mfYLgvVc3kcjNz8
sdNjnjpAvAOhZEIEB5rdUTfAtIbQHFEMbmiaNOOegog1sK2Qgus=
=B4l/
-----END PGP SIGNATURE-----

View File

@ -139,7 +139,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1733,7 +1733,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoni
@@ -1741,7 +1741,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoni
install|*) ensurepip="" ;; \
esac; \
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
@ -148,7 +148,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
fi
altinstall: commoninstall
@@ -1743,7 +1743,7 @@ altinstall: commoninstall
@@ -1751,7 +1751,7 @@ altinstall: commoninstall
install|*) ensurepip="--altinstall" ;; \
esac; \
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \

View File

@ -29,7 +29,7 @@
Create a Python.framework rather than a traditional Unix install. Optional
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -5480,7 +5480,7 @@ C API
@@ -5685,7 +5685,7 @@ C API
- bpo-40939: Removed documentation for the removed ``PyParser_*`` C API.
- bpo-43795: The list in :ref:`stable-abi-list` now shows the public name

View File

@ -4,7 +4,7 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1222,11 +1222,18 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
@@ -1230,11 +1230,18 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
$(DTRACE_OBJS) \
$(srcdir)/Modules/getbuildinfo.c
$(CC) -c $(PY_CORE_CFLAGS) \

View File

@ -4,7 +4,7 @@
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -434,7 +434,7 @@ class PosixTester(unittest.TestCase):
@@ -428,7 +428,7 @@ class PosixTester(unittest.TestCase):
def test_posix_fadvise(self):
fd = os.open(os_helper.TESTFN, os.O_RDONLY)
try:

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 31 20:54:36 UTC 2022 - Matej Cepl <mcepl@suse.com>
- Update to 3.11.0b2:
- many small updates
- Add patch support-expat-245.patch:
* Support Expat >= 2.4.4 (jsc#SLE-21253)
-------------------------------------------------------------------
Tue May 10 15:01:18 UTC 2022 - Matej Cepl <mcepl@suse.com>

View File

@ -100,7 +100,7 @@ Obsoletes: python39%{?1:-%{1}}
%define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so
%bcond_without profileopt
Name: %{python_pkg_name}%{psuffix}
Version: 3.11.0b1
Version: 3.11.0b2
Release: 0
Summary: Python 3 Interpreter
License: Python-2.0
@ -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
@ -187,7 +190,7 @@ BuildRequires: pkgconfig(libtirpc)
BuildRequires: mpdecimal-devel
%endif
%if %{with doc}
BuildRequires: python3-Sphinx
BuildRequires: python3-Sphinx >= 4.0.0
%if 0%{?suse_version} >= 1500
BuildRequires: python3-python-docs-theme >= 2022.1
%endif
@ -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

75
support-expat-245.patch Normal file
View File

@ -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 <sebastian@pipping.org>
---
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'<fran\xe7ais></fran\xe7ais>')
- self.assertRaises(ExpatError, parseString,
+ self.assertRaises(xml.parsers.expat.ExpatError, parseString,
b'<franais>Comment \xe7a va ? Tr\xe8s bien ?</franais>')
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