diff options
Diffstat (limited to 'python2')
| -rw-r--r-- | python2/.footprint.i686 | 2 | ||||
| -rw-r--r-- | python2/.footprint.x86_64 | 2 | ||||
| -rw-r--r-- | python2/.md5sum.i686 | 1 | ||||
| -rw-r--r-- | python2/.md5sum.x86_64 | 1 | ||||
| -rwxr-xr-x | python2/Pkgfile | 11 | ||||
| -rw-r--r-- | python2/gdbm-magic-values.patch | 12 |
6 files changed, 24 insertions, 5 deletions
diff --git a/python2/.footprint.i686 b/python2/.footprint.i686 index 67e3be0c8..98dfac66c 100644 --- a/python2/.footprint.i686 +++ b/python2/.footprint.i686 @@ -1930,10 +1930,12 @@ 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/math.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/mmap.so diff --git a/python2/.footprint.x86_64 b/python2/.footprint.x86_64 index 67e3be0c8..98dfac66c 100644 --- a/python2/.footprint.x86_64 +++ b/python2/.footprint.x86_64 @@ -1930,10 +1930,12 @@ 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/math.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/mmap.so diff --git a/python2/.md5sum.i686 b/python2/.md5sum.i686 index 61757e7f6..19a42e92e 100644 --- a/python2/.md5sum.i686 +++ b/python2/.md5sum.i686 @@ -1,2 +1,3 @@ ba7b2f11ffdbf195ee0d111b9455a5bd Python-2.7.2.tar.bz2 +560a74139a60138d6371bc1f309b7a6e gdbm-magic-values.patch d9b8161568ce17a305c1b71e61ccd4b5 python-2.7-db51.diff diff --git a/python2/.md5sum.x86_64 b/python2/.md5sum.x86_64 index 61757e7f6..19a42e92e 100644 --- a/python2/.md5sum.x86_64 +++ b/python2/.md5sum.x86_64 @@ -1,2 +1,3 @@ ba7b2f11ffdbf195ee0d111b9455a5bd Python-2.7.2.tar.bz2 +560a74139a60138d6371bc1f309b7a6e gdbm-magic-values.patch d9b8161568ce17a305c1b71e61ccd4b5 python-2.7-db51.diff diff --git a/python2/Pkgfile b/python2/Pkgfile index a292bea61..8395b79be 100755 --- a/python2/Pkgfile +++ b/python2/Pkgfile @@ -6,18 +6,19 @@ name=python2 version=2.7.2 -release=1 +release=2 _pybasever=2.7 - -source=( http://www.python.org/ftp/python/$version/Python-$version.tar.bz2 - python-2.7-db51.diff) +source=(http://www.python.org/ftp/python/$version/Python-$version.tar.bz2 + python-2.7-db51.diff + gdbm-magic-values.patch) build() { cd Python-$version sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c -# patch -Np1 -i ../python-2.7-db51.diff + patch -Np1 -i ../python-2.7-db51.diff + patch -Np1 -i ../gdbm-magic-values.patch sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py diff --git a/python2/gdbm-magic-values.patch b/python2/gdbm-magic-values.patch new file mode 100644 index 000000000..79c63a68a --- /dev/null +++ b/python2/gdbm-magic-values.patch @@ -0,0 +1,12 @@ +diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py +--- Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic 2011-06-11 11:46:26.000000000 -0400 ++++ Python-2.7.2/Lib/whichdb.py 2011-09-30 15:45:21.778872290 -0400 +@@ -91,7 +91,7 @@ def whichdb(filename): + return "" + + # Check for GNU dbm +- if magic == 0x13579ace: ++ if magic in (0x13579ace, 0x13579acd, 0x13579acf): + return "gdbm" + + # Check for old Berkeley db hash file format v2 |