[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.13-mingw.patch python/python-2.7.13-nohardlink.patch python/python-2.7.13-pcbuild.patch python/python-2.7.13-sysbase.patch python/python-2.7.14-mingw.patch python/python-2.7.14-nohardlink.patch python/python-2.7.14-pcbuild.patch python/python-2.7.14-sysbase.patch python/python-freebsd.patch python/python-md5.patch python/python-solaris.patch python/python-solver-before-std.patch python/python-ssl.patch python/pyversion.mk
Pedro Giffuni
pfg at apache.org
Sun Oct 22 02:09:29 UTC 2017
external_deps.lst | 6 -
python/makefile.mk | 2
python/prj/d.lst | 108 +++++++++----------
python/python-2.7.14-mingw.patch | 150 +++++++++++++-------------
python/python-2.7.14-nohardlink.patch | 6 -
python/python-2.7.14-pcbuild.patch | 190 ++++++++++++++++------------------
python/python-2.7.14-sysbase.patch | 8 -
python/python-freebsd.patch | 46 ++++----
python/python-md5.patch | 6 -
python/python-solaris.patch | 4
python/python-solver-before-std.patch | 6 -
python/python-ssl.patch | 12 +-
python/pyversion.mk | 2
13 files changed, 270 insertions(+), 276 deletions(-)
New commits:
commit 0b41270b2ea8ad2b328768b0c4103b83f878d6df
Author: Pedro Giffuni <pfg at apache.org>
Date: Sun Oct 22 00:38:37 2017 +0000
Update Python to version 2.7.14.
Released on 2017-09-16.
ChangeLog available here:
https://raw.githubusercontent.com/python/cpython/84471935ed2f62b8c5758fd544c7d37076fe0fa5/Misc/NEWS
Tested on: FreeBSD
diff --git a/external_deps.lst b/external_deps.lst
index ecd9ae58405e..2703e235c294 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -200,9 +200,9 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES)
- MD5 = 17add4bf0ad0ec2f08e0cae6d205c700
- name = Python-2.7.13.tgz
- URL1 = http://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz
+ MD5 = cee2e4b33ad3750da77b2e85f2f8b724
+ name = Python-2.7.14.tgz
+ URL1 = http://www.python.org/ftp/python/2.7.14/Python-2.7.14.tgz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_BOOST != YES)
diff --git a/python/makefile.mk b/python/makefile.mk
index 22ab60e75c98..14994b5608e5 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=17add4bf0ad0ec2f08e0cae6d205c700
+TARFILE_MD5=cee2e4b33ad3750da77b2e85f2f8b724
PATCH_FILES=\
python-solaris.patch \
python-freebsd.patch \
diff --git a/python/prj/d.lst b/python/prj/d.lst
index b521c1e1c65b..99571b8f2733 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy
mkdir: %_DEST%\lib%_EXT%\python\unittest
mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
-..\%__SRC%\misc\build\Python-2.7.13\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.13\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.13\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
-..\%__SRC%\misc\build\Python-2.7.13\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
-..\%__SRC%\misc\build\Python-2.7.13\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
+..\%__SRC%\misc\build\Python-2.7.14\Lib\* %_DEST%\lib%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.14\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.14\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
+..\%__SRC%\misc\build\Python-2.7.14\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
+..\%__SRC%\misc\build\Python-2.7.14\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
..\%__SRC%\misc\build\python-inst\lib\python2.7\_sysconfigdata.py %_DEST%\lib%_EXT%\python\_sysconfigdata.py
..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk
-..\%__SRC%\misc\build\Python-2.7.13\Include\* %_DEST%\inc%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.14\Include\* %_DEST%\inc%_EXT%\python\*
#unix ONLY !
..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
-..\%__SRC%\misc\build\Python-2.7.13\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
+..\%__SRC%\misc\build\Python-2.7.14\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
..\%__SRC%\misc\build\python-inst\lib\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
..\%__SRC%\misc\build\python-inst\bin\python2.7 %_DEST%\bin%_EXT%\python
..\%__SRC%\misc\build\python-inst\lib\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0
@@ -91,24 +91,24 @@ symlink: %_DEST%\lib%_EXT%\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so
#MingW ONLY !
..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.13\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
+..\%__SRC%\misc\build\Python-2.7.14\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
# WINDOWS ONLY !
..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\python27.dll %_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\python27.lib %_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.13\PC\VS9.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\python.exe %_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\python27.dll %_DEST%\bin%_EXT%\python27.dll
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\python27.lib %_DEST%\lib%_EXT%\python27.lib
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
+..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
#linklib: libpython.so.*.*.*
diff --git a/python/python-2.7.13-mingw.patch b/python/python-2.7.14-mingw.patch
similarity index 76%
rename from python/python-2.7.13-mingw.patch
rename to python/python-2.7.14-mingw.patch
index ee5b1411118e..9f9dc6c14b77 100644
--- a/python/python-2.7.13-mingw.patch
+++ b/python/python-2.7.14-mingw.patch
@@ -1,6 +1,6 @@
-diff -ru misc/Python-2.7.13/Include/pyport.h misc/build/Python-2.7.13/Include/pyport.h
---- misc/Python-2.7.13/Include/pyport.h 2016-06-25 16:49:30.000000000 -0500
-+++ misc/build/Python-2.7.13/Include/pyport.h 2016-09-02 16:42:21.498048000 -0500
+diff -ru misc/Python-2.7.14/Include/pyport.h misc/build/Python-2.7.14/Include/pyport.h
+--- misc/Python-2.7.14/Include/pyport.h 2016-06-25 16:49:30.000000000 -0500
++++ misc/build/Python-2.7.14/Include/pyport.h 2016-09-02 16:42:21.498048000 -0500
@@ -9,6 +9,30 @@
#include <inttypes.h>
#endif
@@ -32,9 +32,9 @@ diff -ru misc/Python-2.7.13/Include/pyport.h misc/build/Python-2.7.13/Include/py
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
-diff -ru misc/Python-2.7.13/Lib/distutils/ccompiler.py misc/build/Python-2.7.13/Lib/distutils/ccompiler.py
---- misc/Python-2.7.13/Lib/distutils/ccompiler.py 2016-06-25 16:49:30.000000000 -0500
-+++ misc/build/Python-2.7.13/Lib/distutils/ccompiler.py 2016-09-02 16:42:21.499097000 -0500
+diff -ru misc/Python-2.7.14/Lib/distutils/ccompiler.py misc/build/Python-2.7.14/Lib/distutils/ccompiler.py
+--- misc/Python-2.7.14/Lib/distutils/ccompiler.py 2016-06-25 16:49:30.000000000 -0500
++++ misc/build/Python-2.7.14/Lib/distutils/ccompiler.py 2016-09-02 16:42:21.499097000 -0500
@@ -896,6 +896,7 @@
# on a cygwin built python we can use gcc like an ordinary UNIXish
# compiler
@@ -43,9 +43,9 @@ diff -ru misc/Python-2.7.13/Lib/distutils/ccompiler.py misc/build/Python-2.7.13/
('os2emx', 'emx'),
# OS name mappings
-diff -ru misc/Python-2.7.13/Lib/distutils/command/build_ext.py misc/build/Python-2.7.13/Lib/distutils/command/build_ext.py
---- misc/Python-2.7.13/Lib/distutils/command/build_ext.py 2016-06-25 16:49:30.000000000 -0500
-+++ misc/build/Python-2.7.13/Lib/distutils/command/build_ext.py 2016-09-02 16:42:21.499914000 -0500
+diff -ru misc/Python-2.7.14/Lib/distutils/command/build_ext.py misc/build/Python-2.7.14/Lib/distutils/command/build_ext.py
+--- misc/Python-2.7.14/Lib/distutils/command/build_ext.py 2016-06-25 16:49:30.000000000 -0500
++++ misc/build/Python-2.7.14/Lib/distutils/command/build_ext.py 2016-09-02 16:42:21.499914000 -0500
@@ -224,7 +224,7 @@
# for extensions under Cygwin and AtheOS Python's library directory must be
@@ -64,9 +64,9 @@ diff -ru misc/Python-2.7.13/Lib/distutils/command/build_ext.py misc/build/Python
template = "python%d.%d"
pythonlib = (template %
(sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-diff -ru misc/Python-2.7.13/Lib/distutils/command/install.py misc/build/Python-2.7.13/Lib/distutils/command/install.py
---- misc/Python-2.7.13/Lib/distutils/command/install.py 2016-06-25 16:49:30.000000000 -0500
-+++ misc/build/Python-2.7.13/Lib/distutils/command/install.py 2016-09-02 16:42:21.500659000 -0500
+diff -ru misc/Python-2.7.14/Lib/distutils/command/install.py misc/build/Python-2.7.14/Lib/distutils/command/install.py
+--- misc/Python-2.7.14/Lib/distutils/command/install.py 2016-06-25 16:49:30.000000000 -0500
++++ misc/build/Python-2.7.14/Lib/distutils/command/install.py 2016-09-02 16:42:21.500659000 -0500
@@ -348,9 +348,10 @@
# Convert directories from Unix /-separated syntax to the local
@@ -102,9 +102,9 @@ diff -ru misc/Python-2.7.13/Lib/distutils/command/install.py misc/build/Python-2
def handle_extra_path (self):
-diff -ru misc/Python-2.7.13/Lib/distutils/spawn.py misc/build/Python-2.7.13/Lib/distutils/spawn.py
---- misc/Python-2.7.13/Lib/distutils/spawn.py 2016-06-25 16:49:30.000000000 -0500
-+++ misc/build/Python-2.7.13/Lib/distutils/spawn.py 2016-09-02 16:42:21.501126000 -0500
+diff -ru misc/Python-2.7.14/Lib/distutils/spawn.py misc/build/Python-2.7.14/Lib/distutils/spawn.py
+--- misc/Python-2.7.14/Lib/distutils/spawn.py 2016-06-25 16:49:30.000000000 -0500
++++ misc/build/Python-2.7.14/Lib/distutils/spawn.py 2016-09-02 16:42:21.501126000 -0500
@@ -212,7 +212,7 @@
paths = path.split(os.pathsep)
base, ext = os.path.splitext(executable)
@@ -114,9 +114,9 @@ diff -ru misc/Python-2.7.13/Lib/distutils/spawn.py misc/build/Python-2.7.13/Lib/
executable = executable + '.exe'
if not os.path.isfile(executable):
-diff -ru misc/Python-2.7.13/Lib/distutils/sysconfig.py misc/build/Python-2.7.13/Lib/distutils/sysconfig.py
---- misc/Python-2.7.13/Lib/distutils/sysconfig.py 2016-06-25 16:49:30.000000000 -0500
-+++ misc/build/Python-2.7.13/Lib/distutils/sysconfig.py 2016-09-02 16:42:21.501681000 -0500
+diff -ru misc/Python-2.7.14/Lib/distutils/sysconfig.py misc/build/Python-2.7.14/Lib/distutils/sysconfig.py
+--- misc/Python-2.7.14/Lib/distutils/sysconfig.py 2016-06-25 16:49:30.000000000 -0500
++++ misc/build/Python-2.7.14/Lib/distutils/sysconfig.py 2016-09-02 16:42:21.501681000 -0500
@@ -450,6 +450,9 @@
global _config_vars
if _config_vars is None:
@@ -127,9 +127,9 @@ diff -ru misc/Python-2.7.13/Lib/distutils/sysconfig.py misc/build/Python-2.7.13/
if func:
func()
else:
-diff -ru misc/Python-2.7.13/Lib/distutils/unixccompiler.py misc/build/Python-2.7.13/Lib/distutils/unixccompiler.py
---- misc/Python-2.7.13/Lib/distutils/unixccompiler.py 2016-06-25 16:49:30.000000000 -0500
-+++ misc/build/Python-2.7.13/Lib/distutils/unixccompiler.py 2016-09-02 16:44:54.962041000 -0500
+diff -ru misc/Python-2.7.14/Lib/distutils/unixccompiler.py misc/build/Python-2.7.14/Lib/distutils/unixccompiler.py
+--- misc/Python-2.7.14/Lib/distutils/unixccompiler.py 2016-06-25 16:49:30.000000000 -0500
++++ misc/build/Python-2.7.14/Lib/distutils/unixccompiler.py 2016-09-02 16:44:54.962041000 -0500
@@ -82,7 +82,7 @@
xcode_stub_lib_extension = ".tbd"
static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
@@ -139,9 +139,9 @@ diff -ru misc/Python-2.7.13/Lib/distutils/unixccompiler.py misc/build/Python-2.7
exe_extension = ".exe"
def preprocess(self, source,
-diff -ru misc/Python-2.7.13/Lib/os.py misc/build/Python-2.7.13/Lib/os.py
---- misc/Python-2.7.13/Lib/os.py 2016-06-25 16:49:31.000000000 -0500
-+++ misc/build/Python-2.7.13/Lib/os.py 2016-09-02 16:42:21.503786000 -0500
+diff -ru misc/Python-2.7.14/Lib/os.py misc/build/Python-2.7.14/Lib/os.py
+--- misc/Python-2.7.14/Lib/os.py 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.14/Lib/os.py 2016-09-02 16:42:21.503786000 -0500
@@ -38,7 +38,21 @@
except AttributeError:
return [n for n in dir(module) if n[0] != '_']
@@ -165,9 +165,9 @@ diff -ru misc/Python-2.7.13/Lib/os.py misc/build/Python-2.7.13/Lib/os.py
name = 'posix'
linesep = '\n'
from posix import *
-diff -ru misc/Python-2.7.13/Lib/socket.py misc/build/Python-2.7.13/Lib/socket.py
---- misc/Python-2.7.13/Lib/socket.py 2016-06-25 16:49:31.000000000 -0500
-+++ misc/build/Python-2.7.13/Lib/socket.py 2016-09-02 16:42:21.504874000 -0500
+diff -ru misc/Python-2.7.14/Lib/socket.py misc/build/Python-2.7.14/Lib/socket.py
+--- misc/Python-2.7.14/Lib/socket.py 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.14/Lib/socket.py 2016-09-02 16:42:21.504874000 -0500
@@ -157,7 +157,7 @@
'sendall', 'setblocking',
'settimeout', 'gettimeout', 'shutdown')
@@ -177,10 +177,10 @@ diff -ru misc/Python-2.7.13/Lib/socket.py misc/build/Python-2.7.13/Lib/socket.py
_socketmethods = _socketmethods + ('ioctl',)
if sys.platform == "riscos":
-diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pre.in
---- misc/Python-2.7.13/Makefile.pre.in 2016-06-25 16:49:31.000000000 -0500
-+++ misc/build/Python-2.7.13/Makefile.pre.in 2016-09-02 16:42:21.506300000 -0500
-@@ -126,6 +126,16 @@
+diff -ru misc/Python-2.7.14/Makefile.pre.in misc/build/Python-2.7.14/Makefile.pre.in
+--- misc/Python-2.7.14/Makefile.pre.in 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.14/Makefile.pre.in 2016-09-02 16:42:21.506300000 -0500
+@@ -125,6 +125,16 @@
BLDSHARED= @BLDSHARED@ $(LDFLAGS)
LDCXXSHARED= @LDCXXSHARED@
DESTSHARED= $(BINLIBDEST)/lib-dynload
@@ -206,7 +206,7 @@ diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pr
Modules/main.o \
Modules/gcmodule.o
-@@ -670,6 +680,10 @@
+@@ -646,6 +656,10 @@
-DVPATH='"$(VPATH)"' \
-o $@ $(srcdir)/Modules/getpath.c
@@ -217,7 +217,7 @@ diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pr
Modules/python.o: $(srcdir)/Modules/python.c
$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
-@@ -716,6 +730,12 @@
+@@ -700,6 +714,12 @@
Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
$(srcdir)/Objects/unicodetype_db.h
@@ -230,7 +230,7 @@ diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pr
STRINGLIB_HEADERS= \
$(srcdir)/Include/bytes_methods.h \
$(srcdir)/Objects/stringlib/count.h \
-@@ -935,7 +955,11 @@
+@@ -928,7 +948,11 @@
# Install shared libraries enabled by Setup
DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
@@ -242,7 +242,7 @@ diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pr
@for i in X $(SHAREDMODS); do \
if test $$i != X; then \
echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
-@@ -943,7 +967,11 @@
+@@ -936,7 +960,11 @@
fi; \
done
@@ -254,7 +254,7 @@ diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pr
@for i in $(DESTDIRS); \
do \
if test ! -d $(DESTDIR)$$i; then \
-@@ -1060,7 +1088,11 @@
+@@ -1054,7 +1082,11 @@
unittest unittest/test \
lib-old \
curses pydoc_data $(MACHDEPS)
@@ -266,7 +266,7 @@ diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pr
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
if test ! -d $(DESTDIR)$$i; then \
-@@ -1120,6 +1152,26 @@
+@@ -1114,6 +1082,26 @@
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
@@ -293,7 +293,7 @@ diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pr
PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST) -f \
-@@ -1146,6 +1198,7 @@
+@@ -1140,6 +1190,7 @@
# Create the PLATDIR source directory, if one wasn't distributed..
$(srcdir)/Lib/$(PLATDIR):
mkdir $(srcdir)/Lib/$(PLATDIR)
@@ -301,7 +301,7 @@ diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pr
cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
export PATH; PATH="`pwd`:$$PATH"; \
export PYTHONPATH; PYTHONPATH="$(srcdir)/Lib:$(abs_builddir)/`cat pybuilddir.txt`"; \
-@@ -1159,6 +1213,7 @@
+@@ -1153,6 +1207,7 @@
PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \
fi; \
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
@@ -309,7 +309,7 @@ diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pr
python-config: $(srcdir)/Misc/python-config.in
# Substitution happens here, as the completely-expanded BINDIR
-@@ -1252,6 +1306,15 @@
+@@ -1246,6 +1300,15 @@
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
@@ -325,7 +325,7 @@ diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pr
sharedinstall: sharedmods
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
--prefix=$(prefix) \
-@@ -1259,6 +1322,7 @@
+@@ -1253,6 +1316,7 @@
--install-platlib=$(DESTSHARED) \
--root=$(DESTDIR)/
-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py*
@@ -333,9 +333,9 @@ diff -ru misc/Python-2.7.13/Makefile.pre.in misc/build/Python-2.7.13/Makefile.pr
# Here are a couple of targets for MacOSX again, to install a full
# framework-based Python. frameworkinstall installs everything, the
-diff -ru misc/Python-2.7.13/Modules/Setup.config.in misc/build/Python-2.7.13/Modules/Setup.config.in
---- misc/Python-2.7.13/Modules/Setup.config.in 2016-06-25 16:49:31.000000000 -0500
-+++ misc/build/Python-2.7.13/Modules/Setup.config.in 2016-09-02 16:42:21.507091000 -0500
+diff -ru misc/Python-2.7.14/Modules/Setup.config.in misc/build/Python-2.7.14/Modules/Setup.config.in
+--- misc/Python-2.7.14/Modules/Setup.config.in 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.14/Modules/Setup.config.in 2016-09-02 16:42:21.507091000 -0500
@@ -9,5 +9,9 @@
# The signal module
@USE_SIGNAL_MODULE at signal signalmodule.c
@@ -346,9 +346,9 @@ diff -ru misc/Python-2.7.13/Modules/Setup.config.in misc/build/Python-2.7.13/Mod
+
# The rest of the modules previously listed in this file are built
# by the setup.py script in Python 2.1 and later.
-diff -ru misc/Python-2.7.13/Modules/Setup.dist misc/build/Python-2.7.13/Modules/Setup.dist
---- misc/Python-2.7.13/Modules/Setup.dist 2016-06-25 16:49:31.000000000 -0500
-+++ misc/build/Python-2.7.13/Modules/Setup.dist 2016-09-02 16:42:21.507936000 -0500
+diff -ru misc/Python-2.7.14/Modules/Setup.dist misc/build/Python-2.7.14/Modules/Setup.dist
+--- misc/Python-2.7.14/Modules/Setup.dist 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.14/Modules/Setup.dist 2016-09-02 16:42:21.507936000 -0500
@@ -114,7 +114,7 @@
posix posixmodule.c # posix (UNIX) system calls
@@ -358,9 +358,9 @@ diff -ru misc/Python-2.7.13/Modules/Setup.dist misc/build/Python-2.7.13/Modules/
# if $HOME is not set
_sre _sre.c # Fredrik Lundh's new regular expressions
_codecs _codecsmodule.c # access to the builtin codecs and codec registry
-diff -ru misc/Python-2.7.13/Modules/_ctypes/libffi/configure misc/build/Python-2.7.13/Modules/_ctypes/libffi/configure
---- misc/Python-2.7.13/Modules/_ctypes/libffi/configure 2016-06-25 16:49:31.000000000 -0500
-+++ misc/build/Python-2.7.13/Modules/_ctypes/libffi/configure 2016-09-02 16:42:21.516830000 -0500
+diff -ru misc/Python-2.7.14/Modules/_ctypes/libffi/configure misc/build/Python-2.7.14/Modules/_ctypes/libffi/configure
+--- misc/Python-2.7.14/Modules/_ctypes/libffi/configure 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.14/Modules/_ctypes/libffi/configure 2016-09-02 16:42:21.516830000 -0500
@@ -18807,6 +18807,12 @@
fi
@@ -374,9 +374,9 @@ diff -ru misc/Python-2.7.13/Modules/_ctypes/libffi/configure misc/build/Python-2
ac_config_commands="$ac_config_commands include"
ac_config_commands="$ac_config_commands src"
-diff -ru misc/Python-2.7.13/Modules/_ctypes/libffi/configure.ac misc/build/Python-2.7.13/Modules/_ctypes/libffi/configure.ac
---- misc/Python-2.7.13/Modules/_ctypes/libffi/configure.ac 2016-06-25 16:49:31.000000000 -0500
-+++ misc/build/Python-2.7.13/Modules/_ctypes/libffi/configure.ac 2016-09-02 16:42:21.517727000 -0500
+diff -ru misc/Python-2.7.14/Modules/_ctypes/libffi/configure.ac misc/build/Python-2.7.14/Modules/_ctypes/libffi/configure.ac
+--- misc/Python-2.7.14/Modules/_ctypes/libffi/configure.ac 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.14/Modules/_ctypes/libffi/configure.ac 2016-09-02 16:42:21.517727000 -0500
@@ -613,6 +613,12 @@
fi
AC_SUBST(toolexeclibdir)
@@ -390,9 +390,9 @@ diff -ru misc/Python-2.7.13/Modules/_ctypes/libffi/configure.ac misc/build/Pytho
AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])
AC_CONFIG_COMMANDS(src, [
test -d src || mkdir src
-diff -ru misc/Python-2.7.13/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Python-2.7.13/Modules/_ctypes/libffi/include/ffi.h.in
---- misc/Python-2.7.13/Modules/_ctypes/libffi/include/ffi.h.in 2016-06-25 16:49:31.000000000 -0500
-+++ misc/build/Python-2.7.13/Modules/_ctypes/libffi/include/ffi.h.in 2016-09-02 16:42:21.518314000 -0500
+diff -ru misc/Python-2.7.14/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Python-2.7.14/Modules/_ctypes/libffi/include/ffi.h.in
+--- misc/Python-2.7.14/Modules/_ctypes/libffi/include/ffi.h.in 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.14/Modules/_ctypes/libffi/include/ffi.h.in 2016-09-02 16:42:21.518314000 -0500
@@ -433,7 +433,11 @@
ffi_type *rtype,
ffi_type **atypes);
@@ -405,9 +405,9 @@ diff -ru misc/Python-2.7.13/Modules/_ctypes/libffi/include/ffi.h.in misc/build/P
void (*fn)(void),
void *rvalue,
void **avalue);
-diff -ru misc/Python-2.7.13/Modules/config.c.in misc/build/Python-2.7.13/Modules/config.c.in
---- misc/Python-2.7.13/Modules/config.c.in 2016-06-25 16:49:31.000000000 -0500
-+++ misc/build/Python-2.7.13/Modules/config.c.in 2016-09-02 16:42:21.518926000 -0500
+diff -ru misc/Python-2.7.14/Modules/config.c.in misc/build/Python-2.7.14/Modules/config.c.in
+--- misc/Python-2.7.14/Modules/config.c.in 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.14/Modules/config.c.in 2016-09-02 16:42:21.518926000 -0500
@@ -48,6 +48,9 @@
{"__builtin__", NULL},
{"sys", NULL},
@@ -418,9 +418,9 @@ diff -ru misc/Python-2.7.13/Modules/config.c.in misc/build/Python-2.7.13/Modules
/* This lives in gcmodule.c */
{"gc", initgc},
-diff -ru misc/Python-2.7.13/Modules/posixmodule.c misc/build/Python-2.7.13/Modules/posixmodule.c
---- misc/Python-2.7.13/Modules/posixmodule.c 2016-06-25 16:49:31.000000000 -0500
-+++ misc/build/Python-2.7.13/Modules/posixmodule.c 2016-09-02 16:42:21.523456000 -0500
+diff -ru misc/Python-2.7.14/Modules/posixmodule.c misc/build/Python-2.7.14/Modules/posixmodule.c
+--- misc/Python-2.7.14/Modules/posixmodule.c 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.14/Modules/posixmodule.c 2016-09-02 16:42:21.523456000 -0500
@@ -132,6 +132,15 @@
#define HAVE_FSYNC 1
#define fsync _commit
@@ -487,9 +487,9 @@ diff -ru misc/Python-2.7.13/Modules/posixmodule.c misc/build/Python-2.7.13/Modul
/* IsUNCRoot -- test whether the supplied path is of the form \\SERVER\SHARE\,
where / can be used in place of \ and the trailing slash is optional.
-diff -ru misc/Python-2.7.13/Modules/socketmodule.c misc/build/Python-2.7.13/Modules/socketmodule.c
---- misc/Python-2.7.13/Modules/socketmodule.c 2016-06-25 16:49:31.000000000 -0500
-+++ misc/build/Python-2.7.13/Modules/socketmodule.c 2016-09-02 16:42:21.526595000 -0500
+diff -ru misc/Python-2.7.14/Modules/socketmodule.c misc/build/Python-2.7.14/Modules/socketmodule.c
+--- misc/Python-2.7.14/Modules/socketmodule.c 2016-06-25 16:49:31.000000000 -0500
++++ misc/build/Python-2.7.14/Modules/socketmodule.c 2016-09-02 16:42:21.526595000 -0500
@@ -341,7 +341,7 @@
/* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
* EAI_* constants are defined in (the already included) ws2tcpip.h.
@@ -499,9 +499,9 @@ diff -ru misc/Python-2.7.13/Modules/socketmodule.c misc/build/Python-2.7.13/Modu
# include "addrinfo.h"
#endif
-diff -ru misc/Python-2.7.13/PC/_winreg.c misc/build/Python-2.7.13/PC/_winreg.c
---- misc/Python-2.7.13/PC/_winreg.c 2016-06-25 16:49:32.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/_winreg.c 2016-09-02 16:42:21.528227000 -0500
+diff -ru misc/Python-2.7.14/PC/_winreg.c misc/build/Python-2.7.14/PC/_winreg.c
+--- misc/Python-2.7.14/PC/_winreg.c 2016-06-25 16:49:32.000000000 -0500
++++ misc/build/Python-2.7.14/PC/_winreg.c 2016-09-02 16:42:21.528227000 -0500
@@ -1792,6 +1792,9 @@
}
@@ -512,9 +512,9 @@ diff -ru misc/Python-2.7.13/PC/_winreg.c misc/build/Python-2.7.13/PC/_winreg.c
PyMODINIT_FUNC init_winreg(void)
{
-diff -ru misc/Python-2.7.13/Python/dynload_win.c misc/build/Python-2.7.13/Python/dynload_win.c
---- misc/Python-2.7.13/Python/dynload_win.c 2016-06-25 16:49:32.000000000 -0500
-+++ misc/build/Python-2.7.13/Python/dynload_win.c 2016-09-02 16:42:21.528984000 -0500
+diff -ru misc/Python-2.7.14/Python/dynload_win.c misc/build/Python-2.7.14/Python/dynload_win.c
+--- misc/Python-2.7.14/Python/dynload_win.c 2016-06-25 16:49:32.000000000 -0500
++++ misc/build/Python-2.7.14/Python/dynload_win.c 2016-09-02 16:42:21.528984000 -0500
@@ -28,6 +28,7 @@
/* Case insensitive string compare, to avoid any dependencies on particular
C RTL implementations */
@@ -531,9 +531,9 @@ diff -ru misc/Python-2.7.13/Python/dynload_win.c misc/build/Python-2.7.13/Python
/* Function to return the name of the "python" DLL that the supplied module
-diff -ru misc/Python-2.7.13/Python/frozenmain.c misc/build/Python-2.7.13/Python/frozenmain.c
---- misc/Python-2.7.13/Python/frozenmain.c 2016-06-25 16:49:32.000000000 -0500
-+++ misc/build/Python-2.7.13/Python/frozenmain.c 2016-09-02 16:46:11.594746000 -0500
+diff -ru misc/Python-2.7.14/Python/frozenmain.c misc/build/Python-2.7.14/Python/frozenmain.c
+--- misc/Python-2.7.14/Python/frozenmain.c 2016-06-25 16:49:32.000000000 -0500
++++ misc/build/Python-2.7.14/Python/frozenmain.c 2016-09-02 16:46:11.594746000 -0500
@@ -3,7 +3,7 @@
#include "Python.h"
@@ -568,4 +568,4 @@ diff -ru misc/Python-2.7.13/Python/frozenmain.c misc/build/Python-2.7.13/Python/
PyWinFreeze_ExeTerm();
#endif
Py_Finalize();
-Only in misc/build/Python-2.7.13/Python: frozenmain.c.rej
+Only in misc/build/Python-2.7.14/Python: frozenmain.c.rej
diff --git a/python/python-2.7.13-nohardlink.patch b/python/python-2.7.14-nohardlink.patch
similarity index 73%
rename from python/python-2.7.13-nohardlink.patch
rename to python/python-2.7.14-nohardlink.patch
index 181c420173c8..115f32ad8e42 100644
--- a/python/python-2.7.13-nohardlink.patch
+++ b/python/python-2.7.14-nohardlink.patch
@@ -1,6 +1,6 @@
---- misc/Python-2.7.13/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.13/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
-@@ -562,7 +562,7 @@
+--- misc/Python-2.7.14/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.14/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
+@@ -533,7 +533,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
diff --git a/python/python-2.7.13-pcbuild.patch b/python/python-2.7.14-pcbuild.patch
similarity index 82%
rename from python/python-2.7.13-pcbuild.patch
rename to python/python-2.7.14-pcbuild.patch
index 2604d3c6074c..150673fb4c54 100644
--- a/python/python-2.7.13-pcbuild.patch
+++ b/python/python-2.7.14-pcbuild.patch
@@ -1,6 +1,6 @@
-diff -u misc/Python-2.7.13/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.13/PC/VS9.0/_bsddb.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.14/PC/VS9.0/_bsddb.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_bsddb.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_bsddb.vcproj 2017-10-21 17:56:40.218589000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -65,9 +65,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.13/PC/VS
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-diff -u misc/Python-2.7.13/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.13/PC/VS9.0/_ctypes.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.14/PC/VS9.0/_ctypes.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_ctypes.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_ctypes.vcproj 2017-10-21 17:56:40.219465000 -0500
@@ -177,7 +177,7 @@
/>
<Tool
@@ -122,9 +122,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.13/PC/V
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-diff -u misc/Python-2.7.13/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.13/PC/VS9.0/_ctypes_test.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.14/PC/VS9.0/_ctypes_test.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_ctypes_test.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_ctypes_test.vcproj 2017-10-21 17:56:40.220226000 -0500
@@ -54,6 +54,7 @@
/>
<Tool
@@ -189,9 +189,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.13
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.13/PC/VS9.0/_elementtree.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.14/PC/VS9.0/_elementtree.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_elementtree.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_elementtree.vcproj 2017-10-21 17:56:40.221003000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -256,9 +256,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.13
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.13/PC/VS9.0/_hashlib.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.14/PC/VS9.0/_hashlib.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_hashlib.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_hashlib.vcproj 2017-10-21 17:56:40.222221000 -0500
@@ -58,6 +58,7 @@
<Tool
Name="VCLinkerTool"
@@ -323,9 +323,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.13/PC/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.13/PC/VS9.0/_msi.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.14/PC/VS9.0/_msi.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_msi.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_msi.vcproj 2017-10-21 17:56:40.223291000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
@@ -390,9 +390,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.13/PC/VS9.
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.7.13/PC/VS9.0/_multiprocessing.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.7.14/PC/VS9.0/_multiprocessing.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_multiprocessing.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_multiprocessing.vcproj 2017-10-21 17:56:40.224316000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -457,9 +457,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.13/PC/VS9.0/_socket.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.14/PC/VS9.0/_socket.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_socket.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_socket.vcproj 2017-10-21 17:56:40.225407000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
@@ -524,9 +524,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.13/PC/V
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.13/PC/VS9.0/_sqlite3.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.14/PC/VS9.0/_sqlite3.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_sqlite3.vcproj 2017-10-21 17:56:40.226403000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -591,14 +591,14 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.13/PC/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.13/PC/VS9.0/_ssl.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_ssl.vcproj 2014-12-10 07:59:58.000000000 -0800
-+++ misc/build/Python-2.7.13/PC/VS9.0/_ssl.vcproj 2016-09-02 03:56:17.659101000 -0700
+diff -urp misc/Python-2.7.14/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.14/PC/VS9.0/_ssl.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_ssl.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_ssl.vcproj 2017-10-21 17:56:40.227504000 -0500
@@ -43,7 +43,7 @@
/>
<Tool
Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+- AdditionalIncludeDirectories="$(opensslDir)\include32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
@@ -617,7 +617,7 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.13/PC/VS9.
/>
<Tool
Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+- AdditionalIncludeDirectories="$(opensslDir)\include64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
@@ -636,7 +636,7 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.13/PC/VS9.
/>
<Tool
Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+- AdditionalIncludeDirectories="$(opensslDir)\include32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
@@ -655,7 +655,7 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.13/PC/VS9.
/>
<Tool
Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+- AdditionalIncludeDirectories="$(opensslDir)\include64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
@@ -674,7 +674,7 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.13/PC/VS9.
/>
<Tool
Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+- AdditionalIncludeDirectories="$(opensslDir)\include32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
@@ -689,9 +689,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.13/PC/VS9.
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.13/PC/VS9.0/_testcapi.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.14/PC/VS9.0/_testcapi.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_testcapi.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_testcapi.vcproj 2017-10-21 17:56:40.228516000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -756,9 +756,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.13/PC
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.13/PC/VS9.0/_tkinter.vcproj
---- misc/Python-2.7.13/PC/VS9.0/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.14/PC/VS9.0/_tkinter.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/_tkinter.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/_tkinter.vcproj 2017-10-21 17:56:40.229664000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -823,12 +823,12 @@ diff -u misc/Python-2.7.13/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.13/PC/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.13/PC/VS9.0/bdist_wininst.vcproj
---- misc/Python-2.7.13/PC/VS9.0/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.14/PC/VS9.0/bdist_wininst.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/bdist_wininst.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/bdist_wininst.vcproj 2017-10-21 17:56:40.230806000 -0500
@@ -81,8 +81,7 @@
IgnoreDefaultLibraryNames="LIBC"
- ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
+ ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0.pdb"
SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
@@ -838,7 +838,7 @@ diff -u misc/Python-2.7.13/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.1
<Tool
@@ -171,8 +170,7 @@
IgnoreDefaultLibraryNames="LIBC"
- ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0-amd64.pdb"
+ ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0-amd64.pdb"
SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
@@ -846,9 +846,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.1
TargetMachine="17"
/>
<Tool
-diff -u misc/Python-2.7.13/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.13/PC/VS9.0/bz2.vcproj
---- misc/Python-2.7.13/PC/VS9.0/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.14/PC/VS9.0/bz2.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/bz2.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/bz2.vcproj 2017-10-21 17:56:40.232092000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -913,9 +913,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.13/PC/VS9.0
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.13/PC/VS9.0/kill_python.vcproj
---- misc/Python-2.7.13/PC/VS9.0/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.14/PC/VS9.0/kill_python.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/kill_python.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/kill_python.vcproj 2017-10-21 17:56:40.233109000 -0500
@@ -56,6 +56,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
@@ -948,9 +948,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.13/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.13/PC/VS9.0/make_buildinfo.vcproj
---- misc/Python-2.7.13/PC/VS9.0/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2017-10-21 17:56:40.233689000 -0500
@@ -61,6 +61,7 @@
OutputFile="$(OutDir)/make_buildinfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
@@ -967,9 +967,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.7.13/PC/VS9.0/make_versioninfo.vcproj
---- misc/Python-2.7.13/PC/VS9.0/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj 2017-10-21 17:56:40.234324000 -0500
@@ -71,6 +71,7 @@
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -1002,10 +1002,10 @@ diff -u misc/Python-2.7.13/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.13/PC/VS9.0/pcbuild.sln
---- misc/Python-2.7.13/PC/VS9.0/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500
-@@ -38,12 +38,12 @@
+diff -urp misc/Python-2.7.14/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.14/PC/VS9.0/pcbuild.sln
+--- misc/Python-2.7.14/PC/VS9.0/pcbuild.sln 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/pcbuild.sln 2017-10-21 17:56:40.235608000 -0500
+@@ -38,12 +38,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
@@ -1024,7 +1024,7 @@ diff -u misc/Python-2.7.13/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.13/PC/VS9.
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -69,12 +69,12 @@
+@@ -69,12 +69,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
@@ -1043,7 +1043,7 @@ diff -u misc/Python-2.7.13/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.13/PC/VS9.
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
ProjectSection(ProjectDependencies) = postProject
{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-@@ -87,16 +87,16 @@
+@@ -87,16 +87,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
@@ -1070,7 +1070,7 @@ diff -u misc/Python-2.7.13/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.13/PC/VS9.
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -114,17 +114,17 @@
+@@ -114,17 +114,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
EndProject
@@ -1099,9 +1099,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.13/PC/VS9.
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-diff -u misc/Python-2.7.13/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.13/PC/VS9.0/pyexpat.vcproj
---- misc/Python-2.7.13/PC/VS9.0/pyexpat.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/pyexpat.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.14/PC/VS9.0/pyexpat.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/pyexpat.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/pyexpat.vcproj 2017-10-21 17:56:40.236395000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -1166,9 +1166,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.13/PC/V
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/python.vcproj misc/build/Python-2.7.13/PC/VS9.0/python.vcproj
---- misc/Python-2.7.13/PC/VS9.0/python.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/python.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/python.vcproj misc/build/Python-2.7.14/PC/VS9.0/python.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/python.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/python.vcproj 2017-10-21 17:56:40.237211000 -0500
@@ -66,6 +66,7 @@
SubSystem="1"
StackReserveSize="2000000"
@@ -1233,9 +1233,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/python.vcproj misc/build/Python-2.7.13/PC/VS
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.13/PC/VS9.0/pythoncore.vcproj
---- misc/Python-2.7.13/PC/VS9.0/pythoncore.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/pythoncore.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.14/PC/VS9.0/pythoncore.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/pythoncore.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/pythoncore.vcproj 2017-10-21 17:56:40.238551000 -0500
@@ -69,6 +69,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
@@ -1300,15 +1300,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.13/P
/>
<Tool
Name="VCALinkTool"
-@@ -1886,4 +1894,4 @@
- </Files>
- <Globals>
- </Globals>
--</VisualStudioProject>
-+</VisualStudioProject>
-diff -u misc/Python-2.7.13/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.13/PC/VS9.0/pythonw.vcproj
---- misc/Python-2.7.13/PC/VS9.0/pythonw.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/pythonw.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.14/PC/VS9.0/pythonw.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/pythonw.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/pythonw.vcproj 2017-10-21 17:56:40.239382000 -0500
@@ -66,6 +66,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1373,9 +1367,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.13/PC/V
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/select.vcproj misc/build/Python-2.7.13/PC/VS9.0/select.vcproj
---- misc/Python-2.7.13/PC/VS9.0/select.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/select.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/select.vcproj misc/build/Python-2.7.14/PC/VS9.0/select.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/select.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/select.vcproj 2017-10-21 17:56:40.240210000 -0500
@@ -57,6 +57,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
@@ -1440,9 +1434,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/select.vcproj misc/build/Python-2.7.13/PC/VS
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.13/PC/VS9.0/sqlite3.vcproj
---- misc/Python-2.7.13/PC/VS9.0/sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.14/PC/VS9.0/sqlite3.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/sqlite3.vcproj 2017-10-21 17:56:40.241775000 -0500
@@ -56,6 +56,7 @@
<Tool
Name="VCLinkerTool"
@@ -1507,9 +1501,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.13/PC/V
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.13/PC/VS9.0/unicodedata.vcproj
---- misc/Python-2.7.13/PC/VS9.0/unicodedata.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/unicodedata.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.14/PC/VS9.0/unicodedata.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/unicodedata.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/unicodedata.vcproj 2017-10-21 17:56:40.242820000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -1574,9 +1568,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.13/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.13/PC/VS9.0/w9xpopen.vcproj
---- misc/Python-2.7.13/PC/VS9.0/w9xpopen.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/w9xpopen.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.14/PC/VS9.0/w9xpopen.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/w9xpopen.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/w9xpopen.vcproj 2017-10-21 17:56:40.243805000 -0500
@@ -59,6 +59,7 @@
<Tool
Name="VCLinkerTool"
@@ -1641,9 +1635,9 @@ diff -u misc/Python-2.7.13/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.13/PC/
/>
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.13/PC/VS9.0/winsound.vcproj misc/build/Python-2.7.13/PC/VS9.0/winsound.vcproj
---- misc/Python-2.7.13/PC/VS9.0/winsound.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/winsound.vcproj 2012-07-30 20:59:37.000000000 -0500
+diff -urp misc/Python-2.7.14/PC/VS9.0/winsound.vcproj misc/build/Python-2.7.14/PC/VS9.0/winsound.vcproj
+--- misc/Python-2.7.14/PC/VS9.0/winsound.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/winsound.vcproj 2017-10-21 17:56:40.244677000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
diff --git a/python/python-2.7.13-sysbase.patch b/python/python-2.7.14-sysbase.patch
similarity index 62%
rename from python/python-2.7.13-sysbase.patch
rename to python/python-2.7.14-sysbase.patch
index 1f62ea880705..08fff43a6a5a 100644
--- a/python/python-2.7.13-sysbase.patch
+++ b/python/python-2.7.14-sysbase.patch
@@ -1,7 +1,7 @@
-diff -ruN misc/Python-2.7.13/configure misc/build/Python-2.7.13/configure
---- misc/Python-2.7.13/configure 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.13/configure 2016-01-01 15:18:37.398344671 -0500
-@@ -3253,7 +3253,9 @@
+diff -ruN misc/Python-2.7.14/configure misc/build/Python-2.7.14/configure
+--- misc/Python-2.7.14/configure 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.14/configure 2016-01-01 15:18:37.398344671 -0500
+@@ -3281,7 +3281,9 @@
ac_sys_release=
else
ac_sys_system=`uname -s`
diff --git a/python/python-freebsd.patch b/python/python-freebsd.patch
index 90b37e525c1c..45d0d460101f 100644
--- a/python/python-freebsd.patch
+++ b/python/python-freebsd.patch
@@ -1,6 +1,6 @@
-diff -ruN misc/Python-2.7.13/Lib/plat-freebsd9/IN.py misc/build/Python-2.7.13/Lib/plat-freebsd9/IN.py
---- misc/Python-2.7.13/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
-+++ misc/build/Python-2.7.13/Lib/plat-freebsd9/IN.py 2016-01-01 17:38:35.922764464 -0500
+diff -ruN misc/Python-2.7.14/Lib/plat-freebsd9/IN.py misc/build/Python-2.7.14/Lib/plat-freebsd9/IN.py
+--- misc/Python-2.7.14/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.14/Lib/plat-freebsd9/IN.py 2016-01-01 17:38:35.922764464 -0500
@@ -0,0 +1,612 @@
+# Generated by h2py from /usr/include/netinet/in.h
+
@@ -614,16 +614,16 @@ diff -ruN misc/Python-2.7.13/Lib/plat-freebsd9/IN.py misc/build/Python-2.7.13/Li
+IPV6CTL_NORBIT_RAIF = 49
+IPV6CTL_RFC6204W3 = 50
+IPV6CTL_MAXID = 51
-diff -ruN misc/Python-2.7.13/Lib/plat-freebsd9/regen misc/build/Python-2.7.13/Lib/plat-freebsd9/regen
---- misc/Python-2.7.13/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
-+++ misc/build/Python-2.7.13/Lib/plat-freebsd9/regen 2016-01-01 17:38:35.922764464 -0500
+diff -ruN misc/Python-2.7.14/Lib/plat-freebsd9/regen misc/build/Python-2.7.14/Lib/plat-freebsd9/regen
+--- misc/Python-2.7.14/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.14/Lib/plat-freebsd9/regen 2016-01-01 17:38:35.922764464 -0500
@@ -0,0 +1,3 @@
+#! /bin/sh
+set -v
+python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
-diff -ruN misc/Python-2.7.13/Lib/test/test_threading.py misc/build/Python-2.7.13/Lib/test/test_threading.py
---- misc/Python-2.7.13/Lib/test/test_threading.py 2014-06-29 21:05:37.000000000 -0500
-+++ misc/build/Python-2.7.13/Lib/test/test_threading.py 2016-01-01 17:38:35.923764731 -0500
+diff -ruN misc/Python-2.7.14/Lib/test/test_threading.py misc/build/Python-2.7.14/Lib/test/test_threading.py
+--- misc/Python-2.7.14/Lib/test/test_threading.py 2014-06-29 21:05:37.000000000 -0500
++++ misc/build/Python-2.7.14/Lib/test/test_threading.py 2016-01-01 17:38:35.923764731 -0500
@@ -486,7 +486,7 @@
# #12316 and #11870), and fork() from a worker thread is known to trigger
# problems with some operating systems (issue #3863): skip problematic tests
@@ -633,9 +633,9 @@ diff -ruN misc/Python-2.7.13/Lib/test/test_threading.py misc/build/Python-2.7.13
'os2emx')
def _run_and_join(self, script):
-diff -ruN misc/Python-2.7.13/Modules/fcntlmodule.c misc/build/Python-2.7.13/Modules/fcntlmodule.c
---- misc/Python-2.7.13/Modules/fcntlmodule.c 2014-06-29 21:05:43.000000000 -0500
-+++ misc/build/Python-2.7.13/Modules/fcntlmodule.c 2016-01-01 17:42:35.865747022 -0500
+diff -ruN misc/Python-2.7.14/Modules/fcntlmodule.c misc/build/Python-2.7.14/Modules/fcntlmodule.c
+--- misc/Python-2.7.14/Modules/fcntlmodule.c 2014-06-29 21:05:43.000000000 -0500
++++ misc/build/Python-2.7.14/Modules/fcntlmodule.c 2016-01-01 17:42:35.865747022 -0500
@@ -98,20 +98,15 @@
{
#define IOCTL_BUFSZ 1024
@@ -687,9 +687,9 @@ diff -ruN misc/Python-2.7.13/Modules/fcntlmodule.c misc/build/Python-2.7.13/Modu
" an integer and optionally an integer or buffer argument",
conv_descriptor, &fd, &code, &arg)) {
return NULL;
-diff -ruN misc/Python-2.7.13/Python/thread_pthread.h misc/build/Python-2.7.13/Python/thread_pthread.h
---- misc/Python-2.7.13/Python/thread_pthread.h 2014-06-29 21:05:47.000000000 -0500
-+++ misc/build/Python-2.7.13/Python/thread_pthread.h 2016-01-01 17:38:35.933764047 -0500
+diff -ruN misc/Python-2.7.14/Python/thread_pthread.h misc/build/Python-2.7.14/Python/thread_pthread.h
+--- misc/Python-2.7.14/Python/thread_pthread.h 2014-06-29 21:05:47.000000000 -0500
++++ misc/build/Python-2.7.14/Python/thread_pthread.h 2016-01-01 17:38:35.933764047 -0500
@@ -38,13 +38,18 @@
#endif
#endif
@@ -743,9 +743,9 @@ diff -ruN misc/Python-2.7.13/Python/thread_pthread.h misc/build/Python-2.7.13/Py
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
#endif
-diff -ruN misc/Python-2.7.13/configure misc/build/Python-2.7.13/configure
---- misc/Python-2.7.13/configure 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.13/configure 2016-01-01 17:41:32.541753889 -0500
+diff -ruN misc/Python-2.7.14/configure misc/build/Python-2.7.14/configure
+--- misc/Python-2.7.14/configure 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.14/configure 2016-01-01 17:41:32.541753889 -0500
@@ -5435,7 +5435,7 @@
;;
SunOS*)
@@ -767,10 +767,10 @@ diff -ruN misc/Python-2.7.13/configure misc/build/Python-2.7.13/configure
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
-diff -ruN misc/Python-2.7.13/setup.py misc/build/Python-2.7.13/setup.py
---- misc/Python-2.7.13/setup.py 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.13/setup.py 2016-01-01 17:38:35.945765223 -0500
-@@ -1573,7 +1573,7 @@
+diff -ruN misc/Python-2.7.14/setup.py misc/build/Python-2.7.14/setup.py
+--- misc/Python-2.7.14/setup.py 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.14/setup.py 2016-01-01 17:38:35.945765223 -0500
+@@ -1576,7 +1576,7 @@
macros = dict()
libraries = []
@@ -779,7 +779,7 @@ diff -ruN misc/Python-2.7.13/setup.py misc/build/Python-2.7.13/setup.py
# FreeBSD's P1003.1b semaphore support is very experimental
# and has many known problems. (as of June 2008)
macros = dict()
-@@ -1625,7 +1625,7 @@
+@@ -1628,7 +1628,7 @@
missing.append('linuxaudiodev')
if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
diff --git a/python/python-md5.patch b/python/python-md5.patch
index a28d2341574d..b7c53933bf6b 100644
--- a/python/python-md5.patch
+++ b/python/python-md5.patch
@@ -1,6 +1,6 @@
-diff -ru misc/Python-2.7.13/Modules/Setup.dist misc/build/Python-2.7.13/Modules/Setup.dist
---- misc/Python-2.7.13/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
-+++ misc/build/Python-2.7.13/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
+diff -ru misc/Python-2.7.14/Modules/Setup.dist misc/build/Python-2.7.14/Modules/Setup.dist
+--- misc/Python-2.7.14/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.14/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
@@ -252,14 +252,14 @@
# Message-Digest Algorithm, described in RFC 1321. The necessary files
# md5.c and md5.h are included here.
diff --git a/python/python-solaris.patch b/python/python-solaris.patch
index 56c57f221d9f..adc2a4dc3c5b 100644
--- a/python/python-solaris.patch
+++ b/python/python-solaris.patch
@@ -1,5 +1,5 @@
---- misc/Python-2.7.13/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.13/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
+--- misc/Python-2.7.14/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.14/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
@@ -640,11 +640,6 @@
in platform-specific #ifdefs.
**************************************************************************/
diff --git a/python/python-solver-before-std.patch b/python/python-solver-before-std.patch
index 4680642d9afc..3645c51a4b0f 100644
--- a/python/python-solver-before-std.patch
+++ b/python/python-solver-before-std.patch
@@ -1,6 +1,6 @@
-diff -ur misc/Python-2.7.13/setup.py misc/build/Python-2.7.13/setup.py
---- misc/Python-2.7.13/setup.py 2016-06-25 16:49:32.000000000 -0500
-+++ misc/build/Python-2.7.13/setup.py 2016-09-02 17:09:20.687419000 -0500
+diff -ur misc/Python-2.7.14/setup.py misc/build/Python-2.7.14/setup.py
+--- misc/Python-2.7.14/setup.py 2016-06-25 16:49:32.000000000 -0500
++++ misc/build/Python-2.7.14/setup.py 2016-09-02 17:09:20.687419000 -0500
@@ -80,39 +80,41 @@
# system, but with only header files and libraries.
sysroot = macosx_sdk_root()
diff --git a/python/python-ssl.patch b/python/python-ssl.patch
index bdc6195b249c..8fe2d241216a 100644
--- a/python/python-ssl.patch
+++ b/python/python-ssl.patch
@@ -1,15 +1,15 @@
-diff -ruN misc/Python-2.7.13/PC/VS9.0/build_ssl.py misc/build/Python-2.7.13/PC/VS9.0/build_ssl.py
---- misc/Python-2.7.13/PC/VS9.0/build_ssl.py 2014-06-29 21:05:46.000000000 -0500
-+++ misc/build/Python-2.7.13/PC/VS9.0/build_ssl.py 2016-01-01 15:15:32.256357072 -0500
+diff -ruN misc/Python-2.7.14/PC/VS9.0/build_ssl.py misc/build/Python-2.7.14/PC/VS9.0/build_ssl.py
+--- misc/Python-2.7.14/PC/VS9.0/build_ssl.py 2014-06-29 21:05:46.000000000 -0500
++++ misc/build/Python-2.7.14/PC/VS9.0/build_ssl.py 2016-01-01 15:15:32.256357072 -0500
@@ -242,4 +242,4 @@
sys.exit(rc)
if __name__=='__main__':
- main()
+ sys.exit(0)
-diff -ruN misc/Python-2.7.13/setup.py misc/build/Python-2.7.13/setup.py
---- misc/Python-2.7.13/setup.py 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.13/setup.py 2016-01-01 15:15:32.258356209 -0500
+diff -ruN misc/Python-2.7.14/setup.py misc/build/Python-2.7.14/setup.py
+--- misc/Python-2.7.14/setup.py 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.14/setup.py 2016-01-01 15:15:32.258356209 -0500
@@ -808,7 +808,15 @@
depends=['socketmodule.h'],
libraries=math_libs) )
diff --git a/python/pyversion.mk b/python/pyversion.mk
index 08561fbbc776..8312fff2bb6d 100644
--- a/python/pyversion.mk
+++ b/python/pyversion.mk
@@ -22,7 +22,7 @@
# in the python project accordingly !!!
PYMAJOR=2
PYMINOR=7
-PYMICRO=13
+PYMICRO=14
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
.IF "$(GUI)" == "UNX"
More information about the Libreoffice-commits
mailing list