diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk index 7f7eddc39a..66b31e3583 100644 --- a/lang/python/python3-version.mk +++ b/lang/python/python3-version.mk @@ -8,7 +8,7 @@ # Note: keep in sync with setuptools & pip PYTHON3_VERSION_MAJOR:=3 PYTHON3_VERSION_MINOR:=11 -PYTHON3_VERSION_MICRO:=14 +PYTHON3_VERSION_MICRO:=16 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 76d3eba39d..456f365783 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -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:=8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78 +PKG_HASH:=91bcdebfdde239a003ae93738a7fce0f9230fee5c4bc2b86f6e6e8c6f98aabe8 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=Python-2.0.1 0BSD diff --git a/lang/python/python3/patches/003-do-not-run-compileall.patch b/lang/python/python3/patches/003-do-not-run-compileall.patch index 0b154bd7e9..9e4e8ef3a1 100644 --- a/lang/python/python3/patches/003-do-not-run-compileall.patch +++ b/lang/python/python3/patches/003-do-not-run-compileall.patch @@ -1,6 +1,11 @@ +From 8a4da017902d21ac6cada21a3bb23caa5b39af0b Mon Sep 17 00:00:00 2001 +From: Jeffery To +Date: Fri, 12 May 2023 19:40:11 +0800 +Subject: [PATCH] Do not run compileall + --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2144,6 +2144,7 @@ libinstall: all $(srcdir)/Modules/xxmodu +@@ -2149,6 +2149,7 @@ libinstall: all $(srcdir)/Modules/xxmodu $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -8,7 +13,7 @@ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -2171,6 +2172,7 @@ libinstall: all $(srcdir)/Modules/xxmodu +@@ -2176,6 +2177,7 @@ libinstall: all $(srcdir)/Modules/xxmodu $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages diff --git a/lang/python/python3/patches/025-choose-python-config-version.patch b/lang/python/python3/patches/025-choose-python-config-version.patch index f4e25ed9e1..1d3e074bbc 100644 --- a/lang/python/python3/patches/025-choose-python-config-version.patch +++ b/lang/python/python3/patches/025-choose-python-config-version.patch @@ -1,6 +1,11 @@ +From 18330902a0ca1b162e1ae938d8024cfb7e7c524d Mon Sep 17 00:00:00 2001 +From: Jeffery To +Date: Tue, 16 Feb 2021 22:23:50 +0800 +Subject: [PATCH] Choose python-config version + --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2189,7 +2189,7 @@ python-config: $(srcdir)/Misc/python-con +@@ -2194,7 +2194,7 @@ python-config: $(srcdir)/Misc/python-con @ # On Darwin, always use the python version of the script, the shell @ # version doesn't use the compiler customizations that are provided @ # in python (_osx_support.py). diff --git a/lang/python/python3/patches/027-fix-host-build-libressl.patch b/lang/python/python3/patches/027-fix-host-build-libressl.patch index f45179d3b5..350392b810 100644 --- a/lang/python/python3/patches/027-fix-host-build-libressl.patch +++ b/lang/python/python3/patches/027-fix-host-build-libressl.patch @@ -1,6 +1,11 @@ +From 49e3c330d4b5e17a740bc51b7ebbb9a42c67e505 Mon Sep 17 00:00:00 2001 +From: Sean Khan +Date: Thu, 27 Jun 2024 22:06:30 -0400 +Subject: [PATCH] Fix host build with LibreSSL + --- a/Modules/_ssl.c +++ b/Modules/_ssl.c -@@ -4551,7 +4551,7 @@ set_sni_callback(PySSLContext *self, PyO +@@ -4553,7 +4553,7 @@ set_sni_callback(PySSLContext *self, PyO return 0; } @@ -9,7 +14,7 @@ static X509_OBJECT *x509_object_dup(const X509_OBJECT *obj) { int ok; -@@ -4624,7 +4624,11 @@ _ssl__SSLContext_cert_store_stats_impl(P +@@ -4626,7 +4626,11 @@ _ssl__SSLContext_cert_store_stats_impl(P int x509 = 0, crl = 0, ca = 0, i; store = SSL_CTX_get_cert_store(self->ctx); @@ -21,7 +26,7 @@ if (objs == NULL) { PyErr_SetString(PyExc_MemoryError, "failed to query cert store"); return NULL; -@@ -4679,7 +4683,11 @@ _ssl__SSLContext_get_ca_certs_impl(PySSL +@@ -4681,7 +4685,11 @@ _ssl__SSLContext_get_ca_certs_impl(PySSL } store = SSL_CTX_get_cert_store(self->ctx);