From 353030bef0a1b50692962ef8b71e03a115d9db73 Mon Sep 17 00:00:00 2001 From: sibel Date: Sun, 26 Dec 2010 20:00:15 +0100 Subject: python2#2.7.1-3, maj port --- extra/python2/.footprint | 80 ++++++++++++++++++++++++++++++++++++-- extra/python2/.md5sum | 1 + extra/python2/Pkgfile | 56 +++++++++++++++++++++----- extra/python2/python-2.7-db51.diff | 42 ++++++++++++++++++++ 4 files changed, 166 insertions(+), 13 deletions(-) create mode 100644 extra/python2/python-2.7-db51.diff (limited to 'extra') diff --git a/extra/python2/.footprint b/extra/python2/.footprint index ed51d4caf..db9cc9798 100644 --- a/extra/python2/.footprint +++ b/extra/python2/.footprint @@ -1,9 +1,12 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/2to3 +-rwxr-xr-x root/root usr/bin/idle2 +-rwxr-xr-x root/root usr/bin/pydoc2 +lrwxrwxrwx root/root usr/bin/python2 -> python2.7 +lrwxrwxrwx root/root usr/bin/python2-config -> python2.7-config -rwxr-xr-x root/root usr/bin/python2.7 -rwxr-xr-x root/root usr/bin/python2.7-config --rwxr-xr-x root/root usr/bin/smtpd.py drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/python2.7/ -rw-r--r-- root/root usr/include/python2.7/Python-ast.h @@ -145,6 +148,76 @@ drwxr-xr-x root/root usr/lib/python2.7/ -rw-r--r-- root/root usr/lib/python2.7/StringIO.py -rw-r--r-- root/root usr/lib/python2.7/StringIO.pyc -rw-r--r-- root/root usr/lib/python2.7/StringIO.pyo +drwxr-xr-x root/root usr/lib/python2.7/Tools/ +drwxr-xr-x root/root usr/lib/python2.7/Tools/i18n/ +-rwxr-xr-x root/root usr/lib/python2.7/Tools/i18n/msgfmt.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/i18n/pygettext.py +drwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/ +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/README +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/analyze_dxp.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/byext.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/byteyears.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/checkappend.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/checkpyc.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/classfix.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/cleanfuture.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/combinerefs.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/copytime.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/crlf.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/cvsfiles.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/db2pickle.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/diff.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/dutree.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/eptags.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/find_recursionlimit.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/finddiv.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/findlinksto.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/findnocoding.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/fixcid.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/fixdiv.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/fixheader.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/fixnotice.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/fixps.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/ftpmirror.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/google.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/gprof2html.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/h2py.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/hotshotmain.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/ifdef.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/lfcr.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/linktree.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/lll.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/logmerge.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/mailerdaemon.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/md5sum.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/methfix.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/mkreal.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/ndiff.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/nm2def.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/objgraph.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/parseentities.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/patchcheck.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/pathfix.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/pdeps.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/pickle2db.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/pindent.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/ptags.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/pysource.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/redemo.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/reindent-rst.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/reindent.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/rgrep.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/serve.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/setup.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/suff.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/svneol.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/texcheck.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/texi2html.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/treesync.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/untabify.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/which.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/win_add2path.py +-rwxr-xr-x root/root usr/lib/python2.7/Tools/scripts/xxci.py -rw-r--r-- root/root usr/lib/python2.7/UserDict.py -rw-r--r-- root/root usr/lib/python2.7/UserDict.pyc -rw-r--r-- root/root usr/lib/python2.7/UserDict.pyo @@ -403,6 +476,7 @@ drwxr-xr-x root/root usr/lib/python2.7/config/ -rw-r--r-- root/root usr/lib/python2.7/config/config.c.in -rwxr-xr-x root/root usr/lib/python2.7/config/install-sh -rw-r--r-- root/root usr/lib/python2.7/config/libpython2.7.a +lrwxrwxrwx root/root usr/lib/python2.7/config/libpython2.7.so -> ../../libpython2.7.so -rwxr-xr-x root/root usr/lib/python2.7/config/makesetup -rw-r--r-- root/root usr/lib/python2.7/config/python.o -rw-r--r-- root/root usr/lib/python2.7/contextlib.py @@ -1844,7 +1918,7 @@ drwxr-xr-x root/root usr/lib/python2.7/lib-dynload/ -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_multiprocessing.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_random.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_socket.so --rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_sqlite3.so +-rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_sqlite3_failed.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_ssl.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_struct.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_testcapi.so @@ -1858,7 +1932,7 @@ drwxr-xr-x root/root usr/lib/python2.7/lib-dynload/ -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/cmath.so -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.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/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 diff --git a/extra/python2/.md5sum b/extra/python2/.md5sum index afab837cc..79488d48e 100644 --- a/extra/python2/.md5sum +++ b/extra/python2/.md5sum @@ -1 +1,2 @@ aa27bc25725137ba155910bd8e5ddc4f Python-2.7.1.tar.bz2 +d9b8161568ce17a305c1b71e61ccd4b5 python-2.7-db51.diff diff --git a/extra/python2/Pkgfile b/extra/python2/Pkgfile index 879e000c5..699bc5c93 100755 --- a/extra/python2/Pkgfile +++ b/extra/python2/Pkgfile @@ -6,22 +6,58 @@ name=python2 version=2.7.1 -release=1 -source=( http://www.python.org/ftp/python/$version/Python-$version.tar.bz2) +release=3 +_pybasever=2.7 + +source=( http://www.python.org/ftp/python/$version/Python-$version.tar.bz2 + python-2.7-db51.diff) build() { cd Python-$version - sed -i "s/ndbm_libs = \[\]/ndbm_libs = ['gdbm', 'gdbm_compat']/" \ - setup.py - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --enable-shared + + patch -Np1 -i ../python-2.7-db51.diff + sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + +# sed -i "s/ndbm_libs = \[\]/ndbm_libs = ['gdbm', 'gdbm_compat']/" \ +# setup.py + + export OPT="${CFLAGS}" + ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ + --enable-unicode=ucs4 --with-system-expat --with-system-ffi + make make DESTDIR=$PKG install + + ln -sf python${_pybasever} $PKG/usr/bin/python2 + ln -sf python${_pybasever}-config $PKG/usr/bin/python2-config + + ln -sf ../../libpython${_pybasever}.so \ + $PKG/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so + + mv $PKG/usr/bin/smtpd.py $pkgdir/usr/lib/python${_pybasever}/ + + # some useful "stuff" + install -dm755 $PKG/usr/lib/python${_pybasever}/Tools/{i18n,scripts} + install -m755 Tools/i18n/{msgfmt,pygettext}.py \ + $PKG/usr/lib/python${_pybasever}/Tools/i18n/ + install -m755 Tools/scripts/{README,*py} \ + $PKG/usr/lib/python${_pybasever}/Tools/scripts/ + + # fix conflicts with python + mv $PKG/usr/bin/idle{,2} + mv $PKG/usr/bin/pydoc{,2} + + # clean up #!s + find $PKG/usr/lib/python2.7/ -name '*.py' | \ + xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + + # clean-up reference to build directory + sed -i "s#$SRC/Python-$version:##" \ + $PKG/usr/lib/python${_pybasever}/config/Makefile - rm $PKG/usr/bin/idle - rm $PKG/usr/bin/pydoc rm $PKG/usr/bin/python rm $PKG/usr/bin/python-config diff --git a/extra/python2/python-2.7-db51.diff b/extra/python2/python-2.7-db51.diff new file mode 100644 index 000000000..2da95c375 --- /dev/null +++ b/extra/python2/python-2.7-db51.diff @@ -0,0 +1,42 @@ +diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c +--- Python-2.7-orig//Modules/_bsddb.c 2010-05-10 00:46:46.000000000 +1000 ++++ Python-2.7/Modules/_bsddb.c 2010-10-20 13:19:26.436669911 +1000 +@@ -9765,8 +9765,11 @@ + + ADD_INT(d, DB_REP_PERMANENT); + +-#if (DBVER >= 44) ++#if (DBVER >= 44) && (DBVER <= 48) + ADD_INT(d, DB_REP_CONF_NOAUTOINIT); ++#endif ++ ++#if (DBVER >= 44) + ADD_INT(d, DB_REP_CONF_DELAYCLIENT); + ADD_INT(d, DB_REP_CONF_BULK); + ADD_INT(d, DB_REP_CONF_NOWAIT); +diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py +--- Python-2.7-orig//setup.py 2010-06-27 22:36:16.000000000 +1000 ++++ Python-2.7/setup.py 2010-10-20 13:10:48.256670026 +1000 +@@ -765,7 +765,7 @@ + # a release. Most open source OSes come with one or more + # versions of BerkeleyDB already installed. + +- max_db_ver = (4, 8) ++ max_db_ver = (5, 1) + min_db_ver = (4, 1) + db_setup_debug = False # verbose debug prints from this script? + +@@ -787,8 +787,12 @@ + return True + + def gen_db_minor_ver_nums(major): +- if major == 4: ++ if major == 5: + for x in range(max_db_ver[1]+1): ++ if allow_db_ver((5, x)): ++ yield x ++ if major == 4: ++ for x in range(9): + if allow_db_ver((4, x)): + yield x + elif major == 3: -- cgit v1.2.3-70-g09d2