python3: Update to 3.10.11, refresh/restore patches

This also restores (and updates) a patch for pip that was removed
earlier but is still necessary.

Fixes: 7a756db00249 ("python3: bump to version 3.10.9")
Signed-off-by: Jeffery To <jeffery.to@gmail.com>

4 files changed, 28 insertions, 8 deletions

diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
index 6633d6ed2..8907db3a1 100644
--- a/lang/python/python3/Makefile
+++ b/lang/python/python3/Makefile
@@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk
 include ../python3-version.mk
 
 PKG_NAME:=python3
-PKG_RELEASE:=7
+PKG_RELEASE:=1
 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
-PKG_HASH:=5ae03e308260164baba39921fdb4dbf8e6d03d8235a939d4582b33f0b5e46a83
+PKG_HASH:=3c3bc3048303721c904a03eb8326b631e921f11cc3be2988456a42f115daf04c
 
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 PKG_LICENSE:=PSF-2.0
diff --git a/lang/python/python3/patches-pip/.gitkeep b/lang/python/python3/patches-pip/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/lang/python/python3/patches-pip/.gitkeep
+++ /dev/null
diff --git a/lang/python/python3/patches-pip/001-pyproject-hooks-pyc-fix.patch b/lang/python/python3/patches-pip/001-pyproject-hooks-pyc-fix.patch
new file mode 100644
index 000000000..72f6896f3
--- /dev/null
+++ b/lang/python/python3/patches-pip/001-pyproject-hooks-pyc-fix.patch
@@ -0,0 +1,20 @@
+diff --git a/pip/_vendor/pyproject_hooks/_in_process/__init__.py b/pip/_vendor/pyproject_hooks/_in_process/__init__.py
+index 917fa065b3c7..c9ec8efd53b3 100644
+--- a/pip/_vendor/pyproject_hooks/_in_process/__init__.py
++++ b/pip/_vendor/pyproject_hooks/_in_process/__init__.py
+@@ -11,8 +11,13 @@ try:
+ except AttributeError:
+     # Python 3.8 compatibility
+     def _in_proc_script_path():
+-        return resources.path(__package__, '_in_process.py')
++        if resources.is_resource(__package__, '_in_process.py'):
++            return resources.path(__package__, '_in_process.py')
++        return resources.path(__package__, '_in_process.pyc')
+ else:
+     def _in_proc_script_path():
++        if resources.files(__package__).joinpath('_in_process.py').is_file():
++            return resources.as_file(
++                resources.files(__package__).joinpath('_in_process.py'))
+         return resources.as_file(
+-            resources.files(__package__).joinpath('_in_process.py'))
++            resources.files(__package__).joinpath('_in_process.pyc'))
diff --git a/lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch b/lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch
index 45f0e7be5..01911fcad 100644
--- a/lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch
+++ b/lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch
@@ -30,7 +30,7 @@
      /* Cached module state, also used in SSLSocket and SSLSession code. */
      _sslmodulestate *state;
  } PySSLContext;
-@@ -2358,8 +2371,14 @@ _ssl__SSLSocket_write_impl(PySSLSocket *
+@@ -2388,8 +2401,14 @@ _ssl__SSLSocket_write_impl(PySSLSocket *
  
      do {
          PySSL_BEGIN_ALLOW_THREADS
@@ -45,7 +45,7 @@
          PySSL_END_ALLOW_THREADS
          self->err = err;
  
-@@ -2510,8 +2529,14 @@ _ssl__SSLSocket_read_impl(PySSLSocket *s
+@@ -2540,8 +2559,14 @@ _ssl__SSLSocket_read_impl(PySSLSocket *s
  
      do {
          PySSL_BEGIN_ALLOW_THREADS
@@ -60,7 +60,7 @@
          PySSL_END_ALLOW_THREADS
          self->err = err;
  
-@@ -3074,8 +3099,10 @@ _ssl__SSLContext_impl(PyTypeObject *type
+@@ -3104,8 +3129,10 @@ _ssl__SSLContext_impl(PyTypeObject *type
      self->hostflags = X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS;
      self->protocol = proto_version;
      self->msg_cb = NULL;
@@ -71,7 +71,7 @@
      self->alpn_protocols = NULL;
      self->set_sni_cb = NULL;
      self->state = get_ssl_state(module);
-@@ -3199,6 +3226,7 @@ context_clear(PySSLContext *self)
+@@ -3225,6 +3252,7 @@ context_clear(PySSLContext *self)
  {
      Py_CLEAR(self->set_sni_cb);
      Py_CLEAR(self->msg_cb);
@@ -79,7 +79,7 @@
      Py_CLEAR(self->keylog_filename);
      if (self->keylog_bio != NULL) {
          PySSL_BEGIN_ALLOW_THREADS
-@@ -3206,6 +3234,7 @@ context_clear(PySSLContext *self)
+@@ -3232,6 +3260,7 @@ context_clear(PySSLContext *self)
          PySSL_END_ALLOW_THREADS
          self->keylog_bio = NULL;
      }
@@ -87,7 +87,7 @@
      return 0;
  }
  
-@@ -4619,8 +4648,10 @@ static PyGetSetDef context_getsetlist[]
+@@ -4645,8 +4674,10 @@ static PyGetSetDef context_getsetlist[]
                          (setter) set_minimum_version, NULL},
      {"maximum_version", (getter) get_maximum_version,
                          (setter) set_maximum_version, NULL},