Author: jsc Date: Tue Apr 15 07:58:19 2014 New Revision: 1587468 URL: http://svn.apache.org/r1587468 Log: #124680# update pyhton from 2.7.5 to 2.7.6
Added: openoffice/trunk/main/python/python-2.7.6-mingw.patch openoffice/trunk/main/python/python-2.7.6-nohardlink.patch openoffice/trunk/main/python/python-2.7.6-pcbuild.patch openoffice/trunk/main/python/python-2.7.6-sysbase.patch Removed: openoffice/trunk/main/python/python-2.7.5-mingw.patch openoffice/trunk/main/python/python-2.7.5-nohardlink.patch openoffice/trunk/main/python/python-2.7.5-pcbuild.patch openoffice/trunk/main/python/python-2.7.5-sysbase.patch Modified: openoffice/trunk/main/external_deps.lst openoffice/trunk/main/python/makefile.mk openoffice/trunk/main/python/prj/d.lst openoffice/trunk/main/python/python-freebsd.patch openoffice/trunk/main/python/python-md5.patch openoffice/trunk/main/python/python-solaris.patch openoffice/trunk/main/python/python-solver-before-std.patch openoffice/trunk/main/python/python-ssl.patch openoffice/trunk/main/python/pyversion.mk Modified: openoffice/trunk/main/external_deps.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1587468&r1=1587467&r2=1587468&view=diff ============================================================================== --- openoffice/trunk/main/external_deps.lst (original) +++ openoffice/trunk/main/external_deps.lst Tue Apr 15 07:58:19 2014 @@ -181,7 +181,7 @@ if (SYSTEM_LIBXSLT != YES) if (SOLAR_JAVA == TRUE) MD5 = 63574e3ada44f473892a61a2da433a59 name = apache-tomcat-5.5.36-src.tar.gz - # URL1 = http://www.alliedquotes.com/mirrors/apache/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz + URL1 = http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SOLAR_JAVA == TRUE) @@ -197,9 +197,9 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) - MD5 = 6334b666b7ff2038c761d7b27ba699c1 - name = Python-2.7.5.tar.bz2 - URL1 = http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tar.bz2 + MD5 = 1d8728eb0dfcac72a0fd99c17ec7f386 + name = Python-2.7.6.tgz + URL1 = http://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) Modified: openoffice/trunk/main/python/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/makefile.mk?rev=1587468&r1=1587467&r2=1587468&view=diff ============================================================================== --- openoffice/trunk/main/python/makefile.mk (original) +++ openoffice/trunk/main/python/makefile.mk Tue Apr 15 07:58:19 2014 @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=6334b666b7ff2038c761d7b27ba699c1 +TARFILE_MD5=1d8728eb0dfcac72a0fd99c17ec7f386 PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ Modified: openoffice/trunk/main/python/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/prj/d.lst?rev=1587468&r1=1587467&r2=1587468&view=diff ============================================================================== --- openoffice/trunk/main/python/prj/d.lst (original) +++ openoffice/trunk/main/python/prj/d.lst Tue Apr 15 07:58:19 2014 @@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multipro mkdir: %_DEST%\lib%_EXT%\python\unittest mkdir: %_DEST%\lib%_EXT%\python\python2.7\config -..\%__SRC%\misc\build\Python-2.7.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. #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.*.*.*