python3: bump to 3.14.5

This is the latest 3.14.x point release with assorted bug fixes
from upstream. PYTHON3_PIP_VERSION is bumped from 26.0.1 to 26.1.1
to match the pip wheel bundled in the 3.14.5 source tarball; the
host build's ensurepip lookup of pip-$(PYTHON3_PIP_VERSION).whl
otherwise fails. The set of OpenWrt-side patches still applies
against the new source; only quilt context-line offsets needed
refreshing for the patches that touch Makefile.pre.in.

Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk
index ac88200279a16b69faeb722a0a388c0cdb28ea9c..698a65bf9d67cd424e77573e22937724bb25dc24 100644 (file)
--- a/lang/python/python3-version.mk
+++ b/lang/python/python3-version.mk
@@ -8,9 +8,9 @@
 # Note: keep in sync with pip
 PYTHON3_VERSION_MAJOR:=3
 PYTHON3_VERSION_MINOR:=14
-PYTHON3_VERSION_MICRO:=4
+PYTHON3_VERSION_MICRO:=5
 
 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
 
 PYTHON3_PIP_PKG_RELEASE:=1
-PYTHON3_PIP_VERSION:=26.0.1
+PYTHON3_PIP_VERSION:=26.1.1

diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
index 2d01515a6fbae212f188019c01b02faf08e15e9f..ed80a98f97f73cb679dd435af8ce29357d7ef5d8 100644 (file)
--- 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:=d923c51303e38e249136fc1bdf3568d56ecb03214efdef48516176d3d7faaef8
+PKG_HASH:=7e32597b99e5d9a39abed35de4693fa169df3e5850d4c334337ffd6a19a36db6
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 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 739abb82cdbdd6d90b92cdd357a8f3349762f7bf..ec3ea216cbd7302597c996bc93e87bab9ccc7464 100644 (file)
--- 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,6 @@
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2811,6 +2811,7 @@ libinstall:      all $(srcdir)/Modules/xxmodu
+@@ -2813,6 +2813,7 @@ libinstall:      all $(srcdir)/Modules/xxmodu
                echo "Applying app store compliance patch"; \
                patch --force --reject-file "$(abs_builddir)/app-store-compliance.rej" --strip 2 --directory "$(DESTDIR)$(LIBDEST)" --input "$(abs_srcdir)/$(APP_STORE_COMPLIANCE_PATCH)" || true ; \
        fi
@@ -8,7 +8,7 @@
        @ # Build PYC files for the 3 optimization levels (0, 1, 2)
        -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
                $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
-@@ -2821,6 +2822,7 @@ libinstall:      all $(srcdir)/Modules/xxmodu
+@@ -2823,6 +2824,7 @@ libinstall:      all $(srcdir)/Modules/xxmodu
                $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
                -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \
                -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages

diff --git a/lang/python/python3/patches/009-don-t-run-profile-task-during-cross-build.patch b/lang/python/python3/patches/009-don-t-run-profile-task-during-cross-build.patch
index 783c91124707354f8373bdd088812a76adf7d9c9..803227c358a3f6cce10d556f0a9420103d4be354 100644 (file)
--- a/lang/python/python3/patches/009-don-t-run-profile-task-during-cross-build.patch
+++ b/lang/python/python3/patches/009-don-t-run-profile-task-during-cross-build.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -850,6 +850,7 @@ profile-gen-stamp: profile-clean-stamp
+@@ -852,6 +852,7 @@ profile-gen-stamp: profile-clean-stamp
  
  # Run task with profile generation build to create profile information.
  profile-run-stamp:
@@ -8,7 +8,7 @@
        @echo "Running code to generate profile data (this can take a while):"
        # First, we need to create a clean build with profile generation
        # enabled.
-@@ -863,6 +864,7 @@ profile-run-stamp:
+@@ -865,6 +866,7 @@ profile-run-stamp:
        # This is an expensive target to build and it does not have proper
        # makefile dependency information.  So, we create a "stamp" file
        # to record its completion and avoid re-running it.

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 a531621ee907b68aa26202d86d4c70ff3659e3de..ca81fef889a6f0dd40e71995775bfc603b477fb8 100644 (file)
--- 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,6 @@
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2837,7 +2837,7 @@ python-config: $(srcdir)/Misc/python-con
+@@ -2839,7 +2839,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).