From a7c615e261c323913c4b80c5be0f1e80de58570d Mon Sep 17 00:00:00 2001 From: OscarL Date: Sat, 14 Dec 2024 03:50:57 -0300 Subject: [PATCH] python3.12: update to version 3.12.8. (#11444) --- ....6.patchset => python3.12-3.12.8.patchset} | 88 +++++++++---------- ...3.12.6.recipe => python3.12-3.12.8.recipe} | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) rename dev-lang/python/patches/{python3.12-3.12.6.patchset => python3.12-3.12.8.patchset} (94%) rename dev-lang/python/{python3.12-3.12.6.recipe => python3.12-3.12.8.recipe} (99%) diff --git a/dev-lang/python/patches/python3.12-3.12.6.patchset b/dev-lang/python/patches/python3.12-3.12.8.patchset similarity index 94% rename from dev-lang/python/patches/python3.12-3.12.6.patchset rename to dev-lang/python/patches/python3.12-3.12.8.patchset index e6b3f1c8b..0c4e571e4 100644 --- a/dev-lang/python/patches/python3.12-3.12.6.patchset +++ b/dev-lang/python/patches/python3.12-3.12.8.patchset @@ -1,4 +1,4 @@ -From 94f044767b77d2e5436b85dd6c06e3f053ad9908 Mon Sep 17 00:00:00 2001 +From f6517bef41cca90c6c2fdb74f67da396728adfbb Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sun, 8 Oct 2023 01:02:25 -0300 Subject: initial Haiku patch @@ -32,7 +32,7 @@ index 0000000..4372ee2 +set -v +eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" $HEADERS/posix/netinet/in.h diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0e64ccc..f3032c3 100644 +index 083f4c7..3a593fa 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -147,7 +147,7 @@ BINDIR= @bindir@ @@ -184,10 +184,10 @@ index 13f1115..45f477c 100644 else PyErr_SetString(PyExc_KeyError, "getspnam(): name not found"); diff --git a/configure.ac b/configure.ac -index 0d6df8e..a85e431 100644 +index 9270b5f..c2eb10c 100644 --- a/configure.ac +++ b/configure.ac -@@ -1524,6 +1524,16 @@ if test $enable_shared = "yes"; then +@@ -1527,6 +1527,16 @@ if test $enable_shared = "yes"; then PY3LIBRARY=libpython3.so fi ;; @@ -204,7 +204,7 @@ index 0d6df8e..a85e431 100644 hp*|HP*) case `uname -m` in ia64) -@@ -1669,6 +1679,7 @@ AC_PROG_MKDIR_P +@@ -1672,6 +1682,7 @@ AC_PROG_MKDIR_P AC_SUBST([LN]) if test -z "$LN" ; then case $ac_sys_system in @@ -212,7 +212,7 @@ index 0d6df8e..a85e431 100644 CYGWIN*) LN="ln -s";; *) LN=ln;; esac -@@ -3441,7 +3452,7 @@ then +@@ -3444,7 +3455,7 @@ then else CCSHARED="+z"; fi;; Linux-android*) ;; @@ -221,7 +221,7 @@ index 0d6df8e..a85e431 100644 Emscripten*|WASI*) AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [ CCSHARED="-fPIC" -@@ -3474,7 +3485,7 @@ then +@@ -3477,7 +3488,7 @@ then LINKFORSHARED="-Wl,-E -Wl,+s";; # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";; @@ -230,7 +230,7 @@ index 0d6df8e..a85e431 100644 # -u libsys_s pulls in all symbols in libsys Darwin/*) LINKFORSHARED="$extra_undefs -framework CoreFoundation" -@@ -5622,6 +5633,7 @@ AC_CHECK_FUNC([__fpu_control], +@@ -5627,6 +5638,7 @@ AC_CHECK_FUNC([__fpu_control], AC_SUBST([LIBM]) case $ac_sys_system in Darwin) ;; @@ -242,7 +242,7 @@ index 0d6df8e..a85e431 100644 2.45.2 -From ad34f4d68d338d042490c7b455b689ac357c2d5d Mon Sep 17 00:00:00 2001 +From 0f8bf2f16dab6e74ceb251260093038e93450684 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 16 Apr 2017 10:05:42 +0200 Subject: fix for negative errnos @@ -280,7 +280,7 @@ index 35ea2ac..ccc25ed 100644 2.45.2 -From 9e5fadd7fc838286ac17b319dd42d6ed66b5f2ea Mon Sep 17 00:00:00 2001 +From 3d4f7f813b91997ccd5ff08f3a46429cbb8ff15f Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sun, 8 Oct 2023 20:06:31 -0300 Subject: Implement CTypes's find_library for Haiku @@ -377,7 +377,7 @@ index c550883..6b23423 100644 2.45.2 -From 49dd426f78da08ed6bceb39d706cf59155d65ec7 Mon Sep 17 00:00:00 2001 +From 734766570e7aa7ca4b75a2e90ed819efdf66a07b Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Mon, 23 Sep 2019 09:14:58 +0200 Subject: webbrowser: Support for default browsers on Haiku @@ -404,7 +404,7 @@ index 13b9e85..7d81178 100755 2.45.2 -From 188f515c46a4a0f581c24dc93ae890a323643a9d Mon Sep 17 00:00:00 2001 +From ec070fbf0a123cab26e0195ee8d4021808942fc3 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 4 Oct 2019 22:02:35 +0200 Subject: since 3.8, don't reinit locks on fork. @@ -427,7 +427,7 @@ index 22d3198..f369a88 100644 2.45.2 -From 40dd67671bc97d1d7c1204e2a46ce11e01cdd968 Mon Sep 17 00:00:00 2001 +From 94814beb78f3d6d1ae8295f1cf53a7ef85f63672 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 15 May 2020 15:20:57 +0200 Subject: handle errors returned by internal_connect() @@ -435,10 +435,10 @@ Subject: handle errors returned by internal_connect() upstream bug #40628 by Ryan C. Gordon diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c -index 9724879..f714ed8 100644 +index 7f2ebba..47e56d1 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c -@@ -3489,7 +3489,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro) +@@ -3492,7 +3492,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro) } res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 1); @@ -447,7 +447,7 @@ index 9724879..f714ed8 100644 return NULL; Py_RETURN_NONE; -@@ -3520,7 +3520,7 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro) +@@ -3523,7 +3523,7 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro) } res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 0); @@ -460,17 +460,17 @@ index 9724879..f714ed8 100644 2.45.2 -From 1ca2d28caa2ecaefd88a19afc6155a89dcdeea21 Mon Sep 17 00:00:00 2001 +From 3115dbf2211aa70c51bb987f6915090b43e856d7 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 19 Oct 2020 18:03:09 +0200 Subject: ttyname_r can use MAXPATHLEN diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 2277cae..365ce3f 100644 +index d529851..3ff4526 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -3249,11 +3249,14 @@ static PyObject * +@@ -3250,11 +3250,14 @@ static PyObject * os_ttyname_impl(PyObject *module, int fd) /*[clinic end generated code: output=c424d2e9d1cd636a input=9ff5a58b08115c55]*/ { @@ -490,7 +490,7 @@ index 2277cae..365ce3f 100644 2.45.2 -From 84387b230b47b9f2fce0e395d3eeea43ad51fd14 Mon Sep 17 00:00:00 2001 +From a3be2555ff00d32c26af0e218805a905d99768e9 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Mon, 24 Oct 2022 20:04:10 -0300 Subject: Lib/test: require the "largefile" usage flag for I/O heavy tests. @@ -501,7 +501,7 @@ This avoids needing several GBs of storage to run the tests (unless the "largefile" resource usage flag is enabled). diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py -index 8b68653..5aede8c 100644 +index d85040a..4e3d67c 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -634,7 +634,7 @@ class IOTest(unittest.TestCase): @@ -543,7 +543,7 @@ index 1867e8c..e4fab02 100644 2.45.2 -From 6156deb2f3bc6b43cde398b9a6d10a3d49d6e357 Mon Sep 17 00:00:00 2001 +From 54f12d1ed2e8ef9c47de9e749d5190bb7d8cb684 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 26 Jul 2024 19:18:56 -0300 Subject: _getuserbase(), getsitepackages(), and INSTALL_SCHEMES for Haiku. @@ -570,7 +570,7 @@ by me, plus: The idea was to have all _getuserbase()/INSTALL_SCHEMES related changes in "one place". diff --git a/Lib/site.py b/Lib/site.py -index 924cfbe..3863055 100644 +index aed254a..d3612a0 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -302,6 +302,14 @@ def _getuserbase(): @@ -622,7 +622,7 @@ index 924cfbe..3863055 100644 if sys.platlibdir != "lib": libdirs.append("lib") diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 122d441..55e13c4 100644 +index 517b13a..8828933 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -47,6 +47,36 @@ _INSTALL_SCHEMES = { @@ -719,7 +719,7 @@ index 122d441..55e13c4 100644 'osx_framework_user': { 'stdlib': '{userbase}/lib/python', 'platstdlib': '{userbase}/lib/python', -@@ -282,6 +341,18 @@ def _expand_vars(scheme, vars): +@@ -280,6 +339,18 @@ def _expand_vars(scheme, vars): def _get_preferred_schemes(): @@ -739,10 +739,10 @@ index 122d441..55e13c4 100644 return { 'prefix': 'nt', diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py -index 1137c20..575e4e5 100644 +index 3468d0c..35bea57 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py -@@ -344,9 +344,10 @@ class TestSysConfig(unittest.TestCase): +@@ -353,9 +353,10 @@ class TestSysConfig(unittest.TestCase): self.assertTrue(os.path.isfile(config_h), config_h) def test_get_scheme_names(self): @@ -759,7 +759,7 @@ index 1137c20..575e4e5 100644 2.45.2 -From d90396e18308b22a1a47a91296731a8ea1bacac1 Mon Sep 17 00:00:00 2001 +From 4e921356e76177f4d88b827c91e654cf1e4b0f64 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 26 Jul 2024 19:01:05 -0300 Subject: Fix location of REPL's history file. @@ -770,10 +770,10 @@ Content-Transfer-Encoding: 8bit From "initial Haiku patch" by Jérôme Duval. diff --git a/Lib/site.py b/Lib/site.py -index 3863055..da608bd 100644 +index d3612a0..3a714a0 100644 --- a/Lib/site.py +++ b/Lib/site.py -@@ -518,8 +518,16 @@ def enablerlcompleter(): +@@ -519,8 +519,16 @@ def enablerlcompleter(): # each interpreter exit when readline was already configured # through a PYTHONSTARTUP hook, see: # http://bugs.python.org/issue5845#msg198636 @@ -796,7 +796,7 @@ index 3863055..da608bd 100644 2.45.2 -From 38533600230ef9bec7d8a99f0760665a2f690ff2 Mon Sep 17 00:00:00 2001 +From 6b29a196969f2beadd77e0de9fbdad69f6f97737 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sun, 8 Oct 2023 17:02:19 -0300 Subject: Use spawn instead of fork for multiprocessing. @@ -849,7 +849,7 @@ index de8a264..02a301e 100644 2.45.2 -From e1b37fe32fcf2b17dafec1efd5dfe860c46d373b Mon Sep 17 00:00:00 2001 +From 8ee1fa0e1b9989a91e194364ee5b7b2a3556f255 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sun, 10 Dec 2023 19:50:22 -0300 Subject: Miscellaneous "Lib/test/" fixes for Haiku. @@ -860,10 +860,10 @@ Content-Transfer-Encoding: 8bit test_fileio.py fix from "initial Haiku patch" by Jérôme Duval. diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py -index 0528e07..0885bc6 100644 +index 903a43a..287624f 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py -@@ -5926,6 +5926,9 @@ def pairs(iterable): +@@ -5973,6 +5973,9 @@ def pairs(iterable): class ZoneInfo(tzinfo): zoneroot = '/usr/share/zoneinfo' @@ -889,7 +889,7 @@ index ebfcffd..0517b87 100644 2.45.2 -From c1134b6f49f4a0c53be2a0334ca24b8db5c5e6bd Mon Sep 17 00:00:00 2001 +From 9262674ee3b170aa945757ccff700e1e05ea78e0 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sat, 10 Feb 2024 06:01:25 -0300 Subject: Fix build on nightlies, following the addition of kqueue. @@ -955,7 +955,7 @@ index 50788e5..82fd9d9 100644 2.45.2 -From 76dd51e3429bdb55f0daeccb9a9945903aa4d0a2 Mon Sep 17 00:00:00 2001 +From a281ee443cfe3b1ccff7a6a8f504c50c9e54de1f Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 14 Mar 2024 12:54:33 -0500 Subject: config.guess: Update to universal haiku arch guessing @@ -985,7 +985,7 @@ index e81d3ae..366429c 100755 2.45.2 -From 0fdc0ab08ce964d27122139a9621dd5441fdb074 Mon Sep 17 00:00:00 2001 +From 67415488bb6276cf3e30b4b6d492178fa3113274 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 9 Aug 2024 13:38:28 -0300 Subject: fix test_utf8_mode. @@ -1008,7 +1008,7 @@ index f668810..a55a8e4 100644 2.45.2 -From a928a72ce3a70d3c0babd0f922809bdeb821fbd0 Mon Sep 17 00:00:00 2001 +From 8122e3c9be99c395c52834f331e9594eec6ec8bf Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 9 Aug 2024 14:35:04 -0300 Subject: Fix test_site. @@ -1023,7 +1023,7 @@ Hardcoding a few paths avoids having to import subprocess, that causes many other subsequent imports. diff --git a/Lib/site.py b/Lib/site.py -index da608bd..d11f972 100644 +index 3a714a0..2124aa1 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -303,12 +303,8 @@ def _getuserbase(): @@ -1091,17 +1091,17 @@ index 1a9c81d..09e612f 100644 2.45.2 -From 10db21f1709a4155d9737f7dac526e542e4537be Mon Sep 17 00:00:00 2001 +From 4ce3290c4d01342e18e27046f7edc6a430598b53 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 9 Aug 2024 15:37:13 -0300 Subject: Fix test_sysconfig. diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py -index 575e4e5..18f73b3 100644 +index 35bea57..04c136f 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py -@@ -201,6 +201,19 @@ class TestSysConfig(unittest.TestCase): +@@ -210,6 +210,19 @@ class TestSysConfig(unittest.TestCase): sysconfig.get_path('purelib', scheme='venv'), sysconfig.get_path('purelib', scheme='nt_venv') ) @@ -1121,7 +1121,7 @@ index 575e4e5..18f73b3 100644 else: self.assertEqual( sysconfig.get_path('scripts', scheme='venv'), -@@ -345,7 +358,7 @@ class TestSysConfig(unittest.TestCase): +@@ -354,7 +367,7 @@ class TestSysConfig(unittest.TestCase): def test_get_scheme_names(self): wanted = ['nt', 'posix_home', 'posix_prefix', 'posix_venv', 'nt_venv', 'venv', 'haiku', @@ -1134,7 +1134,7 @@ index 575e4e5..18f73b3 100644 2.45.2 -From 9a3687667dd0e5ffd65a072b7652356b8a112bf2 Mon Sep 17 00:00:00 2001 +From 423ffcf68a529f951b9fafc53ec755bd3eaac536 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 9 Aug 2024 15:45:45 -0300 Subject: Fix test_compileall by skipping tests that need hardlink support. diff --git a/dev-lang/python/python3.12-3.12.6.recipe b/dev-lang/python/python3.12-3.12.8.recipe similarity index 99% rename from dev-lang/python/python3.12-3.12.6.recipe rename to dev-lang/python/python3.12-3.12.8.recipe index 4e8ee5896..e38cb84f6 100644 --- a/dev-lang/python/python3.12-3.12.6.recipe +++ b/dev-lang/python/python3.12-3.12.8.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2024 Python Software Foundation" REVISION="1" SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-${portVersion}.tar.xz" -CHECKSUM_SHA256="1999658298cf2fb837dffed8ff3c033ef0c98ef20cf73c5d5f66bed5ab89697c" +CHECKSUM_SHA256="c909157bb25ec114e5869124cc2a9c4a4d4c1e957ca4ff553f1edc692101154e" SOURCE_DIR="Python-$portVersion" pyShortVer="${portVersion%.*}"