Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #18122 from jefferyto/python-3.10.3-openwrt-22.03

Browse source 
[openwrt-22.03] python3: Update to 3.10.4
This commit is contained in:
Josef Schlehofer 2022-03-31 09:55:56 +02:00 committed by GitHub
commit 05986f212c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/python/python3-version.mk
View file

@ -8,7 +8,7 @@
# Note: keep in sync with setuptools & pip
PYTHON3_VERSION_MAJOR:=3
PYTHON3_VERSION_MINOR:=10
PYTHON3_VERSION_MICRO:=2
PYTHON3_VERSION_MICRO:=4
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
@ -16,4 +16,4 @@ PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
PYTHON3_PIP_PKG_RELEASE:=1
PYTHON3_SETUPTOOLS_VERSION:=58.1.0
PYTHON3_PIP_VERSION:=21.2.4
PYTHON3_PIP_VERSION:=22.0.4

2
lang/python/python3/Makefile
View file

@ -16,7 +16,7 @@ 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:=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7
PKG_HASH:=80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=PSF-2.0

2
lang/python/python3/patches/006-do-not-add-multiarch-paths-when-cross-compiling.patch
View file

@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -830,7 +830,8 @@ class PyBuildExt(build_ext):
@@ -832,7 +832,8 @@ class PyBuildExt(build_ext):
# only change this for cross builds for 3.3, issues on Mageia
if CROSS_COMPILING:
self.add_cross_compiling_paths()

4
lang/python/python3/patches/014-remove-platform-so-suffix.patch
View file

@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -15649,7 +15649,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
@@ -15616,7 +15616,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
$as_echo "$ABIFLAGS" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
$as_echo_n "checking SOABI... " >&6; }
@ -11,7 +11,7 @@
--- a/configure.ac
+++ b/configure.ac
@@ -4825,7 +4825,7 @@ AC_SUBST(SOABI)
@@ -4824,7 +4824,7 @@ AC_SUBST(SOABI)
AC_MSG_CHECKING(ABIFLAGS)
AC_MSG_RESULT($ABIFLAGS)
AC_MSG_CHECKING(SOABI)

4
lang/python/python3/patches/016-adjust-config-paths.patch
View file

@ -39,7 +39,7 @@
fi
elif test "$cross_compiling" = maybe; then
as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
@@ -15719,7 +15719,7 @@ fi
@@ -15686,7 +15686,7 @@ fi
@ -59,7 +59,7 @@
fi
elif test "$cross_compiling" = maybe; then
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
@@ -4883,7 +4883,7 @@ fi],
@@ -4882,7 +4882,7 @@ fi],
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
AC_SUBST(PY_ENABLE_SHARED)

12
lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch
View file

@ -30,7 +30,7 @@
/* Cached module state, also used in SSLSocket and SSLSession code. */
_sslmodulestate *state;
} PySSLContext;
@@ -2346,8 +2359,14 @@ _ssl__SSLSocket_write_impl(PySSLSocket *
@@ -2358,8 +2371,14 @@ _ssl__SSLSocket_write_impl(PySSLSocket *
do {
PySSL_BEGIN_ALLOW_THREADS
@ -45,7 +45,7 @@
PySSL_END_ALLOW_THREADS
self->err = err;
@@ -2498,8 +2517,14 @@ _ssl__SSLSocket_read_impl(PySSLSocket *s
@@ -2510,8 +2529,14 @@ _ssl__SSLSocket_read_impl(PySSLSocket *s
do {
PySSL_BEGIN_ALLOW_THREADS
@ -60,7 +60,7 @@
PySSL_END_ALLOW_THREADS
self->err = err;
@@ -3062,8 +3087,10 @@ _ssl__SSLContext_impl(PyTypeObject *type
@@ -3074,8 +3099,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);
@@ -3187,6 +3214,7 @@ context_clear(PySSLContext *self)
@@ -3199,6 +3226,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
@@ -3194,6 +3222,7 @@ context_clear(PySSLContext *self)
@@ -3206,6 +3234,7 @@ context_clear(PySSLContext *self)
PySSL_END_ALLOW_THREADS
self->keylog_bio = NULL;
}
@ -87,7 +87,7 @@
return 0;
}
@@ -4603,8 +4632,10 @@ static PyGetSetDef context_getsetlist[]
@@ -4615,8 +4644,10 @@ static PyGetSetDef context_getsetlist[]
(setter) set_minimum_version, NULL},
{"maximum_version", (getter) get_maximum_version,
(setter) set_maximum_version, NULL},