diff --git a/00441-make-vectorized-versions-of-blake2-available-on-x86-too.patch b/00441-make-vectorized-versions-of-blake2-available-on-x86-too.patch new file mode 100644 index 0000000..4a138cf --- /dev/null +++ b/00441-make-vectorized-versions-of-blake2-available-on-x86-too.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jonathan Protzenko +Date: Thu, 10 Oct 2024 11:59:06 +0200 +Subject: [PATCH] 00441: Make vectorized versions of Blake2 available on x86, + too + +Source: https://github.com/python/cpython/pull/125244 +--- + Modules/_hacl/libintvector.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/_hacl/libintvector.h b/Modules/_hacl/libintvector.h +index 99d1133694..11e914f7e1 100644 +--- a/Modules/_hacl/libintvector.h ++++ b/Modules/_hacl/libintvector.h +@@ -19,7 +19,7 @@ + + #define Lib_IntVector_Intrinsics_bit_mask64(x) -((x) & 1) + +-#if defined(__x86_64__) || defined(_M_X64) ++#if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86) + + #if defined(HACL_CAN_COMPILE_VEC128) + diff --git a/00442-gh-125584-require-network-resource-in-test_urllib2-handlertests-test_ftp_error-125586.patch b/00442-gh-125584-require-network-resource-in-test_urllib2-handlertests-test_ftp_error-125586.patch new file mode 100644 index 0000000..94c402e --- /dev/null +++ b/00442-gh-125584-require-network-resource-in-test_urllib2-handlertests-test_ftp_error-125586.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Wed, 16 Oct 2024 15:24:41 +0200 +Subject: [PATCH] 00442: gh-125584: Require network resource in + ``test_urllib2.HandlerTests.test_ftp_error`` (#125586) + +--- + Lib/test/test_urllib2.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py +index 19179fdc95..b90ccc2f12 100644 +--- a/Lib/test/test_urllib2.py ++++ b/Lib/test/test_urllib2.py +@@ -794,6 +794,7 @@ def connect_ftp(self, user, passwd, host, port, dirs, + self.assertEqual(headers.get("Content-type"), mimetype) + self.assertEqual(int(headers["Content-length"]), len(data)) + ++ @support.requires_resource("network") + def test_ftp_error(self): + class ErrorFTPHandler(urllib.request.FTPHandler): + def __init__(self, exception): diff --git a/python3.13.spec b/python3.14.spec similarity index 92% rename from python3.13.spec rename to python3.14.spec index 4cf7517..e4fa5bf 100644 --- a/python3.13.spec +++ b/python3.14.spec @@ -2,10 +2,10 @@ # Top-level metadata # ================== -%global pybasever 3.13 +%global pybasever 3.14 # pybasever without the dot: -%global pyshortver 313 +%global pyshortver 314 Name: python%{pybasever} Summary: Version %{pybasever} of the Python interpreter @@ -14,7 +14,7 @@ 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 ... +%global prerel a1 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} @@ -47,7 +47,7 @@ License: Python-2.0.1 # IMPORTANT: When bootstrapping, it's very likely python-pip-wheel is # not available. Turn off the rpmwheels bcond until # python-pip is built with a wheel to get around the issue. -%bcond bootstrap 0 +%bcond bootstrap 1 # Whether to use RPM build wheels from the python-{pip,setuptools,wheel}-wheel packages # Uses upstream bundled prebuilt wheels otherwise @@ -271,10 +271,6 @@ BuildRequires: xz-devel BuildRequires: zlib-devel BuildRequires: /usr/bin/dtrace -%if %{undefined rhel} -BuildRequires: libb2-devel -%endif - %if %{with tests} BuildRequires: gcc-c++ BuildRequires: gdb @@ -324,9 +320,6 @@ BuildRequires: python3-rpm-generators # ======================= Source0: %{url}ftp/python/%{general_version}/Python-%{upstream_version}.tar.xz -Source1: %{url}ftp/python/%{general_version}/Python-%{upstream_version}.tar.xz.asc -# The release manager for Python 3.13 is Thomas Wouters -Source2: https://github.com/Yhg1s.gpg # A simple script to check timestamps of bytecode files # Run in check section with Python that is currently being built @@ -358,6 +351,16 @@ Source11: idle3.appdata.xml # pypa/distutils integration: https://github.com/pypa/distutils/pull/70 Patch251: 00251-change-user-install-location.patch +# 00441 # 482bf31a8339a4df224d13e7e3f69b9cf306a09a +# Make vectorized versions of Blake2 available on x86, too +# +# Source: https://github.com/python/cpython/pull/125244 +Patch441: 00441-make-vectorized-versions-of-blake2-available-on-x86-too.patch + +# 00442 # 86fff8cce3d6259e0f7efb75c8153f2d8eec4564 +# gh-125584: Require network resource in ``test_urllib2.HandlerTests.test_ftp_error`` (#125586) +Patch442: 00442-gh-125584-require-network-resource-in-test_urllib2-handlertests-test_ftp_error-125586.patch + # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora, EL, etc., @@ -478,9 +481,8 @@ This package contains /usr/bin/python - the "python" command that runs Python 3. %package -n %{pkgname}-libs Summary: Python runtime libraries -# Bundled libb2 is CC0, covered by grandfathering exception # Bundled mimalloc is MIT -%global libs_license Python-2.0.1 AND CC0-1.0 AND MIT +%global libs_license Python-2.0.1 AND MIT %if %{with rpmwheels} Requires: %{python_wheel_pkg_prefix}-pip-wheel >= 23.1.2 License: %{libs_license} @@ -493,10 +495,6 @@ License: %{libs_license} AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND IS %unversioned_obsoletes_of_python3_X_if_main libs -# Bundled internal headers are used even when building with system libb2 -# last updated by https://github.com/python/cpython/pull/6286 -Provides: bundled(libb2) = 0.98.1 - # Bundled mimalloc version in Include/internal/mimalloc/mimalloc.h # Python's version is modified, differences are listed in: # https://github.com/python/cpython/issues/113141 @@ -701,7 +699,6 @@ License: %{libs_license} AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND IS # This package doesn't depend on python3-libs, so we need to explicitly # define the same Provides and Requires. # See the comments in the definition of -libs subpackage for detailed explanations -Provides: bundled(libb2) = 0.98.1 Provides: bundled(mimalloc) = 2.12 Requires: tzdata Requires: expat >= 2.6 @@ -749,7 +746,6 @@ extension modules. # ====================================================== %prep -%gpgverify -k2 -s1 -d0 %autosetup -S git_am -n Python-%{upstream_version} # Verify the second level of bundled provides is up to date @@ -1254,6 +1250,8 @@ CheckPython() { # test.test_concurrent_futures.test_deadlock tends to time out on s390x and ppc64le in # freethreading{,-debug} build, skipping it to shorten the build time # see: https://github.com/python/cpython/issues/121719 + # test_ctypes.test_generated_structs.GeneratedTest.test_generated_data is skipped since + # 3.14.0a1, see: https://github.com/python/cpython/issues/121938 LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \ -wW --slowest %{_smp_mflags} --timeout=2700 \ -i test_freeze_simple_script \ @@ -1265,6 +1263,9 @@ CheckPython() { -x test_signal \ -i test_deadlock \ %endif + %ifarch %{ix86} + -i test_generated_data \ + %endif echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName @@ -1416,7 +1417,6 @@ CheckPython freethreading %{1}/_md5.%{2}.so\ %{1}/_multibytecodec.%{2}.so\ %{1}/_multiprocessing.%{2}.so\ -%{1}/_opcode.%{2}.so\ %{1}/_pickle.%{2}.so\ %{1}/_posixshmem.%{2}.so\ %{1}/_posixsubprocess.%{2}.so\ @@ -1694,121 +1694,6 @@ CheckPython freethreading # ====================================================== %changelog -* Tue Oct 08 2024 Karolina Surma - 3.13.0-1 -- Update to Python 3.13.0 - -* Tue Oct 01 2024 Miro Hrončok - 3.13.0~rc3-1 -- Update to Python 3.13.0rc3 - -* Thu Sep 19 2024 Miro Hrončok - 3.13.0~rc2-3 -- Fix segfault when trying to use PyRun_SimpleString() with some imports - -* Wed Sep 18 2024 Miro Hrončok - 3.13.0~rc2-2 -- Handle an empty AST body when reporting tracebacks -- Fixes: rhbz#2311907 - -* Sat Sep 07 2024 Karolina Surma - 3.13.0~rc2-1 -- Update to Python 3.13.0rc2 - -* Fri Aug 23 2024 Charalampos Stratakis - 3.13.0~rc1-3 -- Security fix for CVE-2024-8088 -- Fixes: rhbz#2307462 - -* Tue Aug 06 2024 Miro Hrončok - 3.13.0~rc1-2 -- Fix SystemError in PyEval_GetLocals() -- Fixes: rhbz#2303107 -- Security fix for CVE-2024-6923 -- Fixes: rhbz#2303160 - -* Thu Aug 01 2024 Karolina Surma - 3.13.0~rc1-1 -- Update to Python 3.13.0rc1 - -* Tue Jul 30 2024 Miro Hrončok - 3.13.0~b4-3 -- Preserve AST nodes for f-string with single-element format specifiers -- Fixes https://github.com/python/cpython/issues/122300 - -* Tue Jul 23 2024 Miro Hrončok - 3.13.0~b4-2 -- Explicitly BuildRequire systemtap-sdt-devel - https://fedoraproject.org/wiki/Changes/Separate_dtrace_package - -* Fri Jul 19 2024 Miro Hrončok - 3.13.0~b4-1 -- Update to Python 3.13.0b4 - -* Fri Jul 19 2024 Fedora Release Engineering - 3.13.0~b3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Jul 02 2024 Miro Hrončok - 3.13.0~b3-2 -- Fix a bug that emptied the command history of the Python REPL (~/.python_history) - -* Fri Jun 28 2024 Karolina Surma - 3.13.0~b3-1 -- Update to Python 3.13.0b3 - -* Tue Jun 18 2024 Miro Hrončok - 3.13.0~b2-4 -- On Fedora 40+ x86_64 and aarch64, build Python with the experimental JIT compiler -- To enable it on runtime, set the PYTHON_JIT environment variable to 1 -- https://peps.python.org/pep-0744/ - -* Thu Jun 06 2024 Python Maint - 3.13.0~b2-3 -- Rebuilt for Python 3.13 - -* Thu Jun 06 2024 Python Maint - 3.13.0~b2-2 -- Bootstrap for Python 3.13 - -* Wed Jun 05 2024 Miro Hrončok - 3.13.0~b2-1 -- Update to Python 3.13.0b2 - -* Thu May 09 2024 Karolina Surma - 3.13.0~b1-1 -- Update to Python 3.13.0b1 - -* Mon May 06 2024 Miro Hrončok - 3.13.0~a6-3 -- Build Python with -O3 -- https://fedoraproject.org/wiki/Changes/Python_built_with_gcc_O3 - -* Wed Apr 17 2024 Miro Hrončok - 3.13.0~a6-2 -- Require expat >= 2.6 to prevent errors when creating venvs with older expat - -* Wed Apr 10 2024 Karolina Surma - 3.13.0~a6-1 -- Update to Python 3.13.0a6 - -* Wed Mar 13 2024 Python Maint - 3.13.0~a5-2 -- Move all test modules to the python3.13-test package, namely: - - __phello__ - - _xxinterpqueues - - _xxsubinterpreters - - xxlimited - - xxlimited_35 - - xxsubtype -- Remove internal usage of @LIBPYTHON@ - -* Wed Mar 13 2024 Miro Hrončok - 3.13.0~a5-1 -- Update to Python 3.13.0a5 - -* Wed Feb 21 2024 Karolina Surma - 3.13.0~a4-2 -- Fix crash involving exhausted list iterator - -* Fri Feb 16 2024 Karolina Surma - 3.13.0~a4-1 -- Update to Python 3.13.0a4 - -* Fri Jan 26 2024 Fedora Release Engineering - 3.13.0~a3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Miro Hrončok - 3.13.0~a3-2 -- Enable python3.13-freethreading and python3.13-freethreading-debug on ppc64le - -* Thu Jan 18 2024 Karolina Surma - 3.13.0~a3-1 -- Update to Python 3.13.0a3 - -* Tue Dec 05 2023 Miro Hrončok - 3.13.0~a2-2 -- Add the python3.13-freethreading and python3.13-freethreading-debug packages -- See https://peps.python.org/pep-0703/ -- ppc64le and s390x are excluded for now, support is expected in 3.13.0a3 - -* Fri Nov 24 2023 Karolina Surma - 3.13.0~a2-1 -- Update to Python 3.13.0a2 - -* Wed Nov 15 2023 Miro Hrončok - 3.13.0~a1-2 -- Build Python 3.13 using Python 3.13 - -* Mon Oct 16 2023 Karolina Surma - 3.13.0~a1-1 -- Initial Python 3.13 package forked from Python 3.12 +* Thu Oct 17 2024 Karolina Surma - 3.14.0~a1-1 +- Initial Python 3.14 package forked from Python 3.13 diff --git a/sources b/sources index 9cf507c..60bf1b0 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (Python-3.13.0.tar.xz) = 44a143c9b96b55b01885ec020c3364265bda55289615cd7d5071915b0d0178a6f35e7551a89090001fcb7f3172d38177a56bf8b8532b15c9dbc50295c9210152 -SHA512 (Python-3.13.0.tar.xz.asc) = 1b8bb0fe4eb93e31ec1770e90b94d44b5864c0391aad5dcba3a30d8e505d9b17107385414353c0060007f8a536254f49b8e919f36ddf6421a6e4330f817f1a3e +SHA512 (Python-3.14.0a1.tar.xz) = f96e8923662c1ba5ffb99673e59f5ce2366b13ea853e21e5a5c74efcf0a36f20d00612a9b882caf6482d2179b7315ae0331dcb45be19b7b9676f0ed4bf2256b8 diff --git a/tests/tests.yml b/tests/tests.yml index 8a4ba6b..2a255a5 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -15,7 +15,7 @@ repositories: - repo: "https://src.fedoraproject.org/tests/python.git" dest: "python" - pybasever: "3.13" + pybasever: "3.14" tests: - rpm_qa: run: rpm -qa