Author: jsc Date: Tue Apr 15 08:02:45 2014 New Revision: 1587470 URL: http://svn.apache.org/r1587470 Log: #124680# merge from trunk, update pyhton from 2.7.5 to 2.7.6
Added: openoffice/branches/AOO410/main/python/python-2.7.6-mingw.patch - copied unchanged from r1587468, openoffice/trunk/main/python/python-2.7.6-mingw.patch openoffice/branches/AOO410/main/python/python-2.7.6-nohardlink.patch - copied unchanged from r1587468, openoffice/trunk/main/python/python-2.7.6-nohardlink.patch openoffice/branches/AOO410/main/python/python-2.7.6-pcbuild.patch - copied unchanged from r1587468, openoffice/trunk/main/python/python-2.7.6-pcbuild.patch openoffice/branches/AOO410/main/python/python-2.7.6-sysbase.patch - copied unchanged from r1587468, openoffice/trunk/main/python/python-2.7.6-sysbase.patch Removed: openoffice/branches/AOO410/main/python/python-2.7.5-mingw.patch openoffice/branches/AOO410/main/python/python-2.7.5-nohardlink.patch openoffice/branches/AOO410/main/python/python-2.7.5-pcbuild.patch openoffice/branches/AOO410/main/python/python-2.7.5-sysbase.patch Modified: openoffice/branches/AOO410/ (props changed) openoffice/branches/AOO410/main/ (props changed) openoffice/branches/AOO410/main/external_deps.lst openoffice/branches/AOO410/main/python/makefile.mk openoffice/branches/AOO410/main/python/prj/d.lst openoffice/branches/AOO410/main/python/python-freebsd.patch openoffice/branches/AOO410/main/python/python-md5.patch openoffice/branches/AOO410/main/python/python-solaris.patch openoffice/branches/AOO410/main/python/python-solver-before-std.patch openoffice/branches/AOO410/main/python/python-ssl.patch openoffice/branches/AOO410/main/python/pyversion.mk Propchange: openoffice/branches/AOO410/ ------------------------------------------------------------------------------ Merged /openoffice/trunk:r1571619,1580657,1581746,1587468 Propchange: openoffice/branches/AOO410/main/ ------------------------------------------------------------------------------ Merged /openoffice/trunk/main:r1580657,1581746,1587468 Modified: openoffice/branches/AOO410/main/external_deps.lst URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/external_deps.lst?rev=1587470&r1=1587469&r2=1587470&view=diff ============================================================================== --- openoffice/branches/AOO410/main/external_deps.lst (original) +++ openoffice/branches/AOO410/main/external_deps.lst Tue Apr 15 08:02:45 2014 @@ -183,7 +183,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) @@ -199,9 +199,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/branches/AOO410/main/python/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/python/makefile.mk?rev=1587470&r1=1587469&r2=1587470&view=diff ============================================================================== --- openoffice/branches/AOO410/main/python/makefile.mk (original) +++ openoffice/branches/AOO410/main/python/makefile.mk Tue Apr 15 08:02:45 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/branches/AOO410/main/python/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/python/prj/d.lst?rev=1587470&r1=1587469&r2=1587470&view=diff ============================================================================== --- openoffice/branches/AOO410/main/python/prj/d.lst (original) +++ openoffice/branches/AOO410/main/python/prj/d.lst Tue Apr 15 08:02:45 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.*.*.* Modified: openoffice/branches/AOO410/main/python/python-freebsd.patch URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/python/python-freebsd.patch?rev=1587470&r1=1587469&r2=1587470&view=diff ============================================================================== --- openoffice/branches/AOO410/main/python/python-freebsd.patch (original) +++ openoffice/branches/AOO410/main/python/python-freebsd.patch Tue Apr 15 08:02:45 2014 @@ -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 mi 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 = [] Modified: openoffice/branches/AOO410/main/python/python-md5.patch URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/python/python-md5.patch?rev=1587470&r1=1587469&r2=1587470&view=diff ============================================================================== --- openoffice/branches/AOO410/main/python/python-md5.patch (original) +++ openoffice/branches/AOO410/main/python/python-md5.patch Tue Apr 15 08:02:45 2014 @@ -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. Modified: openoffice/branches/AOO410/main/python/python-solaris.patch URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/python/python-solaris.patch?rev=1587470&r1=1587469&r2=1587470&view=diff ============================================================================== --- openoffice/branches/AOO410/main/python/python-solaris.patch (original) +++ openoffice/branches/AOO410/main/python/python-solaris.patch Tue Apr 15 08:02:45 2014 @@ -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. **************************************************************************/ Modified: openoffice/branches/AOO410/main/python/python-solver-before-std.patch URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/python/python-solver-before-std.patch?rev=1587470&r1=1587469&r2=1587470&view=diff ============================================================================== --- openoffice/branches/AOO410/main/python/python-solver-before-std.patch (original) +++ openoffice/branches/AOO410/main/python/python-solver-before-std.patch Tue Apr 15 08:02:45 2014 @@ -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() Modified: openoffice/branches/AOO410/main/python/python-ssl.patch URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/python/python-ssl.patch?rev=1587470&r1=1587469&r2=1587470&view=diff ============================================================================== --- openoffice/branches/AOO410/main/python/python-ssl.patch (original) +++ openoffice/branches/AOO410/main/python/python-ssl.patch Tue Apr 15 08:02:45 2014 @@ -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']) ) Modified: openoffice/branches/AOO410/main/python/pyversion.mk URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/python/pyversion.mk?rev=1587470&r1=1587469&r2=1587470&view=diff ============================================================================== --- openoffice/branches/AOO410/main/python/pyversion.mk (original) +++ openoffice/branches/AOO410/main/python/pyversion.mk Tue Apr 15 08:02:45 2014 @@ -22,7 +22,7 @@ # in the python project accordingly !!! PYMAJOR=2 PYMINOR=7 -PYMICRO=5 +PYMICRO=6 PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO) .IF "$(GUI)" == "UNX"