Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at 2016-07-07 15:08:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python (Old) and /work/SRC/openSUSE:Factory/.python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python" Changes: -------- --- /work/SRC/openSUSE:Factory/python/python-base.changes 2016-02-28 02:26:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python.new/python-base.changes 2016-07-07 15:08:45.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Jun 30 09:23:05 UTC 2016 - [email protected] + +- update to 2.7.12 + * dozens of bugfixes, see NEWS for details + * fixes multiple security issues: + CVE-2016-0772 TLS stripping attack on smtplib (bsc#984751) + CVE-2016-5636 zipimporter heap overflow (bsc#985177) + CVE-2016-5699 httplib header injection (bsc#985348) + (this one is actually fixed since 2.7.10) +- removed upstreamed python-2.7.7-mhlib-linkcount.patch +- refreshed multilib patch +- python-2.7.12-makeopcode.patch - run newly-built python interpreter + to make opcodes, in order not to require pre-built python +- update LD_LIBRARY_PATH to use $PWD instead of "." because the test + process escapes to its own directory +- modify shebang-fixing scriptlet to ignore makeopcodetargets.py + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python/python-doc.changes 2015-06-06 09:49:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python-doc.changes 2016-07-07 15:08:45.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jun 30 09:23:05 UTC 2016 - [email protected] + +- update to 2.7.12 + * dozens of bugfixes, see NEWS for details + * fixes multiple security issues: + CVE-2016-0772 TLS stripping attack on smtplib (bsc#984751) + CVE-2016-5636 zipimporter heap overflow (bsc#985177) + CVE-2016-5699 httplib header injection (bsc#985348) + (this one is actually fixed since 2.7.10) + +------------------------------------------------------------------- python.changes: same change Old: ---- Python-2.7.10.tar.xz Python-2.7.10.tar.xz.asc python-2.7.10-docs-pdf-a4.tar.bz2 python-2.7.10-docs-pdf-letter.tar.bz2 python-2.7.7-mhlib-linkcount.patch New: ---- Python-2.7.12.tar.xz Python-2.7.12.tar.xz.asc python-2.7.12-docs-pdf-a4.tar.bz2 python-2.7.12-docs-pdf-letter.tar.bz2 python-2.7.12-makeopcode.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.lWCRRo/_old 2016-07-07 15:08:47.000000000 +0200 +++ /var/tmp/diff_new_pack.lWCRRo/_new 2016-07-07 15:08:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-base # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-base -Version: 2.7.10 +Version: 2.7.12 Release: 0 Summary: Python Interpreter base package License: Python-2.0 @@ -48,8 +48,6 @@ # PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 Patch22: python-2.7-libffi-aarch64.patch Patch24: python-bsddb6.diff -# PATCH-FIX-OPENSUSE remove link count optimization that breaks mhlib on btrfs (and possibly elsewhere) -Patch31: python-2.7.7-mhlib-linkcount.patch # PATCH-FIX-UPSTREAM accept directory-based CA paths as well Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients @@ -57,6 +55,7 @@ # PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch [email protected] -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 Patch35: python-ncurses-6.0-accessors.patch Patch36: python-2.7.10-overflow_check.patch +Patch37: python-2.7.12-makeopcode.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -144,13 +143,13 @@ %patch20 -p1 %patch22 -p1 %patch24 -p1 -%patch31 -p1 %patch33 -p1 %if %{suse_version} == 1315 && !0%{?is_opensuse} %patch34 -p1 %endif %patch35 -p1 %patch36 +%patch37 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac @@ -180,7 +179,7 @@ %else target=all %endif -LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \ +LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH \ make %{?_smp_mflags} $target %check @@ -226,7 +225,9 @@ %install # replace rest of /usr/local/bin/python or /usr/bin/python2.5 with /usr/bin/python -find . -wholename "./Parser" -prune -o -name '*.py' -type f -print0 | xargs -0 grep -lE '^#! *(/usr/.*bin/(env +)?)?python' | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+\.[0-9]+)?@#!/usr/bin/python@' +find . -name '*.py' -type f | grep -vE "^./Parser/|^./Python/" \ + | xargs grep -lE '^#! *(/usr/.*bin/(env +)?)?python' \ + | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+\.[0-9]+)?@#!/usr/bin/python@' # the grep inbetween makes it much faster ######################################## # install it ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.lWCRRo/_old 2016-07-07 15:08:47.000000000 +0200 +++ /var/tmp/diff_new_pack.lWCRRo/_new 2016-07-07 15:08:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-doc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-doc -Version: 2.7.10 +Version: 2.7.12 Release: 0 Summary: Additional Package Documentation for Python License: Python-2.0 @@ -48,8 +49,6 @@ # PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 Patch22: python-2.7-libffi-aarch64.patch Patch24: python-bsddb6.diff -# PATCH-FIX-OPENSUSE remove link count optimization that breaks mhlib on btrfs (and possibly elsewhere) -Patch31: python-2.7.7-mhlib-linkcount.patch # PATCH-FIX-UPSTREAM accept directory-based CA paths as well Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients @@ -57,6 +56,7 @@ # PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch [email protected] -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 Patch35: python-ncurses-6.0-accessors.patch Patch36: python-2.7.10-overflow_check.patch +Patch37: python-2.7.12-makeopcode.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -98,13 +98,13 @@ %patch20 -p1 %patch22 -p1 %patch24 -p1 -%patch31 -p1 %patch33 -p1 %if %{suse_version} == 1315 && !0%{?is_opensuse} %patch34 -p1 %endif %patch35 -p1 %patch36 +%patch37 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.lWCRRo/_old 2016-07-07 15:08:47.000000000 +0200 +++ /var/tmp/diff_new_pack.lWCRRo/_new 2016-07-07 15:08:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python -Version: 2.7.10 +Version: 2.7.12 Release: 0 Summary: Python Interpreter License: Python-2.0 @@ -53,8 +54,6 @@ # PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 Patch22: python-2.7-libffi-aarch64.patch Patch24: python-bsddb6.diff -# PATCH-FIX-OPENSUSE remove link count optimization that breaks mhlib on btrfs (and possibly elsewhere) -Patch31: python-2.7.7-mhlib-linkcount.patch # PATCH-FIX-UPSTREAM accept directory-based CA paths as well Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients @@ -62,6 +61,7 @@ # PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch [email protected] -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 Patch35: python-ncurses-6.0-accessors.patch Patch36: python-2.7.10-overflow_check.patch +Patch37: python-2.7.12-makeopcode.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -199,13 +199,13 @@ %patch20 -p1 %patch22 -p1 %patch24 -p1 -%patch31 -p1 %patch33 -p1 %if %{suse_version} == 1315 && !0%{?is_opensuse} %patch34 -p1 %endif %patch35 -p1 %patch36 +%patch37 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac @@ -233,7 +233,8 @@ --enable-shared \ --enable-unicode=ucs4 -make %{?_smp_mflags} +LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH \ + make %{?_smp_mflags} %check # on hppa, the threading of glibc is quite broken. The tests just stop @@ -250,7 +251,9 @@ %install # replace rest of /usr/local/bin/python or /usr/bin/python2.x with /usr/bin/python -find . -wholename "./Parser" -prune -o -name '*.py' -type f -print0 | xargs -0 grep -lE '^#! *(/usr/.*bin/(env +)?)?python' | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+\.[0-9]+)?@#!/usr/bin/python@' +find . -name '*.py' -type f | grep -vE "^./Parser/|^./Python/" \ + | xargs grep -lE '^#! *(/usr/.*bin/(env +)?)?python' \ + | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python([0-9]+\.[0-9]+)?@#!/usr/bin/python@' # the grep inbetween makes it much faster ######################################## # install it ++++++ Python-2.7.10.tar.xz -> Python-2.7.12.tar.xz ++++++ /work/SRC/openSUSE:Factory/python/Python-2.7.10.tar.xz /work/SRC/openSUSE:Factory/.python.new/Python-2.7.12.tar.xz differ: char 26, line 1 ++++++ python-2.7.10-docs-pdf-a4.tar.bz2 -> python-2.7.12-docs-pdf-a4.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/python/python-2.7.10-docs-pdf-a4.tar.bz2 /work/SRC/openSUSE:Factory/.python.new/python-2.7.12-docs-pdf-a4.tar.bz2 differ: char 11, line 1 ++++++ python-2.7.10-docs-pdf-letter.tar.bz2 -> python-2.7.12-docs-pdf-letter.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/python/python-2.7.10-docs-pdf-letter.tar.bz2 /work/SRC/openSUSE:Factory/.python.new/python-2.7.12-docs-pdf-letter.tar.bz2 differ: char 11, line 1 ++++++ python-2.7.12-makeopcode.patch ++++++ Index: Python-2.7.12/Makefile.pre.in =================================================================== --- Python-2.7.12.orig/Makefile.pre.in +++ Python-2.7.12/Makefile.pre.in @@ -319,7 +319,7 @@ OPCODETARGETS_H= \ $(srcdir)/Python/opcode_targets.h OPCODETARGETGEN= \ - $(srcdir)/Python/makeopcodetargets.py + ./python $(srcdir)/Python/makeopcodetargets.py OPCODETARGETGEN_FILES= \ $(OPCODETARGETGEN) $(srcdir)/Lib/opcode.py ++++++ python-2.7.5-multilib.patch ++++++ --- /var/tmp/diff_new_pack.lWCRRo/_old 2016-07-07 15:08:47.000000000 +0200 +++ /var/tmp/diff_new_pack.lWCRRo/_new 2016-07-07 15:08:47.000000000 +0200 @@ -1,8 +1,8 @@ -Index: Python-2.7.6/configure.ac +Index: Python-2.7.12/configure.ac =================================================================== ---- Python-2.7.6.orig/configure.ac 2013-11-10 08:36:41.000000000 +0100 -+++ Python-2.7.6/configure.ac 2014-02-11 20:08:16.265571499 +0100 -@@ -733,6 +733,41 @@ +--- Python-2.7.12.orig/configure.ac ++++ Python-2.7.12/configure.ac +@@ -756,6 +756,41 @@ SunOS*) ;; esac @@ -44,11 +44,11 @@ AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) -Index: Python-2.7.6/Include/pythonrun.h +Index: Python-2.7.12/Include/pythonrun.h =================================================================== ---- Python-2.7.6.orig/Include/pythonrun.h 2013-11-10 08:36:39.000000000 +0100 -+++ Python-2.7.6/Include/pythonrun.h 2014-02-11 20:08:16.265571499 +0100 -@@ -108,6 +108,8 @@ +--- Python-2.7.12.orig/Include/pythonrun.h ++++ Python-2.7.12/Include/pythonrun.h +@@ -108,6 +108,8 @@ PyAPI_FUNC(char *) Py_GetPath(void); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); PyAPI_FUNC(const char *) Py_GetPlatform(void); @@ -57,11 +57,11 @@ 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.6/Lib/distutils/command/install.py +Index: Python-2.7.12/Lib/distutils/command/install.py =================================================================== ---- Python-2.7.6.orig/Lib/distutils/command/install.py 2014-02-11 20:08:15.760568524 +0100 -+++ Python-2.7.6/Lib/distutils/command/install.py 2014-02-11 20:08:16.265571499 +0100 -@@ -22,6 +22,8 @@ +--- Python-2.7.12.orig/Lib/distutils/command/install.py ++++ Python-2.7.12/Lib/distutils/command/install.py +@@ -22,6 +22,8 @@ from site import USER_BASE from site import USER_SITE @@ -70,7 +70,7 @@ if sys.version < "2.2": WINDOWS_SCHEME = { 'purelib': '$base', -@@ -42,7 +44,7 @@ +@@ -42,7 +44,7 @@ else: INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', @@ -79,11 +79,11 @@ 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-2.7.6/Lib/distutils/sysconfig.py +Index: Python-2.7.12/Lib/distutils/sysconfig.py =================================================================== ---- Python-2.7.6.orig/Lib/distutils/sysconfig.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/distutils/sysconfig.py 2014-02-11 20:08:16.265571499 +0100 -@@ -119,8 +119,11 @@ +--- Python-2.7.12.orig/Lib/distutils/sysconfig.py ++++ Python-2.7.12/Lib/distutils/sysconfig.py +@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": @@ -97,11 +97,11 @@ if standard_lib: return libpython else: -Index: Python-2.7.6/Lib/pydoc.py +Index: Python-2.7.12/Lib/pydoc.py =================================================================== ---- Python-2.7.6.orig/Lib/pydoc.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/pydoc.py 2014-02-11 20:08:16.266571506 +0100 -@@ -352,7 +352,7 @@ +--- Python-2.7.12.orig/Lib/pydoc.py ++++ Python-2.7.12/Lib/pydoc.py +@@ -384,7 +384,7 @@ class Doc: docloc = os.environ.get("PYTHONDOCS", "http://docs.python.org/library";) @@ -110,11 +110,11 @@ "python"+sys.version[0:3]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-2.7.6/Lib/site.py +Index: Python-2.7.12/Lib/site.py =================================================================== ---- Python-2.7.6.orig/Lib/site.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/site.py 2014-02-11 20:12:51.208189992 +0100 -@@ -231,29 +231,38 @@ +--- Python-2.7.12.orig/Lib/site.py ++++ Python-2.7.12/Lib/site.py +@@ -231,29 +231,38 @@ def getuserbase(): USER_BASE = get_config_var('userbase') return USER_BASE @@ -159,7 +159,7 @@ def addusersitepackages(known_paths): """Add a per user site-package to sys.path -@@ -263,10 +272,12 @@ +@@ -263,10 +272,12 @@ def addusersitepackages(known_paths): """ # get the per user site-package path # this call will also make sure USER_BASE and USER_SITE are set @@ -175,7 +175,7 @@ return known_paths def getsitepackages(): -@@ -288,13 +299,18 @@ +@@ -288,13 +299,18 @@ def getsitepackages(): if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': @@ -197,11 +197,11 @@ if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -Index: Python-2.7.6/Lib/sysconfig.py +Index: Python-2.7.12/Lib/sysconfig.py =================================================================== ---- Python-2.7.6.orig/Lib/sysconfig.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/sysconfig.py 2014-02-11 20:08:16.266571506 +0100 -@@ -7,10 +7,10 @@ +--- Python-2.7.12.orig/Lib/sysconfig.py ++++ Python-2.7.12/Lib/sysconfig.py +@@ -7,10 +7,10 @@ from os.path import pardir, realpath _INSTALL_SCHEMES = { 'posix_prefix': { @@ -215,7 +215,7 @@ 'include': '{base}/include/python{py_version_short}', 'platinclude': '{platbase}/include/python{py_version_short}', 'scripts': '{base}/bin', -@@ -65,10 +65,10 @@ +@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { 'data' : '{userbase}', }, 'posix_user': { @@ -229,11 +229,11 @@ 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data' : '{userbase}', -Index: Python-2.7.6/Lib/test/test_dl.py +Index: Python-2.7.12/Lib/test/test_dl.py =================================================================== ---- Python-2.7.6.orig/Lib/test/test_dl.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/test/test_dl.py 2014-02-11 20:08:16.266571506 +0100 -@@ -5,10 +5,11 @@ +--- Python-2.7.12.orig/Lib/test/test_dl.py ++++ Python-2.7.12/Lib/test/test_dl.py +@@ -4,10 +4,11 @@ import unittest from test.test_support import verbose, import_module dl = import_module('dl', deprecated=True) @@ -247,11 +247,11 @@ ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] -Index: Python-2.7.6/Lib/test/test_site.py +Index: Python-2.7.12/Lib/test/test_site.py =================================================================== ---- Python-2.7.6.orig/Lib/test/test_site.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/test/test_site.py 2014-02-11 20:08:16.266571506 +0100 -@@ -241,12 +241,16 @@ +--- 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) elif os.sep == '/': # OS X non-framwework builds, Linux, FreeBSD, etc @@ -271,11 +271,11 @@ else: # other platforms self.assertEqual(len(dirs), 2) -Index: Python-2.7.6/Lib/trace.py +Index: Python-2.7.12/Lib/trace.py =================================================================== ---- Python-2.7.6.orig/Lib/trace.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/trace.py 2014-02-11 20:08:16.266571506 +0100 -@@ -754,10 +754,10 @@ +--- Python-2.7.12.orig/Lib/trace.py ++++ Python-2.7.12/Lib/trace.py +@@ -754,10 +754,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) s = s.replace("$prefix", @@ -288,11 +288,11 @@ "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-2.7.6/Makefile.pre.in +Index: Python-2.7.12/Makefile.pre.in =================================================================== ---- Python-2.7.6.orig/Makefile.pre.in 2014-02-11 20:08:15.175565077 +0100 -+++ Python-2.7.6/Makefile.pre.in 2014-02-11 20:08:16.267571511 +0100 -@@ -87,6 +87,8 @@ +--- Python-2.7.12.orig/Makefile.pre.in ++++ Python-2.7.12/Makefile.pre.in +@@ -92,6 +92,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -301,7 +301,7 @@ # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -584,6 +586,7 @@ +@@ -669,6 +671,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -309,7 +309,7 @@ -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -626,7 +629,7 @@ +@@ -720,7 +723,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 @@ -318,25 +318,20 @@ Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-2.7.6/Modules/getpath.c +Index: Python-2.7.12/Modules/getpath.c =================================================================== ---- Python-2.7.6.orig/Modules/getpath.c 2013-11-10 08:36:41.000000000 +0100 -+++ Python-2.7.6/Modules/getpath.c 2014-02-11 20:08:16.267571511 +0100 -@@ -116,9 +116,11 @@ - #define EXEC_PREFIX PREFIX +--- Python-2.7.12.orig/Modules/getpath.c ++++ Python-2.7.12/Modules/getpath.c +@@ -100,6 +100,8 @@ + #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" #endif +#define LIB_PYTHON LIB "/python" VERSION + - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ -+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" - #endif - #ifndef LANDMARK -@@ -129,7 +131,7 @@ + #define LANDMARK "os.py" + #endif +@@ -108,7 +110,7 @@ static char prefix[MAXPATHLEN+1]; static char exec_prefix[MAXPATHLEN+1]; static char progpath[MAXPATHLEN+1]; static char *module_search_path = NULL; @@ -345,11 +340,11 @@ static void reduce(char *dir) -Index: Python-2.7.6/Python/getplatform.c +Index: Python-2.7.12/Python/getplatform.c =================================================================== ---- Python-2.7.6.orig/Python/getplatform.c 2013-11-10 08:36:41.000000000 +0100 -+++ Python-2.7.6/Python/getplatform.c 2014-02-11 20:08:16.267571511 +0100 -@@ -10,3 +10,23 @@ +--- Python-2.7.12.orig/Python/getplatform.c ++++ Python-2.7.12/Python/getplatform.c +@@ -10,3 +10,23 @@ Py_GetPlatform(void) { return PLATFORM; } @@ -373,11 +368,11 @@ +{ + return LIB; +} -Index: Python-2.7.6/Python/sysmodule.c +Index: Python-2.7.12/Python/sysmodule.c =================================================================== ---- Python-2.7.6.orig/Python/sysmodule.c 2013-11-10 08:36:41.000000000 +0100 -+++ Python-2.7.6/Python/sysmodule.c 2014-02-11 20:08:16.267571511 +0100 -@@ -1419,6 +1419,10 @@ +--- Python-2.7.12.orig/Python/sysmodule.c ++++ Python-2.7.12/Python/sysmodule.c +@@ -1437,6 +1437,10 @@ _PySys_Init(void) PyString_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyString_FromString(Py_GetPlatform())); @@ -388,11 +383,11 @@ SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); SET_SYS_FROM_STRING("prefix", -Index: Python-2.7.6/setup.py +Index: Python-2.7.12/setup.py =================================================================== ---- Python-2.7.6.orig/setup.py 2013-11-10 08:36:41.000000000 +0100 -+++ Python-2.7.6/setup.py 2014-02-11 20:08:16.268571517 +0100 -@@ -438,7 +438,7 @@ +--- Python-2.7.12.orig/setup.py ++++ Python-2.7.12/setup.py +@@ -456,7 +456,7 @@ class PyBuildExt(build_ext): def detect_modules(self): # Ensure that /usr/local is always used if not cross_compiling: @@ -401,7 +396,7 @@ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') if cross_compiling: self.add_gcc_paths() -@@ -758,11 +758,11 @@ +@@ -782,11 +782,11 @@ class PyBuildExt(build_ext): elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -415,7 +410,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -1910,18 +1910,17 @@ +@@ -1938,18 +1938,17 @@ class PyBuildExt(build_ext): # Check for various platform-specific directories if host_platform == 'sunos5': include_dirs.append('/usr/openwin/include')
