external_deps.lst | 6 python/makefile.mk | 2 python/prj/d.lst | 108 +- python/python-2.7.8-mingw.patch | 1056 -------------------- python/python-2.7.8-nohardlink.patch | 11 python/python-2.7.8-pcbuild.patch | 1768 ---------------------------------- python/python-2.7.8-sysbase.patch | 14 python/python-2.7.9-mingw.patch | 1056 ++++++++++++++++++++ python/python-2.7.9-nohardlink.patch | 11 python/python-2.7.9-pcbuild.patch | 1750 +++++++++++++++++++++++++++++++++ python/python-2.7.9-sysbase.patch | 14 python/python-freebsd.patch | 125 -- python/python-md5.patch | 6 python/python-solaris.patch | 4 python/python-solver-before-std.patch | 8 python/python-ssl.patch | 18 python/pyversion.mk | 2 17 files changed, 2933 insertions(+), 3026 deletions(-)
New commits: commit 0b44f5c65c2674aa5e39273f696a9040beb99bb9 Author: Pedro Giffuni <p...@apache.org> Date: Fri Sep 2 04:43:14 2016 +0000 python: update to version 2.7.9. The new version contains many fixes including the following vulnerabilities: CVE-2013-1752 CVE-2013-1753 Which may or may not apply to AOO. It is also an important step as it uses features from the newer OpenSSL version that was imported in r1756954. Tested on FreeBSD, may still need adjustments for MS-Windows. diff --git a/external_deps.lst b/external_deps.lst index bfbaaf1..8012615 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) - MD5 = d4bca0159acb0b44a781292b5231936f - name = Python-2.7.8.tgz - URL1 = http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz + MD5 = 5eebcaa0030dc4061156d3429657fb83 + name = Python-2.7.9.tgz + URL1 = http://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) diff --git a/python/makefile.mk b/python/makefile.mk index 2a146a1..5ab7893 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=d4bca0159acb0b44a781292b5231936f +TARFILE_MD5=5eebcaa0030dc4061156d3429657fb83 PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ diff --git a/python/prj/d.lst b/python/prj/d.lst index ac5bd1d..39ee038 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.8\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\json\* %_DEST%\lib%_EXT%\python\json\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree -..\%__SRC%\misc\build\Python-2.7.8\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\* -..\%__SRC%\misc\build\Python-2.7.8\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile +..\%__SRC%\misc\build\Python-2.7.9\Lib\* %_DEST%\lib%_EXT%\python\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\email\* %_DEST%\lib%_EXT%\python\email\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\config\* %_DEST%\lib%_EXT%\python\config\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\json\* %_DEST%\lib%_EXT%\python\json\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree +..\%__SRC%\misc\build\Python-2.7.9\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree +..\%__SRC%\misc\build\Python-2.7.9\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\* +..\%__SRC%\misc\build\Python-2.7.9\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\* +..\%__SRC%\misc\build\Python-2.7.9\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.8\Include\* %_DEST%\inc%_EXT%\python\* +..\%__SRC%\misc\build\Python-2.7.9\Include\* %_DEST%\inc%_EXT%\python\* #unix ONLY ! ..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python -..\%__SRC%\misc\build\Python-2.7.8\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h +..\%__SRC%\misc\build\Python-2.7.9\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h ..\%__SRC%\misc\build\python-inst\lib\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\* ..\%__SRC%\misc\build\python-inst\bin\python2.7 %_DEST%\bin%_EXT%\python ..\%__SRC%\misc\build\python-inst\lib\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0 @@ -91,24 +91,24 @@ symlink: %_DEST%\lib%_EXT%\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so #MingW ONLY ! ..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe -..\%__SRC%\misc\build\Python-2.7.8\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll +..\%__SRC%\misc\build\Python-2.7.9\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.8\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\python27.dll %_DEST%\bin%_EXT%\python27.dll -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\python27.lib %_DEST%\lib%_EXT%\python27.lib -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd -..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\python27.dll %_DEST%\bin%_EXT%\python27.dll +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\python27.lib %_DEST%\lib%_EXT%\python27.lib +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.7.9\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd #linklib: libpython.so.*.*.* diff --git a/python/python-2.7.8-mingw.patch b/python/python-2.7.9-mingw.patch similarity index 81% rename from python/python-2.7.8-mingw.patch rename to python/python-2.7.9-mingw.patch index fb3e42d..127d342 100644 --- a/python/python-2.7.8-mingw.patch +++ b/python/python-2.7.9-mingw.patch @@ -1,6 +1,6 @@ -diff -ru misc/Python-2.7.8/Include/pyport.h misc/build/Python-2.7.8/Include/pyport.h ---- misc/Python-2.7.8/Include/pyport.h 2014-06-29 21:05:24.000000000 -0500 -+++ misc/build/Python-2.7.8/Include/pyport.h 2016-01-01 17:49:55.171717963 -0500 +diff -ru misc/Python-2.7.9/Include/pyport.h misc/build/Python-2.7.9/Include/pyport.h +--- misc/Python-2.7.9/Include/pyport.h 2014-06-29 21:05:24.000000000 -0500 ++++ misc/build/Python-2.7.9/Include/pyport.h 2016-01-01 17:49:55.171717963 -0500 @@ -9,6 +9,30 @@ #include <inttypes.h> #endif @@ -32,9 +32,9 @@ diff -ru misc/Python-2.7.8/Include/pyport.h misc/build/Python-2.7.8/Include/pypo #ifdef HAVE_STDINT_H #include <stdint.h> #endif -diff -ru misc/Python-2.7.8/Lib/distutils/ccompiler.py misc/build/Python-2.7.8/Lib/distutils/ccompiler.py ---- misc/Python-2.7.8/Lib/distutils/ccompiler.py 2014-06-29 21:05:25.000000000 -0500 -+++ misc/build/Python-2.7.8/Lib/distutils/ccompiler.py 2016-01-01 17:49:55.172717391 -0500 +diff -ru misc/Python-2.7.9/Lib/distutils/ccompiler.py misc/build/Python-2.7.9/Lib/distutils/ccompiler.py +--- misc/Python-2.7.9/Lib/distutils/ccompiler.py 2014-06-29 21:05:25.000000000 -0500 ++++ misc/build/Python-2.7.9/Lib/distutils/ccompiler.py 2016-01-01 17:49:55.172717391 -0500 @@ -895,6 +895,7 @@ # on a cygwin built python we can use gcc like an ordinary UNIXish # compiler @@ -43,9 +43,9 @@ diff -ru misc/Python-2.7.8/Lib/distutils/ccompiler.py misc/build/Python-2.7.8/Li ('os2emx', 'emx'), # OS name mappings -diff -ru misc/Python-2.7.8/Lib/distutils/command/build_ext.py misc/build/Python-2.7.8/Lib/distutils/command/build_ext.py ---- misc/Python-2.7.8/Lib/distutils/command/build_ext.py 2014-06-29 21:05:25.000000000 -0500 -+++ misc/build/Python-2.7.8/Lib/distutils/command/build_ext.py 2016-01-01 17:49:55.173717798 -0500 +diff -ru misc/Python-2.7.9/Lib/distutils/command/build_ext.py misc/build/Python-2.7.9/Lib/distutils/command/build_ext.py +--- misc/Python-2.7.9/Lib/distutils/command/build_ext.py 2014-06-29 21:05:25.000000000 -0500 ++++ misc/build/Python-2.7.9/Lib/distutils/command/build_ext.py 2016-01-01 17:49:55.173717798 -0500 @@ -221,7 +221,7 @@ # for extensions under Cygwin and AtheOS Python's library directory must be @@ -64,9 +64,9 @@ diff -ru misc/Python-2.7.8/Lib/distutils/command/build_ext.py misc/build/Python- template = "python%d.%d" pythonlib = (template % (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff)) -diff -ru misc/Python-2.7.8/Lib/distutils/command/install.py misc/build/Python-2.7.8/Lib/distutils/command/install.py ---- misc/Python-2.7.8/Lib/distutils/command/install.py 2014-06-29 21:05:25.000000000 -0500 -+++ misc/build/Python-2.7.8/Lib/distutils/command/install.py 2016-01-01 17:49:55.174717925 -0500 +diff -ru misc/Python-2.7.9/Lib/distutils/command/install.py misc/build/Python-2.7.9/Lib/distutils/command/install.py +--- misc/Python-2.7.9/Lib/distutils/command/install.py 2014-06-29 21:05:25.000000000 -0500 ++++ misc/build/Python-2.7.9/Lib/distutils/command/install.py 2016-01-01 17:49:55.174717925 -0500 @@ -348,9 +348,10 @@ # Convert directories from Unix /-separated syntax to the local @@ -102,9 +102,9 @@ diff -ru misc/Python-2.7.8/Lib/distutils/command/install.py misc/build/Python-2. def handle_extra_path (self): -diff -ru misc/Python-2.7.8/Lib/distutils/spawn.py misc/build/Python-2.7.8/Lib/distutils/spawn.py ---- misc/Python-2.7.8/Lib/distutils/spawn.py 2014-06-29 21:05:26.000000000 -0500 -+++ misc/build/Python-2.7.8/Lib/distutils/spawn.py 2016-01-01 17:49:55.175718681 -0500 +diff -ru misc/Python-2.7.9/Lib/distutils/spawn.py misc/build/Python-2.7.9/Lib/distutils/spawn.py +--- misc/Python-2.7.9/Lib/distutils/spawn.py 2014-06-29 21:05:26.000000000 -0500 ++++ misc/build/Python-2.7.9/Lib/distutils/spawn.py 2016-01-01 17:49:55.175718681 -0500 @@ -212,7 +212,7 @@ paths = path.split(os.pathsep) base, ext = os.path.splitext(executable) @@ -114,10 +114,10 @@ diff -ru misc/Python-2.7.8/Lib/distutils/spawn.py misc/build/Python-2.7.8/Lib/di executable = executable + '.exe' if not os.path.isfile(executable): -diff -ru misc/Python-2.7.8/Lib/distutils/sysconfig.py misc/build/Python-2.7.8/Lib/distutils/sysconfig.py ---- misc/Python-2.7.8/Lib/distutils/sysconfig.py 2014-06-29 21:05:26.000000000 -0500 -+++ misc/build/Python-2.7.8/Lib/distutils/sysconfig.py 2016-01-01 17:49:55.175718681 -0500 -@@ -449,6 +449,9 @@ +diff -ru misc/Python-2.7.9/Lib/distutils/sysconfig.py misc/build/Python-2.7.9/Lib/distutils/sysconfig.py +--- misc/Python-2.7.9/Lib/distutils/sysconfig.py 2014-06-29 21:05:26.000000000 -0500 ++++ misc/build/Python-2.7.9/Lib/distutils/sysconfig.py 2016-01-01 17:49:55.175718681 -0500 +@@ -450,6 +450,9 @@ global _config_vars if _config_vars is None: func = globals().get("_init_" + os.name) @@ -127,9 +127,9 @@ diff -ru misc/Python-2.7.8/Lib/distutils/sysconfig.py misc/build/Python-2.7.8/Li if func: func() else: -diff -ru misc/Python-2.7.8/Lib/distutils/unixccompiler.py misc/build/Python-2.7.8/Lib/distutils/unixccompiler.py ---- misc/Python-2.7.8/Lib/distutils/unixccompiler.py 2014-06-29 21:05:26.000000000 -0500 -+++ misc/build/Python-2.7.8/Lib/distutils/unixccompiler.py 2016-01-01 17:49:55.176718668 -0500 +diff -ru misc/Python-2.7.9/Lib/distutils/unixccompiler.py misc/build/Python-2.7.9/Lib/distutils/unixccompiler.py +--- misc/Python-2.7.9/Lib/distutils/unixccompiler.py 2014-06-29 21:05:26.000000000 -0500 ++++ misc/build/Python-2.7.9/Lib/distutils/unixccompiler.py 2016-01-01 17:49:55.176718668 -0500 @@ -80,7 +80,7 @@ shared_lib_extension = ".so" dylib_lib_extension = ".dylib" @@ -139,9 +139,9 @@ diff -ru misc/Python-2.7.8/Lib/distutils/unixccompiler.py misc/build/Python-2.7. exe_extension = ".exe" def preprocess(self, source, -diff -ru misc/Python-2.7.8/Lib/os.py misc/build/Python-2.7.8/Lib/os.py ---- misc/Python-2.7.8/Lib/os.py 2014-06-29 21:05:30.000000000 -0500 -+++ misc/build/Python-2.7.8/Lib/os.py 2016-01-01 17:49:55.177718586 -0500 +diff -ru misc/Python-2.7.9/Lib/os.py misc/build/Python-2.7.9/Lib/os.py +--- misc/Python-2.7.9/Lib/os.py 2014-06-29 21:05:30.000000000 -0500 ++++ misc/build/Python-2.7.9/Lib/os.py 2016-01-01 17:49:55.177718586 -0500 @@ -38,7 +38,21 @@ except AttributeError: return [n for n in dir(module) if n[0] != '_'] @@ -165,9 +165,9 @@ diff -ru misc/Python-2.7.8/Lib/os.py misc/build/Python-2.7.8/Lib/os.py name = 'posix' linesep = '\n' from posix import * -diff -ru misc/Python-2.7.8/Lib/socket.py misc/build/Python-2.7.8/Lib/socket.py ---- misc/Python-2.7.8/Lib/socket.py 2014-06-29 21:05:30.000000000 -0500 -+++ misc/build/Python-2.7.8/Lib/socket.py 2016-01-01 17:49:55.178717595 -0500 +diff -ru misc/Python-2.7.9/Lib/socket.py misc/build/Python-2.7.9/Lib/socket.py +--- misc/Python-2.7.9/Lib/socket.py 2014-06-29 21:05:30.000000000 -0500 ++++ misc/build/Python-2.7.9/Lib/socket.py 2016-01-01 17:49:55.178717595 -0500 @@ -153,7 +153,7 @@ 'sendall', 'setblocking', 'settimeout', 'gettimeout', 'shutdown') @@ -177,9 +177,9 @@ diff -ru misc/Python-2.7.8/Lib/socket.py misc/build/Python-2.7.8/Lib/socket.py _socketmethods = _socketmethods + ('ioctl',) if sys.platform == "riscos": -diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre.in ---- misc/Python-2.7.8/Makefile.pre.in 2014-06-29 21:05:39.000000000 -0500 -+++ misc/build/Python-2.7.8/Makefile.pre.in 2016-01-01 17:49:55.179718421 -0500 +diff -ru misc/Python-2.7.9/Makefile.pre.in misc/build/Python-2.7.9/Makefile.pre.in +--- misc/Python-2.7.9/Makefile.pre.in 2014-06-29 21:05:39.000000000 -0500 ++++ misc/build/Python-2.7.9/Makefile.pre.in 2016-01-01 17:49:55.179718421 -0500 @@ -121,6 +121,16 @@ BLDSHARED= @BLDSHARED@ $(LDFLAGS) LDCXXSHARED= @LDCXXSHARED@ @@ -197,7 +197,7 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. # Executable suffix (.exe on Windows and Mac OS X) EXE= @EXEEXT@ -@@ -211,7 +221,7 @@ +@@ -214,7 +224,7 @@ # Modules MODULE_OBJS= \ Modules/config.o \ @@ -206,7 +206,7 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. Modules/main.o \ Modules/gcmodule.o -@@ -586,6 +596,10 @@ +@@ -599,6 +609,10 @@ -DVPATH='"$(VPATH)"' \ -o $@ $(srcdir)/Modules/getpath.c @@ -217,7 +217,7 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. Modules/python.o: $(srcdir)/Modules/python.c $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c -@@ -634,6 +648,12 @@ +@@ -647,6 +661,12 @@ Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \ $(srcdir)/Objects/unicodetype_db.h @@ -230,7 +230,7 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. STRINGLIB_HEADERS= \ $(srcdir)/Include/bytes_methods.h \ $(srcdir)/Objects/stringlib/count.h \ -@@ -829,7 +849,11 @@ +@@ -861,7 +881,11 @@ # Install shared libraries enabled by Setup DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED) @@ -242,7 +242,7 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. @for i in X $(SHAREDMODS); do \ if test $$i != X; then \ echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \ -@@ -837,7 +861,11 @@ +@@ -869,7 +893,11 @@ fi; \ done @@ -254,7 +254,7 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. @for i in $(DESTDIRS); \ do \ if test ! -d $(DESTDIR)$$i; then \ -@@ -949,7 +977,11 @@ +@@ -982,7 +1010,11 @@ unittest unittest/test \ lib-old \ curses pydoc_data $(MACHDEPS) @@ -266,7 +266,7 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ if test ! -d $(DESTDIR)$$i; then \ -@@ -1009,6 +1041,26 @@ +@@ -1042,6 +1074,26 @@ $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -293,7 +293,7 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -@@ -1035,6 +1087,7 @@ +@@ -1068,6 +1120,7 @@ # Create the PLATDIR source directory, if one wasn't distributed.. $(srcdir)/Lib/$(PLATDIR): mkdir $(srcdir)/Lib/$(PLATDIR) @@ -301,7 +301,7 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. 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`"; \ -@@ -1048,6 +1101,7 @@ +@@ -1081,6 +1134,7 @@ PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \ fi; \ cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen @@ -309,7 +309,7 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. python-config: $(srcdir)/Misc/python-config.in # Substitution happens here, as the completely-expanded BINDIR -@@ -1141,6 +1195,15 @@ +@@ -1174,6 +1228,15 @@ # Install the dynamically loadable modules # This goes into $(exec_prefix) @@ -325,7 +325,7 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. sharedinstall: sharedmods $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ --prefix=$(prefix) \ -@@ -1148,6 +1211,7 @@ +@@ -1181,6 +1244,7 @@ --install-platlib=$(DESTSHARED) \ --root=$(DESTDIR)/ -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py* @@ -333,9 +333,9 @@ diff -ru misc/Python-2.7.8/Makefile.pre.in misc/build/Python-2.7.8/Makefile.pre. # 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.8/Modules/Setup.config.in misc/build/Python-2.7.8/Modules/Setup.config.in ---- misc/Python-2.7.8/Modules/Setup.config.in 2014-06-29 21:05:40.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/Setup.config.in 2016-01-01 17:49:55.179718421 -0500 +diff -ru misc/Python-2.7.9/Modules/Setup.config.in misc/build/Python-2.7.9/Modules/Setup.config.in +--- misc/Python-2.7.9/Modules/Setup.config.in 2014-06-29 21:05:40.000000000 -0500 ++++ misc/build/Python-2.7.9/Modules/Setup.config.in 2016-01-01 17:49:55.179718421 -0500 @@ -9,5 +9,9 @@ # The signal module @USE_SIGNAL_MODULE@signal signalmodule.c @@ -346,9 +346,9 @@ diff -ru misc/Python-2.7.8/Modules/Setup.config.in misc/build/Python-2.7.8/Modul + # 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.8/Modules/Setup.dist misc/build/Python-2.7.8/Modules/Setup.dist ---- misc/Python-2.7.8/Modules/Setup.dist 2014-06-29 21:05:40.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/Setup.dist 2016-01-01 17:49:55.180717640 -0500 +diff -ru misc/Python-2.7.9/Modules/Setup.dist misc/build/Python-2.7.9/Modules/Setup.dist +--- misc/Python-2.7.9/Modules/Setup.dist 2014-06-29 21:05:40.000000000 -0500 ++++ misc/build/Python-2.7.9/Modules/Setup.dist 2016-01-01 17:49:55.180717640 -0500 @@ -114,7 +114,7 @@ posix posixmodule.c # posix (UNIX) system calls @@ -358,10 +358,10 @@ diff -ru misc/Python-2.7.8/Modules/Setup.dist misc/build/Python-2.7.8/Modules/Se # 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.8/Modules/_ctypes/libffi/configure misc/build/Python-2.7.8/Modules/_ctypes/libffi/configure ---- misc/Python-2.7.8/Modules/_ctypes/libffi/configure 2014-06-29 21:05:40.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/_ctypes/libffi/configure 2016-01-01 17:49:55.235718066 -0500 -@@ -14855,6 +14855,12 @@ +diff -ru misc/Python-2.7.9/Modules/_ctypes/libffi/configure misc/build/Python-2.7.9/Modules/_ctypes/libffi/configure +--- misc/Python-2.7.9/Modules/_ctypes/libffi/configure 2014-06-29 21:05:40.000000000 -0500 ++++ misc/build/Python-2.7.9/Modules/_ctypes/libffi/configure 2016-01-01 17:49:55.235718066 -0500 +@@ -18807,6 +18807,12 @@ fi @@ -374,10 +374,10 @@ diff -ru misc/Python-2.7.8/Modules/_ctypes/libffi/configure misc/build/Python-2. ac_config_commands="$ac_config_commands include" ac_config_commands="$ac_config_commands src" -diff -ru misc/Python-2.7.8/Modules/_ctypes/libffi/configure.ac misc/build/Python-2.7.8/Modules/_ctypes/libffi/configure.ac ---- misc/Python-2.7.8/Modules/_ctypes/libffi/configure.ac 2014-06-29 21:05:40.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/_ctypes/libffi/configure.ac 2016-01-01 17:49:55.236718053 -0500 -@@ -564,6 +564,12 @@ +diff -ru misc/Python-2.7.9/Modules/_ctypes/libffi/configure.ac misc/build/Python-2.7.9/Modules/_ctypes/libffi/configure.ac +--- misc/Python-2.7.9/Modules/_ctypes/libffi/configure.ac 2014-06-29 21:05:40.000000000 -0500 ++++ misc/build/Python-2.7.9/Modules/_ctypes/libffi/configure.ac 2016-01-01 17:49:55.236718053 -0500 +@@ -613,6 +613,12 @@ fi AC_SUBST(toolexeclibdir) @@ -390,10 +390,10 @@ diff -ru misc/Python-2.7.8/Modules/_ctypes/libffi/configure.ac misc/build/Python AC_CONFIG_COMMANDS(include, [test -d include || mkdir include]) AC_CONFIG_COMMANDS(src, [ test -d src || mkdir src -diff -ru misc/Python-2.7.8/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Python-2.7.8/Modules/_ctypes/libffi/include/ffi.h.in ---- misc/Python-2.7.8/Modules/_ctypes/libffi/include/ffi.h.in 2014-06-29 21:05:40.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/_ctypes/libffi/include/ffi.h.in 2016-01-01 17:49:55.236718053 -0500 -@@ -428,7 +428,11 @@ +diff -ru misc/Python-2.7.9/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Python-2.7.9/Modules/_ctypes/libffi/include/ffi.h.in +--- misc/Python-2.7.9/Modules/_ctypes/libffi/include/ffi.h.in 2014-06-29 21:05:40.000000000 -0500 ++++ misc/build/Python-2.7.9/Modules/_ctypes/libffi/include/ffi.h.in 2016-01-01 17:49:55.236718053 -0500 +@@ -433,7 +433,11 @@ ffi_type *rtype, ffi_type **atypes); @@ -405,9 +405,9 @@ diff -ru misc/Python-2.7.8/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Py void (*fn)(void), void *rvalue, void **avalue); -diff -ru misc/Python-2.7.8/Modules/config.c.in misc/build/Python-2.7.8/Modules/config.c.in ---- misc/Python-2.7.8/Modules/config.c.in 2014-06-29 21:05:42.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/config.c.in 2016-01-01 17:49:55.237718460 -0500 +diff -ru misc/Python-2.7.9/Modules/config.c.in misc/build/Python-2.7.9/Modules/config.c.in +--- misc/Python-2.7.9/Modules/config.c.in 2014-06-29 21:05:42.000000000 -0500 ++++ misc/build/Python-2.7.9/Modules/config.c.in 2016-01-01 17:49:55.237718460 -0500 @@ -48,6 +48,9 @@ {"__builtin__", NULL}, {"sys", NULL}, @@ -418,9 +418,9 @@ diff -ru misc/Python-2.7.8/Modules/config.c.in misc/build/Python-2.7.8/Modules/c /* This lives in gcmodule.c */ {"gc", initgc}, -diff -ru misc/Python-2.7.8/Modules/posixmodule.c misc/build/Python-2.7.8/Modules/posixmodule.c ---- misc/Python-2.7.8/Modules/posixmodule.c 2014-06-29 21:05:43.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/posixmodule.c 2016-01-01 17:49:55.241719248 -0500 +diff -ru misc/Python-2.7.9/Modules/posixmodule.c misc/build/Python-2.7.9/Modules/posixmodule.c +--- misc/Python-2.7.9/Modules/posixmodule.c 2014-06-29 21:05:43.000000000 -0500 ++++ misc/build/Python-2.7.9/Modules/posixmodule.c 2016-01-01 17:49:55.241719248 -0500 @@ -132,6 +132,15 @@ #define HAVE_FSYNC 1 #define fsync _commit @@ -487,10 +487,10 @@ diff -ru misc/Python-2.7.8/Modules/posixmodule.c misc/build/Python-2.7.8/Modules /* 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.8/Modules/socketmodule.c misc/build/Python-2.7.8/Modules/socketmodule.c ---- misc/Python-2.7.8/Modules/socketmodule.c 2014-06-29 21:05:43.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/socketmodule.c 2016-01-01 17:49:55.244718023 -0500 -@@ -313,7 +313,7 @@ +diff -ru misc/Python-2.7.9/Modules/socketmodule.c misc/build/Python-2.7.9/Modules/socketmodule.c +--- misc/Python-2.7.9/Modules/socketmodule.c 2014-06-29 21:05:43.000000000 -0500 ++++ misc/build/Python-2.7.9/Modules/socketmodule.c 2016-01-01 17:49:55.244718023 -0500 +@@ -317,7 +317,7 @@ /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and * EAI_* constants are defined in (the already included) ws2tcpip.h. */ @@ -499,10 +499,10 @@ diff -ru misc/Python-2.7.8/Modules/socketmodule.c misc/build/Python-2.7.8/Module # include "addrinfo.h" #endif -diff -ru misc/Python-2.7.8/PC/_winreg.c misc/build/Python-2.7.8/PC/_winreg.c ---- misc/Python-2.7.8/PC/_winreg.c 2014-06-29 21:05:46.000000000 -0500 -+++ misc/build/Python-2.7.8/PC/_winreg.c 2016-01-01 17:49:55.246717928 -0500 -@@ -1790,6 +1790,9 @@ +diff -ru misc/Python-2.7.9/PC/_winreg.c misc/build/Python-2.7.9/PC/_winreg.c +--- misc/Python-2.7.9/PC/_winreg.c 2014-06-29 21:05:46.000000000 -0500 ++++ misc/build/Python-2.7.9/PC/_winreg.c 2016-01-01 17:49:55.246717928 -0500 +@@ -1792,6 +1792,9 @@ } #define ADD_KEY(val) inskey(d, #val, val) @@ -512,9 +512,9 @@ diff -ru misc/Python-2.7.8/PC/_winreg.c misc/build/Python-2.7.8/PC/_winreg.c PyMODINIT_FUNC init_winreg(void) { -diff -ru misc/Python-2.7.8/Python/dynload_win.c misc/build/Python-2.7.8/Python/dynload_win.c ---- misc/Python-2.7.8/Python/dynload_win.c 2014-06-29 21:05:47.000000000 -0500 -+++ misc/build/Python-2.7.8/Python/dynload_win.c 2016-01-01 17:49:55.246717928 -0500 +diff -ru misc/Python-2.7.9/Python/dynload_win.c misc/build/Python-2.7.9/Python/dynload_win.c +--- misc/Python-2.7.9/Python/dynload_win.c 2014-06-29 21:05:47.000000000 -0500 ++++ misc/build/Python-2.7.9/Python/dynload_win.c 2016-01-01 17:49:55.246717928 -0500 @@ -28,6 +28,7 @@ /* Case insensitive string compare, to avoid any dependencies on particular C RTL implementations */ @@ -531,9 +531,9 @@ diff -ru misc/Python-2.7.8/Python/dynload_win.c misc/build/Python-2.7.8/Python/d /* Function to return the name of the "python" DLL that the supplied module -diff -ru misc/Python-2.7.8/Python/frozenmain.c misc/build/Python-2.7.8/Python/frozenmain.c ---- misc/Python-2.7.8/Python/frozenmain.c 2014-06-29 21:05:47.000000000 -0500 -+++ misc/build/Python-2.7.8/Python/frozenmain.c 2016-01-01 17:49:55.247717915 -0500 +diff -ru misc/Python-2.7.9/Python/frozenmain.c misc/build/Python-2.7.9/Python/frozenmain.c +--- misc/Python-2.7.9/Python/frozenmain.c 2014-06-29 21:05:47.000000000 -0500 ++++ misc/build/Python-2.7.9/Python/frozenmain.c 2016-01-01 17:49:55.247717915 -0500 @@ -3,7 +3,7 @@ #include "Python.h" @@ -567,10 +567,10 @@ diff -ru misc/Python-2.7.8/Python/frozenmain.c misc/build/Python-2.7.8/Python/fr PyWinFreeze_ExeTerm(); #endif Py_Finalize(); -diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure ---- misc/Python-2.7.8/configure 2014-06-29 21:05:48.000000000 -0500 -+++ misc/build/Python-2.7.8/configure 2016-01-01 17:49:55.307717091 -0500 -@@ -637,8 +637,10 @@ +diff -ru misc/Python-2.7.9/configure misc/build/Python-2.7.9/configure +--- misc/Python-2.7.9/configure 2014-06-29 21:05:48.000000000 -0500 ++++ misc/build/Python-2.7.9/configure 2016-01-01 17:49:55.307717091 -0500 +@@ -638,8 +638,10 @@ LIBOBJS TRUE MACHDEP_OBJS @@ -581,7 +581,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure THREADOBJ LDLAST USE_THREAD_MODULE -@@ -3359,6 +3361,13 @@ +@@ -3367,6 +3369,13 @@ LDFLAGS="$SGI_ABI $LDFLAGS" MACHDEP=`echo "${MACHDEP}${SGI_ABI}" | sed 's/ *//g'` fi @@ -595,7 +595,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACHDEP" >&5 $as_echo "$MACHDEP" >&6; } -@@ -5272,7 +5281,7 @@ +@@ -5280,7 +5289,7 @@ if test -z "$enable_shared" then case $ac_sys_system in @@ -604,7 +604,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure enable_shared="yes";; *) enable_shared="no";; -@@ -5341,7 +5350,7 @@ +@@ -5349,7 +5358,7 @@ BeOS*) LDLIBRARY='libpython$(VERSION).so' ;; @@ -613,7 +613,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure LDLIBRARY='libpython$(VERSION).dll.a' DLLLIBRARY='libpython$(VERSION).dll' ;; -@@ -5397,7 +5406,7 @@ +@@ -5405,7 +5413,7 @@ esac else # shared is disabled case $ac_sys_system in @@ -622,7 +622,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure BLDLIBRARY='$(LIBRARY)' LDLIBRARY='libpython$(VERSION).dll.a' ;; -@@ -7812,6 +7821,10 @@ +@@ -7820,6 +7829,10 @@ @@ -633,7 +633,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable large file support" >&5 $as_echo_n "checking whether to enable large file support... " >&6; } if test "$have_long_long" = yes -@@ -8128,7 +8141,7 @@ +@@ -8136,7 +8149,7 @@ *) SO=.sl;; esac ;; @@ -642,7 +642,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure *) SO=.so;; esac else -@@ -8292,7 +8305,7 @@ +@@ -8300,7 +8313,7 @@ SCO_SV*) LDSHARED='$(CC) -Wl,-G,-Bexport' LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';; @@ -651,7 +651,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure LDSHARED="gcc -shared -Wl,--enable-auto-image-base" LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";; atheos*) -@@ -8388,7 +8401,7 @@ +@@ -8396,7 +8409,7 @@ LINKFORSHARED="-Xlinker --export-dynamic" fi;; esac;; @@ -660,7 +660,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure if test $enable_shared = "no" then LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)' -@@ -8412,7 +8425,7 @@ +@@ -8420,7 +8433,7 @@ if test ! "$LIBRARY" = "$LDLIBRARY" then case $ac_sys_system in @@ -669,7 +669,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure # Cygwin needs CCSHARED when building extension DLLs # but not when building the interpreter DLL. CFLAGSFORSHARED='';; -@@ -9663,7 +9676,7 @@ +@@ -9671,7 +9684,7 @@ #define HAVE_PTHREAD_SIGMASK 1 _ACEOF case $ac_sys_system in @@ -678,7 +678,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure $as_echo "#define HAVE_BROKEN_PTHREAD_SIGMASK 1" >>confdefs.h -@@ -9686,6 +9699,17 @@ +@@ -9694,6 +9707,17 @@ fi @@ -696,7 +696,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure # Check for enable-ipv6 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-ipv6 is specified" >&5 -@@ -10120,6 +10144,11 @@ +@@ -10128,6 +10152,11 @@ # Use dynload_next.c only on 10.2 and below, which don't have native dlopen() Darwin/[0156]\..*) DYNLOADFILE="dynload_next.o";; atheos*) DYNLOADFILE="dynload_atheos.o";; @@ -708,7 +708,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure *) # use dynload_shlib.c and dlopen() if we have it; otherwise stub # out any dynamic loading -@@ -10139,6 +10168,21 @@ +@@ -10147,6 +10176,21 @@ fi @@ -730,7 +730,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure # MACHDEP_OBJS can be set to platform-specific object files needed by Python -@@ -11737,6 +11781,20 @@ +@@ -11745,6 +11789,20 @@ fi @@ -751,7 +751,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then : -@@ -11757,6 +11815,8 @@ +@@ -11765,6 +11823,8 @@ fi @@ -760,7 +760,7 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5 $as_echo_n "checking for time.h that defines altzone... " >&6; } -@@ -13140,6 +13200,7 @@ +@@ -13148,6 +13208,7 @@ @@ -768,10 +768,10 @@ diff -ru misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure if test "$enable_unicode" = "no" then -diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac ---- misc/Python-2.7.8/configure.ac 2014-06-29 21:05:48.000000000 -0500 -+++ misc/build/Python-2.7.8/configure.ac 2016-01-01 17:49:55.310717403 -0500 -@@ -488,6 +488,13 @@ +diff -ru misc/Python-2.7.9/configure.ac misc/build/Python-2.7.9/configure.ac +--- misc/Python-2.7.9/configure.ac 2014-06-29 21:05:48.000000000 -0500 ++++ misc/build/Python-2.7.9/configure.ac 2016-01-01 17:49:55.310717403 -0500 +@@ -491,6 +491,13 @@ LDFLAGS="$SGI_ABI $LDFLAGS" MACHDEP=`echo "${MACHDEP}${SGI_ABI}" | sed 's/ *//g'` fi @@ -785,7 +785,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac AC_MSG_RESULT($MACHDEP) # And add extra plat-mac for darwin -@@ -821,7 +828,7 @@ +@@ -824,7 +831,7 @@ if test -z "$enable_shared" then case $ac_sys_system in @@ -794,7 +794,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac enable_shared="yes";; *) enable_shared="no";; -@@ -873,7 +880,7 @@ +@@ -876,7 +883,7 @@ BeOS*) LDLIBRARY='libpython$(VERSION).so' ;; @@ -803,7 +803,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac LDLIBRARY='libpython$(VERSION).dll.a' DLLLIBRARY='libpython$(VERSION).dll' ;; -@@ -929,7 +936,7 @@ +@@ -932,7 +939,7 @@ esac else # shared is disabled case $ac_sys_system in @@ -812,7 +812,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac BLDLIBRARY='$(LIBRARY)' LDLIBRARY='libpython$(VERSION).dll.a' ;; -@@ -1711,6 +1718,10 @@ +@@ -1714,6 +1721,10 @@ #endif ]) @@ -823,7 +823,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac AC_MSG_CHECKING(whether to enable large file support) if test "$have_long_long" = yes then -@@ -1916,7 +1927,7 @@ +@@ -1919,7 +1930,7 @@ *) SO=.sl;; esac ;; @@ -832,7 +832,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac *) SO=.so;; esac else -@@ -2074,7 +2085,7 @@ +@@ -2077,7 +2088,7 @@ SCO_SV*) LDSHARED='$(CC) -Wl,-G,-Bexport' LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';; @@ -841,7 +841,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac LDSHARED="gcc -shared -Wl,--enable-auto-image-base" LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";; atheos*) -@@ -2166,7 +2177,7 @@ +@@ -2169,7 +2120,7 @@ LINKFORSHARED="-Xlinker --export-dynamic" fi;; esac;; @@ -850,7 +850,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac if test $enable_shared = "no" then LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)' -@@ -2188,7 +2199,7 @@ +@@ -2191,7 +2202,7 @@ if test ! "$LIBRARY" = "$LDLIBRARY" then case $ac_sys_system in @@ -859,7 +859,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac # Cygwin needs CCSHARED when building extension DLLs # but not when building the interpreter DLL. CFLAGSFORSHARED='';; -@@ -2598,7 +2609,7 @@ +@@ -2601,7 +2612,7 @@ fi AC_CHECK_FUNCS(pthread_sigmask, [case $ac_sys_system in @@ -868,7 +868,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac AC_DEFINE(HAVE_BROKEN_PTHREAD_SIGMASK, 1, [Define if pthread_sigmask() does not work on your system.]) ;; -@@ -2606,6 +2617,17 @@ +@@ -2609,6 +2620,17 @@ AC_CHECK_FUNCS(pthread_atfork) fi @@ -886,7 +886,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac # Check for enable-ipv6 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) -@@ -2877,6 +2899,11 @@ +@@ -2880,6 +2902,11 @@ # Use dynload_next.c only on 10.2 and below, which don't have native dlopen() Darwin/@<:@0156@:>@\..*) DYNLOADFILE="dynload_next.o";; atheos*) DYNLOADFILE="dynload_atheos.o";; @@ -898,7 +898,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac *) # use dynload_shlib.c and dlopen() if we have it; otherwise stub # out any dynamic loading -@@ -2894,6 +2921,19 @@ +@@ -2897,6 +2924,19 @@ [Defined when any dynamic module loading is enabled.]) fi @@ -918,7 +918,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac # MACHDEP_OBJS can be set to platform-specific object files needed by Python AC_SUBST(MACHDEP_OBJS) -@@ -3355,7 +3395,14 @@ +@@ -3358,7 +3398,14 @@ AC_CHECK_MEMBERS([struct stat.st_flags]) AC_CHECK_MEMBERS([struct stat.st_gen]) AC_CHECK_MEMBERS([struct stat.st_birthtime]) @@ -933,7 +933,7 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac AC_MSG_CHECKING(for time.h that defines altzone) AC_CACHE_VAL(ac_cv_header_time_altzone,[ -@@ -3976,6 +4023,7 @@ +@@ -3979,6 +4026,7 @@ AH_TEMPLATE(PY_UNICODE_TYPE, [Define as the integral type used for Unicode representation.]) @@ -941,10 +941,10 @@ diff -ru misc/Python-2.7.8/configure.ac misc/build/Python-2.7.8/configure.ac AC_SUBST(UNICODE_OBJS) if test "$enable_unicode" = "no" then -diff -ru misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py ---- misc/Python-2.7.8/setup.py 2014-06-29 21:05:48.000000000 -0500 -+++ misc/build/Python-2.7.8/setup.py 2016-01-01 17:49:55.312719892 -0500 -@@ -285,6 +285,18 @@ +diff -ru misc/Python-2.7.9/setup.py misc/build/Python-2.7.9/setup.py +--- misc/Python-2.7.9/setup.py 2014-06-29 21:05:48.000000000 -0500 ++++ misc/build/Python-2.7.9/setup.py 2016-01-01 17:49:55.312719892 -0500 +@@ -287,6 +287,18 @@ if not self.configure_ctypes(ext): return @@ -963,7 +963,7 @@ diff -ru misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py try: build_ext.build_extension(self, ext) except (CCompilerError, DistutilsError), why: -@@ -314,7 +326,7 @@ +@@ -316,7 +328,7 @@ # Workaround for Cygwin: Cygwin currently has fork issues when many # modules have been imported @@ -972,7 +972,7 @@ diff -ru misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py self.announce('WARNING: skipping import check for Cygwin-based "%s"' % ext.name) return -@@ -1233,7 +1245,7 @@ +@@ -1235,7 +1247,7 @@ dbm_order = ['gdbm'] # The standard Unix dbm module: @@ -981,7 +981,7 @@ diff -ru misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py config_args = [arg.strip("'") for arg in sysconfig.get_config_var("CONFIG_ARGS").split()] dbm_args = [arg for arg in config_args -@@ -1325,7 +1337,7 @@ +@@ -1327,7 +1339,7 @@ missing.append('resource') # Sun yellow pages. Some systems have the functions in libc. @@ -990,7 +990,7 @@ diff -ru misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None): if (self.compiler.find_library_file(lib_dirs, 'nsl')): libs = ['nsl'] -@@ -1547,7 +1559,7 @@ +@@ -1549,7 +1561,7 @@ macros = dict() libraries = [] @@ -999,7 +999,7 @@ diff -ru misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py macros = dict() libraries = [] -@@ -1569,7 +1581,7 @@ +@@ -1571,7 +1583,7 @@ macros = dict() libraries = ['rt'] @@ -1008,7 +1008,7 @@ diff -ru misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c', '_multiprocessing/semaphore.c', '_multiprocessing/pipe_connection.c', -@@ -1588,6 +1600,7 @@ +@@ -1590,6 +1602,7 @@ if sysconfig.get_config_var('WITH_THREAD'): exts.append ( Extension('_multiprocessing', multiprocessing_srcs, define_macros=macros.items(), @@ -1016,7 +1016,7 @@ diff -ru misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py include_dirs=["Modules/_multiprocessing"])) else: missing.append('_multiprocessing') -@@ -1721,6 +1734,10 @@ +@@ -1723,6 +1736,10 @@ '-framework', 'Carbon']) ) @@ -1027,7 +1027,7 @@ diff -ru misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py self.extensions.extend(exts) # Call the method for detecting whether _tkinter can be compiled -@@ -1930,7 +1947,7 @@ +@@ -1932,7 +1949,7 @@ added_lib_dirs.append('/usr/X11/lib') # If Cygwin, then verify that X is installed before proceeding @@ -1036,7 +1036,7 @@ diff -ru misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py x11_inc = find_file('X11/Xlib.h', [], include_dirs) if x11_inc is None: return -@@ -1953,7 +1970,7 @@ +@@ -1955,7 +1972,7 @@ libs.append('ld') # Finally, link with the X11 libraries (not appropriate on cygwin) @@ -1045,7 +1045,7 @@ diff -ru misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py libs.append('X11') ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], -@@ -2023,6 +2040,8 @@ +@@ -2025,6 +2042,8 @@ if (('--host=' in arg) or ('--build=' in arg))] if not self.verbose: config_args.append("-q") diff --git a/python/python-2.7.8-nohardlink.patch b/python/python-2.7.9-nohardlink.patch similarity index 73% rename from python/python-2.7.8-nohardlink.patch rename to python/python-2.7.9-nohardlink.patch index 26fc5fd..01b5c66 100644 --- a/python/python-2.7.8-nohardlink.patch +++ b/python/python-2.7.9-nohardlink.patch @@ -1,6 +1,6 @@ ---- misc/Python-2.7.8/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500 -+++ misc/build/Python-2.7.8/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500 -@@ -478,7 +478,7 @@ +--- misc/Python-2.7.9/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500 ++++ misc/build/Python-2.7.9/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500 +@@ -491,7 +491,7 @@ libpython$(VERSION).so: $(LIBRARY_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ diff --git a/python/python-2.7.8-pcbuild.patch b/python/python-2.7.9-pcbuild.patch similarity index 81% rename from python/python-2.7.8-pcbuild.patch rename to python/python-2.7.9-pcbuild.patch index 69577cb..5cd80b5 100644 --- a/python/python-2.7.8-pcbuild.patch +++ b/python/python-2.7.9-pcbuild.patch @@ -1,6 +1,6 @@ -diff -u misc/Python-2.7.8/PCbuild/_bsddb.vcproj misc/build/Python-2.7.8/PCbuild/_bsddb.vcproj ---- misc/Python-2.7.8/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_bsddb.vcproj misc/build/Python-2.7.9/PCbuild/_bsddb.vcproj +--- misc/Python-2.7.9/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -56,6 +56,7 @@ /> <Tool @@ -65,9 +65,9 @@ diff -u misc/Python-2.7.8/PCbuild/_bsddb.vcproj misc/build/Python-2.7.8/PCbuild/ AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" TargetMachine="17" -diff -u misc/Python-2.7.8/PCbuild/_ctypes.vcproj misc/build/Python-2.7.8/PCbuild/_ctypes.vcproj ---- misc/Python-2.7.8/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_ctypes.vcproj misc/build/Python-2.7.9/PCbuild/_ctypes.vcproj +--- misc/Python-2.7.9/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -177,7 +177,7 @@ /> <Tool @@ -122,9 +122,9 @@ diff -u misc/Python-2.7.8/PCbuild/_ctypes.vcproj misc/build/Python-2.7.8/PCbuild SubSystem="0" BaseAddress="0x1D1A0000" TargetMachine="17" -diff -u misc/Python-2.7.8/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.8/PCbuild/_ctypes_test.vcproj ---- misc/Python-2.7.8/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.9/PCbuild/_ctypes_test.vcproj +--- misc/Python-2.7.9/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -54,6 +54,7 @@ /> <Tool @@ -189,9 +189,9 @@ diff -u misc/Python-2.7.8/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.8/PC /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/_elementtree.vcproj misc/build/Python-2.7.8/PCbuild/_elementtree.vcproj ---- misc/Python-2.7.8/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_elementtree.vcproj misc/build/Python-2.7.9/PCbuild/_elementtree.vcproj +--- misc/Python-2.7.9/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -57,6 +57,7 @@ <Tool Name="VCLinkerTool" @@ -256,9 +256,9 @@ diff -u misc/Python-2.7.8/PCbuild/_elementtree.vcproj misc/build/Python-2.7.8/PC /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/_hashlib.vcproj misc/build/Python-2.7.8/PCbuild/_hashlib.vcproj ---- misc/Python-2.7.8/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_hashlib.vcproj misc/build/Python-2.7.9/PCbuild/_hashlib.vcproj +--- misc/Python-2.7.9/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -58,6 +58,7 @@ <Tool Name="VCLinkerTool" @@ -323,9 +323,9 @@ diff -u misc/Python-2.7.8/PCbuild/_hashlib.vcproj misc/build/Python-2.7.8/PCbuil /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/_msi.vcproj misc/build/Python-2.7.8/PCbuild/_msi.vcproj ---- misc/Python-2.7.8/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_msi.vcproj misc/build/Python-2.7.9/PCbuild/_msi.vcproj +--- misc/Python-2.7.9/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -56,6 +56,7 @@ Name="VCLinkerTool" AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" @@ -390,9 +390,9 @@ diff -u misc/Python-2.7.8/PCbuild/_msi.vcproj misc/build/Python-2.7.8/PCbuild/_m /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.8/PCbuild/_multiprocessing.vcproj ---- misc/Python-2.7.8/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.9/PCbuild/_multiprocessing.vcproj +--- misc/Python-2.7.9/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -56,6 +56,7 @@ Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib" @@ -457,9 +457,9 @@ diff -u misc/Python-2.7.8/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7. /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/_socket.vcproj misc/build/Python-2.7.8/PCbuild/_socket.vcproj ---- misc/Python-2.7.8/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_socket.vcproj misc/build/Python-2.7.9/PCbuild/_socket.vcproj +--- misc/Python-2.7.9/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -56,6 +56,7 @@ Name="VCLinkerTool" AdditionalDependencies="ws2_32.lib" @@ -524,9 +524,9 @@ diff -u misc/Python-2.7.8/PCbuild/_socket.vcproj misc/build/Python-2.7.8/PCbuild /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.8/PCbuild/_sqlite3.vcproj ---- misc/Python-2.7.8/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.9/PCbuild/_sqlite3.vcproj +--- misc/Python-2.7.9/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -57,6 +57,7 @@ <Tool Name="VCLinkerTool" @@ -591,9 +591,9 @@ diff -u misc/Python-2.7.8/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.8/PCbuil /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/_ssl.vcproj misc/build/Python-2.7.8/PCbuild/_ssl.vcproj ---- misc/Python-2.7.8/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_ssl.vcproj misc/build/Python-2.7.9/PCbuild/_ssl.vcproj +--- misc/Python-2.7.9/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -43,7 +43,7 @@ /> <Tool @@ -607,9 +607,9 @@ diff -u misc/Python-2.7.8/PCbuild/_ssl.vcproj misc/build/Python-2.7.8/PCbuild/_s /> <Tool Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" +- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" + AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib /> <Tool Name="VCALinkTool" @@ -626,9 +626,9 @@ diff -u misc/Python-2.7.8/PCbuild/_ssl.vcproj misc/build/Python-2.7.8/PCbuild/_s /> <Tool Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" +- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" + AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib /> <Tool Name="VCALinkTool" @@ -645,9 +645,9 @@ diff -u misc/Python-2.7.8/PCbuild/_ssl.vcproj misc/build/Python-2.7.8/PCbuild/_s /> <Tool Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" +- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" + AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -660,17 +660,18 @@ diff -u misc/Python-2.7.8/PCbuild/_ssl.vcproj misc/build/Python-2.7.8/PCbuild/_s /> <Tool Name="VCManagedResourceCompilerTool" -@@ -247,7 +250,8 @@ +@@ -247,8 +250,8 @@ /> <Tool Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - /> +- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" +- /> ++ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE" ++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" /> <Tool Name="VCALinkTool" -@@ -296,7 +300,7 @@ + /> +@@ -296,7 +299,7 @@ /> <Tool Name="VCCLCompilerTool" @@ -679,17 +680,18 @@ diff -u misc/Python-2.7.8/PCbuild/_ssl.vcproj misc/build/Python-2.7.8/PCbuild/_s /> <Tool Name="VCManagedResourceCompilerTool" -@@ -310,7 +314,8 @@ +@@ -310,8 +313,8 @@ /> <Tool Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - /> +- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" +- /> ++ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE" ++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib /> <Tool Name="VCALinkTool" -@@ -360,7 +365,7 @@ + /> +@@ -360,7 +363,7 @@ /> <Tool Name="VCCLCompilerTool" @@ -698,17 +700,7 @@ diff -u misc/Python-2.7.8/PCbuild/_ssl.vcproj misc/build/Python-2.7.8/PCbuild/_s /> <Tool Name="VCManagedResourceCompilerTool" -@@ -374,7 +379,8 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - TargetMachine="17" - /> - <Tool -@@ -424,7 +430,7 @@ +@@ -424,7 +427,7 @@ /> <Tool Name="VCCLCompilerTool" @@ -717,17 +709,18 @@ diff -u misc/Python-2.7.8/PCbuild/_ssl.vcproj misc/build/Python-2.7.8/PCbuild/_s /> <Tool Name="VCManagedResourceCompilerTool" -@@ -438,7 +444,8 @@ +@@ -438,8 +441,8 @@ /> <Tool Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" +- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" +- /> + AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - /> ++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib /> <Tool Name="VCALinkTool" -@@ -488,7 +495,7 @@ + /> +@@ -488,7 +491,7 @@ /> <Tool Name="VCCLCompilerTool" @@ -736,19 +729,9 @@ diff -u misc/Python-2.7.8/PCbuild/_ssl.vcproj misc/build/Python-2.7.8/PCbuild/_s /> <Tool Name="VCManagedResourceCompilerTool" -@@ -502,7 +509,8 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - TargetMachine="17" - /> - <Tool -diff -u misc/Python-2.7.8/PCbuild/_testcapi.vcproj misc/build/Python-2.7.8/PCbuild/_testcapi.vcproj ---- misc/Python-2.7.8/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_testcapi.vcproj misc/build/Python-2.7.9/PCbuild/_testcapi.vcproj +--- misc/Python-2.7.9/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -55,6 +55,7 @@ <Tool Name="VCLinkerTool" @@ -813,9 +796,9 @@ diff -u misc/Python-2.7.8/PCbuild/_testcapi.vcproj misc/build/Python-2.7.8/PCbui /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/_tkinter.vcproj misc/build/Python-2.7.8/PCbuild/_tkinter.vcproj ---- misc/Python-2.7.8/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/_tkinter.vcproj misc/build/Python-2.7.9/PCbuild/_tkinter.vcproj +--- misc/Python-2.7.9/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -57,6 +57,7 @@ <Tool Name="VCLinkerTool" @@ -880,9 +863,9 @@ diff -u misc/Python-2.7.8/PCbuild/_tkinter.vcproj misc/build/Python-2.7.8/PCbuil /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.8/PCbuild/bdist_wininst.vcproj ---- misc/Python-2.7.8/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.9/PCbuild/bdist_wininst.vcproj +--- misc/Python-2.7.9/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -81,8 +81,7 @@ IgnoreDefaultLibraryNames="LIBC" ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb" @@ -903,9 +886,9 @@ diff -u misc/Python-2.7.8/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.8/P TargetMachine="17" /> <Tool -diff -u misc/Python-2.7.8/PCbuild/bz2.vcproj misc/build/Python-2.7.8/PCbuild/bz2.vcproj ---- misc/Python-2.7.8/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/bz2.vcproj misc/build/Python-2.7.9/PCbuild/bz2.vcproj +--- misc/Python-2.7.9/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -57,6 +57,7 @@ <Tool Name="VCLinkerTool" @@ -970,9 +953,9 @@ diff -u misc/Python-2.7.8/PCbuild/bz2.vcproj misc/build/Python-2.7.8/PCbuild/bz2 /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/kill_python.vcproj misc/build/Python-2.7.8/PCbuild/kill_python.vcproj ---- misc/Python-2.7.8/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/kill_python.vcproj misc/build/Python-2.7.9/PCbuild/kill_python.vcproj +--- misc/Python-2.7.9/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -56,6 +56,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)\$(ProjectName)_d.exe" @@ -1005,9 +988,9 @@ diff -u misc/Python-2.7.8/PCbuild/kill_python.vcproj misc/build/Python-2.7.8/PCb /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.8/PCbuild/make_buildinfo.vcproj ---- misc/Python-2.7.8/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.9/PCbuild/make_buildinfo.vcproj +--- misc/Python-2.7.9/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -61,6 +61,7 @@ OutputFile="$(OutDir)/make_buildinfo.exe" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" @@ -1024,9 +1007,9 @@ diff -u misc/Python-2.7.8/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.8/ /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.8/PCbuild/make_versioninfo.vcproj ---- misc/Python-2.7.8/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.9/PCbuild/make_versioninfo.vcproj +--- misc/Python-2.7.9/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -71,6 +71,7 @@ ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" SubSystem="1" @@ -1059,9 +1042,9 @@ diff -u misc/Python-2.7.8/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7. /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/pcbuild.sln misc/build/Python-2.7.8/PCbuild/pcbuild.sln ---- misc/Python-2.7.8/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/pcbuild.sln misc/build/Python-2.7.9/PCbuild/pcbuild.sln +--- misc/Python-2.7.9/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500 @@ -38,12 +38,12 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection @@ -1156,9 +1139,9 @@ diff -u misc/Python-2.7.8/PCbuild/pcbuild.sln misc/build/Python-2.7.8/PCbuild/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 -u misc/Python-2.7.8/PCbuild/pyexpat.vcproj misc/build/Python-2.7.8/PCbuild/pyexpat.vcproj ---- misc/Python-2.7.8/PCbuild/pyexpat.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/pyexpat.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/pyexpat.vcproj misc/build/Python-2.7.9/PCbuild/pyexpat.vcproj +--- misc/Python-2.7.9/PCbuild/pyexpat.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/pyexpat.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -56,6 +56,7 @@ /> <Tool @@ -1223,9 +1206,9 @@ diff -u misc/Python-2.7.8/PCbuild/pyexpat.vcproj misc/build/Python-2.7.8/PCbuild /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/python.vcproj misc/build/Python-2.7.8/PCbuild/python.vcproj ---- misc/Python-2.7.8/PCbuild/python.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/python.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/python.vcproj misc/build/Python-2.7.9/PCbuild/python.vcproj +--- misc/Python-2.7.9/PCbuild/python.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/python.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -66,6 +66,7 @@ SubSystem="1" StackReserveSize="2000000" @@ -1290,9 +1273,9 @@ diff -u misc/Python-2.7.8/PCbuild/python.vcproj misc/build/Python-2.7.8/PCbuild/ /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/pythoncore.vcproj misc/build/Python-2.7.8/PCbuild/pythoncore.vcproj ---- misc/Python-2.7.8/PCbuild/pythoncore.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/pythoncore.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/pythoncore.vcproj misc/build/Python-2.7.9/PCbuild/pythoncore.vcproj +--- misc/Python-2.7.9/PCbuild/pythoncore.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/pythoncore.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -69,6 +69,7 @@ ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" BaseAddress="0x1e000000" @@ -1357,16 +1340,15 @@ diff -u misc/Python-2.7.8/PCbuild/pythoncore.vcproj misc/build/Python-2.7.8/PCbu /> <Tool Name="VCALinkTool" -@@ -1874,4 +1882,4 @@ +@@ -1886,4 +1894,4 @@ </Files> <Globals> </Globals> --</VisualStudioProject> -\ No newline at end of file +-</VisualStudioProject> +</VisualStudioProject> -diff -u misc/Python-2.7.8/PCbuild/pythonw.vcproj misc/build/Python-2.7.8/PCbuild/pythonw.vcproj ---- misc/Python-2.7.8/PCbuild/pythonw.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/pythonw.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/pythonw.vcproj misc/build/Python-2.7.9/PCbuild/pythonw.vcproj +--- misc/Python-2.7.9/PCbuild/pythonw.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/pythonw.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -66,6 +66,7 @@ StackReserveSize="2000000" BaseAddress="0x1d000000" @@ -1431,9 +1413,9 @@ diff -u misc/Python-2.7.8/PCbuild/pythonw.vcproj misc/build/Python-2.7.8/PCbuild /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/select.vcproj misc/build/Python-2.7.8/PCbuild/select.vcproj ---- misc/Python-2.7.8/PCbuild/select.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/select.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/select.vcproj misc/build/Python-2.7.9/PCbuild/select.vcproj +--- misc/Python-2.7.9/PCbuild/select.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/select.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -57,6 +57,7 @@ AdditionalDependencies="ws2_32.lib" IgnoreDefaultLibraryNames="libc" @@ -1498,9 +1480,9 @@ diff -u misc/Python-2.7.8/PCbuild/select.vcproj misc/build/Python-2.7.8/PCbuild/ /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/sqlite3.vcproj misc/build/Python-2.7.8/PCbuild/sqlite3.vcproj ---- misc/Python-2.7.8/PCbuild/sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/sqlite3.vcproj misc/build/Python-2.7.9/PCbuild/sqlite3.vcproj +--- misc/Python-2.7.9/PCbuild/sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -56,6 +56,7 @@ <Tool Name="VCLinkerTool" @@ -1565,9 +1547,9 @@ diff -u misc/Python-2.7.8/PCbuild/sqlite3.vcproj misc/build/Python-2.7.8/PCbuild /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/unicodedata.vcproj misc/build/Python-2.7.8/PCbuild/unicodedata.vcproj ---- misc/Python-2.7.8/PCbuild/unicodedata.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/unicodedata.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/unicodedata.vcproj misc/build/Python-2.7.9/PCbuild/unicodedata.vcproj +--- misc/Python-2.7.9/PCbuild/unicodedata.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/unicodedata.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -55,6 +55,7 @@ <Tool Name="VCLinkerTool" @@ -1632,9 +1614,9 @@ diff -u misc/Python-2.7.8/PCbuild/unicodedata.vcproj misc/build/Python-2.7.8/PCb /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.8/PCbuild/w9xpopen.vcproj ---- misc/Python-2.7.8/PCbuild/w9xpopen.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/w9xpopen.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.9/PCbuild/w9xpopen.vcproj +--- misc/Python-2.7.9/PCbuild/w9xpopen.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/w9xpopen.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -59,6 +59,7 @@ <Tool Name="VCLinkerTool" @@ -1699,9 +1681,9 @@ diff -u misc/Python-2.7.8/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.8/PCbuil /> <Tool Name="VCALinkTool" -diff -u misc/Python-2.7.8/PCbuild/winsound.vcproj misc/build/Python-2.7.8/PCbuild/winsound.vcproj ---- misc/Python-2.7.8/PCbuild/winsound.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/winsound.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.9/PCbuild/winsound.vcproj misc/build/Python-2.7.9/PCbuild/winsound.vcproj +--- misc/Python-2.7.9/PCbuild/winsound.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/winsound.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -55,6 +55,7 @@ <Tool Name="VCLinkerTool" diff --git a/python/python-2.7.8-sysbase.patch b/python/python-2.7.9-sysbase.patch similarity index 62% rename from python/python-2.7.8-sysbase.patch rename to python/python-2.7.9-sysbase.patch index 27a8fe7..623e569 100644 --- a/python/python-2.7.8-sysbase.patch +++ b/python/python-2.7.9-sysbase.patch @@ -1,7 +1,7 @@ -diff -ruN misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure ---- misc/Python-2.7.8/configure 2014-06-29 21:05:48.000000000 -0500 -+++ misc/build/Python-2.7.8/configure 2016-01-01 15:18:37.398344671 -0500 -@@ -3191,7 +3191,9 @@ +diff -ruN misc/Python-2.7.9/configure misc/build/Python-2.7.9/configure +--- misc/Python-2.7.9/configure 2014-06-29 21:05:48.000000000 -0500 ++++ misc/build/Python-2.7.9/configure 2016-01-01 15:18:37.398344671 -0500 +@@ -3199,7 +3199,9 @@ ac_sys_release= else ac_sys_system=`uname -s` diff --git a/python/python-freebsd.patch b/python/python-freebsd.patch index 19cad1b..d13164b 100644 --- a/python/python-freebsd.patch +++ b/python/python-freebsd.patch @@ -1,6 +1,6 @@ -diff -ruN misc/Python-2.7.8/Lib/plat-freebsd9/IN.py misc/build/Python-2.7.8/Lib/plat-freebsd9/IN.py ---- misc/Python-2.7.8/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500 -+++ misc/build/Python-2.7.8/Lib/plat-freebsd9/IN.py 2016-01-01 17:38:35.922764464 -0500 +diff -ruN misc/Python-2.7.9/Lib/plat-freebsd9/IN.py misc/build/Python-2.7.9/Lib/plat-freebsd9/IN.py +--- misc/Python-2.7.9/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500 ++++ misc/build/Python-2.7.9/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.8/Lib/plat-freebsd9/IN.py misc/build/Python-2.7.8/Lib/ +IPV6CTL_NORBIT_RAIF = 49 +IPV6CTL_RFC6204W3 = 50 +IPV6CTL_MAXID = 51 -diff -ruN misc/Python-2.7.8/Lib/plat-freebsd9/regen misc/build/Python-2.7.8/Lib/plat-freebsd9/regen ---- misc/Python-2.7.8/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500 -+++ misc/build/Python-2.7.8/Lib/plat-freebsd9/regen 2016-01-01 17:38:35.922764464 -0500 +diff -ruN misc/Python-2.7.9/Lib/plat-freebsd9/regen misc/build/Python-2.7.9/Lib/plat-freebsd9/regen +--- misc/Python-2.7.9/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500 ++++ misc/build/Python-2.7.9/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.8/Lib/test/test_threading.py misc/build/Python-2.7.8/Lib/test/test_threading.py ---- misc/Python-2.7.8/Lib/test/test_threading.py 2014-06-29 21:05:37.000000000 -0500 -+++ misc/build/Python-2.7.8/Lib/test/test_threading.py 2016-01-01 17:38:35.923764731 -0500 +diff -ruN misc/Python-2.7.9/Lib/test/test_threading.py misc/build/Python-2.7.9/Lib/test/test_threading.py +--- misc/Python-2.7.9/Lib/test/test_threading.py 2014-06-29 21:05:37.000000000 -0500 ++++ misc/build/Python-2.7.9/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,31 +633,9 @@ diff -ruN misc/Python-2.7.8/Lib/test/test_threading.py misc/build/Python-2.7.8/L 'os2emx') def _run_and_join(self, script): -diff -ruN misc/Python-2.7.8/Modules/_ctypes/libffi/configure misc/build/Python-2.7.8/Modules/_ctypes/libffi/configure ---- misc/Python-2.7.8/Modules/_ctypes/libffi/configure 2014-06-29 21:05:40.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/_ctypes/libffi/configure 2016-01-01 17:38:35.931765818 -0500 -@@ -6889,7 +6889,7 @@ - rm -rf conftest* - ;; - --x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ - s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext -@@ -13459,6 +13459,9 @@ - powerpc64-*-freebsd*) - TARGET=POWERPC; TARGETDIR=powerpc - ;; -+ powerpc64-*-freebsd*) -+ TARGET=POWERPC; TARGETDIR=powerpc -+ ;; - powerpc*-*-rtems*) - TARGET=POWERPC; TARGETDIR=powerpc - ;; -diff -ruN misc/Python-2.7.8/Modules/fcntlmodule.c misc/build/Python-2.7.8/Modules/fcntlmodule.c ---- misc/Python-2.7.8/Modules/fcntlmodule.c 2014-06-29 21:05:43.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/fcntlmodule.c 2016-01-01 17:42:35.865747022 -0500 +diff -ruN misc/Python-2.7.9/Modules/fcntlmodule.c misc/build/Python-2.7.9/Modules/fcntlmodule.c +--- misc/Python-2.7.9/Modules/fcntlmodule.c 2014-06-29 21:05:43.000000000 -0500 ++++ misc/build/Python-2.7.9/Modules/fcntlmodule.c 2016-01-01 17:42:35.865747022 -0500 @@ -98,20 +98,15 @@ { #define IOCTL_BUFSZ 1024 @@ -709,37 +687,9 @@ diff -ruN misc/Python-2.7.8/Modules/fcntlmodule.c misc/build/Python-2.7.8/Module " an integer and optionally an integer or buffer argument", conv_descriptor, &fd, &code, &arg)) { return NULL; -diff -ruN misc/Python-2.7.8/Modules/fcntlmodule.c.rej misc/build/Python-2.7.8/Modules/fcntlmodule.c.rej ---- misc/Python-2.7.8/Modules/fcntlmodule.c.rej 1969-12-31 19:00:00.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/fcntlmodule.c.rej 2016-01-01 17:38:35.933764047 -0500 -@@ -0,0 +1,24 @@ -+@@ -97,20 +97,15 @@ -+ { -+ #define IOCTL_BUFSZ 1024 -+ int fd; -+- /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I' -++ /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k' -+ format for the 'code' parameter because Python turns 0x8000000 -+ into either a large positive number (PyLong or PyInt on 64-bit -+ platforms) or a negative number on others (32-bit PyInt) -+ whereas the system expects it to be a 32bit bit field value -+ regardless of it being passed as an int or unsigned long on -+- various platforms. See the termios.TIOCSWINSZ constant across -+- platforms for an example of thise. -+- -+- If any of the 64bit platforms ever decide to use more than 32bits -+- in their unsigned long ioctl codes this will break and need -+- special casing based on the platform being built on. -++ various platforms. -+ */ -+- unsigned int code; -++ unsigned long code; -+ int arg; -+ int ret; -+ char *str; -diff -ruN misc/Python-2.7.8/Python/thread_pthread.h misc/build/Python-2.7.8/Python/thread_pthread.h ---- misc/Python-2.7.8/Python/thread_pthread.h 2014-06-29 21:05:47.000000000 -0500 -+++ misc/build/Python-2.7.8/Python/thread_pthread.h 2016-01-01 17:38:35.933764047 -0500 +diff -ruN misc/Python-2.7.9/Python/thread_pthread.h misc/build/Python-2.7.9/Python/thread_pthread.h +--- misc/Python-2.7.9/Python/thread_pthread.h 2014-06-29 21:05:47.000000000 -0500 ++++ misc/build/Python-2.7.9/Python/thread_pthread.h 2016-01-01 17:38:35.933764047 -0500 @@ -38,13 +38,18 @@ #endif #endif @@ -793,10 +743,10 @@ diff -ruN misc/Python-2.7.8/Python/thread_pthread.h misc/build/Python-2.7.8/Pyth #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) pthread_attr_destroy(&attrs); #endif -diff -ruN misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure ---- misc/Python-2.7.8/configure 2014-06-29 21:05:48.000000000 -0500 -+++ misc/build/Python-2.7.8/configure 2016-01-01 17:41:32.541753889 -0500 -@@ -5347,7 +5347,7 @@ +diff -ruN misc/Python-2.7.9/configure misc/build/Python-2.7.9/configure +--- misc/Python-2.7.9/configure 2014-06-29 21:05:48.000000000 -0500 ++++ misc/build/Python-2.7.9/configure 2016-01-01 17:41:32.541753889 -0500 +@@ -5355,7 +5355,7 @@ ;; SunOS*) LDLIBRARY='libpython$(VERSION).so' @@ -805,7 +755,7 @@ diff -ruN misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} INSTSONAME="$LDLIBRARY".$SOVERSION ;; -@@ -5355,11 +5355,6 @@ +@@ -5363,11 +5363,6 @@ LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} @@ -817,35 +767,10 @@ diff -ruN misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) -diff -ruN misc/Python-2.7.8/configure.rej misc/build/Python-2.7.8/configure.rej ---- misc/Python-2.7.8/configure.rej 1969-12-31 19:00:00.000000000 -0500 -+++ misc/build/Python-2.7.8/configure.rej 2016-01-01 17:38:35.943764550 -0500 -@@ -0,0 +1,21 @@ -+@@ -4916,7 +4916,7 @@ -+ ;; -+ SunOS*) -+ LDLIBRARY='libpython$(VERSION).so' -+- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)' -++ BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)' -+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; -+@@ -4924,11 +4924,6 @@ -+ LDLIBRARY='libpython$(VERSION).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+- case $ac_sys_system in -+- FreeBSD*) -+- SOVERSION=`echo $SOVERSION|cut -d "." -f 1` -+- ;; -+- esac -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; -+ hp*|HP*) -diff -ruN misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py ---- misc/Python-2.7.8/setup.py 2014-06-29 21:05:48.000000000 -0500 -+++ misc/build/Python-2.7.8/setup.py 2016-01-01 17:38:35.945765223 -0500 -@@ -1551,7 +1551,7 @@ +diff -ruN misc/Python-2.7.9/setup.py misc/build/Python-2.7.9/setup.py +--- misc/Python-2.7.9/setup.py 2014-06-29 21:05:48.000000000 -0500 ++++ misc/build/Python-2.7.9/setup.py 2016-01-01 17:38:35.945765223 -0500 +@@ -1553,7 +1553,7 @@ macros = dict() libraries = [] @@ -854,7 +779,7 @@ diff -ruN misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py # FreeBSD's P1003.1b semaphore support is very experimental # and has many known problems. (as of June 2008) macros = dict() -@@ -1603,7 +1603,7 @@ +@@ -1605,7 +1605,7 @@ missing.append('linuxaudiodev') if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', diff --git a/python/python-md5.patch b/python/python-md5.patch index b22dd71..0ce7138 100644 --- a/python/python-md5.patch +++ b/python/python-md5.patch @@ -1,6 +1,6 @@ -diff -ru misc/Python-2.7.8/Modules/Setup.dist misc/build/Python-2.7.8/Modules/Setup.dist ---- misc/Python-2.7.8/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500 -+++ misc/build/Python-2.7.8/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500 +diff -ru misc/Python-2.7.9/Modules/Setup.dist misc/build/Python-2.7.9/Modules/Setup.dist +--- misc/Python-2.7.9/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500 ++++ misc/build/Python-2.7.9/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 d745453..0cc3898 100644 --- a/python/python-solaris.patch +++ b/python/python-solaris.patch @@ -1,5 +1,5 @@ ---- misc/Python-2.7.8/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500 -+++ misc/build/Python-2.7.8/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500 +--- misc/Python-2.7.9/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500 ++++ misc/build/Python-2.7.9/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 3a63013..09d0218 100644 --- a/python/python-solver-before-std.patch +++ b/python/python-solver-before-std.patch @@ -1,5 +1,5 @@ ---- misc/Python-2.7.8/setup.py 2013-07-01 17:51:46.237674580 +0200 -+++ misc/build/Python-2.7.8/setup.py 2013-07-01 17:51:24.230453108 +0200 +--- misc/Python-2.7.9/setup.py 2013-07-01 17:51:46.237674580 +0200 ++++ misc/build/Python-2.7.9/setup.py 2013-07-01 17:51:24.230453108 +0200 @@ -80,61 +80,62 @@ # system, but with only header files and libraries. sysroot = macosx_sdk_root() @@ -79,7 +79,7 @@ else: assert False, "Internal error: Path not found in std_dirs or paths" -@@ -808,6 +809,7 @@ +@@ -810,6 +811,7 @@ exts.append( Extension('_ssl', ['_ssl.c'], include_dirs = ssl_incs, library_dirs = ssl_libs, @@ -87,7 +87,7 @@ libraries = ['ssl', 'crypto'], depends = ['socketmodule.h']), ) else: -@@ -847,6 +849,7 @@ +@@ -849,6 +851,7 @@ exts.append( Extension('_hashlib', ['_hashopenssl.c'], include_dirs = ssl_incs, library_dirs = ssl_libs, diff --git a/python/python-ssl.patch b/python/python-ssl.patch index 0e19983..8c8fab5 100644 --- a/python/python-ssl.patch +++ b/python/python-ssl.patch @@ -1,16 +1,16 @@ -diff -ruN misc/Python-2.7.8/PCbuild/build_ssl.py misc/build/Python-2.7.8/PCbuild/build_ssl.py ---- misc/Python-2.7.8/PCbuild/build_ssl.py 2014-06-29 21:05:46.000000000 -0500 -+++ misc/build/Python-2.7.8/PCbuild/build_ssl.py 2016-01-01 15:15:32.256357072 -0500 -@@ -229,4 +229,4 @@ +diff -ruN misc/Python-2.7.9/PCbuild/build_ssl.py misc/build/Python-2.7.9/PCbuild/build_ssl.py +--- misc/Python-2.7.9/PCbuild/build_ssl.py 2014-06-29 21:05:46.000000000 -0500 ++++ misc/build/Python-2.7.9/PCbuild/build_ssl.py 2016-01-01 15:15:32.256357072 -0500 +@@ -240,4 +240,4 @@ sys.exit(rc) if __name__=='__main__': - main() + sys.exit(0) -diff -ruN misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py ---- misc/Python-2.7.8/setup.py 2014-06-29 21:05:48.000000000 -0500 -+++ misc/build/Python-2.7.8/setup.py 2016-01-01 15:15:32.258356209 -0500 -@@ -786,7 +786,15 @@ +diff -ruN misc/Python-2.7.9/setup.py misc/build/Python-2.7.9/setup.py +--- misc/Python-2.7.9/setup.py 2014-06-29 21:05:48.000000000 -0500 ++++ misc/build/Python-2.7.9/setup.py 2016-01-01 15:15:32.258356209 -0500 +@@ -788,7 +788,15 @@ depends=['socketmodule.h'], libraries=math_libs) ) # Detect SSL support for the socket module (via _ssl) @@ -26,7 +26,7 @@ diff -ruN misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py '/usr/local/ssl/include', '/usr/contrib/ssl/include/' ] -@@ -798,8 +806,15 @@ +@@ -800,8 +808,15 @@ ['/usr/kerberos/include']) if krb5_h: ssl_incs += krb5_h diff --git a/python/pyversion.mk b/python/pyversion.mk index eba0878..6538252 100644 --- a/python/pyversion.mk +++ b/python/pyversion.mk @@ -22,7 +22,7 @@ # in the python project accordingly !!! PYMAJOR=2 PYMINOR=7 -PYMICRO=8 +PYMICRO=9 PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO) .IF "$(GUI)" == "UNX" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits