diff --git a/Makefile b/Makefile index 696f33b..09cd104 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,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.15.1 +PYTHON_VERSION=3.15.2 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 ef36dec..4fab918 100644 --- a/patch/Python/Python.patch +++ b/patch/Python/Python.patch @@ -18,10 +18,10 @@ index c0809effb99..295898adb26 100644 #elif defined(__powerpc64__) #if defined(__clang__) && _Py__has_builtin(__builtin_thread_pointer) diff --git a/Include/internal/mimalloc/mimalloc/prim.h b/Include/internal/mimalloc/mimalloc/prim.h -index 322ab29e6b4..bb54814238d 100644 +index a73d795c7d4..d3822d390db 100644 --- a/Include/internal/mimalloc/mimalloc/prim.h +++ b/Include/internal/mimalloc/mimalloc/prim.h -@@ -174,12 +174,15 @@ +@@ -166,12 +166,15 @@ __asm__ volatile ("mrc p15, 0, %0, c13, c0, 3\nbic %0, %0, #3" : "=r" (tcb)); res = tcb[slot]; #elif defined(__aarch64__) @@ -38,9 +38,9 @@ index 322ab29e6b4..bb54814238d 100644 #endif + void** tcb = (void**)(uintptr_t)tp; res = tcb[slot]; - #endif - return res; -@@ -201,12 +204,15 @@ + #elif defined(__riscv) + void** tcb; MI_UNUSED(ofs); +@@ -200,12 +203,15 @@ __asm__ volatile ("mrc p15, 0, %0, c13, c0, 3\nbic %0, %0, #3" : "=r" (tcb)); tcb[slot] = value; #elif defined(__aarch64__) @@ -57,10 +57,10 @@ index 322ab29e6b4..bb54814238d 100644 #endif + void** tcb = (void**)(uintptr_t)tp; tcb[slot] = value; - #endif - } + #elif defined(__riscv) + void** tcb; MI_UNUSED(ofs); diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py -index 67415bf4473..4fabe95bed5 100644 +index ca13a43c6ab..2922a47447d 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -662,10 +662,10 @@ @@ -384,10 +384,10 @@ index f3bfa6c0982..49486b08ae9 100644 COMMAND_TIMEOUT = 60.0 diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py -index eb2a44fd7d8..776aa361590 100644 +index ff5181833c7..9c9e758a04a 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py -@@ -588,7 +588,7 @@ +@@ -601,7 +601,7 @@ sys.platform == "android", f"Android blocks {name} with SELinux" ) @@ -396,7 +396,7 @@ index eb2a44fd7d8..776aa361590 100644 unix_shell = '/system/bin/sh' if is_android else '/bin/sh' else: unix_shell = None -@@ -607,7 +607,7 @@ +@@ -620,7 +620,7 @@ def skip_wasi_stack_overflow(): return unittest.skipIf(is_wasi, "Exhausts stack on WASI") @@ -501,7 +501,7 @@ index ec8b544a6b0..26020844023 100644 if objc: # If objc exists, we know ctypes is also importable. diff --git a/Makefile.pre.in b/Makefile.pre.in -index f24b41db6f0..f08a8492730 100644 +index 95fefcc3a75..6ee9a3e50c0 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -215,6 +215,12 @@ @@ -4357,7 +4357,7 @@ index 1bb6a05dc11..49febd56a37 100755 none--*) # None (no kernel, i.e. freestanding / bare metal), diff --git a/configure b/configure -index 5a728e8ba68..57a8df07a2e 100755 +index 6f7ff1b04a3..a06f94bec6a 100755 --- a/configure +++ b/configure @@ -994,6 +994,10 @@ @@ -4783,7 +4783,7 @@ index 5a728e8ba68..57a8df07a2e 100755 LDLIBRARY='libpython$(LDVERSION).dylib' ;; AIX*) -@@ -14204,7 +14440,7 @@ +@@ -14226,7 +14462,7 @@ BLDSHARED="$LDSHARED" fi ;; @@ -4792,7 +4792,7 @@ index 5a728e8ba68..57a8df07a2e 100755 LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)' LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)' BLDSHARED="$LDSHARED" -@@ -14337,7 +14573,7 @@ +@@ -14359,7 +14595,7 @@ Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";; Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; # -u libsys_s pulls in all symbols in libsys @@ -4801,7 +4801,7 @@ index 5a728e8ba68..57a8df07a2e 100755 LINKFORSHARED="$extra_undefs -framework CoreFoundation" # Issue #18075: the default maximum stack size (8MBytes) is too -@@ -14361,7 +14597,7 @@ +@@ -14383,7 +14619,7 @@ LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' fi LINKFORSHARED="$LINKFORSHARED" @@ -4810,7 +4810,7 @@ index 5a728e8ba68..57a8df07a2e 100755 LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)' fi ;; -@@ -16190,7 +16426,7 @@ +@@ -16212,7 +16448,7 @@ ctypes_malloc_closure=yes ;; #( @@ -4819,7 +4819,7 @@ index 5a728e8ba68..57a8df07a2e 100755 ctypes_malloc_closure=yes ;; #( -@@ -20063,12 +20299,6 @@ +@@ -20085,12 +20321,6 @@ then : printf "%s\n" "#define HAVE_DUP 1" >>confdefs.h @@ -4832,7 +4832,7 @@ index 5a728e8ba68..57a8df07a2e 100755 fi ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero" if test "x$ac_cv_func_explicit_bzero" = xyes -@@ -20129,18 +20359,6 @@ +@@ -20151,18 +20381,6 @@ then : printf "%s\n" "#define HAVE_FEXECVE 1" >>confdefs.h @@ -4851,7 +4851,7 @@ index 5a728e8ba68..57a8df07a2e 100755 fi ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf" if test "x$ac_cv_func_fpathconf" = xyes -@@ -20573,24 +20791,6 @@ +@@ -20595,24 +20813,6 @@ then : printf "%s\n" "#define HAVE_POSIX_OPENPT 1" >>confdefs.h @@ -4876,7 +4876,7 @@ index 5a728e8ba68..57a8df07a2e 100755 fi ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread" if test "x$ac_cv_func_pread" = xyes -@@ -20909,12 +21109,6 @@ +@@ -20931,12 +21131,6 @@ then : printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h @@ -4889,7 +4889,7 @@ index 5a728e8ba68..57a8df07a2e 100755 fi ac_fn_c_check_func "$LINENO" "sigfillset" "ac_cv_func_sigfillset" if test "x$ac_cv_func_sigfillset" = xyes -@@ -21292,18 +21486,12 @@ +@@ -21314,18 +21508,12 @@ fi @@ -4911,7 +4911,7 @@ index 5a728e8ba68..57a8df07a2e 100755 if test "x$ac_cv_func_getentropy" = xyes then : printf "%s\n" "#define HAVE_GETENTROPY 1" >>confdefs.h -@@ -21314,6 +21502,24 @@ +@@ -21336,6 +21524,24 @@ then : printf "%s\n" "#define HAVE_GETGROUPS 1" >>confdefs.h @@ -4936,7 +4936,7 @@ index 5a728e8ba68..57a8df07a2e 100755 fi ac_fn_c_check_func "$LINENO" "pipe2" "ac_cv_func_pipe2" if test "x$ac_cv_func_pipe2" = xyes -@@ -21321,10 +21527,98 @@ +@@ -21343,10 +21549,98 @@ printf "%s\n" "#define HAVE_PIPE2 1" >>confdefs.h fi @@ -5038,7 +5038,7 @@ index 5a728e8ba68..57a8df07a2e 100755 fi -@@ -24784,7 +25078,8 @@ +@@ -24806,7 +25100,8 @@ ;; esac # check for openpty, login_tty, and forkpty @@ -5048,7 +5048,7 @@ index 5a728e8ba68..57a8df07a2e 100755 for ac_func in openpty do : -@@ -24898,7 +25193,7 @@ +@@ -24920,7 +25215,7 @@ fi done @@ -5057,7 +5057,7 @@ index 5a728e8ba68..57a8df07a2e 100755 printf %s "checking for library containing login_tty... " >&6; } if test ${ac_cv_search_login_tty+y} then : -@@ -25081,6 +25376,7 @@ +@@ -25103,6 +25398,7 @@ fi done @@ -5065,7 +5065,7 @@ index 5a728e8ba68..57a8df07a2e 100755 # check for long file support functions ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64" -@@ -25346,10 +25642,10 @@ +@@ -25368,10 +25664,10 @@ done @@ -5078,7 +5078,7 @@ index 5a728e8ba68..57a8df07a2e 100755 then for ac_func in clock_settime -@@ -25666,7 +25962,7 @@ +@@ -25688,7 +25984,7 @@ e) if test "$cross_compiling" = yes then : @@ -5087,7 +5087,7 @@ index 5a728e8ba68..57a8df07a2e 100755 ac_cv_buggy_getaddrinfo="no" elif test "${enable_ipv6+set}" = set; then ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6" -@@ -27744,8 +28040,8 @@ +@@ -27766,8 +28062,8 @@ LIBPYTHON="-lpython${VERSION}${ABIFLAGS}" fi @@ -5098,7 +5098,7 @@ index 5a728e8ba68..57a8df07a2e 100755 MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)" fi -@@ -30865,7 +31161,7 @@ +@@ -30887,7 +31183,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5 printf "%s\n" "$as_me: checking for device files" >&6;} @@ -5107,7 +5107,7 @@ index 5a728e8ba68..57a8df07a2e 100755 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no else -@@ -31419,7 +31715,7 @@ +@@ -31441,7 +31737,7 @@ with_ensurepip=no ;; #( WASI) : with_ensurepip=no ;; #( @@ -5116,7 +5116,7 @@ index 5a728e8ba68..57a8df07a2e 100755 with_ensurepip=no ;; #( *) : with_ensurepip=upgrade -@@ -32369,6 +32665,9 @@ +@@ -32391,6 +32687,9 @@ NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268 Darwin) _PYTHREAD_NAME_MAXLEN=63;; iOS) _PYTHREAD_NAME_MAXLEN=63;; @@ -5126,7 +5126,7 @@ index 5a728e8ba68..57a8df07a2e 100755 FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268 OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268 *) _PYTHREAD_NAME_MAXLEN=;; -@@ -32400,7 +32699,7 @@ +@@ -32422,7 +32721,7 @@ ;; #( Darwin) : ;; #( @@ -5135,7 +5135,7 @@ index 5a728e8ba68..57a8df07a2e 100755 -@@ -36703,6 +37002,9 @@ +@@ -36725,6 +37024,9 @@ "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" ;; "Platforms/Apple/iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES Platforms/Apple/iOS/Resources/Info.plist" ;; @@ -5146,7 +5146,7 @@ index 5a728e8ba68..57a8df07a2e 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 08cfd620afb..bd3da42aa02 100644 +index 99238054b9a..bf7ff3d7bc4 100644 --- a/configure.ac +++ b/configure.ac @@ -345,6 +345,15 @@ @@ -5567,7 +5567,7 @@ index 08cfd620afb..bd3da42aa02 100644 LDLIBRARY='libpython$(LDVERSION).dylib' ;; AIX*) -@@ -3659,7 +3864,7 @@ +@@ -3657,7 +3862,7 @@ BLDSHARED="$LDSHARED" fi ;; @@ -5576,7 +5576,7 @@ index 08cfd620afb..bd3da42aa02 100644 LDSHARED='$(CC) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)' LDCXXSHARED='$(CXX) -dynamiclib -F . -framework $(PYTHONFRAMEWORK)' BLDSHARED="$LDSHARED" -@@ -3783,7 +3988,7 @@ +@@ -3781,7 +3986,7 @@ Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";; Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; # -u libsys_s pulls in all symbols in libsys @@ -5585,7 +5585,7 @@ index 08cfd620afb..bd3da42aa02 100644 LINKFORSHARED="$extra_undefs -framework CoreFoundation" # Issue #18075: the default maximum stack size (8MBytes) is too -@@ -3807,7 +4012,7 @@ +@@ -3805,7 +4010,7 @@ LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' fi LINKFORSHARED="$LINKFORSHARED" @@ -5594,7 +5594,7 @@ index 08cfd620afb..bd3da42aa02 100644 LINKFORSHARED="-Wl,-stack_size,$stack_size $LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)' fi ;; -@@ -4315,7 +4520,7 @@ +@@ -4313,7 +4518,7 @@ dnl when do we need USING_APPLE_OS_LIBFFI? ctypes_malloc_closure=yes ], @@ -5603,7 +5603,7 @@ index 08cfd620afb..bd3da42aa02 100644 ctypes_malloc_closure=yes ], [sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [" -mimpure-text"])] -@@ -5494,9 +5699,9 @@ +@@ -5492,9 +5697,9 @@ AC_CHECK_FUNCS([ \ accept4 alarm bind_textdomain_codeset chmod chown clearenv \ clock closefrom close_range confstr \ @@ -5615,7 +5615,7 @@ index 08cfd620afb..bd3da42aa02 100644 gai_strerror getegid geteuid getgid getgrent getgrgid getgrgid_r \ getgrnam_r getgrouplist gethostname getitimer getloadavg getlogin getlogin_r \ getpeername getpgid getpid getppid getpriority _getpty \ -@@ -5504,8 +5709,7 @@ +@@ -5502,8 +5707,7 @@ getspnam getuid getwd grantpt if_nameindex initgroups kill killpg lchown linkat \ lockf lstat lutimes madvise mbrtowc memrchr mkdirat mkfifo mkfifoat \ mknod mknodat mktime mmap mremap nice openat opendir pathconf pause pipe \ @@ -5625,7 +5625,7 @@ index 08cfd620afb..bd3da42aa02 100644 pread preadv preadv2 process_vm_readv \ pthread_cond_timedwait_relative_np pthread_condattr_setclock pthread_init \ pthread_kill pthread_get_name_np pthread_getname_np pthread_set_name_np \ -@@ -5515,7 +5719,7 @@ +@@ -5513,7 +5717,7 @@ sched_setparam sched_setscheduler sem_clockwait sem_getvalue sem_open \ sem_timedwait sem_unlink sendfile setegid seteuid setgid sethostname \ setitimer setlocale setpgid setpgrp setpriority setregid setresgid \ @@ -5634,7 +5634,7 @@ index 08cfd620afb..bd3da42aa02 100644 sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \ sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \ sysconf sysctlbyname tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \ -@@ -5541,12 +5745,34 @@ +@@ -5539,12 +5743,34 @@ AC_CHECK_FUNCS([lchmod]) fi @@ -5672,7 +5672,7 @@ index 08cfd620afb..bd3da42aa02 100644 fi AC_CHECK_DECL([dirfd], -@@ -5875,20 +6101,22 @@ +@@ -5873,20 +6099,22 @@ @%:@include ])] ) # check for openpty, login_tty, and forkpty @@ -5709,7 +5709,7 @@ index 08cfd620afb..bd3da42aa02 100644 # check for long file support functions AC_CHECK_FUNCS([fseek64 fseeko fstatvfs ftell64 ftello statvfs]) -@@ -5927,10 +6155,10 @@ +@@ -5925,10 +6153,10 @@ ]) ]) @@ -5722,7 +5722,7 @@ index 08cfd620afb..bd3da42aa02 100644 then AC_CHECK_FUNCS([clock_settime], [], [ AC_CHECK_LIB([rt], [clock_settime], [ -@@ -6088,7 +6316,7 @@ +@@ -6086,7 +6314,7 @@ [ac_cv_buggy_getaddrinfo=no], [ac_cv_buggy_getaddrinfo=yes], [ @@ -5731,7 +5731,7 @@ index 08cfd620afb..bd3da42aa02 100644 ac_cv_buggy_getaddrinfo="no" elif test "${enable_ipv6+set}" = set; then ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6" -@@ -6692,8 +6920,8 @@ +@@ -6690,8 +6918,8 @@ LIBPYTHON="-lpython${VERSION}${ABIFLAGS}" fi @@ -5742,7 +5742,7 @@ index 08cfd620afb..bd3da42aa02 100644 MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)" fi -@@ -7367,7 +7595,7 @@ +@@ -7365,7 +7593,7 @@ dnl NOTE: Inform user how to proceed with files when cross compiling. dnl Some cross-compile builds are predictable; they won't ever dnl have /dev/ptmx or /dev/ptc, so we can set them explicitly. @@ -5751,7 +5751,7 @@ index 08cfd620afb..bd3da42aa02 100644 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no else -@@ -7696,7 +7924,7 @@ +@@ -7694,7 +7922,7 @@ AS_CASE([$ac_sys_system], [Emscripten], [with_ensurepip=no], [WASI], [with_ensurepip=no], @@ -5760,7 +5760,7 @@ index 08cfd620afb..bd3da42aa02 100644 [with_ensurepip=upgrade] ) ]) -@@ -8084,6 +8312,9 @@ +@@ -8082,6 +8310,9 @@ NetBSD*) _PYTHREAD_NAME_MAXLEN=15;; # gh-131268 Darwin) _PYTHREAD_NAME_MAXLEN=63;; iOS) _PYTHREAD_NAME_MAXLEN=63;; @@ -5770,7 +5770,7 @@ index 08cfd620afb..bd3da42aa02 100644 FreeBSD*) _PYTHREAD_NAME_MAXLEN=19;; # gh-131268 OpenBSD*) _PYTHREAD_NAME_MAXLEN=23;; # gh-131268 *) _PYTHREAD_NAME_MAXLEN=;; -@@ -8108,7 +8339,7 @@ +@@ -8106,7 +8337,7 @@ [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])], dnl The _scproxy module is available on macOS [Darwin], [],