Author: pfg
Date: Sun Jan 3 05:10:43 2016
New Revision: 1722700
URL: http://svn.apache.org/viewvc?rev=1722700&view=rev
Log:
Revert r1722635: Update Python bundled version to 2.7.8
It broke the buildots .. requires some investigation.
Added:
openoffice/trunk/main/python/python-2.7.6-mingw.patch
- copied unchanged from r1722634,
openoffice/trunk/main/python/python-2.7.6-mingw.patch
openoffice/trunk/main/python/python-2.7.6-nohardlink.patch
- copied unchanged from r1722634,
openoffice/trunk/main/python/python-2.7.6-nohardlink.patch
openoffice/trunk/main/python/python-2.7.6-pcbuild.patch
- copied unchanged from r1722634,
openoffice/trunk/main/python/python-2.7.6-pcbuild.patch
openoffice/trunk/main/python/python-2.7.6-sysbase.patch
- copied unchanged from r1722634,
openoffice/trunk/main/python/python-2.7.6-sysbase.patch
Removed:
openoffice/trunk/main/python/python-2.7.8-mingw.patch
openoffice/trunk/main/python/python-2.7.8-nohardlink.patch
openoffice/trunk/main/python/python-2.7.8-pcbuild.patch
openoffice/trunk/main/python/python-2.7.8-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=1722700&r1=1722699&r2=1722700&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Sun Jan 3 05:10:43 2016
@@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES)
- MD5 = d4bca0159acb0b44a781292b5231936f
- name = Python-2.7.8.tgz
- URL1 = http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz
+ MD5 = 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=1722700&r1=1722699&r2=1722700&view=diff
==============================================================================
--- openoffice/trunk/main/python/makefile.mk (original)
+++ openoffice/trunk/main/python/makefile.mk Sun Jan 3 05:10:43 2016
@@ -42,7 +42,7 @@ all:
TARFILE_NAME=Python-$(PYVERSION)
-TARFILE_MD5=d4bca0159acb0b44a781292b5231936f
+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=1722700&r1=1722699&r2=1722700&view=diff
==============================================================================
--- openoffice/trunk/main/python/prj/d.lst (original)
+++ openoffice/trunk/main/python/prj/d.lst Sun Jan 3 05:10:43 2016
@@ -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.8\Lib\* %_DEST%\lib%_EXT%\python\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-old\*
%_DEST%\lib%_EXT%\python\lib-old\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-tk\*
%_DEST%\lib%_EXT%\python\lib-tk\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\site-packages\*
%_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\encodings\*
%_DEST%\lib%_EXT%\python\encodings\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\email\mime\*
%_DEST%\lib%_EXT%\python\email\mime\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\compiler\*
%_DEST%\lib%_EXT%\python\compiler\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\hotshot\*
%_DEST%\lib%_EXT%\python\hotshot\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\*
%_DEST%\lib%_EXT%\python\distutils\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\command\*
%_DEST%\lib%_EXT%\python\distutils\command\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\dom\*
%_DEST%\lib%_EXT%\python\xml\dom\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\parsers\*
%_DEST%\lib%_EXT%\python\xml\parsers\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\sax\*
%_DEST%\lib%_EXT%\python\xml\sax\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\curses\*
%_DEST%\lib%_EXT%\python\curses\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\plat-linux2\*
%_DEST%\lib%_EXT%\python\plat-linux2\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\config\*
%_DEST%\lib%_EXT%\python\config\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\logging\*
%_DEST%\lib%_EXT%\python\logging\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\*
%_DEST%\lib%_EXT%\python\idlelib\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\Icons\*
%_DEST%\lib%_EXT%\python\idlelib\Icons\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\wsgiref\*
%_DEST%\lib%_EXT%\python\wsgiref\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\json\* %_DEST%\lib%_EXT%\python\json\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\*
%_DEST%\lib%_EXT%\python\lib2to3\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\fixes\*
%_DEST%\lib%_EXT%\python\lib2to3\fixes\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\pgen2\*
%_DEST%\lib%_EXT%\python\lib2to3\pgen2\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\sqlite3\*
%_DEST%\lib%_EXT%\python\sqlite3\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\ctypes\*
%_DEST%\lib%_EXT%\python\ctypes\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\ctypes\macholib\*
%_DEST%\lib%_EXT%\python\ctypes\macholib\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\etree\*
%_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\etree\*
%_DEST%\lib%_EXT%\python\xml\etree
-..\%__SRC%\misc\build\Python-2.7.8\Lib\importlib\*
%_DEST%\lib%_EXT%\python\importlib\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\multiprocessing\*
%_DEST%\lib%_EXT%\python\multiprocessing\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\multiprocessing\dummy\*
%_DEST%\lib%_EXT%\python\multiprocessing\dummy\*
-..\%__SRC%\misc\build\Python-2.7.8\Lib\unittest\*
%_DEST%\lib%_EXT%\python\unittest\*
-..\%__SRC%\misc\build\Python-2.7.8\Makefile
%_DEST%\lib%_EXT%\python\python2.7\config\Makefile
+..\%__SRC%\misc\build\Python-2.7.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.8\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.8\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.8\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.8\PCbuild\python.exe
%_DEST%\bin%_EXT%\python.exe
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\python27.dll
%_DEST%\bin%_EXT%\python27.dll
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\python27.lib
%_DEST%\lib%_EXT%\python27.lib
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_socket.pyd
%_DEST%\lib%_EXT%\python\_socket.pyd
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_ssl.pyd
%_DEST%\lib%_EXT%\python\_ssl.pyd
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\select.pyd
%_DEST%\lib%_EXT%\python\select.pyd
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\unicodedata.pyd
%_DEST%\lib%_EXT%\python\unicodedata.pyd
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\winsound.pyd
%_DEST%\lib%_EXT%\python\winsound.pyd
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\pyexpat.pyd
%_DEST%\lib%_EXT%\python\pyexpat.pyd
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_testcapi.pyd
%_DEST%\lib%_EXT%\python\_testcapi.pyd
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_multiprocessing.pyd
%_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_msi.pyd
%_DEST%\lib%_EXT%\python\_msi.pyd
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_elementtree.pyd
%_DEST%\lib%_EXT%\python\_elementtree.pyd
-..\%__SRC%\misc\build\Python-2.7.8\PCbuild\_ctypes.pyd
%_DEST%\lib%_EXT%\python\_ctypes.pyd
+..\%__SRC%\misc\build\Python-2.7.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/trunk/main/python/python-freebsd.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-freebsd.patch?rev=1722700&r1=1722699&r2=1722700&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-freebsd.patch (original)
+++ openoffice/trunk/main/python/python-freebsd.patch Sun Jan 3 05:10:43 2016
@@ -1,6 +1,5 @@
-diff -ruN misc/Python-2.7.8/Lib/plat-freebsd9/IN.py
misc/build/Python-2.7.8/Lib/plat-freebsd9/IN.py
---- misc/Python-2.7.8/Lib/plat-freebsd9/IN.py 1969-12-31 19:00:00.000000000
-0500
-+++ misc/build/Python-2.7.8/Lib/plat-freebsd9/IN.py 2016-01-01
17:38:35.922764464 -0500
+--- 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
+
@@ -614,17 +613,15 @@ diff -ruN misc/Python-2.7.8/Lib/plat-fre
+IPV6CTL_NORBIT_RAIF = 49
+IPV6CTL_RFC6204W3 = 50
+IPV6CTL_MAXID = 51
-diff -ruN misc/Python-2.7.8/Lib/plat-freebsd9/regen
misc/build/Python-2.7.8/Lib/plat-freebsd9/regen
---- misc/Python-2.7.8/Lib/plat-freebsd9/regen 1969-12-31 19:00:00.000000000
-0500
-+++ misc/build/Python-2.7.8/Lib/plat-freebsd9/regen 2016-01-01
17:38:35.922764464 -0500
+--- 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
-diff -ruN misc/Python-2.7.8/Lib/test/test_threading.py
misc/build/Python-2.7.8/Lib/test/test_threading.py
---- misc/Python-2.7.8/Lib/test/test_threading.py 2014-06-29
21:05:37.000000000 -0500
-+++ misc/build/Python-2.7.8/Lib/test/test_threading.py 2016-01-01
17:38:35.923764731 -0500
-@@ -486,7 +486,7 @@
+--- 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
# on platforms known to behave badly.
@@ -633,10 +630,9 @@ diff -ruN misc/Python-2.7.8/Lib/test/tes
'os2emx')
def _run_and_join(self, script):
-diff -ruN misc/Python-2.7.8/Modules/_ctypes/libffi/configure
misc/build/Python-2.7.8/Modules/_ctypes/libffi/configure
---- misc/Python-2.7.8/Modules/_ctypes/libffi/configure 2014-06-29
21:05:40.000000000 -0500
-+++ misc/build/Python-2.7.8/Modules/_ctypes/libffi/configure 2016-01-01
17:38:35.931765818 -0500
-@@ -6889,7 +6889,7 @@
+--- 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*
;;
@@ -645,9 +641,9 @@ diff -ruN misc/Python-2.7.8/Modules/_cty
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
-@@ -13459,6 +13459,9 @@
- powerpc64-*-freebsd*)
- TARGET=POWERPC; TARGETDIR=powerpc
+@@ -11275,6 +11275,9 @@
+ powerpc-*-freebsd*)
+ TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
;;
+ powerpc64-*-freebsd*)
+ TARGET=POWERPC; TARGETDIR=powerpc
@@ -655,10 +651,9 @@ diff -ruN misc/Python-2.7.8/Modules/_cty
powerpc*-*-rtems*)
TARGET=POWERPC; TARGETDIR=powerpc
;;
-diff -ruN misc/Python-2.7.8/Modules/fcntlmodule.c
misc/build/Python-2.7.8/Modules/fcntlmodule.c
---- misc/Python-2.7.8/Modules/fcntlmodule.c 2014-06-29 21:05:43.000000000
-0500
-+++ misc/build/Python-2.7.8/Modules/fcntlmodule.c 2016-01-01
17:42:35.865747022 -0500
-@@ -98,20 +98,15 @@
+--- 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
int fd;
@@ -670,7 +665,7 @@ diff -ruN misc/Python-2.7.8/Modules/fcnt
whereas the system expects it to be a 32bit bit field value
regardless of it being passed as an int or unsigned long on
- various platforms. See the termios.TIOCSWINSZ constant across
-- platforms for an example of this.
+- platforms for an example of thise.
-
- If any of the 64bit platforms ever decide to use more than 32bits
- in their unsigned long ioctl codes this will break and need
@@ -682,7 +677,7 @@ diff -ruN misc/Python-2.7.8/Modules/fcnt
int arg;
int ret;
char *str;
-@@ -119,7 +114,7 @@
+@@ -118,7 +113,7 @@
int mutate_arg = 1;
char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */
@@ -691,7 +686,7 @@ diff -ruN misc/Python-2.7.8/Modules/fcnt
conv_descriptor, &fd, &code,
&str, &len, &mutate_arg)) {
char *arg;
-@@ -170,7 +165,7 @@
+@@ -169,7 +164,7 @@
}
PyErr_Clear();
@@ -700,7 +695,7 @@ diff -ruN misc/Python-2.7.8/Modules/fcnt
conv_descriptor, &fd, &code, &str, &len)) {
if (len > IOCTL_BUFSZ) {
PyErr_SetString(PyExc_ValueError,
-@@ -192,7 +187,7 @@
+@@ -191,7 +186,7 @@
PyErr_Clear();
arg = 0;
if (!PyArg_ParseTuple(args,
@@ -709,37 +704,8 @@ diff -ruN misc/Python-2.7.8/Modules/fcnt
" an integer and optionally an integer or buffer argument",
conv_descriptor, &fd, &code, &arg)) {
return NULL;
-diff -ruN misc/Python-2.7.8/Modules/fcntlmodule.c.rej
misc/build/Python-2.7.8/Modules/fcntlmodule.c.rej
---- misc/Python-2.7.8/Modules/fcntlmodule.c.rej 1969-12-31
19:00:00.000000000 -0500
-+++ misc/build/Python-2.7.8/Modules/fcntlmodule.c.rej 2016-01-01
17:38:35.933764047 -0500
-@@ -0,0 +1,24 @@
-+@@ -97,20 +97,15 @@
-+ {
-+ #define IOCTL_BUFSZ 1024
-+ int fd;
-+- /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'
-++ /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'
-+ format for the 'code' parameter because Python turns 0x8000000
-+ into either a large positive number (PyLong or PyInt on 64-bit
-+ platforms) or a negative number on others (32-bit PyInt)
-+ whereas the system expects it to be a 32bit bit field value
-+ regardless of it being passed as an int or unsigned long on
-+- various platforms. See the termios.TIOCSWINSZ constant across
-+- platforms for an example of thise.
-+-
-+- If any of the 64bit platforms ever decide to use more than 32bits
-+- in their unsigned long ioctl codes this will break and need
-+- special casing based on the platform being built on.
-++ various platforms.
-+ */
-+- unsigned int code;
-++ unsigned long code;
-+ int arg;
-+ int ret;
-+ char *str;
-diff -ruN misc/Python-2.7.8/Python/thread_pthread.h
misc/build/Python-2.7.8/Python/thread_pthread.h
---- misc/Python-2.7.8/Python/thread_pthread.h 2014-06-29 21:05:47.000000000
-0500
-+++ misc/build/Python-2.7.8/Python/thread_pthread.h 2016-01-01
17:38:35.933764047 -0500
+--- 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
@@ -768,7 +734,7 @@ diff -ruN misc/Python-2.7.8/Python/threa
#if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101
#undef PTHREAD_SYSTEM_SCHED_SUPPORTED
#endif
-@@ -162,6 +166,7 @@
+@@ -161,6 +165,7 @@
{
pthread_t th;
int status;
@@ -776,7 +742,7 @@ diff -ruN misc/Python-2.7.8/Python/threa
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_t attrs;
#endif
-@@ -190,6 +195,8 @@
+@@ -189,6 +194,8 @@
#if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
#endif
@@ -785,7 +751,7 @@ diff -ruN misc/Python-2.7.8/Python/threa
status = pthread_create(&th,
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
-@@ -201,6 +208,7 @@
+@@ -200,6 +207,7 @@
(void *)arg
);
@@ -793,22 +759,22 @@ diff -ruN misc/Python-2.7.8/Python/threa
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
#endif
-diff -ruN misc/Python-2.7.8/configure misc/build/Python-2.7.8/configure
---- misc/Python-2.7.8/configure 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.8/configure 2016-01-01 17:41:32.541753889 -0500
-@@ -5347,7 +5347,7 @@
+diff -ruN misc/Python-2.7.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*)
LDLIBRARY='libpython$(VERSION).so'
- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
+ BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
- RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
-@@ -5355,11 +5355,6 @@
+@@ -4924,11 +4924,6 @@
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
- RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- case $ac_sys_system in
- FreeBSD*)
- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
@@ -817,35 +783,10 @@ diff -ruN misc/Python-2.7.8/configure mi
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
-diff -ruN misc/Python-2.7.8/configure.rej misc/build/Python-2.7.8/configure.rej
---- misc/Python-2.7.8/configure.rej 1969-12-31 19:00:00.000000000 -0500
-+++ misc/build/Python-2.7.8/configure.rej 2016-01-01 17:38:35.943764550
-0500
-@@ -0,0 +1,21 @@
-+@@ -4916,7 +4916,7 @@
-+ ;;
-+ SunOS*)
-+ LDLIBRARY='libpython$(VERSION).so'
-+- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
-++ BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
-+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-+ INSTSONAME="$LDLIBRARY".$SOVERSION
-+ ;;
-+@@ -4924,11 +4924,6 @@
-+ LDLIBRARY='libpython$(VERSION).so'
-+ BLDLIBRARY='-L. -lpython$(VERSION)'
-+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-+- case $ac_sys_system in
-+- FreeBSD*)
-+- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
-+- ;;
-+- esac
-+ INSTSONAME="$LDLIBRARY".$SOVERSION
-+ ;;
-+ hp*|HP*)
-diff -ruN misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py
---- misc/Python-2.7.8/setup.py 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.8/setup.py 2016-01-01 17:38:35.945765223 -0500
-@@ -1551,7 +1551,7 @@
+diff -ruN misc/Python-2.7.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 = []
@@ -854,7 +795,7 @@ diff -ruN misc/Python-2.7.8/setup.py mis
# FreeBSD's P1003.1b semaphore support is very experimental
# and has many known problems. (as of June 2008)
macros = dict()
-@@ -1603,7 +1603,7 @@
+@@ -1607,7 +1592,7 @@
missing.append('linuxaudiodev')
if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
Modified: openoffice/trunk/main/python/python-md5.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-md5.patch?rev=1722700&r1=1722699&r2=1722700&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-md5.patch (original)
+++ openoffice/trunk/main/python/python-md5.patch Sun Jan 3 05:10:43 2016
@@ -1,7 +1,7 @@
-diff -ru misc/Python-2.7.8/Modules/Setup.dist
misc/build/Python-2.7.8/Modules/Setup.dist
---- misc/Python-2.7.8/Modules/Setup.dist 2012-04-09 18:07:33.000000000
-0500
-+++ misc/build/Python-2.7.8/Modules/Setup.dist 2012-07-24 17:08:56.000000000
-0500
-@@ -252,14 +252,14 @@
+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/trunk/main/python/python-solaris.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-solaris.patch?rev=1722700&r1=1722699&r2=1722700&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-solaris.patch (original)
+++ openoffice/trunk/main/python/python-solaris.patch Sun Jan 3 05:10:43 2016
@@ -1,6 +1,6 @@
---- misc/Python-2.7.8/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
-+++ misc/build/Python-2.7.8/Include/pyport.h 2012-07-24 18:19:52.000000000
-0500
-@@ -640,11 +640,6 @@
+--- 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/trunk/main/python/python-solver-before-std.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-solver-before-std.patch?rev=1722700&r1=1722699&r2=1722700&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-solver-before-std.patch (original)
+++ openoffice/trunk/main/python/python-solver-before-std.patch Sun Jan 3
05:10:43 2016
@@ -1,5 +1,5 @@
---- misc/Python-2.7.8/setup.py 2013-07-01 17:51:46.237674580 +0200
-+++ misc/build/Python-2.7.8/setup.py 2013-07-01 17:51:24.230453108 +0200
+--- misc/Python-2.7.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()
@@ -79,7 +79,7 @@
else:
assert False, "Internal error: Path not found in std_dirs or paths"
-@@ -808,6 +809,7 @@
+@@ -819,6 +820,7 @@
exts.append( Extension('_ssl', ['_ssl.c'],
include_dirs = ssl_incs,
library_dirs = ssl_libs,
@@ -87,7 +87,7 @@
libraries = ['ssl', 'crypto'],
depends = ['socketmodule.h']), )
else:
-@@ -847,6 +849,7 @@
+@@ -858,6 +860,7 @@
exts.append( Extension('_hashlib', ['_hashopenssl.c'],
include_dirs = ssl_incs,
library_dirs = ssl_libs,
Modified: openoffice/trunk/main/python/python-ssl.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-ssl.patch?rev=1722700&r1=1722699&r2=1722700&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-ssl.patch (original)
+++ openoffice/trunk/main/python/python-ssl.patch Sun Jan 3 05:10:43 2016
@@ -1,18 +1,18 @@
-diff -ruN misc/Python-2.7.8/PCbuild/build_ssl.py
misc/build/Python-2.7.8/PCbuild/build_ssl.py
---- misc/Python-2.7.8/PCbuild/build_ssl.py 2014-06-29 21:05:46.000000000
-0500
-+++ misc/build/Python-2.7.8/PCbuild/build_ssl.py 2016-01-01
15:15:32.256357072 -0500
-@@ -229,4 +229,4 @@
+diff -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 -ruN misc/Python-2.7.8/setup.py misc/build/Python-2.7.8/setup.py
---- misc/Python-2.7.8/setup.py 2014-06-29 21:05:48.000000000 -0500
-+++ misc/build/Python-2.7.8/setup.py 2016-01-01 15:15:32.258356209 -0500
-@@ -786,7 +786,15 @@
- depends=['socketmodule.h'],
- libraries=math_libs) )
+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']) )
# Detect SSL support for the socket module (via _ssl)
+ UPDMINOR = os.environ.get('UPDMINOREXT')
+ ooosslinc = os.environ.get('SOLARVERSION') + '/' + \
@@ -26,7 +26,7 @@ diff -ruN misc/Python-2.7.8/setup.py mis
'/usr/local/ssl/include',
'/usr/contrib/ssl/include/'
]
-@@ -798,8 +806,15 @@
+@@ -714,8 +722,15 @@
['/usr/kerberos/include'])
if krb5_h:
ssl_incs += krb5_h
Modified: openoffice/trunk/main/python/pyversion.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/pyversion.mk?rev=1722700&r1=1722699&r2=1722700&view=diff
==============================================================================
--- openoffice/trunk/main/python/pyversion.mk (original)
+++ openoffice/trunk/main/python/pyversion.mk Sun Jan 3 05:10:43 2016
@@ -22,7 +22,7 @@
# in the python project accordingly !!!
PYMAJOR=2
PYMINOR=7
-PYMICRO=8
+PYMICRO=6
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
.IF "$(GUI)" == "UNX"
