Update to 3.12.0b2

00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-gh-28549-gh-28589.patch

@@ -16,10 +16,10 @@ https://github.com/GrahamDumpleton/mod_wsgi/issues/730
  2 files changed, 8 insertions(+), 50 deletions(-)
 
 diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
-index 97165264b3..7667ed37e8 100644
+index 9e4972ecb6..6f081d8f38 100644
 --- a/Lib/test/test_threading.py
 +++ b/Lib/test/test_threading.py
-@@ -1015,39 +1015,6 @@ def noop(): pass
+@@ -987,39 +987,6 @@ def noop(): pass
              threading.Thread(target=noop).start()
              # Thread.join() is not called
  
@@ -56,9 +56,9 @@ index 97165264b3..7667ed37e8 100644
 -        self.assertEqual(out, b'')
 -        self.assertEqual(err, b'')
 -
- 
+     def test_start_new_thread_at_exit(self):
- class ThreadJoinOnShutdown(BaseTestCase):
+         code = """if 1:
- 
+             import atexit
 diff --git a/Lib/threading.py b/Lib/threading.py
 index df273870fa..eba297776d 100644
 --- a/Lib/threading.py

00398-fix-stack-overwrite-on-32-bit-in-perf-map-test-harness-gh-104811-104823.patch

@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Carl Meyer <carl@oddbird.net>
-Date: Tue, 23 May 2023 16:04:31 -0600
-Subject: [PATCH] 00398: fix stack overwrite on 32-bit in perf map test harness
- (#104811)
-
----
- Modules/_testinternalcapi.c | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
-index b91f7b620f..8267dbf677 100644
---- a/Modules/_testinternalcapi.c
-+++ b/Modules/_testinternalcapi.c
-@@ -762,19 +762,24 @@ clear_extension(PyObject *self, PyObject *args)
- static PyObject *
- write_perf_map_entry(PyObject *self, PyObject *args)
- {
-+    PyObject *code_addr_v;
-     const void *code_addr;
-     unsigned int code_size;
-     const char *entry_name;
- 
--    if (!PyArg_ParseTuple(args, "KIs", &code_addr, &code_size, &entry_name))
-+    if (!PyArg_ParseTuple(args, "OIs", &code_addr_v, &code_size, &entry_name))
-         return NULL;
-+    code_addr = PyLong_AsVoidPtr(code_addr_v);
-+    if (code_addr == NULL) {
-+        return NULL;
-+    }
- 
-     int ret = PyUnstable_WritePerfMapEntry(code_addr, code_size, entry_name);
--    if (ret == -1) {
--        PyErr_SetString(PyExc_OSError, "Failed to write performance map entry");
-+    if (ret < 0) {
-+        PyErr_SetFromErrno(PyExc_OSError);
-         return NULL;
-     }
--    return Py_BuildValue("i", ret);
-+    return PyLong_FromLong(ret);
- }
- 
- static PyObject *

python3.12.spec

@@ -14,10 +14,10 @@ URL: https://www.python.org/
 #  WARNING  When rebasing to a new Python version,
 #           remember to update the python3-docs package as well
 %global general_version %{pybasever}.0
-%global prerel b1
+%global prerel b2
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Python-2.0.1
 
 
@@ -351,7 +351,7 @@ Source11: idle3.appdata.xml
 # pypa/distutils integration: https://github.com/pypa/distutils/pull/70
 Patch251: 00251-change-user-install-location.patch
 
-# 00371 # 1fc313929648e9b543542de09f59c55e175ac45a
+# 00371 # d917a50238c94c652bc30ae9061d65f60cc8accd
 # Revert "bpo-1596321: Fix threading._shutdown() for the main thread (GH-28549) (GH-28589)"
 #
 # This reverts commit 38c67738c64304928c68d5c2bd78bbb01d979b94. It
@@ -362,10 +362,6 @@ Patch251: 00251-change-user-install-location.patch
 # https://github.com/GrahamDumpleton/mod_wsgi/issues/730
 Patch371: 00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-gh-28549-gh-28589.patch
 
-# 00398 # 3a2e73c1542a7204628783cef2186e4b8a385f79
-# fix stack overwrite on 32-bit in perf map test harness (#104811)
-Patch398: 00398-fix-stack-overwrite-on-32-bit-in-perf-map-test-harness-gh-104811-104823.patch
-
 # 00401 # 48310af24b090719553bf0e9c965d80524e0b40e
 # Tests: Use setuptools+wheel from sysconfig.get_config_var('WHEEL_PKG_DIR') if set
 #
@@ -1661,6 +1657,9 @@ CheckPython optimized
 # ======================================================
 
 %changelog
+* Wed Jun 07 2023 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.12.0~b2-1
+- Update to 3.12.0b2
+
 * Mon May 29 2023 Miro Hrončok <mhroncok@redhat.com> - 3.12.0~b1-2
 - Use wheels from RPMs, at least on Fedora 39+
 - On older Fedora releases, declare bundled() provides and a complex License tag

sources

@@ -1,2 +1,2 @@
-SHA512 (Python-3.12.0b1.tar.xz) = 7d6d009f765ba48ef48e6b25cb1f043ba66979d66cb9141452862e84ae954611361d24178cce628d1892b75d306370a56fcb30a7c1715b0eedcfef5610f3e1ae
+SHA512 (Python-3.12.0b2.tar.xz) = 9bfac70f2ccc1f6798bc63a55d92f0b162e3a9077624a2e37448002ea310cb7b1da64ad2aceda795b45de91f60eb4d95dde85984900e54906d814625b42143b5
-SHA512 (Python-3.12.0b1.tar.xz.asc) = cea449f05ae66c28aeb4ffd99b5748ba4c09bfb2a6889a771744ea81ca2afc2420648d4ca92592d32ddb26660804e73912e6fb8d906674e9e1895ba613904b26
+SHA512 (Python-3.12.0b2.tar.xz.asc) = 22a1f2c3335bc428cfee0ce2e081aeed24474d3cd877fac1cc4cf92b4a2bee70f85aed0068a71600cddef9c8b46bbde257a92c57bd494ad820c0686ab7c8c0f0