python3.11: update to version 3.11.6 (#9561)

dev-lang/python/patches/python3.11-3.11.6.patchset

@@ -1,14 +1,14 @@
-From 5d191a7773513212c1b4ca8e496a36f6776d75ad Mon Sep 17 00:00:00 2001
+From c3b4b1afd5bc8991607aa93f7f9ce53b126a7b99 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Thu, 10 Apr 2014 16:03:33 +0000
 Subject: initial Haiku patch
 
 
 diff --git a/Include/pyport.h b/Include/pyport.h
-index 93250f4..d170ac9 100644
+index b3b8b6f..40d8c2d 100644
 --- a/Include/pyport.h
 +++ b/Include/pyport.h
-@@ -685,7 +685,7 @@ extern char * _getpty(int *, int, mode_t, int);
+@@ -680,7 +680,7 @@ extern char * _getpty(int *, int, mode_t, int);
  #  define _Py_FORCE_UTF8_LOCALE
  #endif
  
@@ -218,7 +218,7 @@ index 5cc3d4b..6f53287 100644
                          # Somehow /dev/tty appears seekable on some BSDs
                          self.assertEqual(f.seekable(), False)
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 3ea8653..1b16bda 100644
+index 0d0ac13..0262fe2 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -146,7 +146,7 @@ BINDIR=		@bindir@
@@ -373,14 +373,14 @@ index 42123c9..60de40a 100644
 2.37.3
 
 
-From 10a9824ed8ac63d5cf0b0ef6543c3d01ebaada49 Mon Sep 17 00:00:00 2001
+From 419df530c60c9b1ff9d537f979e362c03c342938 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sun, 16 Apr 2017 10:05:42 +0200
 Subject: fix for negative errnos
 
 
 diff --git a/Lib/subprocess.py b/Lib/subprocess.py
-index fbc76b8..d719f09 100644
+index 6df5dd5..39dde15 100644
 --- a/Lib/subprocess.py
 +++ b/Lib/subprocess.py
 @@ -1938,6 +1938,8 @@ class Popen:
@@ -393,7 +393,7 @@ index fbc76b8..d719f09 100644
                      if child_exec_never_called:
                          err_msg = ""
 diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
-index ad9daae..f4d9702 100644
+index 072519c..1023c8a 100644
 --- a/Modules/_posixsubprocess.c
 +++ b/Modules/_posixsubprocess.c
 @@ -724,6 +724,10 @@ error:
@@ -411,7 +411,7 @@ index ad9daae..f4d9702 100644
 2.37.3
 
 
-From 3f8dc4f41ab07c615a9638d6669a65f2897f7143 Mon Sep 17 00:00:00 2001
+From 0ca9b22dc9f39f1866eafb7bee7eb98d5f32acd6 Mon Sep 17 00:00:00 2001
 From: Philippe Houdoin <philippe.houdoin@gmail.com>
 Date: Wed, 24 May 2017 11:09:43 +0000
 Subject: Implement CTypes's find_library for Haiku
@@ -495,7 +495,7 @@ index 0c2510e..2b4f04c 100644
 2.37.3
 
 
-From 47b3e011cfc9808b6f7f126f5c74ed923c50f79f Mon Sep 17 00:00:00 2001
+From 182fbe4efcec340ada0dc71d6c1b4201e372d0cc Mon Sep 17 00:00:00 2001
 From: Philipp Wolfer <phil@parolu.io>
 Date: Mon, 23 Sep 2019 09:14:58 +0200
 Subject: webbrowser: Support for default browsers on Haiku
@@ -521,7 +521,7 @@ index 44974d4..ce78f41 100755
 2.37.3
 
 
-From 71113b3e83a9efeef8b19eee1a4dbe1e99370ef9 Mon Sep 17 00:00:00 2001
+From cf4eb8d61f5dd02a787c1a2af0eeb9889062347f Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Fri, 4 Oct 2019 22:02:35 +0200
 Subject: since 3.8, don't reinit locks on fork.
@@ -544,7 +544,7 @@ index bcee2ba..46630a4 100644
 2.37.3
 
 
-From 1e76f9a4a07888e29233765205dabc3bc1e7df08 Mon Sep 17 00:00:00 2001
+From 44b1ed3fb034a0ad699190462e9b74779c713dd4 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Fri, 15 May 2020 15:20:57 +0200
 Subject: handle errors returned by internal_connect()
@@ -552,7 +552,7 @@ 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 65d0e10..6b88397 100644
+index db3e051..614c5a8 100644
 --- a/Modules/socketmodule.c
 +++ b/Modules/socketmodule.c
 @@ -3325,7 +3325,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro)
@@ -577,17 +577,17 @@ index 65d0e10..6b88397 100644
 2.37.3
 
 
-From 5c37732a4d4ba06beb9414d2b74380dd93650829 Mon Sep 17 00:00:00 2001
+From d5b4f946259e8061d365176bcac866a2627511a6 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 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 a01662d..681b833 100644
+index 2e4a66a..0a80ca7 100644
 --- a/Modules/posixmodule.c
 +++ b/Modules/posixmodule.c
