From c2705d70ab20dec3080cb20884ca8907d3166fc2 Mon Sep 17 00:00:00 2001 From: orchidman Date: Thu, 3 Nov 2011 14:30:01 +0100 Subject: python2 2.7.2-1 maj port --- base/python2/.footprint.i686 | 54 +++++++++++++++++++++++++++++++++++------- base/python2/.footprint.x86_64 | 52 ++++++++++++++++++++++++++++++++++------ base/python2/.md5sum.i686 | 2 +- base/python2/.md5sum.x86_64 | 2 +- base/python2/Pkgfile | 16 +++++++++---- 5 files changed, 103 insertions(+), 23 deletions(-) (limited to 'base') diff --git a/base/python2/.footprint.i686 b/base/python2/.footprint.i686 index e4360acd0..40a697715 100644 --- a/base/python2/.footprint.i686 +++ b/base/python2/.footprint.i686 @@ -1889,7 +1889,7 @@ drwxr-xr-x root/root usr/lib/python2.7/json/tests/ -rw-r--r-- root/root usr/lib/python2.7/keyword.pyc -rw-r--r-- root/root usr/lib/python2.7/keyword.pyo drwxr-xr-x root/root usr/lib/python2.7/lib-dynload/ --rw-r--r-- root/root usr/lib/python2.7/lib-dynload/Python-2.7.1-py2.7.egg-info +-rw-r--r-- root/root usr/lib/python2.7/lib-dynload/Python-2.7.2-py2.7.egg-info -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_bisect.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_bsddb.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1932,12 +1932,10 @@ drwxr-xr-x root/root usr/lib/python2.7/lib-dynload/ -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/crypt.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/datetime.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/dbm_failed.so --rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/dl.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/fcntl.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/future_builtins.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/gdbm.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/grp.so --rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/imageop.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/itertools.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/linuxaudiodev.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/math.so @@ -1957,7 +1955,6 @@ drwxr-xr-x root/root usr/lib/python2.7/lib-dynload/ -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/time.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/unicodedata.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/zlib.so -drwxr-xr-x root/root usr/lib/python2.7/lib-old/ drwxr-xr-x root/root usr/lib/python2.7/lib-tk/ -rw-r--r-- root/root usr/lib/python2.7/lib-tk/Canvas.py -rw-r--r-- root/root usr/lib/python2.7/lib-tk/Canvas.pyc @@ -2049,12 +2046,15 @@ drwxr-xr-x root/root usr/lib/python2.7/lib-tk/test/test_ttk/ -rw-r--r-- root/root usr/lib/python2.7/lib-tk/turtle.pyo drwxr-xr-x root/root usr/lib/python2.7/lib2to3/ -rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar.txt --rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar2.7.1.final.0.pickle +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar2.7.2.final.0.pickle -rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar.txt --rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar2.7.1.final.0.pickle +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar2.7.2.final.0.pickle -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.py -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.pyc -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.pyo +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/__main__.py +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/__main__.pyc +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/__main__.pyo -rw-r--r-- root/root usr/lib/python2.7/lib2to3/btm_matcher.py -rw-r--r-- root/root usr/lib/python2.7/lib2to3/btm_matcher.pyc -rw-r--r-- root/root usr/lib/python2.7/lib2to3/btm_matcher.pyo @@ -2718,9 +2718,33 @@ drwxr-xr-x root/root usr/lib/python2.7/test/ -rw-r--r-- root/root usr/lib/python2.7/test/buffer_tests.pyo -rw-r--r-- root/root usr/lib/python2.7/test/cfgparser.1 -rw-r--r-- root/root usr/lib/python2.7/test/check_soundcard.vbs --rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings_test.py --rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings_test.pyc --rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings_test.pyo +drwxr-xr-x root/root usr/lib/python2.7/test/cjkencodings/ +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/big5-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/big5.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/big5hkscs-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/big5hkscs.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/cp949-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/cp949.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_jisx0213-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_jisx0213.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_jp-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_jp.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_kr-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_kr.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gb18030-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gb18030.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gb2312-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gb2312.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gbk-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gbk.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/hz-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/hz.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/johab-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/johab.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/shift_jis-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/shift_jis.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/shift_jisx0213-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/shift_jisx0213.txt -rw-r--r-- root/root usr/lib/python2.7/test/cmath_testcases.txt -rw-r--r-- root/root usr/lib/python2.7/test/curses_tests.py -rw-r--r-- root/root usr/lib/python2.7/test/curses_tests.pyc @@ -2969,6 +2993,10 @@ drwxr-xr-x root/root usr/lib/python2.7/test/decimaltestdata/ -rw-r--r-- root/root usr/lib/python2.7/test/string_tests.py -rw-r--r-- root/root usr/lib/python2.7/test/string_tests.pyc -rw-r--r-- root/root usr/lib/python2.7/test/string_tests.pyo +drwxr-xr-x root/root usr/lib/python2.7/test/subprocessdata/ +-rw-r--r-- root/root usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py +-rw-r--r-- root/root usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc +-rw-r--r-- root/root usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo -rw-r--r-- root/root usr/lib/python2.7/test/svn_python_org_https_cert.pem -rw-r--r-- root/root usr/lib/python2.7/test/test_MimeWriter.py -rw-r--r-- root/root usr/lib/python2.7/test/test_MimeWriter.pyc @@ -3617,6 +3645,9 @@ drwxr-xr-x root/root usr/lib/python2.7/test/decimaltestdata/ -rw-r--r-- root/root usr/lib/python2.7/test/test_modulefinder.py -rw-r--r-- root/root usr/lib/python2.7/test/test_modulefinder.pyc -rw-r--r-- root/root usr/lib/python2.7/test/test_modulefinder.pyo +-rw-r--r-- root/root usr/lib/python2.7/test/test_msilib.py +-rw-r--r-- root/root usr/lib/python2.7/test/test_msilib.pyc +-rw-r--r-- root/root usr/lib/python2.7/test/test_msilib.pyo -rw-r--r-- root/root usr/lib/python2.7/test/test_multibytecodec.py -rw-r--r-- root/root usr/lib/python2.7/test/test_multibytecodec.pyc -rw-r--r-- root/root usr/lib/python2.7/test/test_multibytecodec.pyo @@ -4431,3 +4462,8 @@ drwxr-xr-x root/root usr/lib/python2.7/xml/sax/ -rw-r--r-- root/root usr/lib/python2.7/zipfile.py -rw-r--r-- root/root usr/lib/python2.7/zipfile.pyc -rw-r--r-- root/root usr/lib/python2.7/zipfile.pyo +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +lrwxrwxrwx root/root usr/share/man/man1/python2.1.gz -> python2.7.1.gz +-rw-r--r-- root/root usr/share/man/man1/python2.7.1.gz diff --git a/base/python2/.footprint.x86_64 b/base/python2/.footprint.x86_64 index e1ad210d6..40a697715 100644 --- a/base/python2/.footprint.x86_64 +++ b/base/python2/.footprint.x86_64 @@ -1889,7 +1889,7 @@ drwxr-xr-x root/root usr/lib/python2.7/json/tests/ -rw-r--r-- root/root usr/lib/python2.7/keyword.pyc -rw-r--r-- root/root usr/lib/python2.7/keyword.pyo drwxr-xr-x root/root usr/lib/python2.7/lib-dynload/ --rw-r--r-- root/root usr/lib/python2.7/lib-dynload/Python-2.7.1-py2.7.egg-info +-rw-r--r-- root/root usr/lib/python2.7/lib-dynload/Python-2.7.2-py2.7.egg-info -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_bisect.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_bsddb.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1955,7 +1955,6 @@ drwxr-xr-x root/root usr/lib/python2.7/lib-dynload/ -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/time.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/unicodedata.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/zlib.so -drwxr-xr-x root/root usr/lib/python2.7/lib-old/ drwxr-xr-x root/root usr/lib/python2.7/lib-tk/ -rw-r--r-- root/root usr/lib/python2.7/lib-tk/Canvas.py -rw-r--r-- root/root usr/lib/python2.7/lib-tk/Canvas.pyc @@ -2047,12 +2046,15 @@ drwxr-xr-x root/root usr/lib/python2.7/lib-tk/test/test_ttk/ -rw-r--r-- root/root usr/lib/python2.7/lib-tk/turtle.pyo drwxr-xr-x root/root usr/lib/python2.7/lib2to3/ -rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar.txt --rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar2.7.1.final.0.pickle +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar2.7.2.final.0.pickle -rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar.txt --rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar2.7.1.final.0.pickle +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar2.7.2.final.0.pickle -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.py -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.pyc -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.pyo +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/__main__.py +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/__main__.pyc +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/__main__.pyo -rw-r--r-- root/root usr/lib/python2.7/lib2to3/btm_matcher.py -rw-r--r-- root/root usr/lib/python2.7/lib2to3/btm_matcher.pyc -rw-r--r-- root/root usr/lib/python2.7/lib2to3/btm_matcher.pyo @@ -2716,9 +2718,33 @@ drwxr-xr-x root/root usr/lib/python2.7/test/ -rw-r--r-- root/root usr/lib/python2.7/test/buffer_tests.pyo -rw-r--r-- root/root usr/lib/python2.7/test/cfgparser.1 -rw-r--r-- root/root usr/lib/python2.7/test/check_soundcard.vbs --rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings_test.py --rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings_test.pyc --rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings_test.pyo +drwxr-xr-x root/root usr/lib/python2.7/test/cjkencodings/ +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/big5-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/big5.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/big5hkscs-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/big5hkscs.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/cp949-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/cp949.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_jisx0213-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_jisx0213.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_jp-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_jp.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_kr-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/euc_kr.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gb18030-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gb18030.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gb2312-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gb2312.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gbk-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/gbk.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/hz-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/hz.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/johab-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/johab.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/shift_jis-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/shift_jis.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/shift_jisx0213-utf8.txt +-rw-r--r-- root/root usr/lib/python2.7/test/cjkencodings/shift_jisx0213.txt -rw-r--r-- root/root usr/lib/python2.7/test/cmath_testcases.txt -rw-r--r-- root/root usr/lib/python2.7/test/curses_tests.py -rw-r--r-- root/root usr/lib/python2.7/test/curses_tests.pyc @@ -2967,6 +2993,10 @@ drwxr-xr-x root/root usr/lib/python2.7/test/decimaltestdata/ -rw-r--r-- root/root usr/lib/python2.7/test/string_tests.py -rw-r--r-- root/root usr/lib/python2.7/test/string_tests.pyc -rw-r--r-- root/root usr/lib/python2.7/test/string_tests.pyo +drwxr-xr-x root/root usr/lib/python2.7/test/subprocessdata/ +-rw-r--r-- root/root usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py +-rw-r--r-- root/root usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc +-rw-r--r-- root/root usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo -rw-r--r-- root/root usr/lib/python2.7/test/svn_python_org_https_cert.pem -rw-r--r-- root/root usr/lib/python2.7/test/test_MimeWriter.py -rw-r--r-- root/root usr/lib/python2.7/test/test_MimeWriter.pyc @@ -3615,6 +3645,9 @@ drwxr-xr-x root/root usr/lib/python2.7/test/decimaltestdata/ -rw-r--r-- root/root usr/lib/python2.7/test/test_modulefinder.py -rw-r--r-- root/root usr/lib/python2.7/test/test_modulefinder.pyc -rw-r--r-- root/root usr/lib/python2.7/test/test_modulefinder.pyo +-rw-r--r-- root/root usr/lib/python2.7/test/test_msilib.py +-rw-r--r-- root/root usr/lib/python2.7/test/test_msilib.pyc +-rw-r--r-- root/root usr/lib/python2.7/test/test_msilib.pyo -rw-r--r-- root/root usr/lib/python2.7/test/test_multibytecodec.py -rw-r--r-- root/root usr/lib/python2.7/test/test_multibytecodec.pyc -rw-r--r-- root/root usr/lib/python2.7/test/test_multibytecodec.pyo @@ -4429,3 +4462,8 @@ drwxr-xr-x root/root usr/lib/python2.7/xml/sax/ -rw-r--r-- root/root usr/lib/python2.7/zipfile.py -rw-r--r-- root/root usr/lib/python2.7/zipfile.pyc -rw-r--r-- root/root usr/lib/python2.7/zipfile.pyo +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +lrwxrwxrwx root/root usr/share/man/man1/python2.1.gz -> python2.7.1.gz +-rw-r--r-- root/root usr/share/man/man1/python2.7.1.gz diff --git a/base/python2/.md5sum.i686 b/base/python2/.md5sum.i686 index 79488d48e..61757e7f6 100644 --- a/base/python2/.md5sum.i686 +++ b/base/python2/.md5sum.i686 @@ -1,2 +1,2 @@ -aa27bc25725137ba155910bd8e5ddc4f Python-2.7.1.tar.bz2 +ba7b2f11ffdbf195ee0d111b9455a5bd Python-2.7.2.tar.bz2 d9b8161568ce17a305c1b71e61ccd4b5 python-2.7-db51.diff diff --git a/base/python2/.md5sum.x86_64 b/base/python2/.md5sum.x86_64 index 79488d48e..61757e7f6 100644 --- a/base/python2/.md5sum.x86_64 +++ b/base/python2/.md5sum.x86_64 @@ -1,2 +1,2 @@ -aa27bc25725137ba155910bd8e5ddc4f Python-2.7.1.tar.bz2 +ba7b2f11ffdbf195ee0d111b9455a5bd Python-2.7.2.tar.bz2 d9b8161568ce17a305c1b71e61ccd4b5 python-2.7-db51.diff diff --git a/base/python2/Pkgfile b/base/python2/Pkgfile index da3495b3f..416678f5c 100755 --- a/base/python2/Pkgfile +++ b/base/python2/Pkgfile @@ -2,11 +2,11 @@ # URL: http://www.python.org # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: +# Depends on:tk name=python2 -version=2.7.1 -release=6 +version=2.7.2 +release=1 _pybasever=2.7 source=( http://www.python.org/ftp/python/$version/Python-$version.tar.bz2 @@ -15,9 +15,12 @@ source=( http://www.python.org/ftp/python/$version/Python-$version.tar.bz2 build() { cd Python-$version - patch -Np1 -i ../python-2.7-db51.diff + sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c + +# patch -Np1 -i ../python-2.7-db51.diff sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py rm -r Modules/expat rm -r Modules/zlib @@ -29,14 +32,17 @@ build() { --enable-unicode=ucs4 --with-system-expat --with-system-ffi make - make DESTDIR=$PKG altinstall + make DESTDIR=$PKG altinstall maninstall ln -sf python${_pybasever} $PKG/usr/bin/python2 ln -sf python${_pybasever}-config $PKG/usr/bin/python2-config + ln -sf python${_pybasever}.1 $PKG/usr/share/man/man1/python2.1 ln -sf ../../libpython${_pybasever}.so \ $PKG/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so + + mv $PKG/usr/bin/smtpd.py $PKG/usr/lib/python${_pybasever}/ # some useful "stuff" -- cgit v1.2.3-70-g09d2