diff --git a/Makefile b/Makefile index 2949860..fc1e8f5 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ BUILD_NUMBER=custom # of a release cycle, as official binaries won't be published. # PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0) # PYTHON_VER is the major/minor version (e.g., 3.10) -PYTHON_VERSION=3.12.6 +PYTHON_VERSION=3.12.7 PYTHON_PKG_VERSION=$(PYTHON_VERSION) PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+") PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+") diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch index 0bcb11c..3c228f5 100644 --- a/patch/Python/Python.patch +++ b/patch/Python/Python.patch @@ -93,11 +93,11 @@ index 57a77d51a02..f1157e189a3 100644 Group database entries are reported as a tuple-like object, whose attributes correspond to the members of the ``group`` structure (Attribute field below, see diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst -index b100e6c8e85..c7faf8ba218 100644 +index 7ecfc6ad3c4..9b8b9f8474e 100644 --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst -@@ -1241,6 +1241,69 @@ - and how the module's :attr:`__file__` is populated. +@@ -1234,6 +1234,69 @@ + and how the module's :attr:`__file__` is populated. +.. class:: AppleFrameworkLoader(name, path) @@ -812,7 +812,7 @@ index 27909b763e9..fb5353e1895 100644 categories: URL parsing and URL quoting. These are covered in detail in the following sections. diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst -index 57b0ee7157c..c24945169e8 100644 +index 546ce3716d2..bdebc700db2 100644 --- a/Doc/library/venv.rst +++ b/Doc/library/venv.rst @@ -56,7 +56,7 @@ @@ -1298,7 +1298,7 @@ index e1a3111f36a..f55a12f1ab8 100644 +all code that is known to cause issues with the App Store review process. This +patch is applied automatically when building for iOS. diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst -index 31d37aad2a7..44fb00de373 100644 +index 8b67652d1df..2dfac075843 100644 --- a/Doc/using/mac.rst +++ b/Doc/using/mac.rst @@ -188,6 +188,28 @@ @@ -2975,7 +2975,7 @@ index 0cd9e721b20..ffa58230425 100644 import subprocess argv = [sys.executable, '-c', '''if True: diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py -index 8b68653779e..2117c1f18de 100644 +index adabf6d6ed7..2b7ed85efd1 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -39,11 +39,9 @@ @@ -3064,7 +3064,7 @@ index 1867e8c957f..f75e40940e4 100644 'test requires %s bytes and a long time to run' % str(0x180000000)) f = open(TESTFN, 'w+b') diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py -index 7a04e5ad500..ee18f99c476 100644 +index 8277ec9b608..5ff0a528c74 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2372,6 +2372,7 @@ @@ -3075,7 +3075,7 @@ index 7a04e5ad500..ee18f99c476 100644 def test_fpathconf(self): self.check(os.pathconf, "PC_NAME_MAX") self.check(os.fpathconf, "PC_NAME_MAX") -@@ -3945,6 +3946,7 @@ +@@ -3946,6 +3947,7 @@ self.assertGreaterEqual(size.columns, 0) self.assertGreaterEqual(size.lines, 0) @@ -3201,7 +3201,7 @@ index b62a9e38977..39b9f7b178b 100644 for mac_ver, expected_terse, expected in [ # darwin: mac_ver() returns empty strings diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py -index 7ed45acf28c..9bb1d056eb7 100644 +index aa811326e4c..f26d80cb643 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -1,7 +1,7 @@ @@ -3213,7 +3213,7 @@ index 7ed45acf28c..9bb1d056eb7 100644 from test.support import os_helper from test.support import warnings_helper from test.support.script_helper import assert_python_ok -@@ -564,6 +564,7 @@ +@@ -566,6 +566,7 @@ @unittest.skipUnless(hasattr(posix, 'confstr'), 'test needs posix.confstr()') @@ -3221,7 +3221,7 @@ index 7ed45acf28c..9bb1d056eb7 100644 def test_confstr(self): self.assertRaises(ValueError, posix.confstr, "CS_garbage") self.assertEqual(len(posix.confstr("CS_PATH")) > 0, True) -@@ -792,9 +793,10 @@ +@@ -794,9 +795,10 @@ check_stat(uid, gid) self.assertRaises(OSError, chown_func, first_param, 0, -1) check_stat(uid, gid) @@ -3235,7 +3235,7 @@ index 7ed45acf28c..9bb1d056eb7 100644 # test illegal types for t in str, float: self.assertRaises(TypeError, chown_func, first_param, t(uid), gid) -@@ -1260,8 +1262,8 @@ +@@ -1262,8 +1264,8 @@ self.assertIsInstance(lo, int) self.assertIsInstance(hi, int) self.assertGreaterEqual(hi, lo) @@ -3246,7 +3246,7 @@ index 7ed45acf28c..9bb1d056eb7 100644 self.assertRaises(OSError, posix.sched_get_priority_min, -23) self.assertRaises(OSError, posix.sched_get_priority_max, -23) -@@ -2041,11 +2043,13 @@ +@@ -2043,11 +2045,13 @@ @unittest.skipUnless(hasattr(os, 'posix_spawn'), "test needs os.posix_spawn") @@ -3340,7 +3340,7 @@ index 7bc5d12e09c..1680706a4d5 100644 'need os.get_terminal_size()') def test_stty_match(self): diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py -index c7b9549dd3a..591cd4177d9 100644 +index a45527d7315..8101322347e 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -13,9 +13,10 @@ @@ -3356,7 +3356,7 @@ index c7b9549dd3a..591cd4177d9 100644 try: import _testcapi except ImportError: -@@ -832,7 +833,7 @@ +@@ -834,7 +835,7 @@ self.assertEqual(self.hndl_called, True) # Issue 3864, unknown if this affects earlier versions of freebsd also @@ -3365,7 +3365,7 @@ index c7b9549dd3a..591cd4177d9 100644 'itimer not reliable (does not mix well with threading) on some BSDs.') def test_itimer_virtual(self): self.itimer = signal.ITIMER_VIRTUAL -@@ -1344,7 +1345,7 @@ +@@ -1346,7 +1347,7 @@ # Python handler self.assertEqual(len(sigs), N, "Some signals were lost") @@ -3375,7 +3375,7 @@ index c7b9549dd3a..591cd4177d9 100644 "test needs SIGUSR1") @threading_helper.requires_working_threading() diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py -index 545564094e1..63418d702c8 100644 +index acfa1cd503b..45cfa075803 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -3,6 +3,7 @@ @@ -4191,12 +4191,12 @@ index 0a310000751..83a2bc469ae 100644 } - diff --git a/Python/marshal.c b/Python/marshal.c -index 8ecdb738147..79ae624c975 100644 +index 3fc3f890422..892debe38dc 100644 --- a/Python/marshal.c +++ b/Python/marshal.c -@@ -15,6 +15,10 @@ - #include "pycore_hashtable.h" // _Py_hashtable_t +@@ -16,6 +16,10 @@ #include "marshal.h" // Py_MARSHAL_VERSION + #include "pycore_pystate.h" // _PyInterpreterState_GET() +#ifdef __APPLE__ +# include "TargetConditionals.h" @@ -4205,7 +4205,7 @@ index 8ecdb738147..79ae624c975 100644 /*[clinic input] module marshal [clinic start generated code]*/ -@@ -34,11 +38,14 @@ +@@ -35,11 +39,14 @@ * #if defined(MS_WINDOWS) && defined(_DEBUG) */ #if defined(MS_WINDOWS) @@ -4224,7 +4224,7 @@ index 8ecdb738147..79ae624c975 100644 #define TYPE_NULL '0' diff --git a/Python/stdlib_module_names.h b/Python/stdlib_module_names.h -index ed4a0ac2dd3..bc8da328ba9 100644 +index 1b1a1bdee78..47372fae53e 100644 --- a/Python/stdlib_module_names.h +++ b/Python/stdlib_module_names.h @@ -39,6 +39,7 @@ @@ -4769,7 +4769,7 @@ index d74fb6deac9..1bb6a05dc11 100755 # Local variables: diff --git a/configure b/configure -index 4dfaeecfc0b..97f6ed048ad 100755 +index 1c75810d9e8..e7785926f05 100755 --- a/configure +++ b/configure @@ -975,10 +975,14 @@ @@ -6072,7 +6072,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 # check for long file support functions ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64" -@@ -22197,6 +22626,11 @@ +@@ -22199,6 +22628,11 @@ done @@ -6084,7 +6084,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 for ac_func in clock_settime do : -@@ -22207,7 +22641,7 @@ +@@ -22209,7 +22643,7 @@ else $as_nop @@ -6093,7 +6093,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 printf %s "checking for clock_settime in -lrt... " >&6; } if test ${ac_cv_lib_rt_clock_settime+y} then : -@@ -22245,7 +22679,7 @@ +@@ -22247,7 +22681,7 @@ if test "x$ac_cv_lib_rt_clock_settime" = xyes then : @@ -6102,7 +6102,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 fi -@@ -22254,6 +22688,7 @@ +@@ -22256,6 +22690,7 @@ fi done @@ -6110,7 +6110,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 for ac_func in clock_nanosleep -@@ -22475,7 +22910,9 @@ +@@ -22477,7 +22912,9 @@ if test "$cross_compiling" = yes then : @@ -6121,7 +6121,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6" else ac_cv_buggy_getaddrinfo=yes -@@ -24377,7 +24814,7 @@ +@@ -24379,7 +24816,7 @@ printf "%s\n" "$ABIFLAGS" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5 printf %s "checking SOABI... " >&6; } @@ -6130,7 +6130,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5 printf "%s\n" "$SOABI" >&6; } -@@ -24385,7 +24822,7 @@ +@@ -24387,7 +24824,7 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then # Similar to SOABI but remove "d" flag from ABIFLAGS @@ -6139,7 +6139,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 printf "%s\n" "#define ALT_SOABI \"${ALT_SOABI}\"" >>confdefs.h -@@ -27136,24 +27573,28 @@ +@@ -27138,24 +27575,28 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5 printf "%s\n" "$as_me: checking for device files" >&6;} @@ -6180,7 +6180,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 printf %s "checking for /dev/ptmx... " >&6; } if test ${ac_cv_file__dev_ptmx+y} then : -@@ -27174,12 +27615,12 @@ +@@ -27176,12 +27617,12 @@ fi @@ -6196,7 +6196,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 printf %s "checking for /dev/ptc... " >&6; } if test ${ac_cv_file__dev_ptc+y} then : -@@ -27200,10 +27641,11 @@ +@@ -27202,10 +27643,11 @@ fi @@ -6209,7 +6209,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 fi if test $ac_sys_system = Darwin -@@ -27645,6 +28087,8 @@ +@@ -27647,6 +28089,8 @@ with_ensurepip=no ;; #( WASI) : with_ensurepip=no ;; #( @@ -6218,7 +6218,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 *) : with_ensurepip=upgrade ;; -@@ -28586,6 +29030,27 @@ +@@ -28588,6 +29032,27 @@ py_cv_module_ossaudiodev=n/a py_cv_module_spwd=n/a ;; #( @@ -6246,7 +6246,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 CYGWIN*) : -@@ -32332,6 +32797,9 @@ +@@ -32334,6 +32799,9 @@ "Mac/PythonLauncher/Makefile") CONFIG_FILES="$CONFIG_FILES Mac/PythonLauncher/Makefile" ;; "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;; "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;; @@ -6257,7 +6257,7 @@ index 4dfaeecfc0b..97f6ed048ad 100755 "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;; "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;; diff --git a/configure.ac b/configure.ac -index 0d6df8e24e4..6ecb9fb8e85 100644 +index d0d54050286..46d3019c5ca 100644 --- a/configure.ac +++ b/configure.ac @@ -307,6 +307,161 @@ @@ -7375,7 +7375,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644 # check for long file support functions AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs]) -@@ -5263,11 +5662,17 @@ +@@ -5265,11 +5664,17 @@ ]) ]) @@ -7398,7 +7398,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644 AC_CHECK_FUNCS([clock_nanosleep], [], [ AC_CHECK_LIB([rt], [clock_nanosleep], [ -@@ -5413,7 +5818,9 @@ +@@ -5415,7 +5820,9 @@ [ac_cv_buggy_getaddrinfo=no], [ac_cv_buggy_getaddrinfo=yes], [ @@ -7409,7 +7409,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644 ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6" else ac_cv_buggy_getaddrinfo=yes -@@ -5968,14 +6375,14 @@ +@@ -5970,14 +6377,14 @@ AC_MSG_CHECKING([ABIFLAGS]) AC_MSG_RESULT([$ABIFLAGS]) AC_MSG_CHECKING([SOABI]) @@ -7426,7 +7426,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644 AC_DEFINE_UNQUOTED([ALT_SOABI], ["${ALT_SOABI}"], [Alternative SOABI used in debug build to load C extensions built in release mode]) fi -@@ -6624,28 +7031,35 @@ +@@ -6626,28 +7033,35 @@ AC_MSG_NOTICE([checking for device files]) dnl NOTE: Inform user how to proceed with files when cross compiling. @@ -7482,7 +7482,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644 fi if test $ac_sys_system = Darwin -@@ -6917,6 +7331,7 @@ +@@ -6919,6 +7333,7 @@ AS_CASE([$ac_sys_system], [Emscripten], [with_ensurepip=no], [WASI], [with_ensurepip=no], @@ -7490,7 +7490,7 @@ index 0d6df8e24e4..6ecb9fb8e85 100644 [with_ensurepip=upgrade] ) ]) -@@ -7259,6 +7674,28 @@ +@@ -7261,6 +7676,28 @@ [AIX], [PY_STDLIB_MOD_SET_NA([_scproxy], [spwd])], [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [_crypt], [termios], [grp])], [Darwin], [PY_STDLIB_MOD_SET_NA([ossaudiodev], [spwd])],