-@@ -3091,11 +3091,14 @@ static PyObject *
+@@ -3112,11 +3112,14 @@ static PyObject *
  os_ttyname_impl(PyObject *module, int fd)
  /*[clinic end generated code: output=c424d2e9d1cd636a input=9ff5a58b08115c55]*/
  {
@@ -607,7 +607,7 @@ index a01662d..681b833 100644
 2.37.3
 
 
-From 2bb7e5696dd15014215aa238bcb0ecff6956ee5d Mon Sep 17 00:00:00 2001
+From 6a7904e4ae7fb1b1d58939189f1b25bd4000cc3f Mon Sep 17 00:00:00 2001
 From: Oscar Lesta <oscar.lesta@gmail.com>
 Date: Wed, 5 Oct 2022 16:09:41 -0300
 Subject: The rest of korli's "initial Haiku patch".
@@ -648,7 +648,7 @@ index ebe3711..63e2742 100644
      # This is done to support downstream modifications where distributors change
      # the installation layout (eg. different site-packages directory).
 diff --git a/configure.ac b/configure.ac
-index 1c25abd..ce5ab17 100644
+index e1cbb7c..7b261b5 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1495,6 +1495,16 @@ if test $enable_shared = "yes"; then
@@ -676,7 +676,7 @@ index 1c25abd..ce5ab17 100644
  		CYGWIN*) LN="ln -s";;
  		*) LN=ln;;
  	esac
-@@ -3252,7 +3263,7 @@ then
+@@ -3256,7 +3267,7 @@ then
  		 else CCSHARED="+z";
  		 fi;;
  	Linux-android*) ;;
