From e42c8450393a317ab6df39f6e01411722872fd6b Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 11:53:41 +0800 Subject: python3: Update to 3.11.5, refresh patches Includes fix for CVE-2023-40217 (Bypass TLS handshake on closed sockets). This also: * Remove 027-install-python3-symlink-after-stdlib.patch This was merged upstream in https://github.com/python/cpython/pull/104693. * Remove fix for unnecessary linking with libbsd (60bf01cb606344619e002901646171da1e69c0f9) This was fixed upstream in https://github.com/python/cpython/pull/105236. Signed-off-by: Jeffery To --- lang/python/python3/patches/003-do-not-run-compileall.patch | 4 ++-- .../python3/patches/025-choose-python-config-version.patch | 2 +- lang/python/python3/patches/026-openssl-feature-flags.patch | 2 +- .../patches/027-install-python3-symlink-after-stdlib.patch | 11 ----------- 4 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 lang/python/python3/patches/027-install-python3-symlink-after-stdlib.patch (limited to 'lang/python/python3/patches') 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 9b6bc45a3..9bb10fac7 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,6 @@ --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2118,6 +2118,7 @@ libinstall: all $(srcdir)/Modules/xxmodu +@@ -2123,6 +2123,7 @@ libinstall: all $(srcdir)/Modules/xxmodu $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -8,7 +8,7 @@ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -2145,6 +2146,7 @@ libinstall: all $(srcdir)/Modules/xxmodu +@@ -2150,6 +2151,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 a8c06a726..aa56d8942 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,6 @@ --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2163,7 +2163,7 @@ python-config: $(srcdir)/Misc/python-con +@@ -2168,7 +2168,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/026-openssl-feature-flags.patch b/lang/python/python3/patches/026-openssl-feature-flags.patch index 2546048b0..604f41d8e 100644 --- a/lang/python/python3/patches/026-openssl-feature-flags.patch +++ b/lang/python/python3/patches/026-openssl-feature-flags.patch @@ -47,7 +47,7 @@ PY_HASH_ENTRY(NULL, NULL, NULL, 0), }; -@@ -873,11 +889,15 @@ py_evp_fromname(PyObject *module, const +@@ -874,11 +890,15 @@ py_evp_fromname(PyObject *module, const goto exit; } diff --git a/lang/python/python3/patches/027-install-python3-symlink-after-stdlib.patch b/lang/python/python3/patches/027-install-python3-symlink-after-stdlib.patch deleted file mode 100644 index 26241d03e..000000000 --- a/lang/python/python3/patches/027-install-python3-symlink-after-stdlib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1839,7 +1839,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK - $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \ - fi - --bininstall: altbininstall -+bininstall: commoninstall altbininstall - if test ! -d $(DESTDIR)$(LIBPC); then \ - echo "Creating directory $(LIBPC)"; \ - $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \ -- cgit