From db68008d034003d823e174a2b33ee2591bd2f618ceaa0d6c09558eec3acde9d3 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 9 Jun 2025 17:32:07 +0000 Subject: [PATCH] Fix sphinx patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python39?expand=0&rev=234 --- python39.changes | 2 +- sphinx-802.patch | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/python39.changes b/python39.changes index 08153c6..7560fe9 100644 --- a/python39.changes +++ b/python39.changes @@ -6,7 +6,7 @@ Mon Jun 9 16:14:05 UTC 2025 - Matej Cepl - gh-135034: Fixes multiple issues that allowed tarfile extraction filters (filter="data" and filter="tar") to be bypassed using crafted symlinks and hard links. - - Addresses CVE-2024-12718 (bsc#1244056), CVE-2025-4138 + Addresses CVE-2024-12718 (bsc#1244056), CVE-2025-4138 (bsc#1244059), CVE-2025-4330 (bsc#1244060), and CVE-2025-4517 (bsc#1244032). - gh-133767: Fix use-after-free in the “unicode-escape” diff --git a/sphinx-802.patch b/sphinx-802.patch index de00f20..6e75210 100644 --- a/sphinx-802.patch +++ b/sphinx-802.patch @@ -1,12 +1,10 @@ --- - Doc/tools/extensions/pyspecific.py | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) + Doc/tools/extensions/pyspecific.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) -Index: Python-3.9.22/Doc/tools/extensions/pyspecific.py -=================================================================== ---- Python-3.9.22.orig/Doc/tools/extensions/pyspecific.py 2025-04-11 09:50:56.818993764 +0200 -+++ Python-3.9.22/Doc/tools/extensions/pyspecific.py 2025-04-11 09:51:18.844485631 +0200 -@@ -28,7 +28,13 @@ +--- a/Doc/tools/extensions/pyspecific.py ++++ b/Doc/tools/extensions/pyspecific.py +@@ -28,7 +28,13 @@ try: except ImportError: from sphinx.environment import NoUri from sphinx.locale import _ as sphinx_gettext @@ -21,3 +19,12 @@ Index: Python-3.9.22/Doc/tools/extensions/pyspecific.py from sphinx.util.nodes import split_explicit_title from sphinx.writers.text import TextWriter, TextTranslator from sphinx.writers.latex import LaTeXTranslator +@@ -338,7 +344,7 @@ class PyAbstractMethod(PyMethod): + def expand_version_arg(argument, release): + """Expand "next" to the current version""" + if argument == 'next': +- return translators['sphinx'].gettext('{} (unreleased)').format(release) ++ return sphinx_gettext('{} (unreleased)').format(release) + return argument + +