Update to 3.11.8

This commit is contained in:
Tomáš Hrnčiar 2024-02-07 15:08:14 +01:00
commit 19c104a138
6 changed files with 16 additions and 44 deletions

View file

@ -61,10 +61,10 @@ index 01d5331a63..79f70f0de4 100644
else:
if self.exec_prefix is None:
diff --git a/Lib/site.py b/Lib/site.py
index 69670d9d7f..104cb93899 100644
index 2904e44cff..1c9bfa7713 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -377,8 +377,15 @@ def getsitepackages(prefixes=None):
@@ -387,8 +387,15 @@ def getsitepackages(prefixes=None):
return sitepackages
def addsitepackages(known_paths, prefixes=None):

View file

@ -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 17319c366a..6a46d5b76c 100644
index ec6a319486..1dbb9d0baa 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -965,39 +965,6 @@ def test_debug_deprecation(self):
@@ -1045,39 +1045,6 @@ def test_debug_deprecation(self):
b'is deprecated and will be removed in Python 3.12')
self.assertIn(msg, err)
@ -60,7 +60,7 @@ index 17319c366a..6a46d5b76c 100644
class ThreadJoinOnShutdown(BaseTestCase):
diff --git a/Lib/threading.py b/Lib/threading.py
index 70601fc0d5..b7af6da432 100644
index 29b8ec7465..2145f5a6dc 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1553,29 +1553,20 @@ def _shutdown():

View file

@ -1,27 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
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 <vstinner@python.org>
---
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 \

View file

@ -72,7 +72,7 @@ index 0e266b6a45..6723dc4f13 100644
.. function:: parsedate(date)
diff --git a/Lib/email/utils.py b/Lib/email/utils.py
index cfdfeb3f1a..9522341fab 100644
index 8993858ab4..94ead0e91f 100644
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -48,6 +48,7 @@
@ -81,7 +81,7 @@ index cfdfeb3f1a..9522341fab 100644
+
def _has_surrogates(s):
"""Return True if s contains surrogate-escaped binary data."""
"""Return True if s may contain surrogate-escaped binary data."""
# This check is based on the fact that unless there are surrogates, utf8
@@ -106,12 +107,127 @@ def formataddr(pair, charset='utf-8'):
return address

View file

@ -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}.7
%global general_version %{pybasever}.8
#global prerel ...
%global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}}
Release: 4%{?dist}
Release: 1%{?dist}
License: Python-2.0.1
@ -67,7 +67,7 @@ License: Python-2.0.1
# If the rpmwheels condition is disabled, we use the bundled wheel packages
# from Python with the versions below.
# This needs to be manually updated when we update Python.
%global pip_version 23.2.1
%global pip_version 24.0
%global setuptools_version 65.5.0
# Expensive optimizations (mainly, profile-guided optimizations)
@ -317,11 +317,7 @@ 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
# 00415 # 9ca4533e0b4a03d919953017026f66c6a060756e
# 00415 # 744762808f7303a55fa941f65cacb94fd7099e5e
# [CVE-2023-27043] gh-102988: Reject malformed addresses in email.parseaddr() (#111116)
#
# Detect email address parsing errors and return empty tuple to
@ -1632,6 +1628,9 @@ CheckPython optimized
# ======================================================
%changelog
* Wed Feb 07 2024 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.11.8-1
- Update to 3.11.8
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

View file

@ -1,2 +1,2 @@
SHA512 (Python-3.11.7.tar.xz) = 11e06f2ffe1f66888cb5b4e9f607de815294d6863a77eda6ec6d7c724ef158df9f51881f4a956d4a6fa973c2fb6fd031d495e3496e9b0bb53793fb1cc8434c63
SHA512 (Python-3.11.7.tar.xz.asc) = 7b342990c6e32897047f8ba33c4d264f1be987b73843b61bd7db08bfa1a7280c616e9dcd96225f37602f876549d011ff82a4d79f1e32a5ab7d7cc22651bba44f
SHA512 (Python-3.11.8.tar.xz) = 434e727fa370def348838fd84acb69b4d309cfb03f61bf5069150164e9ca005637ac01dfbf997f445607d4e28d02c8bed0858b36589240ccadaa4c14c19f2320
SHA512 (Python-3.11.8.tar.xz.asc) = aebec01f84e96a76f6c5949004df2bb51c817bac3fc8d925ee26ded1ff2d80bec1b579dd0fc129004bc9cd81cbdcdcdf7c1f0471c3d26b70bd6dac11b97187e0