@@ -685,7 +685,7 @@ index 1c25abd..ce5ab17 100644
  	Emscripten*|WASI*)
  		AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [
  			CCSHARED="-fPIC"
-@@ -3285,7 +3296,7 @@ then
+@@ -3289,7 +3300,7 @@ then
  	    LINKFORSHARED="-Wl,-E -Wl,+s";;
  #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
  	Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
@@ -694,7 +694,7 @@ index 1c25abd..ce5ab17 100644
  	# -u libsys_s pulls in all symbols in libsys
  	Darwin/*)
  		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
-@@ -5340,6 +5351,7 @@ AC_CHECK_FUNC(__fpu_control,
+@@ -5344,6 +5355,7 @@ AC_CHECK_FUNC(__fpu_control,
  AC_SUBST(LIBM)
  case $ac_sys_system in
  Darwin) ;;
@@ -730,7 +730,7 @@ index 4f122b6..dc42f39 100644
 2.37.3
 
 
-From 980960bf6f76ccbc15e87613fafead38bc585ec8 Mon Sep 17 00:00:00 2001
+From 264960853e6c4acdba649d6aeeb9e7d16002a86d Mon Sep 17 00:00:00 2001
 From: Oscar Lesta <oscar.lesta@gmail.com>
 Date: Mon, 24 Oct 2022 20:04:10 -0300
 Subject: Lib/test: require the "largefile" usage flag for I/O heavy tests.
@@ -741,7 +741,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 79aa2da..b45826b 100644
+index e54a13c..71d13e5 100644
 --- a/Lib/test/test_io.py
 +++ b/Lib/test/test_io.py
 @@ -609,7 +609,7 @@ class IOTest(unittest.TestCase):
@@ -754,10 +754,10 @@ index 79aa2da..b45826b 100644
                  'largefile',
                  'test requires %s bytes and a long time to run' % self.LARGE)
 diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
-index 3c11c59..512db2f 100644
+index 3b0930f..c21f001 100644
 --- a/Lib/test/test_largefile.py
 +++ b/Lib/test/test_largefile.py
-@@ -253,7 +253,7 @@ def setUpModule():
+@@ -255,7 +255,7 @@ def setUpModule():
      # takes a long time to build the >2 GiB file and takes >2 GiB of disk
      # space therefore the resource must be enabled to run this test.
      # If not, nothing after this line stanza will be executed.
@@ -767,10 +767,10 @@ index 3c11c59..512db2f 100644
                   'test requires %s bytes and a long time to run' % str(size))
      else:
 diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
-index 517cbe0..dc41464 100644
+index dfcf303..611d3c8 100644
 --- a/Lib/test/test_mmap.py
 +++ b/Lib/test/test_mmap.py
-@@ -981,7 +981,7 @@ class LargeMmapTests(unittest.TestCase):
+@@ -1007,7 +1007,7 @@ class LargeMmapTests(unittest.TestCase):
          unlink(TESTFN)
  
      def _make_test_file(self, num_zeroes, tail):
@@ -783,7 +783,7 @@ index 517cbe0..dc41464 100644
 2.37.3
 
 
-From 8348d6bcc81947db02a8323706b22387b7875278 Mon Sep 17 00:00:00 2001
+From 1cbfe24473c33347afffab23635d87aa69b8f708 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 7 Mar 2023 18:29:29 +0100
 Subject: default schemes for Haiku
@@ -870,7 +870,7 @@ index 63e2742..6ba9d18 100644
 2.37.3
 
 
-From 022dfd22f91d24f84fba38966959b5a102cf0a1d Mon Sep 17 00:00:00 2001
+From 3a60e8925c496a98183eb7a6f3ec4c4a3b4faf1b Mon Sep 17 00:00:00 2001
 From: Oscar Lesta <oscar.lesta@gmail.com>
 Date: Fri, 10 Mar 2023 20:15:14 -0300
 Subject: syncronize both _getuserbase() copies on site.py and sysconfig.py.

dev-lang/python/patches/python3.11_x86-3.11.6.patchset

@@ -1,4 +1,4 @@
-From 672ea87bdc26e47c81052cecc9cfde9f4c7467a7 Mon Sep 17 00:00:00 2001
+From 5883f7abbe78fecb71a0dc1f9ea7752000aaca5c Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sat, 3 Feb 2018 11:33:49 +0100
 Subject: Fix include paths for secondary x86
@@ -10,10 +10,10 @@ It also fixes a crash because python would try to load the gcc2 libroot
 even when built with gcc5.
 
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index b2e4095..34e56aa 100644
+index 2b4f04c..dab556c 100644
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
-@@ -273,6 +273,7 @@ elif os.name == "posix":
+@@ -286,6 +286,7 @@ elif os.name == "posix":
                      directory = directory.replace('%A',
                          os.path.dirname(os.path.abspath(sys.argv[0] or os.getcwd())))
  
@@ -22,10 +22,10 @@ index b2e4095..34e56aa 100644
                      continue
  
 diff --git a/setup.py b/setup.py
-index 704e7ec..f480cc9 100644
+index dc42f39..1c6db8f 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -696,8 +696,8 @@ class PyBuildExt(build_ext):
+@@ -894,8 +894,8 @@ class PyBuildExt(build_ext):
          # Haiku-specific library locations
          if HAIKU:
              self.inc_dirs += ['/boot/develop/headers/posix',
@@ -37,5 +37,5 @@ index 704e7ec..f480cc9 100644
          if HOST_PLATFORM in ['osf1', 'unixware7', 'openunix8']:
              self.lib_dirs += ['/usr/ccs/lib']
 -- 
-2.23.0
+2.37.3
 

dev-lang/python/python3.11-3.11.6.recipe

@@ -13,7 +13,7 @@ LICENSE="Python"
 COPYRIGHT="1990-2023 Python Software Foundation"
 REVISION="1"
 SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz"
-CHECKSUM_SHA256="85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f"
+CHECKSUM_SHA256="0fab78fa7f133f4f38210c6260d90d7c0d5c7198446419ce057ec7ac2e6f5f38"
 SOURCE_DIR="Python-$portVersion"
 
 pyShortVer="${portVersion%.*}"
@@ -54,6 +54,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	timezone_data
 	cmd:file
 	lib:libbz2$secondaryArchSuffix
 	lib:libedit$secondaryArchSuffix
@@ -92,6 +93,10 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+TEST_REQUIRES="
+	timezone_data
+	"
+
 BUILD()
 {
 	autoreconf -fi
@@ -115,11 +120,10 @@ BUILD()
 		--with-readline=editline \
 		--with-system-expat \
 		--with-system-ffi \
+		--with-tzpath=$dataDir/zoneinfo \
 		--without-static-libpython
 		# configure: WARNING: --with(out)-system-ffi is ignored on this platform
 		# --with-lto # this one is too CPU/RAM intensive.
-		# ToDo: See if something like this helps with tz related tests or not.
-		# --with-tzpath=$libDir/tcl8.6/tzdata
 
 	# prevent make from rebuilding stuff that requires python
 	touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
@@ -175,7 +179,7 @@ INSTALL()
 	# drop testsuite altogether; move to a separate package if needed
 	cd $prefix/lib/python$pyShortVer
 	rm -rf ctypes/test distutils/tests idlelib/idle_test lib2to3/tests \
-		sqlite3/test test tkinter/test unittest/test
+		test tkinter/test unittest/test
 }
 
 # Some of the test will crash, invoking the crash dialog, and will hang waiting for
@@ -183,10 +187,9 @@ INSTALL()
 # the following lines in the file "~/config/settings/system/debug_server/settings":
 ##---
 # executable_actions {
-#	/sources/Python-$portVersion/python kill
+#	/sources/Python-3.*/python kill
 # }
 ##---
-# Replace $portVersion as necessary.
 
 # For some tests that purposefully crash, it would make sense to add support for
 # crash-report suppression (as done for other platforms) on "tests/support/__init__,py"'s
@@ -196,7 +199,7 @@ INSTALL()
 
 # To see the available test-runs options:
 # > hp -E python3.11
-# > LIBRARY_PATH=/sources/Python-3.11.4:%A/lib:/boot/home/config/non-packaged/lib:/boot/home/config/lib:/boot/system/non-packaged/lib:/boot/system/lib python -m test --help
+# > LIBRARY_PATH=/sources/Python-3.11.6:%A/lib:/boot/home/config/non-packaged/lib:/boot/home/config/lib:/boot/system/non-packaged/lib:/boot/system/lib python -m test --help
 #
 # To only execute a particular test:
 # > cd Lib/test