diff options
Diffstat (limited to 'python')
-rw-r--r-- | python/makefile.mk | 2 | ||||
-rw-r--r-- | python/prj/d.lst | 108 | ||||
-rw-r--r-- | python/python-2.7.6-mingw.patch (renamed from python/python-2.7.5-mingw.patch) | 146 | ||||
-rw-r--r-- | python/python-2.7.6-nohardlink.patch (renamed from python/python-2.7.5-nohardlink.patch) | 4 | ||||
-rw-r--r-- | python/python-2.7.6-pcbuild.patch (renamed from python/python-2.7.5-pcbuild.patch) | 162 | ||||
-rw-r--r-- | python/python-2.7.6-sysbase.patch (renamed from python/python-2.7.5-sysbase.patch) | 4 | ||||
-rw-r--r-- | python/python-freebsd.patch | 36 | ||||
-rw-r--r-- | python/python-md5.patch | 6 | ||||
-rw-r--r-- | python/python-solaris.patch | 4 | ||||
-rw-r--r-- | python/python-solver-before-std.patch | 4 | ||||
-rw-r--r-- | python/python-ssl.patch | 12 | ||||
-rw-r--r-- | python/pyversion.mk | 2 |
12 files changed, 245 insertions, 245 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index f9b0051a73c1..7949af94a851 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=6334b666b7ff2038c761d7b27ba699c1 +TARFILE_MD5=1d8728eb0dfcac72a0fd99c17ec7f386 PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ diff --git a/python/prj/d.lst b/python/prj/d.lst index 1748f37543d0..fd8d0a2395a1 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.5\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\json\* %_DEST%\lib%_EXT%\python\json\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree -..\%__SRC%\misc\build\Python-2.7.5\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree -..\%__SRC%\misc\build\Python-2.7.5\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\* -..\%__SRC%\misc\build\Python-2.7.5\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\* -..\%__SRC%\misc\build\Python-2.7.5\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile +..\%__SRC%\misc\build\Python-2.7.6\Lib\* %_DEST%\lib%_EXT%\python\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\email\* %_DEST%\lib%_EXT%\python\email\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\config\* %_DEST%\lib%_EXT%\python\config\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\json\* %_DEST%\lib%_EXT%\python\json\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\python\lib2to3\fixes\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\lib2to3\pgen2\* %_DEST%\lib%_EXT%\python\lib2to3\pgen2\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\sqlite3\* %_DEST%\lib%_EXT%\python\sqlite3\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\ctypes\* %_DEST%\lib%_EXT%\python\ctypes\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\ctypes\macholib\* %_DEST%\lib%_EXT%\python\ctypes\macholib\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree +..\%__SRC%\misc\build\Python-2.7.6\Lib\xml\etree\* %_DEST%\lib%_EXT%\python\xml\etree +..\%__SRC%\misc\build\Python-2.7.6\Lib\importlib\* %_DEST%\lib%_EXT%\python\importlib\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\multiprocessing\* %_DEST%\lib%_EXT%\python\multiprocessing\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\* +..\%__SRC%\misc\build\Python-2.7.6\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\* +..\%__SRC%\misc\build\Python-2.7.6\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.5\Include\* %_DEST%\inc%_EXT%\python\* +..\%__SRC%\misc\build\Python-2.7.6\Include\* %_DEST%\inc%_EXT%\python\* #unix ONLY ! ..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python -..\%__SRC%\misc\build\Python-2.7.5\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h +..\%__SRC%\misc\build\Python-2.7.6\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.5\libpython2.7.dll %_DEST%\bin%_EXT%\libpython2.7.dll +..\%__SRC%\misc\build\Python-2.7.6\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.5\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\python27.dll %_DEST%\bin%_EXT%\python27.dll -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\python27.lib %_DEST%\lib%_EXT%\python27.lib -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd -..\%__SRC%\misc\build\Python-2.7.5\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\python.exe %_DEST%\bin%_EXT%\python.exe +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\python27.dll %_DEST%\bin%_EXT%\python27.dll +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\python27.lib %_DEST%\lib%_EXT%\python27.lib +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.7.6\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd #linklib: libpython.so.*.*.* diff --git a/python/python-2.7.5-mingw.patch b/python/python-2.7.6-mingw.patch index 255aad75977d..56e03dd23a11 100644 --- a/python/python-2.7.5-mingw.patch +++ b/python/python-2.7.6-mingw.patch @@ -1,6 +1,6 @@ -diff -ru misc/Python-2.7.5/Include/pyport.h misc/build/Python-2.7.5/Include/pyport.h ---- misc/Python-2.7.5/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500 -+++ misc/build/Python-2.7.5/Include/pyport.h 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Include/pyport.h misc/build/Python-2.7.6/Include/pyport.h +--- misc/Python-2.7.6/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500 ++++ misc/build/Python-2.7.6/Include/pyport.h 2012-07-25 15:33:16.000000000 -0500 @@ -9,6 +9,30 @@ #include <inttypes.h> #endif @@ -32,20 +32,20 @@ diff -ru misc/Python-2.7.5/Include/pyport.h misc/build/Python-2.7.5/Include/pypo #ifdef HAVE_STDINT_H #include <stdint.h> #endif -diff -ru misc/Python-2.7.5/Lib/distutils/ccompiler.py misc/build/Python-2.7.5/Lib/distutils/ccompiler.py ---- misc/Python-2.7.5/Lib/distutils/ccompiler.py 2012-04-09 18:07:29.000000000 -0500 -+++ misc/build/Python-2.7.5/Lib/distutils/ccompiler.py 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Lib/distutils/ccompiler.py misc/build/Python-2.7.6/Lib/distutils/ccompiler.py +--- misc/Python-2.7.6/Lib/distutils/ccompiler.py 2012-04-09 18:07:29.000000000 -0500 ++++ misc/build/Python-2.7.6/Lib/distutils/ccompiler.py 2012-07-25 15:33:16.000000000 -0500 @@ -893,6 +893,7 @@ - # on a cygwin built python we can use gcc like an ordinary UNIXish + # on a cygwin built python we can use gcc like an ordinary UNIXishno # compiler ('cygwin.*', 'unix'), + ('winmingw*', 'unix'), ('os2emx', 'emx'), # OS name mappings -diff -ru misc/Python-2.7.5/Lib/distutils/command/build_ext.py misc/build/Python-2.7.5/Lib/distutils/command/build_ext.py ---- misc/Python-2.7.5/Lib/distutils/command/build_ext.py 2012-04-09 18:07:29.000000000 -0500 -+++ misc/build/Python-2.7.5/Lib/distutils/command/build_ext.py 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Lib/distutils/command/build_ext.py misc/build/Python-2.7.6/Lib/distutils/command/build_ext.py +--- misc/Python-2.7.6/Lib/distutils/command/build_ext.py 2012-04-09 18:07:29.000000000 -0500 ++++ misc/build/Python-2.7.6/Lib/distutils/command/build_ext.py 2012-07-25 15:33:16.000000000 -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.5/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.5/Lib/distutils/command/install.py misc/build/Python-2.7.5/Lib/distutils/command/install.py ---- misc/Python-2.7.5/Lib/distutils/command/install.py 2012-04-09 18:07:29.000000000 -0500 -+++ misc/build/Python-2.7.5/Lib/distutils/command/install.py 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Lib/distutils/command/install.py misc/build/Python-2.7.6/Lib/distutils/command/install.py +--- misc/Python-2.7.6/Lib/distutils/command/install.py 2012-04-09 18:07:29.000000000 -0500 ++++ misc/build/Python-2.7.6/Lib/distutils/command/install.py 2012-07-25 15:33:16.000000000 -0500 @@ -348,9 +348,10 @@ # Convert directories from Unix /-separated syntax to the local @@ -102,9 +102,9 @@ diff -ru misc/Python-2.7.5/Lib/distutils/command/install.py misc/build/Python-2. def handle_extra_path (self): -diff -ru misc/Python-2.7.5/Lib/distutils/spawn.py misc/build/Python-2.7.5/Lib/distutils/spawn.py ---- misc/Python-2.7.5/Lib/distutils/spawn.py 2012-04-09 18:07:29.000000000 -0500 -+++ misc/build/Python-2.7.5/Lib/distutils/spawn.py 2012-07-25 15:39:23.000000000 -0500 +diff -ru misc/Python-2.7.6/Lib/distutils/spawn.py misc/build/Python-2.7.6/Lib/distutils/spawn.py +--- misc/Python-2.7.6/Lib/distutils/spawn.py 2012-04-09 18:07:29.000000000 -0500 ++++ misc/build/Python-2.7.6/Lib/distutils/spawn.py 2012-07-25 15:39:23.000000000 -0500 @@ -185,7 +185,7 @@ paths = path.split(os.pathsep) base, ext = os.path.splitext(executable) @@ -114,9 +114,9 @@ diff -ru misc/Python-2.7.5/Lib/distutils/spawn.py misc/build/Python-2.7.5/Lib/di executable = executable + '.exe' if not os.path.isfile(executable): -diff -ru misc/Python-2.7.5/Lib/distutils/sysconfig.py misc/build/Python-2.7.5/Lib/distutils/sysconfig.py ---- misc/Python-2.7.5/Lib/distutils/sysconfig.py 2012-04-09 18:07:29.000000000 -0500 -+++ misc/build/Python-2.7.5/Lib/distutils/sysconfig.py 2012-07-25 15:44:24.000000000 -0500 +diff -ru misc/Python-2.7.6/Lib/distutils/sysconfig.py misc/build/Python-2.7.6/Lib/distutils/sysconfig.py +--- misc/Python-2.7.6/Lib/distutils/sysconfig.py 2012-04-09 18:07:29.000000000 -0500 ++++ misc/build/Python-2.7.6/Lib/distutils/sysconfig.py 2012-07-25 15:44:24.000000000 -0500 @@ -419,6 +419,9 @@ raise DistutilsPlatformError(my_msg) @@ -137,9 +137,9 @@ diff -ru misc/Python-2.7.5/Lib/distutils/sysconfig.py misc/build/Python-2.7.5/Li if func: func() else: -diff -ru misc/Python-2.7.5/Lib/distutils/unixccompiler.py misc/build/Python-2.7.5/Lib/distutils/unixccompiler.py ---- misc/Python-2.7.5/Lib/distutils/unixccompiler.py 2012-04-09 18:07:30.000000000 -0500 -+++ misc/build/Python-2.7.5/Lib/distutils/unixccompiler.py 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Lib/distutils/unixccompiler.py misc/build/Python-2.7.6/Lib/distutils/unixccompiler.py +--- misc/Python-2.7.6/Lib/distutils/unixccompiler.py 2012-04-09 18:07:30.000000000 -0500 ++++ misc/build/Python-2.7.6/Lib/distutils/unixccompiler.py 2012-07-25 15:33:16.000000000 -0500 @@ -139,7 +139,7 @@ shared_lib_extension = ".so" dylib_lib_extension = ".dylib" @@ -149,9 +149,9 @@ diff -ru misc/Python-2.7.5/Lib/distutils/unixccompiler.py misc/build/Python-2.7. exe_extension = ".exe" def preprocess(self, source, -diff -ru misc/Python-2.7.5/Lib/os.py misc/build/Python-2.7.5/Lib/os.py ---- misc/Python-2.7.5/Lib/os.py 2012-04-09 18:07:30.000000000 -0500 -+++ misc/build/Python-2.7.5/Lib/os.py 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Lib/os.py misc/build/Python-2.7.6/Lib/os.py +--- misc/Python-2.7.6/Lib/os.py 2012-04-09 18:07:30.000000000 -0500 ++++ misc/build/Python-2.7.6/Lib/os.py 2012-07-25 15:33:16.000000000 -0500 @@ -38,7 +38,21 @@ except AttributeError: return [n for n in dir(module) if n[0] != '_'] @@ -175,9 +175,9 @@ diff -ru misc/Python-2.7.5/Lib/os.py misc/build/Python-2.7.5/Lib/os.py name = 'posix' linesep = '\n' from posix import * -diff -ru misc/Python-2.7.5/Lib/socket.py misc/build/Python-2.7.5/Lib/socket.py ---- misc/Python-2.7.5/Lib/socket.py 2012-04-09 18:07:31.000000000 -0500 -+++ misc/build/Python-2.7.5/Lib/socket.py 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Lib/socket.py misc/build/Python-2.7.6/Lib/socket.py +--- misc/Python-2.7.6/Lib/socket.py 2012-04-09 18:07:31.000000000 -0500 ++++ misc/build/Python-2.7.6/Lib/socket.py 2012-07-25 15:33:16.000000000 -0500 @@ -153,7 +153,7 @@ 'sendall', 'setblocking', 'settimeout', 'gettimeout', 'shutdown') @@ -187,9 +187,9 @@ diff -ru misc/Python-2.7.5/Lib/socket.py misc/build/Python-2.7.5/Lib/socket.py _socketmethods = _socketmethods + ('ioctl',) if sys.platform == "riscos": -diff -ru misc/Python-2.7.5/Makefile.pre.in misc/build/Python-2.7.5/Makefile.pre.in ---- misc/Python-2.7.5/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500 -+++ misc/build/Python-2.7.5/Makefile.pre.in 2012-07-25 16:01:28.000000000 -0500 +diff -ru misc/Python-2.7.6/Makefile.pre.in misc/build/Python-2.7.6/Makefile.pre.in +--- misc/Python-2.7.6/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500 ++++ misc/build/Python-2.7.6/Makefile.pre.in 2012-07-25 16:01:28.000000000 -0500 @@ -112,6 +112,16 @@ BLDSHARED= @BLDSHARED@ $(LDFLAGS) LDCXXSHARED= @LDCXXSHARED@ @@ -347,9 +347,9 @@ diff -ru misc/Python-2.7.5/Makefile.pre.in misc/build/Python-2.7.5/Makefile.pre. # Here are a couple of targets for MacOSX again, to install a full # framework-based Python. frameworkinstall installs everything, the # subtargets install specific parts. Much of the actual work is offloaded to -diff -ru misc/Python-2.7.5/Modules/Setup.config.in misc/build/Python-2.7.5/Modules/Setup.config.in ---- misc/Python-2.7.5/Modules/Setup.config.in 2012-04-09 18:07:33.000000000 -0500 -+++ misc/build/Python-2.7.5/Modules/Setup.config.in 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Modules/Setup.config.in misc/build/Python-2.7.6/Modules/Setup.config.in +--- misc/Python-2.7.6/Modules/Setup.config.in 2012-04-09 18:07:33.000000000 -0500 ++++ misc/build/Python-2.7.6/Modules/Setup.config.in 2012-07-25 15:33:16.000000000 -0500 @@ -9,5 +9,9 @@ # The signal module @USE_SIGNAL_MODULE@signal signalmodule.c @@ -360,9 +360,9 @@ diff -ru misc/Python-2.7.5/Modules/Setup.config.in misc/build/Python-2.7.5/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.5/Modules/Setup.dist misc/build/Python-2.7.5/Modules/Setup.dist ---- misc/Python-2.7.5/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500 -+++ misc/build/Python-2.7.5/Modules/Setup.dist 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Modules/Setup.dist misc/build/Python-2.7.6/Modules/Setup.dist +--- misc/Python-2.7.6/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500 ++++ misc/build/Python-2.7.6/Modules/Setup.dist 2012-07-25 15:33:16.000000000 -0500 @@ -114,7 +114,7 @@ posix posixmodule.c # posix (UNIX) system calls @@ -372,9 +372,9 @@ diff -ru misc/Python-2.7.5/Modules/Setup.dist misc/build/Python-2.7.5/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.5/Modules/_ctypes/libffi/configure misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure ---- misc/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500 -+++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-07-25 16:12:30.000000000 -0500 +diff -ru misc/Python-2.7.6/Modules/_ctypes/libffi/configure misc/build/Python-2.7.6/Modules/_ctypes/libffi/configure +--- misc/Python-2.7.6/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500 ++++ misc/build/Python-2.7.6/Modules/_ctypes/libffi/configure 2012-07-25 16:12:30.000000000 -0500 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. @@ -3572,9 +3572,9 @@ diff -ru misc/Python-2.7.5/Modules/_ctypes/libffi/configure misc/build/Python-2. fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -diff -ru misc/Python-2.7.5/Modules/_ctypes/libffi/configure.ac misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure.ac ---- misc/Python-2.7.5/Modules/_ctypes/libffi/configure.ac 2012-04-09 18:07:33.000000000 -0500 -+++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure.ac 2012-07-25 16:10:32.000000000 -0500 +diff -ru misc/Python-2.7.6/Modules/_ctypes/libffi/configure.ac misc/build/Python-2.7.6/Modules/_ctypes/libffi/configure.ac +--- misc/Python-2.7.6/Modules/_ctypes/libffi/configure.ac 2012-04-09 18:07:33.000000000 -0500 ++++ misc/build/Python-2.7.6/Modules/_ctypes/libffi/configure.ac 2012-07-25 16:10:32.000000000 -0500 @@ -401,6 +401,12 @@ multilib_arg= fi @@ -3588,9 +3588,9 @@ diff -ru misc/Python-2.7.5/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.5/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in ---- misc/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in 2012-04-09 18:07:33.000000000 -0500 -+++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Python-2.7.6/Modules/_ctypes/libffi/include/ffi.h.in +--- misc/Python-2.7.6/Modules/_ctypes/libffi/include/ffi.h.in 2012-04-09 18:07:33.000000000 -0500 ++++ misc/build/Python-2.7.6/Modules/_ctypes/libffi/include/ffi.h.in 2012-07-25 15:33:16.000000000 -0500 @@ -359,7 +359,11 @@ ffi_type *rtype, ffi_type **atypes); @@ -3603,9 +3603,9 @@ diff -ru misc/Python-2.7.5/Modules/_ctypes/libffi/include/ffi.h.in misc/build/Py void (*fn)(void), void *rvalue, void **avalue); -diff -ru misc/Python-2.7.5/Modules/config.c.in misc/build/Python-2.7.5/Modules/config.c.in ---- misc/Python-2.7.5/Modules/config.c.in 2012-04-09 18:07:34.000000000 -0500 -+++ misc/build/Python-2.7.5/Modules/config.c.in 2012-07-25 16:19:28.000000000 -0500 +diff -ru misc/Python-2.7.6/Modules/config.c.in misc/build/Python-2.7.6/Modules/config.c.in +--- misc/Python-2.7.6/Modules/config.c.in 2012-04-09 18:07:34.000000000 -0500 ++++ misc/build/Python-2.7.6/Modules/config.c.in 2012-07-25 16:19:28.000000000 -0500 @@ -48,6 +48,9 @@ {"__builtin__", NULL}, {"sys", NULL}, @@ -3616,9 +3616,9 @@ diff -ru misc/Python-2.7.5/Modules/config.c.in misc/build/Python-2.7.5/Modules/c /* This lives in gcmodule.c */ {"gc", initgc}, -diff -ru misc/Python-2.7.5/Modules/posixmodule.c misc/build/Python-2.7.5/Modules/posixmodule.c ---- misc/Python-2.7.5/Modules/posixmodule.c 2012-04-09 18:07:34.000000000 -0500 -+++ misc/build/Python-2.7.5/Modules/posixmodule.c 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Modules/posixmodule.c misc/build/Python-2.7.6/Modules/posixmodule.c +--- misc/Python-2.7.6/Modules/posixmodule.c 2012-04-09 18:07:34.000000000 -0500 ++++ misc/build/Python-2.7.6/Modules/posixmodule.c 2012-07-25 15:33:16.000000000 -0500 @@ -129,6 +129,15 @@ #define HAVE_FSYNC 1 #define fsync _commit @@ -3685,9 +3685,9 @@ diff -ru misc/Python-2.7.5/Modules/posixmodule.c misc/build/Python-2.7.5/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.5/Modules/socketmodule.c misc/build/Python-2.7.5/Modules/socketmodule.c ---- misc/Python-2.7.5/Modules/socketmodule.c 2012-04-09 18:07:34.000000000 -0500 -+++ misc/build/Python-2.7.5/Modules/socketmodule.c 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/Modules/socketmodule.c misc/build/Python-2.7.6/Modules/socketmodule.c +--- misc/Python-2.7.6/Modules/socketmodule.c 2012-04-09 18:07:34.000000000 -0500 ++++ misc/build/Python-2.7.6/Modules/socketmodule.c 2012-07-25 15:33:16.000000000 -0500 @@ -312,7 +312,7 @@ /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and * EAI_* constants are defined in (the already included) ws2tcpip.h. @@ -3697,9 +3697,9 @@ diff -ru misc/Python-2.7.5/Modules/socketmodule.c misc/build/Python-2.7.5/Module # include "addrinfo.h" #endif -diff -ru misc/Python-2.7.5/PC/_winreg.c misc/build/Python-2.7.5/PC/_winreg.c ---- misc/Python-2.7.5/PC/_winreg.c 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PC/_winreg.c 2012-07-25 15:33:16.000000000 -0500 +diff -ru misc/Python-2.7.6/PC/_winreg.c misc/build/Python-2.7.6/PC/_winreg.c +--- misc/Python-2.7.6/PC/_winreg.c 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PC/_winreg.c 2012-07-25 15:33:16.000000000 -0500 @@ -1784,6 +1784,9 @@ } @@ -3710,9 +3710,9 @@ diff -ru misc/Python-2.7.5/PC/_winreg.c misc/build/Python-2.7.5/PC/_winreg.c PyMODINIT_FUNC init_winreg(void) { -diff -ru misc/Python-2.7.5/Python/dynload_win.c misc/build/Python-2.7.5/Python/dynload_win.c ---- misc/Python-2.7.5/Python/dynload_win.c 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/Python/dynload_win.c 2012-07-25 16:25:30.000000000 -0500 +diff -ru misc/Python-2.7.6/Python/dynload_win.c misc/build/Python-2.7.6/Python/dynload_win.c +--- misc/Python-2.7.6/Python/dynload_win.c 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/Python/dynload_win.c 2012-07-25 16:25:30.000000000 -0500 @@ -28,6 +28,7 @@ /* Case insensitive string compare, to avoid any dependencies on particular C RTL implementations */ @@ -3729,9 +3729,9 @@ diff -ru misc/Python-2.7.5/Python/dynload_win.c misc/build/Python-2.7.5/Python/d /* Function to return the name of the "python" DLL that the supplied module -diff -ru misc/Python-2.7.5/Python/frozenmain.c misc/build/Python-2.7.5/Python/frozenmain.c ---- misc/Python-2.7.5/Python/frozenmain.c 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/Python/frozenmain.c 2012-07-25 16:28:20.000000000 -0500 +diff -ru misc/Python-2.7.6/Python/frozenmain.c misc/build/Python-2.7.6/Python/frozenmain.c +--- misc/Python-2.7.6/Python/frozenmain.c 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/Python/frozenmain.c 2012-07-25 16:28:20.000000000 -0500 @@ -3,7 +3,7 @@ #include "Python.h" @@ -3765,9 +3765,9 @@ diff -ru misc/Python-2.7.5/Python/frozenmain.c misc/build/Python-2.7.5/Python/fr PyWinFreeze_ExeTerm(); #endif Py_Finalize(); -diff -ru misc/Python-2.7.5/configure misc/build/Python-2.7.5/configure ---- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500 -+++ misc/build/Python-2.7.5/configure 2012-07-25 16:40:08.000000000 -0500 +diff -ru misc/Python-2.7.6/configure misc/build/Python-2.7.6/configure +--- misc/Python-2.7.6/configure 2012-04-09 18:07:36.000000000 -0500 ++++ misc/build/Python-2.7.6/configure 2012-07-25 16:40:08.000000000 -0500 @@ -1,14 +1,12 @@ #! /bin/sh # From configure.in Revision. @@ -7020,9 +7020,9 @@ diff -ru misc/Python-2.7.5/configure misc/build/Python-2.7.5/configure || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; -diff -ru misc/Python-2.7.5/configure.in misc/build/Python-2.7.5/configure.in ---- misc/Python-2.7.5/configure.in 2012-04-09 18:07:36.000000000 -0500 -+++ misc/build/Python-2.7.5/configure.in 2012-07-25 16:31:28.000000000 -0500 +diff -ru misc/Python-2.7.6/configure.in misc/build/Python-2.7.6/configure.in +--- misc/Python-2.7.6/configure.in 2012-04-09 18:07:36.000000000 -0500 ++++ misc/build/Python-2.7.6/configure.in 2012-07-25 16:31:28.000000000 -0500 @@ -417,6 +417,13 @@ LDFLAGS="$SGI_ABI $LDFLAGS" MACHDEP=`echo "${MACHDEP}${SGI_ABI}" | sed 's/ *//g'` @@ -7192,9 +7192,9 @@ diff -ru misc/Python-2.7.5/configure.in misc/build/Python-2.7.5/configure.in AC_SUBST(UNICODE_OBJS) if test "$enable_unicode" = "no" then -diff -ru misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py ---- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500 -+++ misc/build/Python-2.7.5/setup.py 2012-07-25 16:38:25.000000000 -0500 +diff -ru misc/Python-2.7.6/setup.py misc/build/Python-2.7.6/setup.py +--- misc/Python-2.7.6/setup.py 2012-04-09 18:07:36.000000000 -0500 ++++ misc/build/Python-2.7.6/setup.py 2012-07-25 16:38:25.000000000 -0500 @@ -271,6 +271,18 @@ if not self.configure_ctypes(ext): return diff --git a/python/python-2.7.5-nohardlink.patch b/python/python-2.7.6-nohardlink.patch index 94a9e06046f3..16008d069fb4 100644 --- a/python/python-2.7.5-nohardlink.patch +++ b/python/python-2.7.6-nohardlink.patch @@ -1,5 +1,5 @@ ---- misc/Python-2.7.5/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500 -+++ misc/build/Python-2.7.5/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500 +--- misc/Python-2.7.6/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500 ++++ misc/build/Python-2.7.6/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500 @@ -427,7 +427,7 @@ libpython$(VERSION).so: $(LIBRARY_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ diff --git a/python/python-2.7.5-pcbuild.patch b/python/python-2.7.6-pcbuild.patch index c6c8cf1d9755..c2e542a92c90 100644 --- a/python/python-2.7.5-pcbuild.patch +++ b/python/python-2.7.6-pcbuild.patch @@ -1,6 +1,6 @@ -diff -u misc/Python-2.7.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/_bsddb.vcproj ---- misc/Python-2.7.5/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_bsddb.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_bsddb.vcproj misc/build/Python-2.7.6/PCbuild/_bsddb.vcproj +--- misc/Python-2.7.6/PCbuild/_bsddb.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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.5/PCbuild/_bsddb.vcproj misc/build/Python-2.7.5/PCbuild/ AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-diff -u misc/Python-2.7.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild/_ctypes.vcproj ---- misc/Python-2.7.5/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_ctypes.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_ctypes.vcproj misc/build/Python-2.7.6/PCbuild/_ctypes.vcproj +--- misc/Python-2.7.6/PCbuild/_ctypes.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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.5/PCbuild/_ctypes.vcproj misc/build/Python-2.7.5/PCbuild SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-diff -u misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PCbuild/_ctypes_test.vcproj ---- misc/Python-2.7.5/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_ctypes_test.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.6/PCbuild/_ctypes_test.vcproj +--- misc/Python-2.7.6/PCbuild/_ctypes_test.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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.5/PCbuild/_ctypes_test.vcproj misc/build/Python-2.7.5/PC />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PCbuild/_elementtree.vcproj ---- misc/Python-2.7.5/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_elementtree.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_elementtree.vcproj misc/build/Python-2.7.6/PCbuild/_elementtree.vcproj +--- misc/Python-2.7.6/PCbuild/_elementtree.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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.5/PCbuild/_elementtree.vcproj misc/build/Python-2.7.5/PC />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuild/_hashlib.vcproj ---- misc/Python-2.7.5/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_hashlib.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_hashlib.vcproj misc/build/Python-2.7.6/PCbuild/_hashlib.vcproj +--- misc/Python-2.7.6/PCbuild/_hashlib.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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.5/PCbuild/_hashlib.vcproj misc/build/Python-2.7.5/PCbuil />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_msi.vcproj ---- misc/Python-2.7.5/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_msi.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_msi.vcproj misc/build/Python-2.7.6/PCbuild/_msi.vcproj +--- misc/Python-2.7.6/PCbuild/_msi.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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.5/PCbuild/_msi.vcproj misc/build/Python-2.7.5/PCbuild/_m />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.5/PCbuild/_multiprocessing.vcproj ---- misc/Python-2.7.5/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_multiprocessing.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7.6/PCbuild/_multiprocessing.vcproj +--- misc/Python-2.7.6/PCbuild/_multiprocessing.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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.5/PCbuild/_multiprocessing.vcproj misc/build/Python-2.7. />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild/_socket.vcproj ---- misc/Python-2.7.5/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_socket.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_socket.vcproj misc/build/Python-2.7.6/PCbuild/_socket.vcproj +--- misc/Python-2.7.6/PCbuild/_socket.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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.5/PCbuild/_socket.vcproj misc/build/Python-2.7.5/PCbuild />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuild/_sqlite3.vcproj ---- misc/Python-2.7.5/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.6/PCbuild/_sqlite3.vcproj +--- misc/Python-2.7.6/PCbuild/_sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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.5/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.5/PCbuil />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_ssl.vcproj ---- misc/Python-2.7.5/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_ssl.vcproj misc/build/Python-2.7.6/PCbuild/_ssl.vcproj +--- misc/Python-2.7.6/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -43,7 +43,7 @@ />
<Tool
@@ -746,9 +746,9 @@ diff -u misc/Python-2.7.5/PCbuild/_ssl.vcproj misc/build/Python-2.7.5/PCbuild/_s TargetMachine="17"
/>
<Tool
-diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbuild/_testcapi.vcproj ---- misc/Python-2.7.5/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_testcapi.vcproj misc/build/Python-2.7.6/PCbuild/_testcapi.vcproj +--- misc/Python-2.7.6/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -55,6 +55,7 @@ <Tool
Name="VCLinkerTool"
@@ -813,9 +813,9 @@ diff -u misc/Python-2.7.5/PCbuild/_testcapi.vcproj misc/build/Python-2.7.5/PCbui />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuild/_tkinter.vcproj ---- misc/Python-2.7.5/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/_tkinter.vcproj misc/build/Python-2.7.6/PCbuild/_tkinter.vcproj +--- misc/Python-2.7.6/PCbuild/_tkinter.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/_tkinter.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -57,6 +57,7 @@ <Tool
Name="VCLinkerTool"
@@ -880,9 +880,9 @@ diff -u misc/Python-2.7.5/PCbuild/_tkinter.vcproj misc/build/Python-2.7.5/PCbuil />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.5/PCbuild/bdist_wininst.vcproj ---- misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/bdist_wininst.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.6/PCbuild/bdist_wininst.vcproj +--- misc/Python-2.7.6/PCbuild/bdist_wininst.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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 +903,9 @@ diff -u misc/Python-2.7.5/PCbuild/bdist_wininst.vcproj misc/build/Python-2.7.5/P TargetMachine="17"
/>
<Tool
-diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2.vcproj ---- misc/Python-2.7.5/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/bz2.vcproj misc/build/Python-2.7.6/PCbuild/bz2.vcproj +--- misc/Python-2.7.6/PCbuild/bz2.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/bz2.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -57,6 +57,7 @@ <Tool
Name="VCLinkerTool"
@@ -970,9 +970,9 @@ diff -u misc/Python-2.7.5/PCbuild/bz2.vcproj misc/build/Python-2.7.5/PCbuild/bz2 />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/kill_python.vcproj misc/build/Python-2.7.5/PCbuild/kill_python.vcproj ---- misc/Python-2.7.5/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/kill_python.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/kill_python.vcproj misc/build/Python-2.7.6/PCbuild/kill_python.vcproj +--- misc/Python-2.7.6/PCbuild/kill_python.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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 +1005,9 @@ diff -u misc/Python-2.7.5/PCbuild/kill_python.vcproj misc/build/Python-2.7.5/PCb />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.5/PCbuild/make_buildinfo.vcproj ---- misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/make_buildinfo.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.6/PCbuild/make_buildinfo.vcproj +--- misc/Python-2.7.6/PCbuild/make_buildinfo.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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 +1024,9 @@ diff -u misc/Python-2.7.5/PCbuild/make_buildinfo.vcproj misc/build/Python-2.7.5/ />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.5/PCbuild/make_versioninfo.vcproj ---- misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7.6/PCbuild/make_versioninfo.vcproj +--- misc/Python-2.7.6/PCbuild/make_versioninfo.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/make_versioninfo.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -71,6 +71,7 @@ ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -1059,9 +1059,9 @@ diff -u misc/Python-2.7.5/PCbuild/make_versioninfo.vcproj misc/build/Python-2.7. />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/pcbuild.sln misc/build/Python-2.7.5/PCbuild/pcbuild.sln ---- misc/Python-2.7.5/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/pcbuild.sln 2012-07-30 21:04:33.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/pcbuild.sln misc/build/Python-2.7.6/PCbuild/pcbuild.sln +--- misc/Python-2.7.6/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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 +1156,9 @@ diff -u misc/Python-2.7.5/PCbuild/pcbuild.sln misc/build/Python-2.7.5/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.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild/pyexpat.vcproj ---- misc/Python-2.7.5/PCbuild/pyexpat.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/pyexpat.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/pyexpat.vcproj misc/build/Python-2.7.6/PCbuild/pyexpat.vcproj +--- misc/Python-2.7.6/PCbuild/pyexpat.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/pyexpat.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -56,6 +56,7 @@ />
<Tool
@@ -1223,9 +1223,9 @@ diff -u misc/Python-2.7.5/PCbuild/pyexpat.vcproj misc/build/Python-2.7.5/PCbuild />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/python.vcproj ---- misc/Python-2.7.5/PCbuild/python.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/python.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/python.vcproj misc/build/Python-2.7.6/PCbuild/python.vcproj +--- misc/Python-2.7.6/PCbuild/python.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/python.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -66,6 +66,7 @@ SubSystem="1"
StackReserveSize="2000000"
@@ -1290,9 +1290,9 @@ diff -u misc/Python-2.7.5/PCbuild/python.vcproj misc/build/Python-2.7.5/PCbuild/ />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbuild/pythoncore.vcproj ---- misc/Python-2.7.5/PCbuild/pythoncore.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/pythoncore.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/pythoncore.vcproj misc/build/Python-2.7.6/PCbuild/pythoncore.vcproj +--- misc/Python-2.7.6/PCbuild/pythoncore.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/pythoncore.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -69,6 +69,7 @@ ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
@@ -1364,9 +1364,9 @@ diff -u misc/Python-2.7.5/PCbuild/pythoncore.vcproj misc/build/Python-2.7.5/PCbu -</VisualStudioProject>
\ No newline at end of file +</VisualStudioProject>
-diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild/pythonw.vcproj ---- misc/Python-2.7.5/PCbuild/pythonw.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/pythonw.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/pythonw.vcproj misc/build/Python-2.7.6/PCbuild/pythonw.vcproj +--- misc/Python-2.7.6/PCbuild/pythonw.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/pythonw.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -66,6 +66,7 @@ StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1431,9 +1431,9 @@ diff -u misc/Python-2.7.5/PCbuild/pythonw.vcproj misc/build/Python-2.7.5/PCbuild />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/select.vcproj ---- misc/Python-2.7.5/PCbuild/select.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/select.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/select.vcproj misc/build/Python-2.7.6/PCbuild/select.vcproj +--- misc/Python-2.7.6/PCbuild/select.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/select.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -57,6 +57,7 @@ AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
@@ -1498,9 +1498,9 @@ diff -u misc/Python-2.7.5/PCbuild/select.vcproj misc/build/Python-2.7.5/PCbuild/ />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild/sqlite3.vcproj ---- misc/Python-2.7.5/PCbuild/sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/sqlite3.vcproj misc/build/Python-2.7.6/PCbuild/sqlite3.vcproj +--- misc/Python-2.7.6/PCbuild/sqlite3.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/sqlite3.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -56,6 +56,7 @@ <Tool
Name="VCLinkerTool"
@@ -1565,9 +1565,9 @@ diff -u misc/Python-2.7.5/PCbuild/sqlite3.vcproj misc/build/Python-2.7.5/PCbuild />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCbuild/unicodedata.vcproj ---- misc/Python-2.7.5/PCbuild/unicodedata.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/unicodedata.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/unicodedata.vcproj misc/build/Python-2.7.6/PCbuild/unicodedata.vcproj +--- misc/Python-2.7.6/PCbuild/unicodedata.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/unicodedata.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -55,6 +55,7 @@ <Tool
Name="VCLinkerTool"
@@ -1632,9 +1632,9 @@ diff -u misc/Python-2.7.5/PCbuild/unicodedata.vcproj misc/build/Python-2.7.5/PCb />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuild/w9xpopen.vcproj ---- misc/Python-2.7.5/PCbuild/w9xpopen.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/w9xpopen.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.6/PCbuild/w9xpopen.vcproj +--- misc/Python-2.7.6/PCbuild/w9xpopen.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/w9xpopen.vcproj 2012-07-30 20:59:37.000000000 -0500 @@ -59,6 +59,7 @@ <Tool
Name="VCLinkerTool"
@@ -1699,9 +1699,9 @@ diff -u misc/Python-2.7.5/PCbuild/w9xpopen.vcproj misc/build/Python-2.7.5/PCbuil />
<Tool
Name="VCALinkTool"
-diff -u misc/Python-2.7.5/PCbuild/winsound.vcproj misc/build/Python-2.7.5/PCbuild/winsound.vcproj ---- misc/Python-2.7.5/PCbuild/winsound.vcproj 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/winsound.vcproj 2012-07-30 20:59:37.000000000 -0500 +diff -u misc/Python-2.7.6/PCbuild/winsound.vcproj misc/build/Python-2.7.6/PCbuild/winsound.vcproj +--- misc/Python-2.7.6/PCbuild/winsound.vcproj 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/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.5-sysbase.patch b/python/python-2.7.6-sysbase.patch index 03c47f0036e1..3385a4e67953 100644 --- a/python/python-2.7.5-sysbase.patch +++ b/python/python-2.7.6-sysbase.patch @@ -1,5 +1,5 @@ ---- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500 -+++ misc/build/Python-2.7.5/configure 2012-07-22 15:01:20.000000000 -0500 +--- misc/Python-2.7.6/configure 2012-04-09 18:07:36.000000000 -0500 ++++ misc/build/Python-2.7.6/configure 2012-07-22 15:01:20.000000000 -0500 @@ -2982,7 +2982,9 @@ if test -z "$MACHDEP" then diff --git a/python/python-freebsd.patch b/python/python-freebsd.patch index 63efa1100a03..0489052f2290 100644 --- a/python/python-freebsd.patch +++ b/python/python-freebsd.patch @@ -1,5 +1,5 @@ ---- misc/Python-2.7.5/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500 -+++ misc/build/Python-2.7.5/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500 +--- misc/Python-2.7.6/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000 -0500 ++++ misc/build/Python-2.7.6/Lib/plat-freebsd9/IN.py 2012-08-01 18:56:04.000000000 -0500 @@ -0,0 +1,612 @@ +# Generated by h2py from /usr/include/netinet/in.h + @@ -613,14 +613,14 @@ +IPV6CTL_NORBIT_RAIF = 49 +IPV6CTL_RFC6204W3 = 50 +IPV6CTL_MAXID = 51 ---- misc/Python-2.7.5/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500 -+++ misc/build/Python-2.7.5/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500 +--- misc/Python-2.7.6/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000 -0500 ++++ misc/build/Python-2.7.6/Lib/plat-freebsd9/regen 2012-08-01 18:55:27.000000000 -0500 @@ -0,0 +1,3 @@ +#! /bin/sh +set -v +python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h ---- misc/Python-2.7.5/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500 -+++ misc/build/Python-2.7.5/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500 +--- misc/Python-2.7.6/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500 ++++ misc/build/Python-2.7.6/Lib/test/test_threading.py 2012-08-01 18:44:40.000000000 -0500 @@ -421,7 +421,7 @@ # #12316 and #11870), and fork() from a worker thread is known to trigger # problems with some operating systems (issue #3863): skip problematic tests @@ -630,8 +630,8 @@ 'os2emx') def _run_and_join(self, script): ---- misc/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500 -+++ misc/build/Python-2.7.5/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500 +--- misc/Python-2.7.6/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500 ++++ misc/build/Python-2.7.6/Modules/_ctypes/libffi/configure 2012-08-01 18:53:21.000000000 -0500 @@ -6289,7 +6289,7 @@ rm -rf conftest* ;; @@ -651,8 +651,8 @@ powerpc*-*-rtems*) TARGET=POWERPC; TARGETDIR=powerpc ;; ---- misc/Python-2.7.5/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500 -+++ misc/build/Python-2.7.5/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500 +--- misc/Python-2.7.6/Modules/fcntlmodule.c 2012-04-09 18:07:34.000000000 -0500 ++++ misc/build/Python-2.7.6/Modules/fcntlmodule.c 2012-08-01 18:44:40.000000000 -0500 @@ -97,20 +97,15 @@ { #define IOCTL_BUFSZ 1024 @@ -704,8 +704,8 @@ " an integer and optionally an integer or buffer argument", conv_descriptor, &fd, &code, &arg)) { return NULL; ---- misc/Python-2.7.5/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500 +--- misc/Python-2.7.6/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/Python/thread_pthread.h 2012-08-01 18:44:40.000000000 -0500 @@ -38,13 +38,18 @@ #endif #endif @@ -759,9 +759,9 @@ #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) pthread_attr_destroy(&attrs); #endif -diff -ruN misc/Python-2.7.5/configure misc/build/Python-2.7.5/configure ---- misc/Python-2.7.5/configure 2012-04-09 18:07:36.000000000 -0500 -+++ misc/build/Python-2.7.5/configure 2012-08-01 18:44:40.000000000 -0500 +diff -ruN misc/Python-2.7.6/configure misc/build/Python-2.7.6/configure +--- misc/Python-2.7.6/configure 2012-04-09 18:07:36.000000000 -0500 ++++ misc/build/Python-2.7.6/configure 2012-08-01 18:44:40.000000000 -0500 @@ -4916,7 +4916,7 @@ ;; SunOS*) @@ -783,9 +783,9 @@ diff -ruN misc/Python-2.7.5/configure misc/build/Python-2.7.5/configure INSTSONAME="$LDLIBRARY".$SOVERSION ;; hp*|HP*) -diff -ruN misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py ---- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500 -+++ misc/build/Python-2.7.5/setup.py 2012-08-01 18:44:40.000000000 -0500 +diff -ruN misc/Python-2.7.6/setup.py misc/build/Python-2.7.6/setup.py +--- misc/Python-2.7.6/setup.py 2012-04-09 18:07:36.000000000 -0500 ++++ misc/build/Python-2.7.6/setup.py 2012-08-01 18:44:40.000000000 -0500 @@ -1555,7 +1540,7 @@ macros = dict() libraries = [] diff --git a/python/python-md5.patch b/python/python-md5.patch index c1c284c90bc6..981907109ca4 100644 --- a/python/python-md5.patch +++ b/python/python-md5.patch @@ -1,6 +1,6 @@ -diff -ru misc/Python-2.7.5/Modules/Setup.dist misc/build/Python-2.7.5/Modules/Setup.dist ---- misc/Python-2.7.5/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500 -+++ misc/build/Python-2.7.5/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500 +diff -ru misc/Python-2.7.6/Modules/Setup.dist misc/build/Python-2.7.6/Modules/Setup.dist +--- misc/Python-2.7.6/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500 ++++ misc/build/Python-2.7.6/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500 @@ -248,14 +248,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 583a1d7b0864..707a3af202bd 100644 --- a/python/python-solaris.patch +++ b/python/python-solaris.patch @@ -1,5 +1,5 @@ ---- misc/Python-2.7.5/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500 -+++ misc/build/Python-2.7.5/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500 +--- misc/Python-2.7.6/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500 ++++ misc/build/Python-2.7.6/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500 @@ -603,11 +603,6 @@ in platform-specific #ifdefs. **************************************************************************/ diff --git a/python/python-solver-before-std.patch b/python/python-solver-before-std.patch index 938b99c94168..1c66d24216d5 100644 --- a/python/python-solver-before-std.patch +++ b/python/python-solver-before-std.patch @@ -1,5 +1,5 @@ ---- misc/Python-2.7.5/setup.py 2013-07-01 17:51:46.237674580 +0200 -+++ misc/build/Python-2.7.5/setup.py 2013-07-01 17:51:24.230453108 +0200 +--- misc/Python-2.7.6/setup.py 2013-07-01 17:51:46.237674580 +0200 ++++ misc/build/Python-2.7.6/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() diff --git a/python/python-ssl.patch b/python/python-ssl.patch index 02923e9133f8..04921f354612 100644 --- a/python/python-ssl.patch +++ b/python/python-ssl.patch @@ -1,15 +1,15 @@ -diff -ru misc/Python-2.7.5/PCbuild/build_ssl.py misc/build/Python-2.7.5/PCbuild/build_ssl.py ---- misc/Python-2.7.5/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500 -+++ misc/build/Python-2.7.5/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500 +diff -ru misc/Python-2.7.6/PCbuild/build_ssl.py misc/build/Python-2.7.6/PCbuild/build_ssl.py +--- misc/Python-2.7.6/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500 ++++ misc/build/Python-2.7.6/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500 @@ -253,4 +253,4 @@ sys.exit(rc) if __name__=='__main__': - main() + sys.exit(0) -diff -ru misc/Python-2.7.5/setup.py misc/build/Python-2.7.5/setup.py ---- misc/Python-2.7.5/setup.py 2012-04-09 18:07:36.000000000 -0500 -+++ misc/build/Python-2.7.5/setup.py 2012-07-25 14:37:37.000000000 -0500 +diff -ru misc/Python-2.7.6/setup.py misc/build/Python-2.7.6/setup.py +--- misc/Python-2.7.6/setup.py 2012-04-09 18:07:36.000000000 -0500 ++++ misc/build/Python-2.7.6/setup.py 2012-07-25 14:37:37.000000000 -0500 @@ -702,7 +702,15 @@ exts.append( Extension('_socket', ['socketmodule.c'], depends = ['socketmodule.h']) ) diff --git a/python/pyversion.mk b/python/pyversion.mk index 2cc62b98a00a..2f8ae7e7d4ae 100644 --- a/python/pyversion.mk +++ b/python/pyversion.mk @@ -22,7 +22,7 @@ # in the python project accordingly !!! PYMAJOR=2 PYMINOR=7 -PYMICRO=5 +PYMICRO=6 PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO) .IF "$(GUI)" == "UNX" |