mirror of
https://git.yoctoproject.org/poky
synced 2026-02-24 02:19:39 +01:00
python: Upgrade both python and python-native to 2.7.13
Rebased: - python-native/multilib.patch - python/multilib.patch - python/01-use-proper-tools-for-cross-build.patch Upstream: - CVE-2016-1000110 (From OE-Core rev: 2eaadc5464e3340359b626026d80afb6bc01d3f1) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alejandro Hernandez
committed by
Richard Purdie
Richard Purdie
parent
1bd3e545bd
commit
30b2044de6
@@ -1,11 +1,11 @@
|
||||
Rebased for python-2.7.9
|
||||
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
|
||||
|
||||
Index: Python-2.7.12/configure.ac
|
||||
Index: Python-2.7.13/configure.ac
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/configure.ac
|
||||
+++ Python-2.7.12/configure.ac
|
||||
@@ -756,6 +756,10 @@ SunOS*)
|
||||
--- Python-2.7.13.orig/configure.ac
|
||||
+++ Python-2.7.13/configure.ac
|
||||
@@ -759,6 +759,10 @@ SunOS*)
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -16,10 +16,10 @@ Index: Python-2.7.12/configure.ac
|
||||
|
||||
AC_SUBST(LIBRARY)
|
||||
AC_MSG_CHECKING(LIBRARY)
|
||||
Index: Python-2.7.12/Include/pythonrun.h
|
||||
Index: Python-2.7.13/Include/pythonrun.h
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Include/pythonrun.h
|
||||
+++ Python-2.7.12/Include/pythonrun.h
|
||||
--- Python-2.7.13.orig/Include/pythonrun.h
|
||||
+++ Python-2.7.13/Include/pythonrun.h
|
||||
@@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void);
|
||||
/* In their own files */
|
||||
PyAPI_FUNC(const char *) Py_GetVersion(void);
|
||||
@@ -28,10 +28,10 @@ Index: Python-2.7.12/Include/pythonrun.h
|
||||
PyAPI_FUNC(const char *) Py_GetCopyright(void);
|
||||
PyAPI_FUNC(const char *) Py_GetCompiler(void);
|
||||
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
|
||||
Index: Python-2.7.12/Lib/distutils/command/install.py
|
||||
Index: Python-2.7.13/Lib/distutils/command/install.py
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Lib/distutils/command/install.py
|
||||
+++ Python-2.7.12/Lib/distutils/command/install.py
|
||||
--- Python-2.7.13.orig/Lib/distutils/command/install.py
|
||||
+++ Python-2.7.13/Lib/distutils/command/install.py
|
||||
@@ -22,6 +22,8 @@ from site import USER_BASE
|
||||
from site import USER_SITE
|
||||
|
||||
@@ -50,10 +50,10 @@ Index: Python-2.7.12/Lib/distutils/command/install.py
|
||||
'headers': '$base/include/python$py_version_short/$dist_name',
|
||||
'scripts': '$base/bin',
|
||||
'data' : '$base',
|
||||
Index: Python-2.7.12/Lib/distutils/sysconfig.py
|
||||
Index: Python-2.7.13/Lib/distutils/sysconfig.py
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Lib/distutils/sysconfig.py
|
||||
+++ Python-2.7.12/Lib/distutils/sysconfig.py
|
||||
--- Python-2.7.13.orig/Lib/distutils/sysconfig.py
|
||||
+++ Python-2.7.13/Lib/distutils/sysconfig.py
|
||||
@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan
|
||||
prefix = plat_specific and EXEC_PREFIX or PREFIX
|
||||
|
||||
@@ -68,23 +68,23 @@ Index: Python-2.7.12/Lib/distutils/sysconfig.py
|
||||
if standard_lib:
|
||||
return libpython
|
||||
else:
|
||||
Index: Python-2.7.12/Lib/pydoc.py
|
||||
Index: Python-2.7.13/Lib/pydoc.py
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Lib/pydoc.py
|
||||
+++ Python-2.7.12/Lib/pydoc.py
|
||||
@@ -384,7 +384,7 @@ class Doc:
|
||||
--- Python-2.7.13.orig/Lib/pydoc.py
|
||||
+++ Python-2.7.13/Lib/pydoc.py
|
||||
@@ -375,7 +375,7 @@ class Doc:
|
||||
docmodule = docclass = docroutine = docother = docproperty = docdata = fail
|
||||
|
||||
docloc = os.environ.get("PYTHONDOCS",
|
||||
"http://docs.python.org/library")
|
||||
- basedir = os.path.join(sys.exec_prefix, "lib",
|
||||
+ basedir = os.path.join(sys.exec_prefix, sys.lib,
|
||||
"python"+sys.version[0:3])
|
||||
if (isinstance(object, type(os)) and
|
||||
(object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
|
||||
Index: Python-2.7.12/Lib/site.py
|
||||
def getdocloc(self, object,
|
||||
- basedir=os.path.join(sys.exec_prefix, "lib",
|
||||
+ basedir=os.path.join(sys.exec_prefix, "sys.lib",
|
||||
"python"+sys.version[0:3])):
|
||||
"""Return the location of module docs or None"""
|
||||
|
||||
Index: Python-2.7.13/Lib/site.py
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Lib/site.py
|
||||
+++ Python-2.7.12/Lib/site.py
|
||||
--- Python-2.7.13.orig/Lib/site.py
|
||||
+++ Python-2.7.13/Lib/site.py
|
||||
@@ -288,13 +288,18 @@ def getsitepackages():
|
||||
if sys.platform in ('os2emx', 'riscos'):
|
||||
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
|
||||
@@ -104,13 +104,13 @@ Index: Python-2.7.12/Lib/site.py
|
||||
sitepackages.append(prefix)
|
||||
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
|
||||
+ sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
|
||||
if sys.platform == "darwin":
|
||||
# for framework builds *only* we add the standard Apple
|
||||
# locations.
|
||||
Index: Python-2.7.12/Lib/sysconfig.py
|
||||
return sitepackages
|
||||
|
||||
def addsitepackages(known_paths):
|
||||
Index: Python-2.7.13/Lib/sysconfig.py
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Lib/sysconfig.py
|
||||
+++ Python-2.7.12/Lib/sysconfig.py
|
||||
--- Python-2.7.13.orig/Lib/sysconfig.py
|
||||
+++ Python-2.7.13/Lib/sysconfig.py
|
||||
@@ -7,10 +7,10 @@ from os.path import pardir, realpath
|
||||
|
||||
_INSTALL_SCHEMES = {
|
||||
@@ -139,10 +139,10 @@ Index: Python-2.7.12/Lib/sysconfig.py
|
||||
'include': '{userbase}/include/python{py_version_short}',
|
||||
'scripts': '{userbase}/bin',
|
||||
'data' : '{userbase}',
|
||||
Index: Python-2.7.12/Lib/test/test_dl.py
|
||||
Index: Python-2.7.13/Lib/test/test_dl.py
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Lib/test/test_dl.py
|
||||
+++ Python-2.7.12/Lib/test/test_dl.py
|
||||
--- Python-2.7.13.orig/Lib/test/test_dl.py
|
||||
+++ Python-2.7.13/Lib/test/test_dl.py
|
||||
@@ -4,10 +4,11 @@
|
||||
import unittest
|
||||
from test.test_support import verbose, import_module
|
||||
@@ -157,14 +157,14 @@ Index: Python-2.7.12/Lib/test/test_dl.py
|
||||
('/usr/bin/cygwin1.dll', 'getpid'),
|
||||
('/usr/lib/libc.dylib', 'getpid'),
|
||||
]
|
||||
Index: Python-2.7.12/Lib/test/test_site.py
|
||||
Index: Python-2.7.13/Lib/test/test_site.py
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Lib/test/test_site.py
|
||||
+++ Python-2.7.12/Lib/test/test_site.py
|
||||
@@ -246,12 +246,16 @@ class HelperFunctionsTests(unittest.Test
|
||||
self.assertEqual(dirs[2], wanted)
|
||||
--- Python-2.7.13.orig/Lib/test/test_site.py
|
||||
+++ Python-2.7.13/Lib/test/test_site.py
|
||||
@@ -235,12 +235,16 @@ class HelperFunctionsTests(unittest.Test
|
||||
self.assertEqual(dirs[0], wanted)
|
||||
elif os.sep == '/':
|
||||
# OS X non-framwework builds, Linux, FreeBSD, etc
|
||||
# OS X, Linux, FreeBSD, etc
|
||||
- self.assertEqual(len(dirs), 2)
|
||||
wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
|
||||
'site-packages')
|
||||
@@ -181,10 +181,10 @@ Index: Python-2.7.12/Lib/test/test_site.py
|
||||
else:
|
||||
# other platforms
|
||||
self.assertEqual(len(dirs), 2)
|
||||
Index: Python-2.7.12/Lib/trace.py
|
||||
Index: Python-2.7.13/Lib/trace.py
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Lib/trace.py
|
||||
+++ Python-2.7.12/Lib/trace.py
|
||||
--- Python-2.7.13.orig/Lib/trace.py
|
||||
+++ Python-2.7.13/Lib/trace.py
|
||||
@@ -754,10 +754,10 @@ def main(argv=None):
|
||||
# should I also call expanduser? (after all, could use $HOME)
|
||||
|
||||
@@ -198,10 +198,10 @@ Index: Python-2.7.12/Lib/trace.py
|
||||
"python" + sys.version[:3]))
|
||||
s = os.path.normpath(s)
|
||||
ignore_dirs.append(s)
|
||||
Index: Python-2.7.12/Makefile.pre.in
|
||||
Index: Python-2.7.13/Makefile.pre.in
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Makefile.pre.in
|
||||
+++ Python-2.7.12/Makefile.pre.in
|
||||
--- Python-2.7.13.orig/Makefile.pre.in
|
||||
+++ Python-2.7.13/Makefile.pre.in
|
||||
@@ -92,6 +92,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
|
||||
|
||||
# Machine-dependent subdirectories
|
||||
@@ -219,7 +219,7 @@ Index: Python-2.7.12/Makefile.pre.in
|
||||
|
||||
# Detailed destination directories
|
||||
BINLIBDEST= $(LIBDIR)/python$(VERSION)
|
||||
@@ -670,6 +671,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
|
||||
@@ -669,6 +670,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
|
||||
-DEXEC_PREFIX='"$(exec_prefix)"' \
|
||||
-DVERSION='"$(VERSION)"' \
|
||||
-DVPATH='"$(VPATH)"' \
|
||||
@@ -227,7 +227,7 @@ Index: Python-2.7.12/Makefile.pre.in
|
||||
-o $@ $(srcdir)/Modules/getpath.c
|
||||
|
||||
Modules/python.o: $(srcdir)/Modules/python.c
|
||||
@@ -721,7 +723,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
|
||||
@@ -709,7 +711,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
|
||||
Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
|
||||
|
||||
Python/getplatform.o: $(srcdir)/Python/getplatform.c
|
||||
@@ -236,10 +236,10 @@ Index: Python-2.7.12/Makefile.pre.in
|
||||
|
||||
Python/importdl.o: $(srcdir)/Python/importdl.c
|
||||
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
|
||||
Index: Python-2.7.12/Modules/getpath.c
|
||||
Index: Python-2.7.13/Modules/getpath.c
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Modules/getpath.c
|
||||
+++ Python-2.7.12/Modules/getpath.c
|
||||
--- Python-2.7.13.orig/Modules/getpath.c
|
||||
+++ Python-2.7.13/Modules/getpath.c
|
||||
@@ -100,6 +100,13 @@
|
||||
#error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
|
||||
#endif
|
||||
@@ -263,10 +263,10 @@ Index: Python-2.7.12/Modules/getpath.c
|
||||
|
||||
static void
|
||||
reduce(char *dir)
|
||||
Index: Python-2.7.12/Python/getplatform.c
|
||||
Index: Python-2.7.13/Python/getplatform.c
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Python/getplatform.c
|
||||
+++ Python-2.7.12/Python/getplatform.c
|
||||
--- Python-2.7.13.orig/Python/getplatform.c
|
||||
+++ Python-2.7.13/Python/getplatform.c
|
||||
@@ -10,3 +10,13 @@ Py_GetPlatform(void)
|
||||
{
|
||||
return PLATFORM;
|
||||
@@ -281,10 +281,10 @@ Index: Python-2.7.12/Python/getplatform.c
|
||||
+{
|
||||
+ return LIB;
|
||||
+}
|
||||
Index: Python-2.7.12/Python/sysmodule.c
|
||||
Index: Python-2.7.13/Python/sysmodule.c
|
||||
===================================================================
|
||||
--- Python-2.7.12.orig/Python/sysmodule.c
|
||||
+++ Python-2.7.12/Python/sysmodule.c
|
||||
--- Python-2.7.13.orig/Python/sysmodule.c
|
||||
+++ Python-2.7.13/Python/sysmodule.c
|
||||
@@ -1437,6 +1437,8 @@ _PySys_Init(void)
|
||||
PyString_FromString(Py_GetCopyright()));
|
||||
SET_SYS_FROM_STRING("platform",
|
||||
|
||||
Reference in New Issue
Block a user