Skip to content

Commit 83b300a

Browse files
jefferytojefferyto
committed
python: Update to 2.7.17, refresh patches
Patches already merged and so removed: * 011-fix-ssl-build-use-have-npn.patch * 019-bpo-36216-Add-check-for-characters-in-netloc-that-normalize-to-separators-openwrtGH-12216.patch * 020-bpo-36216-Only-print-test-messages-when-verbose-openwrtGH-12291.patch * 021-2.7-bpo-35121-prefix-dot-in-domain-for-proper-subdom.patch * 022-bpo-30458-Disallow-control-chars-in-http-URLs-openwrtGH-13315.patch * 023-bpo-35907-Avoid-file-reading-as-disallowing-the-unnecessary-URL-scheme-in-urllib-openwrtGH-11842.patch * 027-bpo-38243-Escape-the-server-title-of-DocXMLRPCServer.patch * 028-bpo-34155-Dont-parse-domains-containing-openwrtGH-13079.patch Patches no longer necessary and so removed: * 017_lib2to3_fix_pyc_search.patch Signed-off-by: Jeffery To <[email protected]>
1 parent a8bf6a8 commit 83b300a

18 files changed

+16
-1150
lines changed

‎lang/python/python-version.mk‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#
77

88
PYTHON_VERSION:=2.7
9-
PYTHON_VERSION_MICRO:=16
9+
PYTHON_VERSION_MICRO:=17
1010

11-
PYTHON_SETUPTOOLS_PKG_RELEASE:=3
12-
PYTHON_PIP_PKG_RELEASE:=2
11+
PYTHON_SETUPTOOLS_PKG_RELEASE:=1
12+
PYTHON_PIP_PKG_RELEASE:=1
1313

14-
PYTHON_SETUPTOOLS_VERSION:=40.6.2
15-
PYTHON_PIP_VERSION:=18.1
14+
PYTHON_SETUPTOOLS_VERSION:=41.2.0
15+
PYTHON_PIP_VERSION:=19.2.3

‎lang/python/python/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ include ../python-version.mk
1212

1313
PKG_NAME:=python
1414
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
15-
PKG_RELEASE:=11
15+
PKG_RELEASE:=1
1616

1717
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
1818
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
19-
PKG_HASH:=f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7
19+
PKG_HASH:=4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41
2020

2121
PKG_LICENSE:=Python/2.0
2222
PKG_LICENSE_FILES:=LICENSE Doc/copyright.rst Doc/license.rst Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Modules/expat/COPYING

‎lang/python/python/patches/002-do-not-add-include-dirs-when-cross-compiling.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/setup.py
22
+++ b/setup.py
3-
@@ -497,7 +497,8 @@ class PyBuildExt(build_ext):
3+
@@ -543,7 +543,8 @@ class PyBuildExt(build_ext):
44
add_dir_to_list(dir_list, directory)
55

66
if os.path.normpath(sys.prefix) != '/usr' \

‎lang/python/python/patches/003-do-not-compile-tests-at-build.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-
@@ -1127,6 +1127,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
3+
@@ -1133,6 +1133,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
44
done; \
55
done
66
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
77
+ifeq (@COMPILE_ALL_TESTS@,yes)
88
if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
99
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
1010
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
11-
@@ -1153,6 +1154,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
11+
@@ -1159,6 +1160,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
1212
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
1313
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
1414
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt

‎lang/python/python/patches/004-do-not-write-bytes-codes.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@@ -71,7 +71,7 @@ int Py_InteractiveFlag; /* Needed by Py_
44
int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */
55
int Py_NoSiteFlag; /* Suppress 'import site' */
6-
int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
6+
int Py_BytesWarningFlag; /* Warn on comparison between bytearray and unicode */
77
-int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */
88
+int Py_DontWriteBytecodeFlag = 1; /* Suppress writing bytecode files (*.py[co]) */
99
int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */

‎lang/python/python/patches/006-remove-multi-arch-and-local-paths.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/setup.py
22
+++ b/setup.py
3-
@@ -454,13 +454,8 @@ class PyBuildExt(build_ext):
3+
@@ -500,13 +500,8 @@ class PyBuildExt(build_ext):
44
os.unlink(tmpfile)
55

66
def detect_modules(self):

‎lang/python/python/patches/009-do-not-use-dblib_dir-when-cross-compiling.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
--- a/setup.py
22
+++ b/setup.py
3-
@@ -1083,6 +1083,7 @@ class PyBuildExt(build_ext):
3+
@@ -1129,6 +1129,7 @@ class PyBuildExt(build_ext):
44
if db_setup_debug: print "db lib: ", dblib, "not found"
55

66
except db_found:
77
+ rt_dblib_dir = None if cross_compiling else dblib_dir
88
if db_setup_debug:
99
print "bsddb using BerkeleyDB lib:", db_ver, dblib
1010
print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
11-
@@ -1097,7 +1098,7 @@ class PyBuildExt(build_ext):
11+
@@ -1143,7 +1144,7 @@ class PyBuildExt(build_ext):
1212
exts.append(Extension('_bsddb', ['_bsddb.c'],
1313
depends = ['bsddb.h'],
1414
library_dirs=dblib_dir,
@@ -17,7 +17,7 @@
1717
include_dirs=db_incs,
1818
libraries=dblibs))
1919
else:
20-
@@ -1308,10 +1309,11 @@ class PyBuildExt(build_ext):
20+
@@ -1354,10 +1355,11 @@ class PyBuildExt(build_ext):
2121
break
2222
elif cand == "bdb":
2323
if db_incs is not None:

‎lang/python/python/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/setup.py
22
+++ b/setup.py
3-
@@ -463,8 +463,9 @@ class PyBuildExt(build_ext):
3+
@@ -509,8 +509,9 @@ class PyBuildExt(build_ext):
44
# directly since an inconsistently reproducible issue comes up where
55
# the environment variable is not set even though the value were passed
66
# into configure and stored in the Makefile (issue found on OS X 10.3).

‎lang/python/python/patches/011-fix-ssl-build-use-have-npn.patch‎

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

‎lang/python/python/patches/017_lib2to3_fix_pyc_search.patch‎

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

0 commit comments

Comments
 (0)