openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1832718 - in /openoffice/trunk/main: ./ python/ python/prj/
Date Fri, 01 Jun 2018 21:15:27 GMT
Author: pfg
Date: Fri Jun  1 21:15:27 2018
New Revision: 1832718

URL: http://svn.apache.org/viewvc?rev=1832718&view=rev
Log:
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

Added:
    openoffice/trunk/main/python/python-2.7.15-msvs9-dir.patch
      - copied, changed from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-dir.patch
    openoffice/trunk/main/python/python-2.7.15-msvs9-no-host-python.patch
      - copied, changed from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-no-host-python.patch
    openoffice/trunk/main/python/python-2.7.15-msvs9-python-path.patch
      - copied, changed from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-python-path.patch
    openoffice/trunk/main/python/python-2.7.15-msvs9-subsystem.patch
      - copied, changed from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-subsystem.patch
    openoffice/trunk/main/python/python-2.7.15-msvs9-win64-target.patch
      - copied, changed from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-win64-target.patch
    openoffice/trunk/main/python/python-2.7.15-msvs9-win64.patch
      - copied, changed from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-win64.patch
    openoffice/trunk/main/python/python-2.7.15-msvs9.patch
      - copied, changed from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9.patch
    openoffice/trunk/main/python/python-2.7.15-nohardlink.patch
      - copied, changed from r1832717, openoffice/trunk/main/python/python-2.7.14-nohardlink.patch
    openoffice/trunk/main/python/python-2.7.15-sysbase.patch
      - copied, changed from r1832717, openoffice/trunk/main/python/python-2.7.14-sysbase.patch
Removed:
    openoffice/trunk/main/python/python-2.7.14-mingw.patch
    openoffice/trunk/main/python/python-2.7.14-msvs9-dir.patch
    openoffice/trunk/main/python/python-2.7.14-msvs9-no-host-python.patch
    openoffice/trunk/main/python/python-2.7.14-msvs9-python-path.patch
    openoffice/trunk/main/python/python-2.7.14-msvs9-subsystem.patch
    openoffice/trunk/main/python/python-2.7.14-msvs9-win64-target.patch
    openoffice/trunk/main/python/python-2.7.14-msvs9-win64.patch
    openoffice/trunk/main/python/python-2.7.14-msvs9.patch
    openoffice/trunk/main/python/python-2.7.14-nohardlink.patch
    openoffice/trunk/main/python/python-2.7.14-sysbase.patch
Modified:
    openoffice/trunk/main/external_deps.lst
    openoffice/trunk/main/python/makefile.mk
    openoffice/trunk/main/python/prj/d.lst
    openoffice/trunk/main/python/python-freebsd.patch
    openoffice/trunk/main/python/python-md5.patch
    openoffice/trunk/main/python/python-solaris.patch
    openoffice/trunk/main/python/python-solver-before-std.patch
    openoffice/trunk/main/python/python-ssl.patch
    openoffice/trunk/main/python/pyversion.mk

Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1832718&r1=1832717&r2=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Fri Jun  1 21:15:27 2018
@@ -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)

Modified: openoffice/trunk/main/python/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/makefile.mk?rev=1832718&r1=1832717&r2=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/makefile.mk (original)
+++ openoffice/trunk/main/python/makefile.mk Fri Jun  1 21:15:27 2018
@@ -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$
 # 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

Modified: openoffice/trunk/main/python/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/prj/d.lst?rev=1832718&r1=1832717&r2=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/prj/d.lst (original)
+++ openoffice/trunk/main/python/prj/d.lst Fri Jun  1 21:15:27 2018
@@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multipro
 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.
 
 #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.*.*.*
 

