diff --git a/dev-lang/python/patches/python39-3.9.5.patchset b/dev-lang/python/patches/python39-3.9.10.patchset similarity index 93% rename from dev-lang/python/patches/python39-3.9.5.patchset rename to dev-lang/python/patches/python39-3.9.10.patchset index 59230207a..0bddce3a9 100644 --- a/dev-lang/python/patches/python39-3.9.5.patchset +++ b/dev-lang/python/patches/python39-3.9.10.patchset @@ -1,4 +1,4 @@ -From 65545a9e2654e94a3010c68735595e6ed76178cb Mon Sep 17 00:00:00 2001 +From d3e0c005eefca8718fc56879b4c99ac3248de64a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 10 Apr 2014 16:03:33 +0000 Subject: initial Haiku patch @@ -217,10 +217,10 @@ index 9e617af..03b5a28 100644 readline.read_history_file(history) except OSError: diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py -index 26e4500..c150211 100644 +index 2671d6a..d80a5c4 100644 --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py -@@ -384,6 +384,7 @@ class OtherFileTests: +@@ -385,6 +385,7 @@ class OtherFileTests: self.assertEqual(f.writable(), True) if sys.platform != "darwin" and \ 'bsd' not in sys.platform and \ @@ -229,7 +229,7 @@ index 26e4500..c150211 100644 # Somehow /dev/tty appears seekable on some BSDs self.assertEqual(f.seekable(), False) diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py -index bfbcbab..7f4c751 100644 +index 890b7e0..d51c370 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -1166,7 +1166,7 @@ class PosixTester(unittest.TestCase): @@ -242,10 +242,10 @@ index bfbcbab..7f4c751 100644 def test_mknod_dir_fd(self): # Test using mknodat() to create a FIFO (the only use specified diff --git a/Makefile.pre.in b/Makefile.pre.in -index f128444..b5eb77f 100644 +index 42b1ec6..031a856 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -142,7 +142,7 @@ BINDIR= @bindir@ +@@ -141,7 +141,7 @@ BINDIR= @bindir@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ @@ -354,10 +354,10 @@ index ddbf80b..6b50f0b 100644 #endif diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c -index 76ef606..f2e5b00 100644 +index a22060d..a52f57a 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c -@@ -7508,7 +7508,9 @@ PyInit__socket(void) +@@ -7506,7 +7506,9 @@ PyInit__socket(void) /* SOCK_RAW is marked as optional in the POSIX specification */ PyModule_AddIntMacro(m, SOCK_RAW); #endif @@ -408,10 +408,10 @@ index 1601ec0..4c98fe8 100644 else PyErr_SetString(PyExc_KeyError, "getspnam(): name not found"); diff --git a/configure.ac b/configure.ac -index c968d14..54f68ac 100644 +index 431d661..90c19a2 100644 --- a/configure.ac +++ b/configure.ac -@@ -1156,6 +1156,16 @@ if test $enable_shared = "yes"; then +@@ -1172,6 +1172,16 @@ if test $enable_shared = "yes"; then PY3LIBRARY=libpython3.so fi ;; @@ -428,7 +428,7 @@ index c968d14..54f68ac 100644 hp*|HP*) case `uname -m` in ia64) -@@ -1231,6 +1241,7 @@ AC_PROG_MKDIR_P +@@ -1247,6 +1257,7 @@ AC_PROG_MKDIR_P AC_SUBST(LN) if test -z "$LN" ; then case $ac_sys_system in @@ -436,7 +436,7 @@ index c968d14..54f68ac 100644 CYGWIN*) LN="ln -s";; *) LN=ln;; esac -@@ -2660,7 +2671,7 @@ then +@@ -2681,7 +2692,7 @@ then BLDSHARED="$LDSHARED" fi ;; @@ -445,7 +445,7 @@ index c968d14..54f68ac 100644 LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; FreeBSD*) -@@ -2727,7 +2738,7 @@ then +@@ -2748,7 +2759,7 @@ then else CCSHARED="+z"; fi;; Linux-android*) ;; @@ -454,7 +454,7 @@ index c968d14..54f68ac 100644 FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; OpenUNIX*|UnixWare*) if test "$GCC" = "yes" -@@ -2755,7 +2766,7 @@ then +@@ -2776,7 +2787,7 @@ then LINKFORSHARED="-Wl,-E -Wl,+s";; # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";; @@ -463,7 +463,7 @@ index c968d14..54f68ac 100644 # -u libsys_s pulls in all symbols in libsys Darwin/*) LINKFORSHARED="$extra_undefs -framework CoreFoundation" -@@ -3050,6 +3061,12 @@ LDFLAGS="-fsanitize=undefined $LDFLAGS" +@@ -3076,6 +3087,12 @@ LDFLAGS="-fsanitize=undefined $LDFLAGS" AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4 AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets @@ -476,7 +476,7 @@ index c968d14..54f68ac 100644 AC_MSG_CHECKING(for --with-libs) AC_ARG_WITH(libs, AS_HELP_STRING([--with-libs='lib1 ...'], [link against additional libs (default is no)]), -@@ -4433,6 +4450,7 @@ AC_CHECK_FUNC(__fpu_control, +@@ -4459,6 +4476,7 @@ AC_CHECK_FUNC(__fpu_control, AC_SUBST(LIBM) case $ac_sys_system in Darwin) ;; @@ -485,7 +485,7 @@ index c968d14..54f68ac 100644 esac AC_MSG_CHECKING(for --with-libm=STRING) diff --git a/setup.py b/setup.py -index bd5f736..602b332 100644 +index c6023e1..42492e2 100644 --- a/setup.py +++ b/setup.py @@ -65,6 +65,7 @@ CYGWIN = (HOST_PLATFORM == 'cygwin') @@ -493,10 +493,10 @@ index bd5f736..602b332 100644 AIX = (HOST_PLATFORM.startswith('aix')) VXWORKS = ('vxworks' in HOST_PLATFORM) +HAIKU = (HOST_PLATFORM == 'haiku1') - - - SUMMARY = """ -@@ -772,6 +773,11 @@ class PyBuildExt(build_ext): + CC = os.environ.get("CC") + if not CC: + CC = sysconfig.get_config_var("CC") +@@ -778,6 +779,11 @@ class PyBuildExt(build_ext): with open(config_h) as file: self.config_h_vars = sysconfig.parse_config_h(file) @@ -508,7 +508,7 @@ index bd5f736..602b332 100644 # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if HOST_PLATFORM in ['osf1', 'unixware7', 'openunix8']: self.lib_dirs += ['/usr/ccs/lib'] -@@ -817,14 +823,14 @@ class PyBuildExt(build_ext): +@@ -823,14 +829,14 @@ class PyBuildExt(build_ext): extra_compile_args=['-DPy_BUILD_CORE_MODULE'], extra_objects=[shared_math], depends=['_math.h', shared_math], @@ -525,7 +525,7 @@ index bd5f736..602b332 100644 # time libraries: librt may be needed for clock_gettime() time_libs = [] -@@ -838,7 +844,7 @@ class PyBuildExt(build_ext): +@@ -844,7 +850,7 @@ class PyBuildExt(build_ext): # libm is needed by delta_new() that uses round() and by accum() that # uses modf(). self.add(Extension('_datetime', ['_datetimemodule.c'], @@ -534,7 +534,7 @@ index bd5f736..602b332 100644 # zoneinfo module self.add(Extension('_zoneinfo', ['_zoneinfo.c'])), # random number generator implemented in C -@@ -930,7 +936,7 @@ class PyBuildExt(build_ext): +@@ -936,7 +942,7 @@ class PyBuildExt(build_ext): # # audioop needs libm for floor() in multiple functions. self.add(Extension('audioop', ['audioop.c'], @@ -543,7 +543,7 @@ index bd5f736..602b332 100644 # CSV files self.add(Extension('_csv', ['_csv.c'])) -@@ -2139,7 +2145,7 @@ class PyBuildExt(build_ext): +@@ -2146,7 +2152,7 @@ class PyBuildExt(build_ext): # function my_sqrt() needs libm for sqrt() self.add(Extension('_ctypes_test', sources=['_ctypes/_ctypes_test.c'], @@ -552,7 +552,7 @@ index bd5f736..602b332 100644 ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR") ffi_lib = None -@@ -2204,7 +2210,7 @@ class PyBuildExt(build_ext): +@@ -2211,7 +2217,7 @@ class PyBuildExt(build_ext): 'Modules', '_decimal', 'libmpdec'))] @@ -561,7 +561,7 @@ index bd5f736..602b332 100644 sources = [ '_decimal/_decimal.c', '_decimal/libmpdec/basearith.c', -@@ -2432,7 +2438,7 @@ class PyBuildExt(build_ext): +@@ -2444,7 +2450,7 @@ class PyBuildExt(build_ext): )) def detect_nis(self): @@ -571,20 +571,20 @@ index bd5f736..602b332 100644 return -- -2.30.0 +2.30.2 -From ce9187fcecd56ad941642ea64da433460c37bb58 Mon Sep 17 00:00:00 2001 +From 4b7865fa9effb59132db0ed935c7ab682d7cac78 Mon Sep 17 00:00:00 2001 From: Jerome Duval 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 f1d829a..f8c938a 100644 +index 4effc1d..a320f09 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py -@@ -1807,6 +1807,8 @@ class Popen(object): +@@ -1809,6 +1809,8 @@ class Popen(object): SubprocessError) if issubclass(child_exception_type, OSError) and hex_errno: errno_num = int(hex_errno, 16) @@ -594,7 +594,7 @@ index f1d829a..f8c938a 100644 if child_exec_never_called: err_msg = "" diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c -index 5356417..9fbfb06 100644 +index d64e0a1..0885a30 100644 --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -590,6 +590,10 @@ error: @@ -609,10 +609,10 @@ index 5356417..9fbfb06 100644 *--cur = Py_hexdigits[saved_errno % 16]; saved_errno /= 16; -- -2.30.0 +2.30.2 -From 5d95f072a18f2eb4c4bc8f3ee7c6be8f645ea768 Mon Sep 17 00:00:00 2001 +From 5b5e240d597aa98f5ee600e9e7135055fe366b0e Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Wed, 24 May 2017 11:09:43 +0000 Subject: Implement CTypes's find_library for Haiku @@ -693,10 +693,10 @@ index 0c2510e..2b4f04c 100644 print(cdll.LoadLibrary("libm.so")) print(cdll.LoadLibrary("libcrypt.so")) -- -2.30.0 +2.30.2 -From fc02931e1c1e604e20e6bf51405fb6ed2c5af5c0 Mon Sep 17 00:00:00 2001 +From 49f12b17d390b7814a2807eb0cec7cae05e36a1c 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 @@ -719,20 +719,20 @@ index 6023c1e..8359531 100755 # Prefer X browsers if present if os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY"): -- -2.30.0 +2.30.2 -From c0a38f8e9a5f8fe84ceb1ab4eb97af9bf67718dd Mon Sep 17 00:00:00 2001 +From 0f9d57db38f6eca3fed2c25c15301f70049d1302 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. diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py -index 7b169a1..192da49 100644 +index 1ab35a8..c6b54e4 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py -@@ -230,7 +230,7 @@ def _releaseLock(): +@@ -234,7 +234,7 @@ def _releaseLock(): # Prevent a held logging lock from blocking a child from logging. @@ -742,10 +742,10 @@ index 7b169a1..192da49 100644 pass # no-op when os.register_at_fork does not exist. else: -- -2.30.0 +2.30.2 -From 6680eb0c1b68d80be14cfac71154e626dd417790 Mon Sep 17 00:00:00 2001 +From e5ca96567985548860a9a56855602a5c6460a444 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() @@ -753,10 +753,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 f2e5b00..c5a8552 100644 +index a52f57a..e9b380a 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c -@@ -3325,7 +3325,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro) +@@ -3322,7 +3322,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro) } res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 1); @@ -765,7 +765,7 @@ index f2e5b00..c5a8552 100644 return NULL; Py_RETURN_NONE; -@@ -3356,7 +3356,7 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro) +@@ -3353,7 +3353,7 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro) } res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 0); @@ -775,20 +775,20 @@ index f2e5b00..c5a8552 100644 return PyLong_FromLong((long) res); -- -2.30.0 +2.30.2 -From 03f42c329a28e615748813a4c9e2ed1b0fde3828 Mon Sep 17 00:00:00 2001 +From afc7faef9e2feb811e23fa02d1242ceb8092aea8 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 12f72f5..fc83a57 100644 +index 29d6126..aa1ad57 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -2993,11 +2993,14 @@ static PyObject * +@@ -3025,11 +3025,14 @@ static PyObject * os_ttyname_impl(PyObject *module, int fd) /*[clinic end generated code: output=c424d2e9d1cd636a input=9ff5a58b08115c55]*/ { @@ -805,5 +805,5 @@ index 12f72f5..fc83a57 100644 if (buffer == NULL) { return PyErr_NoMemory(); -- -2.30.0 +2.30.2 diff --git a/dev-lang/python/patches/python39_x86-3.9.5.patchset b/dev-lang/python/patches/python39_x86-3.9.10.patchset similarity index 100% rename from dev-lang/python/patches/python39_x86-3.9.5.patchset rename to dev-lang/python/patches/python39_x86-3.9.10.patchset diff --git a/dev-lang/python/python39-3.9.5.recipe b/dev-lang/python/python39-3.9.10.recipe similarity index 98% rename from dev-lang/python/python39-3.9.5.recipe rename to dev-lang/python/python39-3.9.10.recipe index 0c6036442..fd5a259e6 100644 --- a/dev-lang/python/python39-3.9.5.recipe +++ b/dev-lang/python/python39-3.9.10.recipe @@ -11,7 +11,7 @@ LICENSE="Python" COPYRIGHT="1990-2020 Python Software Foundation" REVISION="4" SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" -CHECKSUM_SHA256="0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83" +CHECKSUM_SHA256="0a8fbfb5287ebc3a13e9baf3d54e08fa06778ffeccf6311aef821bb3a6586cc8" SOURCE_DIR="Python-$portVersion" PATCHES="python39-$portVersion.patchset" if [ "$secondaryArchSuffix" = _x86 ] ; then