From e76342e242bcd9107189a79709b6b33d517e3ca5 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Thu, 6 May 2021 12:56:16 +0100 Subject: Ports: Update Python to 3.9.5 Released on 2021-05-03. https://www.python.org/downloads/release/python-395/ --- Ports/python3/patches/define-have-sigset-t.patch | 4 ++-- .../patches/define-py-force-utf8-locale.patch | 4 ++-- Ports/python3/patches/disable-setrlimit.patch | 4 ++-- Ports/python3/patches/fix-autoconf.patch | 27 ++++++++++------------ .../patches/remove-setlocale-from-preconfig.patch | 4 ++-- ...weak-unsupported-printf-format-specifiers.patch | 13 +++++------ Ports/python3/version.sh | 4 ++-- 7 files changed, 28 insertions(+), 32 deletions(-) (limited to 'Ports/python3') diff --git a/Ports/python3/patches/define-have-sigset-t.patch b/Ports/python3/patches/define-have-sigset-t.patch index 5d1cdacf1f..df82b924e9 100644 --- a/Ports/python3/patches/define-have-sigset-t.patch +++ b/Ports/python3/patches/define-have-sigset-t.patch @@ -1,5 +1,5 @@ ---- Python-3.9.4/Modules/posixmodule.h 2021-02-21 20:22:43.839024851 +0100 -+++ Python-3.9.4/Modules/posixmodule.h 2021-02-21 20:28:35.823057995 +0100 +--- Python-3.9.5/Modules/posixmodule.h 2021-02-21 20:22:43.839024851 +0100 ++++ Python-3.9.5/Modules/posixmodule.h 2021-02-21 20:28:35.823057995 +0100 @@ -19,7 +19,8 @@ #endif /* MS_WINDOWS */ diff --git a/Ports/python3/patches/define-py-force-utf8-locale.patch b/Ports/python3/patches/define-py-force-utf8-locale.patch index 107b68f75f..98871a0c2e 100644 --- a/Ports/python3/patches/define-py-force-utf8-locale.patch +++ b/Ports/python3/patches/define-py-force-utf8-locale.patch @@ -1,5 +1,5 @@ ---- Python-3.9.4/Include/pyport.h 2021-02-21 20:22:43.946024250 +0100 -+++ Python-3.9.4/Include/pyport.h 2021-02-21 20:29:32.457743589 +0100 +--- Python-3.9.5/Include/pyport.h 2021-02-21 20:22:43.946024250 +0100 ++++ Python-3.9.5/Include/pyport.h 2021-02-21 20:29:32.457743589 +0100 @@ -838,7 +838,7 @@ # error "Py_TRACE_REFS ABI is not compatible with release and debug ABI" #endif diff --git a/Ports/python3/patches/disable-setrlimit.patch b/Ports/python3/patches/disable-setrlimit.patch index c8dbfc02c3..2fef3b8467 100644 --- a/Ports/python3/patches/disable-setrlimit.patch +++ b/Ports/python3/patches/disable-setrlimit.patch @@ -1,5 +1,5 @@ ---- Python-3.9.4/Modules/faulthandler.c 2021-02-21 20:22:43.884024598 +0100 -+++ Python-3.9.4/Modules/faulthandler.c 2021-02-21 20:34:33.279189754 +0100 +--- Python-3.9.5/Modules/faulthandler.c 2021-02-21 20:22:43.884024598 +0100 ++++ Python-3.9.5/Modules/faulthandler.c 2021-02-21 20:34:33.279189754 +0100 @@ -993,7 +993,7 @@ SetErrorMode(mode | SEM_NOGPFAULTERRORBOX); #endif diff --git a/Ports/python3/patches/fix-autoconf.patch b/Ports/python3/patches/fix-autoconf.patch index 66ac2672e0..b156daf98f 100644 --- a/Ports/python3/patches/fix-autoconf.patch +++ b/Ports/python3/patches/fix-autoconf.patch @@ -1,5 +1,5 @@ ---- Python-3.9.4/config.sub 2021-02-21 20:22:43.901024503 +0100 -+++ Python-3.9.4/config.sub 2021-02-21 20:24:35.079400552 +0100 +--- Python-3.9.5/config.sub 2021-02-21 20:22:43.901024503 +0100 ++++ Python-3.9.5/config.sub 2021-02-21 20:24:35.079400552 +0100 @@ -1485,6 +1485,8 @@ -oss*) os=-sysv3 @@ -9,9 +9,9 @@ -svr4*) os=-sysv4 ;; ---- Python-3.9.4/configure.ac 2021-04-06 20:59:45.319060429 +0200 -+++ Python-3.9.4/configure.ac 2021-04-06 21:02:33.875267539 +0200 -@@ -389,6 +389,9 @@ +--- Python-3.9.5/configure.ac 2021-05-03 15:54:42.000000000 +0100 ++++ Python-3.9.5/configure.ac 2021-05-06 12:46:42.579733794 +0100 +@@ -391,6 +391,9 @@ # a lot of different things including 'define_xopen_source' # in the case statement below. case "$host" in @@ -21,7 +21,7 @@ *-*-linux-android*) ac_sys_system=Linux-android ;; -@@ -435,6 +438,9 @@ +@@ -437,6 +440,9 @@ AC_SUBST(_PYTHON_HOST_PLATFORM) if test "$cross_compiling" = yes; then case "$host" in @@ -31,9 +31,9 @@ *-*-linux*) case "$host_cpu" in arm*) ---- Python-3.9.4/configure 2021-02-21 20:22:43.898024520 +0100 -+++ Python-3.9.4/configure 2021-02-21 20:24:35.096400457 +0100 -@@ -3292,6 +3292,9 @@ +--- Python-3.9.5/configure 2021-05-03 15:54:42.000000000 +0100 ++++ Python-3.9.5/configure 2021-05-06 12:48:56.875043814 +0100 +@@ -3295,6 +3295,9 @@ # a lot of different things including 'define_xopen_source' # in the case statement below. case "$host" in @@ -43,8 +43,8 @@ *-*-linux-android*) ac_sys_system=Linux-android ;; -@@ -3339,6 +3342,9 @@ - +@@ -3342,6 +3345,9 @@ + if test "$cross_compiling" = yes; then case "$host" in + *-*-serenity*) @@ -53,10 +53,7 @@ *-*-linux*) case "$host_cpu" in arm*) -diff -Naur Python-3.9.4/configure Python-3.9.4.serenity/configure ---- Python-3.9.4/configure 2021-04-24 14:50:59.083484421 +0200 -+++ Python-3.9.4.serenity/configure 2021-04-24 15:50:26.821359967 +0200 -@@ -9647,6 +9647,7 @@ +@@ -9646,6 +9652,7 @@ # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";; Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; diff --git a/Ports/python3/patches/remove-setlocale-from-preconfig.patch b/Ports/python3/patches/remove-setlocale-from-preconfig.patch index 975dabbd6e..36eaf264c3 100644 --- a/Ports/python3/patches/remove-setlocale-from-preconfig.patch +++ b/Ports/python3/patches/remove-setlocale-from-preconfig.patch @@ -1,5 +1,5 @@ ---- Python-3.9.4/Python/preconfig.c 2021-02-21 20:22:44.076023521 +0100 -+++ Python-3.9.4/Python/preconfig.c 2021-02-21 20:36:10.936698893 +0100 +--- Python-3.9.5/Python/preconfig.c 2021-02-21 20:22:44.076023521 +0100 ++++ Python-3.9.5/Python/preconfig.c 2021-02-21 20:36:10.936698893 +0100 @@ -790,16 +790,6 @@ preconfig_get_global_vars(config); diff --git a/Ports/python3/patches/tweak-unsupported-printf-format-specifiers.patch b/Ports/python3/patches/tweak-unsupported-printf-format-specifiers.patch index d390cf1fbc..982ae9d2aa 100644 --- a/Ports/python3/patches/tweak-unsupported-printf-format-specifiers.patch +++ b/Ports/python3/patches/tweak-unsupported-printf-format-specifiers.patch @@ -1,5 +1,5 @@ ---- Python-3.9.4/Python/getversion.c 2021-02-21 20:22:44.092438528 +0100 -+++ Python-3.9.4/Python/getversion.c 2021-02-21 20:36:51.249477963 +0100 +--- Python-3.9.5/Python/getversion.c 2021-02-21 20:22:44.092438528 +0100 ++++ Python-3.9.5/Python/getversion.c 2021-02-21 20:36:51.249477963 +0100 @@ -9,7 +9,7 @@ Py_GetVersion(void) { @@ -9,8 +9,8 @@ PY_VERSION, Py_GetBuildInfo(), Py_GetCompiler()); return version; } ---- Python-3.9.4/Modules/getbuildinfo.c 2021-02-21 20:22:43.945286288 +0100 -+++ Python-3.9.4/Modules/getbuildinfo.c 2021-02-21 20:38:09.187987432 +0100 +--- Python-3.9.5/Modules/getbuildinfo.c 2021-02-21 20:22:43.945286288 +0100 ++++ Python-3.9.5/Modules/getbuildinfo.c 2021-02-21 20:38:09.187987432 +0100 @@ -43,7 +43,7 @@ if (!(*gitid)) gitid = "default"; @@ -20,9 +20,8 @@ DATE, TIME); return buildinfo; } -diff -Naur Python-3.9.4/Python/dynload_shlib.c Python-3.9.4.serenity/Python/dynload_shlib.c ---- Python-3.9.4/Python/dynload_shlib.c 2021-04-04 14:56:53.000000000 +0200 -+++ Python-3.9.4.serenity/Python/dynload_shlib.c 2021-04-24 15:57:27.419824682 +0200 +--- Python-3.9.5/Python/dynload_shlib.c 2021-04-04 14:56:53.000000000 +0200 ++++ Python-3.9.5/Python/dynload_shlib.c 2021-04-24 15:57:27.419824682 +0200 @@ -69,12 +69,12 @@ if (strchr(pathname, '/') == NULL) { diff --git a/Ports/python3/version.sh b/Ports/python3/version.sh index 5ae23c209a..12ad4a773d 100644 --- a/Ports/python3/version.sh +++ b/Ports/python3/version.sh @@ -1,4 +1,4 @@ -PYTHON_VERSION="3.9.4" +PYTHON_VERSION="3.9.5" PYTHON_ARCHIVE="Python-${PYTHON_VERSION}.tar.xz" PYTHON_ARCHIVE_URL="https://www.python.org/ftp/python/${PYTHON_VERSION}/${PYTHON_ARCHIVE}" -PYTHON_ARCHIVE_MD5SUM="2a3dba5fc75b695c45cf1806156e1a97" +PYTHON_ARCHIVE_MD5SUM="71f7ada6bec9cdbf4538adc326120cfd" -- cgit v1.2.3