Copied: openoffice/trunk/main/python/python-2.7.15-msvs9-dir.patch (from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-dir.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.15-msvs9-dir.patch?p2=openoffice/trunk/main/python/python-2.7.15-msvs9-dir.patch&p1=openoffice/trunk/main/python/python-2.7.14-msvs9-dir.patch&r1=1832717&r2=1832718&rev=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.14-msvs9-dir.patch (original)
+++ openoffice/trunk/main/python/python-2.7.15-msvs9-dir.patch Fri Jun  1 21:15:27 2018
@@ -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

Copied: openoffice/trunk/main/python/python-2.7.15-msvs9-no-host-python.patch (from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-no-host-python.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.15-msvs9-no-host-python.patch?p2=openoffice/trunk/main/python/python-2.7.15-msvs9-no-host-python.patch&p1=openoffice/trunk/main/python/python-2.7.14-msvs9-no-host-python.patch&r1=1832717&r2=1832718&rev=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.14-msvs9-no-host-python.patch (original)
+++ openoffice/trunk/main/python/python-2.7.15-msvs9-no-host-python.patch Fri Jun  1 21:15:27 2018
@@ -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"

Copied: openoffice/trunk/main/python/python-2.7.15-msvs9-python-path.patch (from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-python-path.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.15-msvs9-python-path.patch?p2=openoffice/trunk/main/python/python-2.7.15-msvs9-python-path.patch&p1=openoffice/trunk/main/python/python-2.7.14-msvs9-python-path.patch&r1=1832717&r2=1832718&rev=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.14-msvs9-python-path.patch (original)
+++ openoffice/trunk/main/python/python-2.7.15-msvs9-python-path.patch Fri Jun  1 21:15:27 2018
@@ -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

Copied: openoffice/trunk/main/python/python-2.7.15-msvs9-subsystem.patch (from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-subsystem.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.15-msvs9-subsystem.patch?p2=openoffice/trunk/main/python/python-2.7.15-msvs9-subsystem.patch&p1=openoffice/trunk/main/python/python-2.7.14-msvs9-subsystem.patch&r1=1832717&r2=1832718&rev=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.14-msvs9-subsystem.patch (original)
+++ openoffice/trunk/main/python/python-2.7.15-msvs9-subsystem.patch Fri Jun  1 21:15:27 2018
@@ -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"

Copied: openoffice/trunk/main/python/python-2.7.15-msvs9-win64-target.patch (from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-win64-target.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.15-msvs9-win64-target.patch?p2=openoffice/trunk/main/python/python-2.7.15-msvs9-win64-target.patch&p1=openoffice/trunk/main/python/python-2.7.14-msvs9-win64-target.patch&r1=1832717&r2=1832718&rev=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.14-msvs9-win64-target.patch (original)
+++ openoffice/trunk/main/python/python-2.7.15-msvs9-win64-target.patch Fri Jun  1 21:15:27 2018
@@ -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

Copied: openoffice/trunk/main/python/python-2.7.15-msvs9-win64.patch (from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9-win64.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.15-msvs9-win64.patch?p2=openoffice/trunk/main/python/python-2.7.15-msvs9-win64.patch&p1=openoffice/trunk/main/python/python-2.7.14-msvs9-win64.patch&r1=1832717&r2=1832718&rev=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.14-msvs9-win64.patch (original)
+++ openoffice/trunk/main/python/python-2.7.15-msvs9-win64.patch Fri Jun  1 21:15:27 2018
@@ -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/_b
  				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/_c
  				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/_c
  			/>
  			<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/_e
  			/>
  			<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/_h
  			/>
  			<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/_m
  			/>
  			<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/_m
  			/>
  			<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/_s
  			/>
  			<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/_s
  			/>
  			<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/_s
  			/>
  			<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/_t
  			/>
  			<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/_t
  			/>
  			<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/bd
  				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/bz
  			/>
  			<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/ki
  			/>
  			<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/ma
  			/>
  			<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/ma
  			/>
  			<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/pc
  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/py
  			/>
  			<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/py
  			/>
  			<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/py
  			/>
  			<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/py
  			/>
  			<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/se
  			/>
  			<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/sq
  			/>
  			<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/un
  			/>
  			<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/w9
  			/>
  			<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"

Copied: openoffice/trunk/main/python/python-2.7.15-msvs9.patch (from r1832717, openoffice/trunk/main/python/python-2.7.14-msvs9.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.15-msvs9.patch?p2=openoffice/trunk/main/python/python-2.7.15-msvs9.patch&p1=openoffice/trunk/main/python/python-2.7.14-msvs9.patch&r1=1832717&r2=1832718&rev=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.14-msvs9.patch (original)
+++ openoffice/trunk/main/python/python-2.7.15-msvs9.patch Fri Jun  1 21:15:27 2018
@@ -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/_b
  				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/_c
  				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/_c
  			/>
  			<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/_e
  			/>
  			<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/_h
  			/>
  			<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/_m
  			/>
  			<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/_m
  			/>
  			<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/_s
  			/>
  			<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/_s
  			/>
  			<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/_s
  			/>
  			<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/_t
  			/>
  			<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/_t
  			/>
  			<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/bd
  				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/bz
  			/>
  			<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/ki
  			/>
  			<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/ma
  			/>
  			<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/ma
  			/>
  			<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/pc
  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/py
  			/>
  			<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/py
  			/>
  			<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/py
  			/>
  			<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/py
  			/>
  			<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/se
  			/>
  			<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/sq
  			/>
  			<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/un
  			/>
  			<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/w9
  			/>
  			<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"

Copied: openoffice/trunk/main/python/python-2.7.15-nohardlink.patch (from r1832717, openoffice/trunk/main/python/python-2.7.14-nohardlink.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.15-nohardlink.patch?p2=openoffice/trunk/main/python/python-2.7.15-nohardlink.patch&p1=openoffice/trunk/main/python/python-2.7.14-nohardlink.patch&r1=1832717&r2=1832718&rev=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.14-nohardlink.patch (original)
+++ openoffice/trunk/main/python/python-2.7.15-nohardlink.patch Fri Jun  1 21:15:27 2018
@@ -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 \

Copied: openoffice/trunk/main/python/python-2.7.15-sysbase.patch (from r1832717, openoffice/trunk/main/python/python-2.7.14-sysbase.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.15-sysbase.patch?p2=openoffice/trunk/main/python/python-2.7.15-sysbase.patch&p1=openoffice/trunk/main/python/python-2.7.14-sysbase.patch&r1=1832717&r2=1832718&rev=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.14-sysbase.patch (original)
+++ openoffice/trunk/main/python/python-2.7.15-sysbase.patch Fri Jun  1 21:15:27 2018
@@ -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

Modified: openoffice/trunk/main/python/python-freebsd.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-freebsd.patch?rev=1832718&r1=1832717&r2=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-freebsd.patch (original)
+++ openoffice/trunk/main/python/python-freebsd.patch Fri Jun  1 21:15:27 2018
@@ -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-fr
 +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/te
                           '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/fcn
           " 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/thre
  #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 m
  	  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 = []

Modified: openoffice/trunk/main/python/python-md5.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-md5.patch?rev=1832718&r1=1832717&r2=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-md5.patch (original)
+++ openoffice/trunk/main/python/python-md5.patch Fri Jun  1 21:15:27 2018
@@ -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.

Modified: openoffice/trunk/main/python/python-solaris.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-solaris.patch?rev=1832718&r1=1832717&r2=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-solaris.patch (original)
+++ openoffice/trunk/main/python/python-solaris.patch Fri Jun  1 21:15:27 2018
@@ -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.
  **************************************************************************/

Modified: openoffice/trunk/main/python/python-solver-before-std.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-solver-before-std.patch?rev=1832718&r1=1832717&r2=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-solver-before-std.patch (original)
+++ openoffice/trunk/main/python/python-solver-before-std.patch Fri Jun  1 21:15:27 2018
@@ -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()

Modified: openoffice/trunk/main/python/python-ssl.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-ssl.patch?rev=1832718&r1=1832717&r2=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-ssl.patch (original)
+++ openoffice/trunk/main/python/python-ssl.patch Fri Jun  1 21:15:27 2018
@@ -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) )

Modified: openoffice/trunk/main/python/pyversion.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/pyversion.mk?rev=1832718&r1=1832717&r2=1832718&view=diff
==============================================================================
--- openoffice/trunk/main/python/pyversion.mk (original)
+++ openoffice/trunk/main/python/pyversion.mk Fri Jun  1 21:15:27 2018
@@ -22,7 +22,7 @@
 # in the python project accordingly !!!
 PYMAJOR=2
 PYMINOR=7
-PYMICRO=14
+PYMICRO=15
 PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
 
 .IF "$(GUI)" == "UNX"



Mime
View raw message