[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.14-mingw.patch python/python-2.7.14-msvs9-dir.patch python/python-2.7.14-msvs9-no-host-python.patch python/python-2.7.14-msvs9.patch python/python-2.7.14-msvs9-python-path.patch python/python-2.7.14-msvs9-subsystem.patch python/python-2.7.14-msvs9-win64.patch python/python-2.7.14-msvs9-win64-target.patch python/python-2.7.14-nohardlink.patch python/python-2.7.14-sysbase.patch python/python-2.7.15-msvs9-dir.patch python/python-2.7.15-msvs9-no-host-python.patch python/python-2.7.15-msvs9.patch python/python-2.7.15-msvs9-python-path.patch python/python-2.7.15-msvs9-subsystem.patch python/python-2.7.15-msvs9-win64.patch python/python-2.7.15-msvs9-win64-target.patch python/python-2.7.15-nohardlink.patch python/python-2.7.15-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
Fri Jun 1 22:15:10 UTC 2018
external_deps.lst | 6
python/makefile.mk | 4
python/prj/d.lst | 136 ++---
python/python-2.7.14-mingw.patch | 571 ------------------------
python/python-2.7.15-msvs9-dir.patch | 4
python/python-2.7.15-msvs9-no-host-python.patch | 4
python/python-2.7.15-msvs9-python-path.patch | 4
python/python-2.7.15-msvs9-subsystem.patch | 8
python/python-2.7.15-msvs9-win64-target.patch | 4
python/python-2.7.15-msvs9-win64.patch | 162 +++---
python/python-2.7.15-msvs9.patch | 162 +++---
python/python-2.7.15-nohardlink.patch | 4
python/python-2.7.15-sysbase.patch | 6
python/python-freebsd.patch | 42 -
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
19 files changed, 288 insertions(+), 859 deletions(-)
New commits:
commit cb258c5635c15d9c828b3e6f583b9fe866e92672
Author: Pedro Giffuni <pfg at apache.org>
Date: Fri Jun 1 21:15:27 2018 +0000
Update internal Python to bugfix version 2.7.15.
The new version includes fixes for security issues among the regular
maintainance changes upstream does.
For this version we are also dropping the mingw build support. It was not terribly
difficult to maintain but AFAICT it has never been tested.
Tested on: FreeBSD
diff --git a/external_deps.lst b/external_deps.lst
index 96c1740eeea8..4243d5be5c0e 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 = cee2e4b33ad3750da77b2e85f2f8b724
- name = Python-2.7.14.tgz
- URL1 = http://www.python.org/ftp/python/2.7.14/Python-2.7.14.tgz
+ MD5 = 045fb3440219a1f6923fefdabde63342
+ name = Python-2.7.15.tgz
+ URL1 = http://www.python.org/ftp/python/2.7.15/Python-2.7.15.tgz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_BOOST != YES)
diff --git a/python/makefile.mk b/python/makefile.mk
index 4fb62c021f58..ae1029e36190 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -42,7 +42,7 @@ all:
TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=cee2e4b33ad3750da77b2e85f2f8b724
+TARFILE_MD5=045fb3440219a1f6923fefdabde63342
PATCH_FILES=\
python-solaris.patch \
python-freebsd.patch \
@@ -96,7 +96,7 @@ BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install &&
# WINDOWS
# ----------------------------------
.IF "$(COM)"=="GCC"
-PATCH_FILES=python-$(PYVERSION)-mingw.patch
+#PATCH_FILES=python-$(PYVERSION)-mingw.patch
BUILD_DIR=
MYCWD=$(shell cygpath -m $(shell @pwd))/$(INPATH)/misc/build
python_CFLAGS=-mno-cygwin -mthreads
diff --git a/python/prj/d.lst b/python/prj/d.lst
index d423579a4878..231cd00282f9 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.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-2.7.15\Lib\* %_DEST%\lib%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\config\* %_DEST%\lib%_EXT%\python\config\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.15\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree
+..\%__SRC%\misc\build\Python-2.7.15\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
+..\%__SRC%\misc\build\Python-2.7.15\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\*
+..\%__SRC%\misc\build\Python-2.7.15\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.14\Include\* %_DEST%\inc%_EXT%\python\*
+..\%__SRC%\misc\build\Python-2.7.15\Include\* %_DEST%\inc%_EXT%\python\*
#unix ONLY !
..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
-..\%__SRC%\misc\build\Python-2.7.14\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
+..\%__SRC%\misc\build\Python-2.7.15\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,40 +91,40 @@ 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.14\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll
+..\%__SRC%\misc\build\Python-2.7.15\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.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
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\python.exe %_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\python27.dll %_DEST%\bin%_EXT%\python27.dll
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\python27.lib %_DEST%\lib%_EXT%\python27.lib
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
# Win64 ONLY!
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\python.exe %_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\python27.dll %_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\python27.lib %_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\python.exe %_DEST%\bin%_EXT%\python.exe
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\python27.dll %_DEST%\bin%_EXT%\python27.dll
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\python27.lib %_DEST%\lib%_EXT%\python27.lib
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
+..\%__SRC%\misc\build\Python-2.7.15\PC\VS9.0\amd64\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
#linklib: libpython.so.*.*.*
diff --git a/python/python-2.7.14-mingw.patch b/python/python-2.7.14-mingw.patch
deleted file mode 100644
index 9f9dc6c14b77..000000000000
--- a/python/python-2.7.14-mingw.patch
+++ /dev/null
@@ -1,571 +0,0 @@
-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
-
-+#if defined(__MINGW32__)
-+#undef HAVE_FORKPTY
-+#undef HAVE_OPENPTY
-+#undef HAVE_DEV_PTMX
-+#undef _POSIX_THREADS
-+#undef HAVE_PTHREAD_H
-+#define MS_WINDOWS
-+#define MS_WIN32
-+#define Py_WIN_WIDE_FILENAMES
-+#ifndef PYTHONPATH
-+# define PYTHONPATH ".\\lib;.\\lib\\python" VERSION ";.\\lib\\python" VERSION "\\lib-dynload;.\\lib\\python" VERSION "\\plat-winmingw32;.\\lib\\python" VERSION "\\lib-tk"
-+#endif
-+#define NT_THREADS
-+#define WITH_THREAD
-+#define WINVER 0x0501
-+#ifdef socklen_t
-+#undef socklen_t
-+#endif
-+#define HAVE_ADDRINFO
-+#define HAVE_GETADDRINFO
-+#define HAVE_GETNAMEINFO
-+#define HAVE_GETPEERNAME
-+#endif
-+
- #ifdef HAVE_STDINT_H
- #include <stdint.h>
- #endif
-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
- ('cygwin.*', 'unix'),
-+ ('winmingw*', 'unix'),
- ('os2emx', 'emx'),
-
- # OS name mappings
-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
- # appended to library_dirs
-- if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
-+ if sys.platform[:6] == 'cygwin' or sys.platform[:8] == 'winmingw' or sys.platform[:6] == 'atheos':
- if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
- # building third party extensions
- self.library_dirs.append(os.path.join(sys.prefix, "lib",
-@@ -726,7 +726,7 @@
- # don't extend ext.libraries, it may be shared with other
- # extensions, it is a reference to the original list
- return ext.libraries + [pythonlib]
-- elif sys.platform[:6] == "cygwin":
-+ elif sys.platform[:6] == "cygwin" or sys.platform[:8] == "winmingw":
- template = "python%d.%d"
- pythonlib = (template %
- (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-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
- # convention.
-- self.convert_paths('lib', 'purelib', 'platlib',
-- 'scripts', 'data', 'headers',
-- 'userbase', 'usersite')
-+ if os.sep != '/':
-+ self.convert_paths('lib', 'purelib', 'platlib',
-+ 'scripts', 'data', 'headers',
-+ 'userbase', 'usersite')
-
- # Well, we're not actually fully completely finalized yet: we still
- # have to deal with 'extra_path', which is the hack for allowing
-@@ -362,7 +363,7 @@
-
- # If a new root directory was supplied, make all the installation
- # dirs relative to it.
-- if self.root is not None:
-+ if self.root is not None and self.root != "":
- self.change_roots('libbase', 'lib', 'purelib', 'platlib',
- 'scripts', 'data', 'headers')
-
-@@ -501,7 +502,10 @@
- def convert_paths (self, *names):
- for name in names:
- attr = "install_" + name
-- setattr(self, attr, convert_path(getattr(self, attr)))
-+ if self.root is None or self.root == "":
-+ setattr(self, attr, getattr(self, attr).replace('/', os.sep))
-+ else:
-+ setattr(self, attr, convert_path(getattr(self, attr)))
-
-
- def handle_extra_path (self):
-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)
-
-- if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'):
-+ if (sys.platform == 'win32' or sys.platform[:8] == "winmingw" or os.name == 'os2') and (ext != '.exe'):
- executable = executable + '.exe'
-
- if not os.path.isfile(executable):
-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:
- func = globals().get("_init_" + os.name)
-+ if sys.platform[:8] == "winmingw":
-+ func = globals().get("_init_posix")
-+
- if func:
- func()
- else:
-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"
- xcode_stub_lib_format = dylib_lib_format
-- if sys.platform == "cygwin":
-+ if sys.platform == "cygwin" or sys.platform == "winmingw":
- exe_extension = ".exe"
-
- def preprocess(self, source,
-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] != '_']
-
--if 'posix' in _names:
-+if 'winmingw32' in _names:
-+ name = 'nt'
-+ linesep = '\r\n'
-+ from posix import *
-+ try:
-+ from posix import _exit
-+ except ImportError:
-+ pass
-+ import ntpath as path
-+
-+ import posix
-+ __all__.extend(_get_exports_list(posix))
-+ del posix
-+
-+elif 'posix' in _names:
- name = 'posix'
- linesep = '\n'
- from posix import *
-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')
-
--if os.name == "nt":
-+if os.name == "nt" and sys.platform[:8] != "winmingw":
- _socketmethods = _socketmethods + ('ioctl',)
-
- if sys.platform == "riscos":
-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
-+ifeq (@MACHDEP@,winmingw32)
-+DESTSHAREDFORRULES= $(shell cd $(DESTSHARED) && pwd || echo DESTSHARED)
-+LIBPYTHONPATH= $(shell cd $(DESTDIR)$(LIBDEST) && cmd /c cd | sed -e s:\\\\:/:g)
-+DESTPYTHONPATH= $(LIBPYTHONPATH);$(shell cd $(DESTDIR)$(DESTSHARED) && cmd /c cd | sed -e s:\\\\:/:g)
-+LIBDESTPARAM= $(shell if test -z "$(DESTDIR)" ; then cd $(LIBDEST) && cmd /c cd | sed -e s:\\\\:/:g ; else echo $(LIBDEST) ; fi)
-+PREFIXPARAM= $(shell if test -z "$(DESTDIR)" ; then cd $(prefix) && cmd /c cd | sed -e s:\\\\:/:g ; else echo $(prefix) ; fi)
-+BINDIRPARAM= $(shell if test -z "$(DESTDIR)" ; then cd $(BINDIR) && cmd /c cd | sed -e s:\\\\:/:g ; else echo $(BINDIR) ; fi)
-+DESTSHAREDPARAM= $(shell if test -z "$(DESTDIR)" ; then cd $(DESTSHARED) && cmd /c cd | sed -e s:\\\\:/:g ; else echo $(DESTSHARED) ; fi)
-+DESTDIRPARAM= $(shell if test ! -z "$(DESTDIR)" ; then cd $(DESTDIR) && cmd /c | sed -e s:\\\\:/:g ; fi)
-+endif
-
- # Executable suffix (.exe on Windows and Mac OS X)
- EXE= @EXEEXT@
-@@ -225,7 +235,7 @@
- # Modules
- MODULE_OBJS= \
- Modules/config.o \
-- Modules/getpath.o \
-+ @GETPATH_OBJS@ \
- Modules/main.o \
- Modules/gcmodule.o
-
-@@ -646,6 +656,10 @@
- -DVPATH='"$(VPATH)"' \
- -o $@ $(srcdir)/Modules/getpath.c
-
-+PC/getpathp.o: $(srcdir)/PC/getpathp.c Makefile
-+ $(CC) -c $(PY_CFLAGS) -DVERSION='"$(VERSION)"' \
-+ -o $@ $(srcdir)/PC/getpathp.c
-+
- Modules/python.o: $(srcdir)/Modules/python.c
- $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
-
-@@ -700,6 +714,12 @@
- Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \
- $(srcdir)/Objects/unicodetype_db.h
-
-+Objects/exceptions.o: $(srcdir)/Objects/exceptions.c
-+ $(CC) -c $(PY_CFLAGS) -I$(srcdir)/PC -o $@ $(srcdir)/Objects/exceptions.c
-+
-+PC/import_nt.o: $(srcdir)/PC/import_nt.c
-+ $(CC) -c $(PY_CFLAGS) -I$(srcdir)/Python -o $@ $(srcdir)/PC/import_nt.c
-+
- STRINGLIB_HEADERS= \
- $(srcdir)/Include/bytes_methods.h \
- $(srcdir)/Objects/stringlib/count.h \
-@@ -928,7 +948,11 @@
- # Install shared libraries enabled by Setup
- DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
-
-+ifeq (@MACHDEP@,winmingw32)
-+oldsharedinstall: $(DESTSHAREDFORRULES) $(SHAREDMODS)
-+else
- oldsharedinstall: $(DESTSHARED) $(SHAREDMODS)
-+endif
- @for i in X $(SHAREDMODS); do \
- if test $$i != X; then \
- echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
-@@ -936,7 +960,11 @@
- fi; \
- done
-
-+ifeq (@MACHDEP@,winmingw32)
-+$(DESTSHAREDFORRULES):
-+else
- $(DESTSHARED):
-+endif
- @for i in $(DESTDIRS); \
- do \
- if test ! -d $(DESTDIR)$$i; then \
-@@ -1054,7 +1082,11 @@
- unittest unittest/test \
- lib-old \
- curses pydoc_data $(MACHDEPS)
-+ifeq (@MACHDEP@,winmingw32)
-+libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c sharedinstall
-+else
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
-+endif
- @for i in $(SCRIPTDIR) $(LIBDEST); \
- do \
- if test ! -d $(DESTDIR)$$i; then \
-@@ -1114,6 +1082,26 @@
- $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- $(DESTDIR)$(LIBDEST)/distutils/tests ; \
- fi
-+ifeq (@MACHDEP@,winmingw32)
-+ PYTHONPATH="$(DESTPYTHONPATH)" $(RUNSHARED) \
-+ ./$(BUILDPYTHON) -Wi -tt $(LIBPYTHONPATH)/compileall.py \
-+ -d $(LIBDESTPARAM) -f \
-+ -x 'bad_coding|badsyntax|site-packages' $(LIBPYTHONPATH)
-+ PYTHONPATH="$(DESTPYTHONPATH)" $(RUNSHARED) \
-+ ./$(BUILDPYTHON) -Wi -tt -O $(LIBPYTHONPATH)/compileall.py \
-+ -d $(LIBDESTPARAM) -f \
-+ -x 'bad_coding|badsyntax|site-packages' $(LIBPYTHONPATH)
-+ -PYTHONPATH="$(DESTPYTHONPATH)" $(RUNSHARED) \
-+ ./$(BUILDPYTHON) -Wi -t $(LIBPYTHONPATH)/compileall.py \
-+ -d $(LIBDESTPARAM)/site-packages -f \
-+ -x badsyntax $(LIBPYTHONPATH)/site-packages
-+ -PYTHONPATH="$(DESTPYTHONPATH)" $(RUNSHARED) \
-+ ./$(BUILDPYTHON) -Wi -t -O $(LIBPYTHONPATH)/compileall.py \
-+ -d $(LIBDESTPARAM)/site-packages -f \
-+ -x badsyntax $(LIBPYTHONPATH)/site-packages
-+ -PYTHONPATH="$(DESTPYTHONPATH)" $(RUNSHARED) \
-+ ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
-+else
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
-@@ -1140,6 +1190,7 @@
- # Create the PLATDIR source directory, if one wasn't distributed..
- $(srcdir)/Lib/$(PLATDIR):
- mkdir $(srcdir)/Lib/$(PLATDIR)
-+ifneq (@MACHDEP@,winmingw32)
- 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`"; \
-@@ -1153,6 +1207,7 @@
- PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \
- fi; \
- cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
-+endif
-
- python-config: $(srcdir)/Misc/python-config.in
- # Substitution happens here, as the completely-expanded BINDIR
-@@ -1246,6 +1300,15 @@
-
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
-+ifeq (@MACHDEP@,winmingw32)
-+sharedinstall: $(DESTSHAREDFORRULES)
-+ $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
-+ --prefix=$(PREFIXPARAM) \
-+ --install-scripts=$(BINDIRPARAM) \
-+ --install-platlib=$(DESTSHAREDPARAM) \
-+ --root=$(DESTDIRPARAM)
-+else
-+
- sharedinstall: sharedmods
- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
- --prefix=$(prefix) \
-@@ -1253,6 +1316,7 @@
- --install-platlib=$(DESTSHARED) \
- --root=$(DESTDIR)/
- -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py*
-+endif
-
- # 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.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
-
-+# The password module
-+ at USE_PASSWORD_MODULE@pwd pwdmodule.c # this is needed to find out the user's home dir
-+ # if $HOME is not set
-+
- # 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.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
- errno errnomodule.c # posix (UNIX) errno values
--pwd pwdmodule.c # this is needed to find out the user's home dir
-+#pwd pwdmodule.c # this is needed to find out the user's home dir
- # 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.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
-
-
-+case $host_os in
-+mingw*)
-+ srcdir=`cd $srcdir && cmd /c cd | sed -e 's:\\\\:/:g'`
-+ ;;
-+esac
-+
- ac_config_commands="$ac_config_commands include"
-
- ac_config_commands="$ac_config_commands src"
-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)
-
-+case $host_os in
-+mingw*)
-+ srcdir=`cd $srcdir && cmd /c cd | sed -e 's:\\\\:/:g'`
-+ ;;
-+esac
-+
- AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])
- AC_CONFIG_COMMANDS(src, [
- test -d src || mkdir src
-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);
-
-+#ifdef MS_WIN32
-+int ffi_call(ffi_cif *cif,
-+#else
- void ffi_call(ffi_cif *cif,
-+#endif
- void (*fn)(void),
- void *rvalue,
- void **avalue);
-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},
- {"exceptions", NULL},
-+#ifdef __MINGW32__
-+ {"winmingw32", NULL},
-+#endif
-
- /* This lives in gcmodule.c */
- {"gc", initgc},
-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
- #else
-+#ifdef __MINGW32__
-+#define HAVE_SPAWNV 1
-+#define HAVE_EXECV 1
-+#define HAVE_GETCWD 1
-+#define HAVE_OPENDIR 1
-+#define HAVE_PIPE 1
-+#define HAVE_POPEN 1
-+#define HAVE_SYSTEM 1
-+#else
- #if defined(PYOS_OS2) && defined(PYCC_GCC) || defined(__VMS)
- /* Everything needed is defined in PC/os2emx/pyconfig.h or vms/pyconfig.h */
- #else /* all other compilers */
-@@ -157,6 +166,7 @@
- #define HAVE_WAIT 1
- #define HAVE_TTYNAME 1
- #endif /* PYOS_OS2 && PYCC_GCC && __VMS */
-+#endif /* __MINGW32__ */
- #endif /* _MSC_VER */
- #endif /* __BORLANDC__ */
- #endif /* ! __WATCOMC__ || __QNX__ */
-@@ -277,6 +287,14 @@
- #define pclose _pclose
- #endif /* _MSC_VER */
-
-+#ifdef __MINGW32__
-+#include "osdefs.h"
-+#include <windows.h>
-+#include <shellapi.h> /* for ShellExecute() */
-+#define popen _popen
-+#define pclose _pclose
-+#endif
-+
- #if defined(PYCC_VACPP) && defined(PYOS_OS2)
- #include <io.h>
- #endif /* OS2 */
-@@ -630,7 +648,7 @@
- */
- #include <crt_externs.h>
- static char **environ;
--#elif !defined(_MSC_VER) && ( !defined(__WATCOMC__) || defined(__QNX__) )
-+#elif !defined(_MSC_VER) && !defined(__MINGW32__) && ( !defined(__WATCOMC__) || defined(__QNX__) )
- extern char **environ;
- #endif /* !_MSC_VER */
-
-@@ -1049,7 +1067,7 @@
- int st_ctime_nsec;
- };
-
--static __int64 secs_between_epochs = 11644473600; /* Seconds between 1.1.1601 and 1.1.1970 */
-+static __int64 secs_between_epochs = 11644473600LL; /* Seconds between 1.1.1601 and 1.1.1970 */
-
- static void
- FILE_TIME_to_time_t_nsec(FILETIME *in_ptr, time_t *time_out, int* nsec_out)
-@@ -1568,7 +1586,7 @@
- return v;
- }
-
--#ifdef MS_WINDOWS
-+#if defined(MS_WINDOWS) && !defined(__MINGW32__)
-
- /* 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.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.
- */
--#else
-+#elif !defined(__MINGW32__)
- # include "addrinfo.h"
- #endif
-
-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 @@
- }
-
- #define ADD_KEY(val) inskey(d, #val, val)
-+#ifndef REG_LEGAL_CHANGE_FILTER
-+#define REG_LEGAL_CHANGE_FILTER (REG_NOTIFY_CHANGE_NAME|REG_NOTIFY_CHANGE_ATTRIBUTES|REG_NOTIFY_CHANGE_LAST_SET|REG_NOTIFY_CHANGE_SECURITY)
-+#endif
-
- PyMODINIT_FUNC init_winreg(void)
- {
-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 */
-
-+#ifndef __MINGW32__
- static int strcasecmp (char *string1, char *string2)
- {
- int first, second;
-@@ -41,6 +42,7 @@
-
- return (first - second);
- }
-+#endif
-
-
- /* Function to return the name of the "python" DLL that the supplied module
-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"
-
--#ifdef MS_WINDOWS
-+#if defined(MS_WINDOWS) && !defined(__MINGW32__)
- extern void PyWinFreeze_ExeInit(void);
- extern void PyWinFreeze_ExeTerm(void);
- extern int PyInitFrozenExtensions(void);
-@@ -32,13 +32,13 @@
- setbuf(stderr, (char *)NULL);
- }
-
--#ifdef MS_WINDOWS
-+#ifdef MS_WINDOWS && !defined(__MINGW32__)
- PyInitFrozenExtensions();
- #endif /* MS_WINDOWS */
- if (argc >= 1)
- Py_SetProgramName(argv[0]);
- Py_Initialize();
--#ifdef MS_WINDOWS
-+#ifdef MS_WINDOWS && !defined(__MINGW32__)
- PyWinFreeze_ExeInit();
- #endif
-
-@@ -61,7 +61,7 @@
- if (inspect && isatty((int)fileno(stdin)))
- sts = PyRun_AnyFile(stdin, "<stdin>") != 0;
-
--#ifdef MS_WINDOWS
-+#ifdef MS_WINDOWS && !defined(__MINGW32__)
- PyWinFreeze_ExeTerm();
- #endif
- Py_Finalize();
-Only in misc/build/Python-2.7.14/Python: frozenmain.c.rej
diff --git a/python/python-2.7.14-msvs9-dir.patch b/python/python-2.7.15-msvs9-dir.patch
similarity index 64%
rename from python/python-2.7.14-msvs9-dir.patch
rename to python/python-2.7.15-msvs9-dir.patch
index 16be5a493224..d1a4660ca01c 100644
--- a/python/python-2.7.14-msvs9-dir.patch
+++ b/python/python-2.7.15-msvs9-dir.patch
@@ -1,5 +1,5 @@
---- misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:37:03.303029800 +0200
-+++ misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:39:42.007110300 +0200
+--- misc/build/Python-2.7.15/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:37:03.303029800 +0200
++++ misc/build/Python-2.7.15/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:39:42.007110300 +0200
@@ -120,6 +120,7 @@
/>
<Tool
diff --git a/python/python-2.7.14-msvs9-no-host-python.patch b/python/python-2.7.15-msvs9-no-host-python.patch
similarity index 59%
rename from python/python-2.7.14-msvs9-no-host-python.patch
rename to python/python-2.7.15-msvs9-no-host-python.patch
index 7fa0878dd451..e33f5ade2f44 100644
--- a/python/python-2.7.14-msvs9-no-host-python.patch
+++ b/python/python-2.7.15-msvs9-no-host-python.patch
@@ -1,5 +1,5 @@
---- misc/build/Python-2.7.14/PC/VS9.0/x64.vsprops 2017-09-16 19:38:35.000000000 +0200
-+++ misc/build/Python-2.7.14/PC/VS9.0/x64.vsprops 2018-03-08 07:04:52.320860000 +0200
+--- misc/build/Python-2.7.15/PC/VS9.0/x64.vsprops 2017-09-16 19:38:35.000000000 +0200
++++ misc/build/Python-2.7.15/PC/VS9.0/x64.vsprops 2018-03-08 07:04:52.320860000 +0200
@@ -15,8 +15,4 @@
Name="VCLinkerTool"
TargetMachine="17"
diff --git a/python/python-2.7.14-msvs9-python-path.patch b/python/python-2.7.15-msvs9-python-path.patch
similarity index 61%
rename from python/python-2.7.14-msvs9-python-path.patch
rename to python/python-2.7.15-msvs9-python-path.patch
index 97b4db0cde20..53d3d8e22da1 100644
--- a/python/python-2.7.14-msvs9-python-path.patch
+++ b/python/python-2.7.15-msvs9-python-path.patch
@@ -1,5 +1,5 @@
---- misc/build/Python-2.7.14/PC/VS9.0/pyproject.vsprops 2017-09-16 19:38:35.000000000 +0200
-+++ misc/build/Python-2.7.14/PC/VS9.0/pyproject.vsprops 2018-03-08 07:10:30.002138400 +0200
+--- misc/build/Python-2.7.15/PC/VS9.0/pyproject.vsprops 2017-09-16 19:38:35.000000000 +0200
++++ misc/build/Python-2.7.15/PC/VS9.0/pyproject.vsprops 2018-03-08 07:10:30.002138400 +0200
@@ -42,7 +42,7 @@
/>
<UserMacro
diff --git a/python/python-2.7.14-msvs9-subsystem.patch b/python/python-2.7.15-msvs9-subsystem.patch
similarity index 63%
rename from python/python-2.7.14-msvs9-subsystem.patch
rename to python/python-2.7.15-msvs9-subsystem.patch
index ac682c5b18f6..e68b2d8292b0 100644
--- a/python/python-2.7.14-msvs9-subsystem.patch
+++ b/python/python-2.7.15-msvs9-subsystem.patch
@@ -1,5 +1,5 @@
---- misc/build/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 05:18:19.659192400 +0200
-+++ misc/build/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 06:06:12.776404800 +0200
+--- misc/build/Python-2.7.15/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 05:18:19.659192400 +0200
++++ misc/build/Python-2.7.15/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 06:06:12.776404800 +0200
@@ -137,6 +137,7 @@
/>
<Tool
@@ -8,8 +8,8 @@
OutputFile="$(SolutionDir)make_versioninfo.exe"
AdditionalOptions="/NXCOMPAT /DYNAMICBASE"
/>
---- misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:21:48.081999200 +0200
-+++ misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:23:02.210741600 +0200
+--- misc/build/Python-2.7.15/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:21:48.081999200 +0200
++++ misc/build/Python-2.7.15/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:23:02.210741600 +0200
@@ -121,6 +121,7 @@
<Tool
Name="VCLinkerTool"
diff --git a/python/python-2.7.14-msvs9-win64-target.patch b/python/python-2.7.15-msvs9-win64-target.patch
similarity index 96%
rename from python/python-2.7.14-msvs9-win64-target.patch
rename to python/python-2.7.15-msvs9-win64-target.patch
index a3162215c592..69572ae222b0 100644
--- a/python/python-2.7.14-msvs9-win64-target.patch
+++ b/python/python-2.7.15-msvs9-win64-target.patch
@@ -1,5 +1,5 @@
---- misc/build/Python-2.7.14/PC/VS9.0/pcbuild.sln 2018-03-08 04:58:56.323391400 +0200
-+++ misc/build/Python-2.7.14/PC/VS9.0/pcbuild.sln 2018-03-08 05:14:36.079035700 +0200
+--- misc/build/Python-2.7.15/PC/VS9.0/pcbuild.sln 2018-03-08 04:58:56.323391400 +0200
++++ misc/build/Python-2.7.15/PC/VS9.0/pcbuild.sln 2018-03-08 05:14:36.079035700 +0200
@@ -162,20 +162,20 @@
{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
diff --git a/python/python-2.7.14-msvs9-win64.patch b/python/python-2.7.15-msvs9-win64.patch
similarity index 85%
rename from python/python-2.7.14-msvs9-win64.patch
rename to python/python-2.7.15-msvs9-win64.patch
index 23460b25f25d..54a53c7267cc 100644
--- a/python/python-2.7.14-msvs9-win64.patch
+++ b/python/python-2.7.15-msvs9-win64.patch
@@ -1,6 +1,6 @@
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.15/PC/VS9.0/_bsddb.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_bsddb.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_bsddb.vcproj 2017-10-21 17:56:40.218589000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -65,9 +65,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.14/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.15/PC/VS9.0/_ctypes.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_ctypes.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_ctypes.vcproj 2017-10-21 17:56:40.219465000 -0500
@@ -177,7 +177,7 @@
/>
<Tool
@@ -122,9 +122,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.14/PC
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.15/PC/VS9.0/_ctypes_test.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_ctypes_test.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_ctypes_test.vcproj 2017-10-21 17:56:40.220226000 -0500
@@ -54,6 +54,7 @@
/>
<Tool
@@ -189,9 +189,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.15/PC/VS9.0/_elementtree.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_elementtree.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.15/PC/VS9.0/_hashlib.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_hashlib.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.14/P
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.15/PC/VS9.0/_msi.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_msi.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.14/PC/VS
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.7.15/PC/VS9.0/_multiprocessing.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_multiprocessing.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.15/PC/VS9.0/_socket.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_socket.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.14/PC
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.15/PC/VS9.0/_sqlite3.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_sqlite3.vcproj 2017-10-21 17:56:40.226403000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -591,9 +591,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.14/P
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.15/PC/VS9.0/_ssl.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_ssl.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_ssl.vcproj 2017-10-21 17:56:40.227504000 -0500
@@ -43,7 +43,7 @@
/>
<Tool
@@ -689,9 +689,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.14/PC/VS
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.15/PC/VS9.0/_testcapi.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_testcapi.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.14/
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.15/PC/VS9.0/_tkinter.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_tkinter.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_tkinter.vcproj 2017-10-21 17:56:40.229664000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -823,9 +823,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.14/P
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.15/PC/VS9.0/bdist_wininst.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/bdist_wininst.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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"
@@ -846,9 +846,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7
TargetMachine="17"
/>
<Tool
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.15/PC/VS9.0/bz2.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/bz2.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.14/PC/VS9
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.15/PC/VS9.0/kill_python.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/kill_python.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.15/PC/VS9.0/make_buildinfo.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/make_buildinfo.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.7.15/PC/VS9.0/make_versioninfo.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/make_versioninfo.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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,9 +1002,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.15/PC/VS9.0/pcbuild.sln
+--- misc/Python-2.7.15/PC/VS9.0/pcbuild.sln 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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
@@ -1099,9 +1099,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.14/PC/VS
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 -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
+diff -urp misc/Python-2.7.15/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.15/PC/VS9.0/pyexpat.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/pyexpat.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/pyexpat.vcproj 2017-10-21 17:56:40.236395000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -1166,9 +1166,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.14/PC
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/python.vcproj misc/build/Python-2.7.15/PC/VS9.0/python.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/python.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/python.vcproj misc/build/Python-2.7.14/PC/
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.15/PC/VS9.0/pythoncore.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/pythoncore.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/pythoncore.vcproj 2017-10-21 17:56:40.238551000 -0500
@@ -69,6 +69,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
@@ -1300,9 +1300,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.14
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.15/PC/VS9.0/pythonw.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/pythonw.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/pythonw.vcproj 2017-10-21 17:56:40.239382000 -0500
@@ -66,6 +66,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1367,9 +1367,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.14/PC
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/select.vcproj misc/build/Python-2.7.15/PC/VS9.0/select.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/select.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/select.vcproj 2017-10-21 17:56:40.240210000 -0500
@@ -57,6 +57,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
@@ -1434,9 +1434,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/select.vcproj misc/build/Python-2.7.14/PC/
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.15/PC/VS9.0/sqlite3.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/sqlite3.vcproj 2017-10-21 17:56:40.241775000 -0500
@@ -56,6 +56,7 @@
<Tool
Name="VCLinkerTool"
@@ -1501,9 +1501,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.14/PC
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.15/PC/VS9.0/unicodedata.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/unicodedata.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/unicodedata.vcproj 2017-10-21 17:56:40.242820000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -1568,9 +1568,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.15/PC/VS9.0/w9xpopen.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/w9xpopen.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/w9xpopen.vcproj 2017-10-21 17:56:40.243805000 -0500
@@ -59,6 +59,7 @@
<Tool
Name="VCLinkerTool"
@@ -1635,9 +1635,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.14/P
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/winsound.vcproj misc/build/Python-2.7.15/PC/VS9.0/winsound.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/winsound.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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.14-msvs9.patch b/python/python-2.7.15-msvs9.patch
similarity index 85%
rename from python/python-2.7.14-msvs9.patch
rename to python/python-2.7.15-msvs9.patch
index 150673fb4c54..33f6a5ca23df 100644
--- a/python/python-2.7.14-msvs9.patch
+++ b/python/python-2.7.15-msvs9.patch
@@ -1,6 +1,6 @@
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.15/PC/VS9.0/_bsddb.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_bsddb.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_bsddb.vcproj 2017-10-21 17:56:40.218589000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -65,9 +65,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.14/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.15/PC/VS9.0/_ctypes.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_ctypes.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_ctypes.vcproj 2017-10-21 17:56:40.219465000 -0500
@@ -177,7 +177,7 @@
/>
<Tool
@@ -122,9 +122,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.14/PC
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.15/PC/VS9.0/_ctypes_test.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_ctypes_test.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_ctypes_test.vcproj 2017-10-21 17:56:40.220226000 -0500
@@ -54,6 +54,7 @@
/>
<Tool
@@ -189,9 +189,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.15/PC/VS9.0/_elementtree.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_elementtree.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.15/PC/VS9.0/_hashlib.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_hashlib.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.14/P
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.15/PC/VS9.0/_msi.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_msi.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.14/PC/VS
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.7.15/PC/VS9.0/_multiprocessing.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_multiprocessing.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.15/PC/VS9.0/_socket.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_socket.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.14/PC
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.15/PC/VS9.0/_sqlite3.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_sqlite3.vcproj 2017-10-21 17:56:40.226403000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -591,9 +591,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.14/P
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.15/PC/VS9.0/_ssl.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_ssl.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_ssl.vcproj 2017-10-21 17:56:40.227504000 -0500
@@ -43,7 +43,7 @@
/>
<Tool
@@ -689,9 +689,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.14/PC/VS
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.15/PC/VS9.0/_testcapi.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_testcapi.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.14/
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.15/PC/VS9.0/_tkinter.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/_tkinter.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/_tkinter.vcproj 2017-10-21 17:56:40.229664000 -0500
@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
@@ -823,9 +823,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.14/P
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.15/PC/VS9.0/bdist_wininst.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/bdist_wininst.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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"
@@ -846,9 +846,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7
TargetMachine="17"
/>
<Tool
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.15/PC/VS9.0/bz2.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/bz2.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.14/PC/VS9
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.15/PC/VS9.0/kill_python.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/kill_python.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.15/PC/VS9.0/make_buildinfo.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/make_buildinfo.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.7.15/PC/VS9.0/make_versioninfo.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/make_versioninfo.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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,9 +1002,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.15/PC/VS9.0/pcbuild.sln
+--- misc/Python-2.7.15/PC/VS9.0/pcbuild.sln 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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
@@ -1099,9 +1099,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.14/PC/VS
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 -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
+diff -urp misc/Python-2.7.15/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.15/PC/VS9.0/pyexpat.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/pyexpat.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/pyexpat.vcproj 2017-10-21 17:56:40.236395000 -0500
@@ -56,6 +56,7 @@
/>
<Tool
@@ -1166,9 +1166,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.14/PC
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/python.vcproj misc/build/Python-2.7.15/PC/VS9.0/python.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/python.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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 -urp misc/Python-2.7.14/PC/VS9.0/python.vcproj misc/build/Python-2.7.14/PC/
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.15/PC/VS9.0/pythoncore.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/pythoncore.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/pythoncore.vcproj 2017-10-21 17:56:40.238551000 -0500
@@ -69,6 +69,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
@@ -1300,9 +1300,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.14
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.15/PC/VS9.0/pythonw.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/pythonw.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/pythonw.vcproj 2017-10-21 17:56:40.239382000 -0500
@@ -66,6 +66,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1367,9 +1367,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.14/PC
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/select.vcproj misc/build/Python-2.7.15/PC/VS9.0/select.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/select.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/select.vcproj 2017-10-21 17:56:40.240210000 -0500
@@ -57,6 +57,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
@@ -1434,9 +1434,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/select.vcproj misc/build/Python-2.7.14/PC/
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.15/PC/VS9.0/sqlite3.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/sqlite3.vcproj 2017-10-21 17:56:40.241775000 -0500
@@ -56,6 +56,7 @@
<Tool
Name="VCLinkerTool"
@@ -1501,9 +1501,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.14/PC
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.15/PC/VS9.0/unicodedata.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/unicodedata.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/unicodedata.vcproj 2017-10-21 17:56:40.242820000 -0500
@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
@@ -1568,9 +1568,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.15/PC/VS9.0/w9xpopen.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/w9xpopen.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/PC/VS9.0/w9xpopen.vcproj 2017-10-21 17:56:40.243805000 -0500
@@ -59,6 +59,7 @@
<Tool
Name="VCLinkerTool"
@@ -1635,9 +1635,9 @@ diff -urp misc/Python-2.7.14/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.14/P
/>
<Tool
Name="VCALinkTool"
-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
+diff -urp misc/Python-2.7.15/PC/VS9.0/winsound.vcproj misc/build/Python-2.7.15/PC/VS9.0/winsound.vcproj
+--- misc/Python-2.7.15/PC/VS9.0/winsound.vcproj 2017-09-16 12:38:35.000000000 -0500
++++ misc/build/Python-2.7.15/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.14-nohardlink.patch b/python/python-2.7.15-nohardlink.patch
similarity index 76%
rename from python/python-2.7.14-nohardlink.patch
rename to python/python-2.7.15-nohardlink.patch
index 115f32ad8e42..b9b3de7bd559 100644
--- a/python/python-2.7.14-nohardlink.patch
+++ b/python/python-2.7.15-nohardlink.patch
@@ -1,5 +1,5 @@
---- 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
+--- misc/Python-2.7.15/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.15/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 \
diff --git a/python/python-2.7.14-sysbase.patch b/python/python-2.7.15-sysbase.patch
similarity index 66%
rename from python/python-2.7.14-sysbase.patch
rename to python/python-2.7.15-sysbase.patch
index 08fff43a6a5a..6bed76d24522 100644
--- a/python/python-2.7.14-sysbase.patch
+++ b/python/python-2.7.15-sysbase.patch
@@ -1,6 +1,6 @@
-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
+diff -ruN misc/Python-2.7.15/configure misc/build/Python-2.7.15/configure
+--- misc/Python-2.7.15/configure 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.15/configure 2016-01-01 15:18:37.398344671 -0500
@@ -3281,7 +3281,9 @@
ac_sys_release=
else
diff --git a/python/python-freebsd.patch b/python/python-freebsd.patch
index 45d0d460101f..0a04a467817a 100644
--- a/python/python-freebsd.patch
+++ b/python/python-freebsd.patch
@@ -1,6 +1,6 @@
-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
+diff -ruN misc/Python-2.7.15/Lib/plat-freebsd9/IN.py misc/build/Python-2.7.15/Lib/plat-freebsd9/IN.py
+--- misc/Python-2.7.15/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.15/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.14/Lib/plat-freebsd9/IN.py misc/build/Python-2.7.14/Li
+IPV6CTL_NORBIT_RAIF = 49
+IPV6CTL_RFC6204W3 = 50
+IPV6CTL_MAXID = 51
-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
+diff -ruN misc/Python-2.7.15/Lib/plat-freebsd9/regen misc/build/Python-2.7.15/Lib/plat-freebsd9/regen
+--- misc/Python-2.7.15/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500
++++ misc/build/Python-2.7.15/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.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
+diff -ruN misc/Python-2.7.15/Lib/test/test_threading.py misc/build/Python-2.7.15/Lib/test/test_threading.py
+--- misc/Python-2.7.15/Lib/test/test_threading.py 2014-06-29 21:05:37.000000000 -0500
++++ misc/build/Python-2.7.15/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.14/Lib/test/test_threading.py misc/build/Python-2.7.14
'os2emx')
def _run_and_join(self, script):
-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
+diff -ruN misc/Python-2.7.15/Modules/fcntlmodule.c misc/build/Python-2.7.15/Modules/fcntlmodule.c
+--- misc/Python-2.7.15/Modules/fcntlmodule.c 2014-06-29 21:05:43.000000000 -0500
++++ misc/build/Python-2.7.15/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.14/Modules/fcntlmodule.c misc/build/Python-2.7.14/Modu
" an integer and optionally an integer or buffer argument",
conv_descriptor, &fd, &code, &arg)) {
return NULL;
-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
+diff -ruN misc/Python-2.7.15/Python/thread_pthread.h misc/build/Python-2.7.15/Python/thread_pthread.h
+--- misc/Python-2.7.15/Python/thread_pthread.h 2014-06-29 21:05:47.000000000 -0500
++++ misc/build/Python-2.7.15/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.14/Python/thread_pthread.h misc/build/Python-2.7.14/Py
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
#endif
-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
+diff -ruN misc/Python-2.7.15/configure misc/build/Python-2.7.15/configure
+--- misc/Python-2.7.15/configure 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.15/configure 2016-01-01 17:41:32.541753889 -0500
@@ -5435,7 +5435,7 @@
;;
SunOS*)
@@ -767,9 +767,9 @@ diff -ruN misc/Python-2.7.14/configure misc/build/Python-2.7.14/configure
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
-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
+diff -ruN misc/Python-2.7.15/setup.py misc/build/Python-2.7.15/setup.py
+--- misc/Python-2.7.15/setup.py 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.15/setup.py 2016-01-01 17:38:35.945765223 -0500
@@ -1576,7 +1576,7 @@
macros = dict()
libraries = []
diff --git a/python/python-md5.patch b/python/python-md5.patch
index b7c53933bf6b..83ab1ef1dd60 100644
--- a/python/python-md5.patch
+++ b/python/python-md5.patch
@@ -1,6 +1,6 @@
-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
+diff -ru misc/Python-2.7.15/Modules/Setup.dist misc/build/Python-2.7.15/Modules/Setup.dist
+--- misc/Python-2.7.15/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
++++ misc/build/Python-2.7.15/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 adc2a4dc3c5b..2d6a26b8788b 100644
--- a/python/python-solaris.patch
+++ b/python/python-solaris.patch
@@ -1,5 +1,5 @@
---- 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
+--- misc/Python-2.7.15/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
++++ misc/build/Python-2.7.15/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 3645c51a4b0f..1671e3dc3db3 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.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
+diff -ur misc/Python-2.7.15/setup.py misc/build/Python-2.7.15/setup.py
+--- misc/Python-2.7.15/setup.py 2016-06-25 16:49:32.000000000 -0500
++++ misc/build/Python-2.7.15/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 8fe2d241216a..1e92413bec78 100644
--- a/python/python-ssl.patch
+++ b/python/python-ssl.patch
@@ -1,15 +1,15 @@
-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
+diff -ruN misc/Python-2.7.15/PC/VS9.0/build_ssl.py misc/build/Python-2.7.15/PC/VS9.0/build_ssl.py
+--- misc/Python-2.7.15/PC/VS9.0/build_ssl.py 2014-06-29 21:05:46.000000000 -0500
++++ misc/build/Python-2.7.15/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.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
+diff -ruN misc/Python-2.7.15/setup.py misc/build/Python-2.7.15/setup.py
+--- misc/Python-2.7.15/setup.py 2014-06-29 21:05:48.000000000 -0500
++++ misc/build/Python-2.7.15/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 8312fff2bb6d..7cc0c1461ac1 100644
--- a/python/pyversion.mk
+++ b/python/pyversion.mk
@@ -22,7 +22,7 @@
# in the python project accordingly !!!
PYMAJOR=2
PYMINOR=7
-PYMICRO=14
+PYMICRO=15
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
.IF "$(GUI)" == "UNX"
More information about the Libreoffice-commits
mailing list