diff --git a/00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-gh-28549-gh-28589.patch b/00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-gh-28549-gh-28589.patch index 1d39233..b5c2fa1 100644 --- a/00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-gh-28549-gh-28589.patch +++ b/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 9c6561c099..84714c03fe 100644 +index 17319c366a..6a46d5b76c 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py -@@ -956,39 +956,6 @@ def test_debug_deprecation(self): +@@ -965,39 +965,6 @@ def test_debug_deprecation(self): b'is deprecated and will be removed in Python 3.12') self.assertIn(msg, err) @@ -60,10 +60,10 @@ index 9c6561c099..84714c03fe 100644 class ThreadJoinOnShutdown(BaseTestCase): diff --git a/Lib/threading.py b/Lib/threading.py -index 4f72938551..18c10e6489 100644 +index 70601fc0d5..b7af6da432 100644 --- a/Lib/threading.py +++ b/Lib/threading.py -@@ -1546,29 +1546,20 @@ def _shutdown(): +@@ -1553,29 +1553,20 @@ def _shutdown(): global _SHUTTING_DOWN _SHUTTING_DOWN = True diff --git a/00412-include-new-dir-test-regrtestdata-in-the-installation-gh-112765-gh-112784.patch b/00412-include-new-dir-test-regrtestdata-in-the-installation-gh-112765-gh-112784.patch new file mode 100644 index 0000000..a855f1b --- /dev/null +++ b/00412-include-new-dir-test-regrtestdata-in-the-installation-gh-112765-gh-112784.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Serhiy Storchaka +Date: Wed, 6 Dec 2023 10:12:08 +0200 +Subject: [PATCH] 00412: Include new dir test/regrtestdata in the installation + (GH-112765) (GH-112784) + +(cherry picked from commit f8c0198e3bfa2f6f65e426765a5efddd8ece78b0) + +Co-authored-by: Victor Stinner +--- + Makefile.pre.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index c61b093fc9..41d3f330b3 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1959,6 +1959,9 @@ TESTSUBDIRS= ctypes/test \ + test/imghdrdata \ + test/leakers \ + test/libregrtest \ ++ test/regrtestdata \ ++ test/regrtestdata/import_from_tests \ ++ test/regrtestdata/import_from_tests/test_regrtest_b \ + test/sndhdrdata \ + test/subprocessdata \ + test/support \ diff --git a/python3.11.spec b/python3.11.spec index 0ea7d64..8735c2e 100644 --- a/python3.11.spec +++ b/python3.11.spec @@ -13,11 +13,11 @@ 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}.6 +%global general_version %{pybasever}.7 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} License: Python-2.0.1 @@ -317,6 +317,10 @@ 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 +# 00412 # cf7ebcc048985d04e2b253b7d1de81829ed267c9 +# Include new dir test/regrtestdata in the installation (GH-112765) (GH-112784) +Patch412: 00412-include-new-dir-test-regrtestdata-in-the-installation-gh-112765-gh-112784.patch + # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora, EL, etc., @@ -1616,6 +1620,9 @@ CheckPython optimized # ====================================================== %changelog +* Wed Dec 06 2023 Tomáš Hrnčiar - 3.11.7-1 +- Update to 3.11.7 + * Tue Oct 03 2023 Yaakov Selkowitz - 3.11.6-2 - Use bundled libb2 in RHEL builds diff --git a/sources b/sources index 05a350f..fd14935 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.11.6.tar.xz) = 94b1038f6f53de0c44f99f72ed0f2e0791fd9d2a325ae00ba145b2b2c332c27b300b3ea3473017518089478f15e01867b1bb203c16610039cce36f8366de341a -SHA512 (Python-3.11.6.tar.xz.asc) = 510f0b1393948c1490f81fbd90987e6f6b048b9f4d9df5814168097f5d9ac96e3682ff9bdc82d35b351eff5a4cc75015c28253b1dbbb2d94780411157c8beb25 +SHA512 (Python-3.11.7.tar.xz) = 11e06f2ffe1f66888cb5b4e9f607de815294d6863a77eda6ec6d7c724ef158df9f51881f4a956d4a6fa973c2fb6fd031d495e3496e9b0bb53793fb1cc8434c63 +SHA512 (Python-3.11.7.tar.xz.asc) = 7b342990c6e32897047f8ba33c4d264f1be987b73843b61bd7db08bfa1a7280c616e9dcd96225f37602f876549d011ff82a4d79f1e32a5ab7d7cc22651bba44f