6e205b10c0
Fixes the following security issues:
- CVE-2013-1752: Change use of readline() in :class:`imaplib.IMAP4_SSL` to limit line length
- CVE-2018-14647: The C accelerated _elementtree module now initializes hash
randomization salt from _Py_HashSecret instead of libexpat's default
CSPRNG.
For more details, see the NEWS file:
https://github.com/python/cpython/blob/v2.7.16/Misc/NEWS.d/2.7.16rc1.rst
Refresh patches, drop now upstream
package/python/0035-bpo-35746-Fix-segfault-in-ssl-s-cert-parser-GH-11569.patch
and adjust hash of LICENSE file for a change of copyright years.
run-tests results:
16:05:41 TestPython2 Starting
16:05:42 TestPython2 Building
16:11:26 TestPython2 Building done
16:11:32 TestPython2 Cleaning up
.
----------------------------------------------------------------------
Ran 1 test in 351.905s
OK
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit c970d7d640)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
106 lines
3.5 KiB
Diff
106 lines
3.5 KiB
Diff
From 2c1810fb002128a6d33cc3a391a157e316479d15 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Tue, 7 Mar 2017 22:27:16 +0100
|
|
Subject: [PATCH] Add an option to disable installation of test modules
|
|
|
|
The Python standard distribution comes with many test modules, that
|
|
are not necessarly useful on embedded targets.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
|
[Bernd: rebased against version 2.7.14]
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
[Peter: update for 2.7.16]
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
|
---
|
|
Makefile.pre.in | 50 +++++++++++++++++++++++++++++++++-----------------
|
|
configure.ac | 6 ++++++
|
|
2 files changed, 39 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
index 37b2ff3a5f..2a5e8adc61 100644
|
|
--- a/Makefile.pre.in
|
|
+++ b/Makefile.pre.in
|
|
@@ -1048,28 +1048,44 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
|
|
plat-mac/lib-scriptpackages/SystemEvents \
|
|
plat-mac/lib-scriptpackages/Terminal
|
|
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
|
|
-LIBSUBDIRS= lib-tk lib-tk/test lib-tk/test/test_tkinter \
|
|
- lib-tk/test/test_ttk site-packages test test/audiodata test/capath \
|
|
- test/data test/cjkencodings test/decimaltestdata test/xmltestdata \
|
|
- test/imghdrdata \
|
|
- test/subprocessdata \
|
|
- test/support \
|
|
- test/tracedmodules \
|
|
+LIBSUBDIRS= lib-tk site-packages \
|
|
encodings compiler hotshot \
|
|
- email email/mime email/test email/test/data \
|
|
+ email email/mime \
|
|
ensurepip ensurepip/_bundled \
|
|
- json json/tests \
|
|
- sqlite3 sqlite3/test \
|
|
- logging bsddb bsddb/test csv importlib wsgiref \
|
|
- lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
|
|
- lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
|
|
- ctypes ctypes/test ctypes/macholib \
|
|
- idlelib idlelib/Icons idlelib/idle_test \
|
|
- distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
|
|
+ json \
|
|
+ sqlite3 \
|
|
+ logging bsddb csv importlib wsgiref \
|
|
+ lib2to3 lib2to3/fixes lib2to3/pgen2 \
|
|
+ ctypes ctypes/macholib \
|
|
+ idlelib idlelib/Icons \
|
|
+ distutils distutils/command $(XMLLIBSUBDIRS) \
|
|
multiprocessing multiprocessing/dummy \
|
|
- unittest unittest/test \
|
|
+ unittest \
|
|
lib-old \
|
|
curses pydoc_data $(MACHDEPS)
|
|
+
|
|
+TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
|
|
+ lib-tk/test/test_ttk test test/audiodata test/capath test/data \
|
|
+ test/cjkencodings test/decimaltestdata test/xmltestdata \
|
|
+ test/imghdrdata \
|
|
+ test/subprocessdata \
|
|
+ test/support \
|
|
+ test/tracedmodules \
|
|
+ email/test email/test/data \
|
|
+ json/tests \
|
|
+ sqlite3/test \
|
|
+ bsddb/test \
|
|
+ lib2to3/tests \
|
|
+ lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
|
|
+ ctypes/test \
|
|
+ idlelib/idle_test \
|
|
+ distutils/tests \
|
|
+ unittest/test
|
|
+
|
|
+ifeq (@TEST_MODULES@,yes)
|
|
+LIBSUBDIRS += $(TESTSUBDIRS)
|
|
+endif
|
|
+
|
|
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
|
|
@for i in $(SCRIPTDIR) $(LIBDEST); \
|
|
do \
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 3f28ef1371..f257a25620 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -2835,6 +2835,12 @@ if test "$posix_threads" = "yes"; then
|
|
fi
|
|
|
|
|
|
+AC_SUBST(TEST_MODULES)
|
|
+
|
|
+AC_ARG_ENABLE(test-modules,
|
|
+ AS_HELP_STRING([--disable-test-modules], [disable test modules]),
|
|
+ [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
|
|
+
|
|
# Check for enable-ipv6
|
|
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
|
|
AC_MSG_CHECKING([if --enable-ipv6 is specified])
|
|
--
|
|
2.11.0
|
|
|