Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite42c845

Browse files
jefferyto1715173329
authored andcommitted
python3: Update to 3.11.5, refresh patches
Includes fix forCVE-2023-40217 (Bypass TLS handshake on closedsockets).This also:* Remove 027-install-python3-symlink-after-stdlib.patch This was merged upstream inpython/cpython#104693.* Remove fix for unnecessary linking with libbsd (60bf01c) This was fixed upstream inpython/cpython#105236.Signed-off-by: Jeffery To <jeffery.to@gmail.com>
1 parent106304c commite42c845

7 files changed

+16
-25
lines changed

‎lang/python/python3-version.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
# Note: keep in sync with setuptools & pip
99
PYTHON3_VERSION_MAJOR:=3
1010
PYTHON3_VERSION_MINOR:=11
11-
PYTHON3_VERSION_MICRO:=4
11+
PYTHON3_VERSION_MICRO:=5
1212

1313
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
1414

1515
PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
1616
PYTHON3_PIP_PKG_RELEASE:=1
1717

1818
PYTHON3_SETUPTOOLS_VERSION:=65.5.0
19-
PYTHON3_PIP_VERSION:=23.1.2
19+
PYTHON3_PIP_VERSION:=23.2.1

‎lang/python/python3/Makefile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ include $(TOPDIR)/rules.mk
1111
include ../python3-version.mk
1212

1313
PKG_NAME:=python3
14-
PKG_RELEASE:=3
14+
PKG_RELEASE:=1
1515
PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
1616

1717
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
1818
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
19-
PKG_HASH:=2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6
19+
PKG_HASH:=85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f
2020

2121
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
22-
PKG_LICENSE:=PSF-2.0
22+
PKG_LICENSE:=Python-2.0.1 0BSD
2323
PKG_LICENSE_FILES:=LICENSE Doc/copyright.rst Doc/license.rst Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi_osx/LICENSE Modules/expat/COPYING
2424
PKG_CPE_ID:=cpe:/a:python:python
2525

@@ -162,11 +162,6 @@ CONFIGURE_VARS += \
162162
ac_cv_file__dev_ptc=no\
163163
ac_cv_file__dev_ptmx=yes
164164

165-
# Do not link with libbsd for flock
166-
# https://github.com/openwrt/packages/issues/21161
167-
CONFIGURE_VARS +=\
168-
ac_cv_lib_bsd_flock=no
169-
170165
# Disable stdlib modules
171166
# Check for a better way in the future: https://github.com/python/cpython/issues/98558
172167
CONFIGURE_VARS +=\

‎lang/python/python3/patches/003-do-not-run-compileall.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
--- a/Makefile.pre.in
22
+++ b/Makefile.pre.in
3-
@@ -2118,6 +2118,7 @@ libinstall:all $(srcdir)/Modules/xxmodu
3+
@@ -2123,6 +2123,7 @@ libinstall:all $(srcdir)/Modules/xxmodu
44
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
55
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
66
fi
77
+ifeq (1,)
88
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
99
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
1010
-j0 -d $(LIBDEST) -f \
11-
@@ -2145,6 +2146,7 @@ libinstall:all $(srcdir)/Modules/xxmodu
11+
@@ -2150,6 +2151,7 @@ libinstall:all $(srcdir)/Modules/xxmodu
1212
$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
1313
-j0 -d $(LIBDEST)/site-packages -f \
1414
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages

‎lang/python/python3/patches/025-choose-python-config-version.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/Makefile.pre.in
22
+++ b/Makefile.pre.in
3-
@@ -2163,7 +2163,7 @@ python-config: $(srcdir)/Misc/python-con
3+
@@ -2168,7 +2168,7 @@ python-config: $(srcdir)/Misc/python-con
44
@ # On Darwin, always use the python version of the script, the shell
55
@ # version doesn't use the compiler customizations that are provided
66
@ # in python (_osx_support.py).

‎lang/python/python3/patches/026-openssl-feature-flags.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
PY_HASH_ENTRY(NULL, NULL, NULL, 0),
4848
};
4949

50-
@@ -873,11 +889,15 @@ py_evp_fromname(PyObject *module, const
50+
@@ -874,11 +890,15 @@ py_evp_fromname(PyObject *module, const
5151
goto exit;
5252
}
5353

‎lang/python/python3/patches/027-install-python3-symlink-after-stdlib.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎lang/python/python3/test.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
case"$1"in
4+
python3|python3-base|python3-light)
5+
python3 --version| grep -Fx"Python$2"
6+
;;
7+
esac

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp