Accepting request 1031408 from devel:languages:python:Factory

OBS-URL: https://build.opensuse.org/request/show/1031408 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python39?expand=0&rev=35
2022-10-28 17:28:34 +00:00
parent a25e716d37 d6d31d7ca3
commit d28bf8ebe9
7 changed files with 104 additions and 20 deletions
--- a/98437-sphinx.locale._-as-gettext-in-pyspecific.patch
+++ b/98437-sphinx.locale._-as-gettext-in-pyspecific.patch
@@ -0,0 +1,54 @@
+From 5775f51691d7d64fb676586e008b41261ce64ac2 Mon Sep 17 00:00:00 2001
+From: "Matt.Wang" <mattwang44@gmail.com>
+Date: Wed, 19 Oct 2022 14:49:08 +0800
+Subject: [PATCH 1/2] fix(doc-tools): use sphinx.locale._ as gettext() for
+ backward-compatibility in pyspecific.py
+
+[why] spinix 5.3 changed locale.translators from a defaultdict(gettext.NullTranslations) to a dict, which leads to failure of pyspecific.py. Use sphinx.locale._ as gettext to fix the issue.
+---
+ Doc/tools/extensions/pyspecific.py                                           |    8 ++++----
+ Misc/NEWS.d/next/Documentation/2022-10-19-07-15-52.gh-issue-98366.UskMXF.rst |    1 +
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+--- a/Doc/tools/extensions/pyspecific.py
+++ b/Doc/tools/extensions/pyspecific.py
+@@ -26,7 +26,7 @@ try:
+     from sphinx.errors import NoUri
+ except ImportError:
+     from sphinx.environment import NoUri
+-from sphinx.locale import translators
+from sphinx.locale import _ as sphinx_gettext
+ from sphinx.util import status_iterator, logging
+ from sphinx.util.nodes import split_explicit_title
+ from sphinx.writers.text import TextWriter, TextTranslator
+@@ -110,7 +110,7 @@ class ImplementationDetail(Directive):
+ 
+     def run(self):
+         pnode = nodes.compound(classes=['impl-detail'])
+-        label = translators['sphinx'].gettext(self.label_text)
+        label = sphinx_gettext(self.label_text)
+         content = self.content
+         add_text = nodes.strong(label, label)
+         if self.arguments:
+@@ -266,7 +266,7 @@ class AuditEvent(Directive):
+         else:
+             args = []
+ 
+-        label = translators['sphinx'].gettext(self._label[min(2, len(args))])
+        label = sphinx_gettext(self._label[min(2, len(args))])
+         text = label.format(name="``{}``".format(name),
+                             args=", ".join("``{}``".format(a) for a in args if a))
+ 
+@@ -445,7 +445,7 @@ class DeprecatedRemoved(Directive):
+         else:
+             label = self._removed_label
+ 
+-        label = translators['sphinx'].gettext(label)
+        label = sphinx_gettext(label)
+         text = label.format(deprecated=self.arguments[0], removed=self.arguments[1])
+         if len(self.arguments) == 3:
+             inodes, messages = self.state.inline_text(self.arguments[2],
+--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2022-10-19-07-15-52.gh-issue-98366.UskMXF.rst
+@@ -0,0 +1 @@
+Use sphinx.locale._ as the gettext function in pyspecific.py.
--- a/Python-3.9.14.tar.xz
+++ b/Python-3.9.14.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:651304d216c8203fe0adf1a80af472d8e92c3b0e0a7892222ae4d9f3ae4debcf
-size 19750176
--- a/Python-3.9.14.tar.xz.asc
+++ b/Python-3.9.14.tar.xz.asc
@@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE4/8oOcBIslwITevpsmmV4xAlBWgFAmMXib8ACgkQsmmV4xAl
-BWiwtA/+LhNMVhCwNFNtDaxDLv2Pt43oX07ka9kuRau6WU0bicf4zBboQW2Ut9en
-epdnw06klvOrb2wlxU4jeWdzuq5bNlhW3rVyT2npbRfYeXqsi/i+sY9eV5SFRPAM
-eZrnCOkuWJxTy/XRQsPFbhE0bG+npoR80RpDtZ9EfjKyL2PSyOsvudKHjepcdHMi
-tCzcmHwJbakD18g268RiDZsR8q7lSQW0c3OhOPwXfFV2Xh+jS8eEEcdp2QSBq/S9
-+HIHEAYJWvAEtg9q3KMKDWOi5rd0Q6Cw4zcO8GI0HTCkNsnJmtLUJ4qTTZWOHC5t
-M8Z0hzuXI9wK23GpxWuThuaMyQCW5HX8tBVuxaHNyWuJ4T6ID0eJJP4ijLNMXv4U
-Q0MRbLYtIIagB8BsZtBnEIIsQ1k7THdJ5KAsWIjVaPe80yQWLOrmuXulJi+E4F/C
-bBKcsFXC605xg5C3AQk58QXpyLDoPtLtRVVPtVi1aqpHCLRCikHA8kqwc7JQIf7v
-p4VsfcNsYga/EF6FArdmVz8fOpQgItvhuHgMRWBZ35p/t9Ckbl7fJQB0PYfVKYWC
-F+uNahFYvJ+gH96U6MddEzZlB0AHx3gfysBrgWXvgUAqvAZ/Vq6FiOf0jhFWUtb1
-8b7sp8GSp7QzIP9U3J75sonXEAvNOA31vuKSJ2sKdxsIP9/KgZE=
-=kQup
-----END PGP SIGNATURE-----
--- a/Python-3.9.15.tar.xz
+++ b/Python-3.9.15.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12daff6809528d9f6154216950423c9e30f0e47336cb57c6aa0b4387dd5eb4b2
+size 19712208
--- a/Python-3.9.15.tar.xz.asc
+++ b/Python-3.9.15.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE4/8oOcBIslwITevpsmmV4xAlBWgFAmNFhjEACgkQsmmV4xAl
+BWhJRA/9H5hksRFz3av1uOB/HDVlglMwxIPJOzk57z6aknzc/ItxVz54UXK46XL7
+t9kSmb2zFo+TVfusE/By17ozf+j1WK8uTr8LrO2uvUC+Sck22U4WIwTkqj95/6sP
+Fmzrqsx1OyyCc6zJAMO6yo2hpxGmDcpxqVrn+lJ+INpuvf54bKerbFwV3+z6MxSe
+s48b2YGuLK1ttjFEOrrsGxf8sS7SNByckBMQDHf++5g95zUczlZ4j5UH15GZ+wHn
+NDW3/kccFGHjBHGGsNjZCIwmFN0+yA6BtbTEsX/nAyfcD45u7w5TQEmVp+knTtU8
+G3Z3C6aCATxBG4UKpO5DxL+UqcC5IvFT1mcKN+TgFluX5X7ENo3QPMGiww906NGr
+/6KztH7kURjUfI0cNQIxkJcnjNXGAbIumgokKOjcyIlWzxnb0I6cQsaj0yg0zUQG
+zIwugTjwoA00JZiV+WZxsFfkrOpxOWCLXFLdA2ph5BM1W0nqBFH21ZIBns77uoHe
+1wM0A1meu6AFFgQZREGV6twyqAnsGGgf+x2Y4a/s9MTLYphoMSEIUOvnbwAzsBbL
+FThjD2o1bsm8E1V9d18hvw/jhsOCievKt4a3Fqnl2wPMjvoRaEYevyv3QNBjg1i
+bLAhT0QpnE68h6doi7FgKd5sdp6OGQT5wUOUseQSAINO9k8R7RQ=
+=Qc71
+-----END PGP SIGNATURE-----
--- a/python39.changes
+++ b/python39.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Oct 21 10:14:03 UTC 2022 - Matej Cepl <mcepl@suse.com>
+
+- Add 98437-sphinx.locale._-as-gettext-in-pyspecific.patch to
+  allow building of documentation with the latest Sphinx 5.3.0
+  (gh#python/cpython#98366).
+
+-------------------------------------------------------------------
+Wed Oct 19 07:12:23 UTC 2022 - Matej Cepl <mcepl@suse.com>
+
+- Update to 3.9.15:
+  - Fix multiplying a list by an integer (list *= int): detect
+    the integer overflow when the new allocated length is close
+    to the maximum size.
+  - Fix a shell code injection vulnerability in the
+    get-remote-certificate.py example script. The script no
+    longer uses a shell to run openssl commands. (originally
+    filed as CVE-2022-37460, later withdrawn)
+  - Fix command line parsing: reject -X int_max_str_digits option
+    with no value (invalid) when the PYTHONINTMAXSTRDIGITS
+    environment variable is set to a valid limit.
+  - When ValueError is raised if an integer is larger than the
+    limit, mention the sys.set_int_max_str_digits() function in
+    the error message.
+  - Update bundled libexpat to 2.4.9
+
 -------------------------------------------------------------------
 Sun Sep 11 08:49:43 UTC 2022 - Matej Cepl <mcepl@suse.com>

--- a/python39.spec
+++ b/python39.spec
@@ -93,7 +93,7 @@
 %define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so
 %bcond_without profileopt
 Name:           %{python_pkg_name}%{psuffix}
-Version:        3.9.14
+Version:        3.9.15
 Release:        0
 Summary:        Python 3 Interpreter
 License:        Python-2.0
@@ -161,6 +161,9 @@ Patch35:        support-expat-CVE-2022-25236-patched.patch
 # PATCH-FIX-UPSTREAM CVE-2015-20107-mailcap-unsafe-filenames.patch bsc#1198511 mcepl@suse.com
 # avoid the command injection in the mailcap module.
 Patch36:        CVE-2015-20107-mailcap-unsafe-filenames.patch
+# PATCH-FIX-UPSTREAM 98437-sphinx.locale._-as-gettext-in-pyspecific.patch gh#python/cpython#98366 mcepl@suse.com
+# this patch makes things totally awesome
+Patch37:        98437-sphinx.locale._-as-gettext-in-pyspecific.patch
 BuildRequires:  autoconf-archive
 BuildRequires:  automake
 BuildRequires:  fdupes
@@ -420,6 +423,7 @@ other applications.
 %endif
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1

 # drop Autoconf version requirement
 sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac