From 69c4eef74bb1c22cdde58f3bb53893219b9c776e2341b9307477f1e3a04ee22e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 30 Jun 2023 13:47:16 +0000 Subject: [PATCH] Accepting request 1096147 from devel:languages:python:Factory revert OBS-URL: https://build.opensuse.org/request/show/1096147 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python39?expand=0&rev=150 --- fix_configure_rst.patch | 40 ---------------------------------------- python39.changes | 2 -- python39.spec | 6 +----- 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 fix_configure_rst.patch diff --git a/fix_configure_rst.patch b/fix_configure_rst.patch deleted file mode 100644 index 5dcafa6..0000000 --- a/fix_configure_rst.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- - Doc/using/configure.rst | 3 --- - Misc/NEWS | 2 +- - 2 files changed, 1 insertion(+), 4 deletions(-) - ---- a/Doc/using/configure.rst -+++ b/Doc/using/configure.rst -@@ -41,7 +41,6 @@ General Options - - See :data:`sys.int_info.bits_per_digit `. - --.. cmdoption:: --with-cxx-main - .. cmdoption:: --with-cxx-main=COMPILER - - Compile the Python ``main()`` function and link Python executable with C++ -@@ -527,13 +526,11 @@ macOS Options - - See ``Mac/README.rst``. - --.. cmdoption:: --enable-universalsdk - .. cmdoption:: --enable-universalsdk=SDKDIR - - Create a universal binary build. *SDKDIR* specifies which macOS SDK should - be used to perform the build (default is no). - --.. cmdoption:: --enable-framework - .. cmdoption:: --enable-framework=INSTALLDIR - - Create a Python.framework rather than a traditional Unix install. Optional ---- a/Misc/NEWS -+++ b/Misc/NEWS -@@ -8105,7 +8105,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 -- :c:struct:`PyFrameObject` rather than ``_frame``. The non-existing entry -+ :c:type:`PyFrameObject` rather than ``_frame``. The non-existing entry - ``_node`` no longer appears in the list. - - - bpo-44378: :c:func:`Py_IS_TYPE` no longer uses :c:func:`Py_TYPE` to avoid diff --git a/python39.changes b/python39.changes index 714718b..9db5b11 100644 --- a/python39.changes +++ b/python39.changes @@ -33,8 +33,6 @@ Wed Jun 28 19:12:12 UTC 2023 - Matej Cepl - Remove upstreamed patches: - CVE-2023-24329-blank-URL-bypass.patch - CVE-2007-4559-filter-tarfile_extractall.patch -- Patch skip-test_pyobject_freed_is_freed.patch should be used - for SLE-15-SP4 as well. ------------------------------------------------------------------- Sat May 6 17:31:35 UTC 2023 - Matej Cepl diff --git a/python39.spec b/python39.spec index c58632c..2f10479 100644 --- a/python39.spec +++ b/python39.spec @@ -158,9 +158,6 @@ Patch34: skip-test_pyobject_freed_is_freed.patch # PATCH-FIX-UPSTREAM support-expat-CVE-2022-25236-patched.patch jsc#SLE-21253 mcepl@suse.com # Makes Python resilient to changes of API of libexpat Patch35: support-expat-CVE-2022-25236-patched.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 -Patch36: fix_configure_rst.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 @@ -416,7 +413,7 @@ other applications. %patch25 -p1 %patch29 -p1 %patch32 -p1 -%if 0%{?sle_version} && 0%{?sle_version} <= 150400 +%if 0%{?sle_version} && 0%{?sle_version} <= 150300 %patch33 -p1 %patch34 -p1 %endif @@ -424,7 +421,6 @@ other applications. %patch05 -p1 %endif %patch35 -p1 -%patch36 -p1 %patch37 -p1 %patch40 -p1