[tools/depends][target] bump python 3.11.1

6 files changed, 7 insertions, 49 deletions

diff --git a/tools/depends/target/python3/01-fix-memleak-PR99301.patch b/tools/depends/target/python3/01-fix-memleak-PR99301.patch
deleted file mode 100644
index 63ed86fb7b..0000000000
--- a/tools/depends/target/python3/01-fix-memleak-PR99301.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/Python/pystate.c
-+++ b/Python/pystate.c
-@@ -341,6 +341,7 @@ PyInterpreterState_New(void)
-         interp = &runtime->_main_interpreter;
-         assert(interp->id == 0);
-         assert(interp->next == NULL);
-+        assert(interp->_static);
- 
-         interpreters->main = interp;
-     }
-@@ -355,6 +356,9 @@ PyInterpreterState_New(void)
-         // Set to _PyInterpreterState_INIT.
-         memcpy(interp, &initial._main_interpreter,
-                sizeof(*interp));
-+        // We need to adjust any fields that are different from the initial
-+        // interpreter (as defined in _PyInterpreterState_INIT):
-+        interp->_static = false;
- 
-         if (id < 0) {
-             /* overflow or Py_Initialize() not called yet! */
-@@ -817,6 +821,7 @@ new_threadstate(PyInterpreterState *interp)
-         assert(id == 1);
-         used_newtstate = 0;
-         tstate = &interp->_initial_thread;
-+        assert(tstate->_static);
-     }
-     else {
-         // Every valid interpreter must have at least one thread.
-@@ -828,6 +833,9 @@ new_threadstate(PyInterpreterState *interp)
-         memcpy(tstate,
-                &initial._main_interpreter._initial_thread,
-                sizeof(*tstate));
-+        // We need to adjust any fields that are different from the initial
-+        // thread (as defined in _PyThreadState_INIT):
-+        tstate->_static = false;
-     }
-     interp->threads.head = tstate;
- 
diff --git a/tools/depends/target/python3/Makefile b/tools/depends/target/python3/Makefile
index 840f7ea12e..d6b427e35a 100644
--- a/tools/depends/target/python3/Makefile
+++ b/tools/depends/target/python3/Makefile
@@ -3,7 +3,6 @@ DEPS = ../../Makefile.include Makefile PYTHON3-VERSION ../../download-files.incl
                                  apple.patch \
                                  crosscompile.patch \
                                  darwin_embedded.patch \
-                                 01-fix-memleak-PR99301.patch \
                                  10-android-modules.patch \
                                  10-linux-modules.patch \
                                  10-osx-modules.patch \
@@ -57,9 +56,6 @@ all: .installed-$(PLATFORM)
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-# Temp patch to resolve https://github.com/python/cpython/issues/99205
-# Remove in 3.11.1+ bump
-	cd $(PLATFORM); patch -p1 -i ../01-fix-memleak-PR99301.patch
 	cd $(PLATFORM); patch -p1 -i ../crosscompile.patch
 	cd $(PLATFORM); patch -p1 -i ../apple.patch
 ifeq ($(OS),darwin_embedded)
diff --git a/tools/depends/target/python3/PYTHON3-VERSION b/tools/depends/target/python3/PYTHON3-VERSION
index 35188cbe3d..a2b1bb1e85 100644
--- a/tools/depends/target/python3/PYTHON3-VERSION
+++ b/tools/depends/target/python3/PYTHON3-VERSION
@@ -1,4 +1,4 @@
 LIBNAME=Python
-VERSION=3.11.0
+VERSION=3.11.1
 ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
-SHA512=314eef88ae0d68760f34d7a32f238fd2ecb27c50963baa7357c42ad8159026ec50229a0b31d83c39710a472904a06422afc082f9658a90a1dc83ccb74c08039d
+SHA512=5edd70c881e083c96199c60471f18f9ebc4c97a2d45dc66f89e16d7c3638d8a5d2cbf2e84b1be3d7f1178ce9f7fa4197884385c1ee3618ff66a538f872f318ed
diff --git a/tools/depends/target/python3/apple.patch b/tools/depends/target/python3/apple.patch
index 11dfdb710b..4deda311fb 100644
--- a/tools/depends/target/python3/apple.patch
+++ b/tools/depends/target/python3/apple.patch
@@ -28,7 +28,7 @@
    # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
    # defining NI_NUMERICHOST.
    QNX/6.3.2)
-@@ -2909,7 +2909,7 @@
+@@ -2947,7 +2947,7 @@
        	  return 1;
        }
      }
diff --git a/tools/depends/target/python3/crosscompile.patch b/tools/depends/target/python3/crosscompile.patch
index bf9b4f6a26..6757c75ace 100644
--- a/tools/depends/target/python3/crosscompile.patch
+++ b/tools/depends/target/python3/crosscompile.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1589,15 +1589,6 @@
+@@ -1625,15 +1625,6 @@
          ARFLAGS="rcs"
  fi
  
@@ -18,7 +18,7 @@
  case $MACHDEP in
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2227,10 +2227,11 @@
+@@ -2233,10 +2233,11 @@
  # This goes into $(exec_prefix)
  sharedinstall: all
  	$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
diff --git a/tools/depends/target/python3/darwin_embedded.patch b/tools/depends/target/python3/darwin_embedded.patch
index 6eb6ba4d4a..77c9d0f30a 100644
--- a/tools/depends/target/python3/darwin_embedded.patch
+++ b/tools/depends/target/python3/darwin_embedded.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -6785,7 +6785,7 @@
+@@ -6827,7 +6827,7 @@
  AS_CASE([$ac_sys_system],
    [AIX], [PY_STDLIB_MOD_SET_NA([_scproxy], [spwd])],
    [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [_crypt], [termios], [grp])],
@@ -11,7 +11,7 @@
    [FreeBSD*], [PY_STDLIB_MOD_SET_NA([_scproxy], [spwd])],
 --- a/Lib/os.py
 +++ b/Lib/os.py
-@@ -604,6 +604,7 @@
+@@ -605,6 +605,7 @@
          fullname = path.join(dir, file)
          try:
              exec_func(fullname, *argrest)