python: update to 2.6rc2, new dependency sqlite3
This commit is contained in:
parent
697a800072
commit
fa5efcd231
6586
python/.footprint
6586
python/.footprint
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,2 @@
|
||||
12d1a9953f105464b1f673b6566f739c CVE-2008-2315.patch.gz
|
||||
810695c756477ea6d407dc1ac4dc8c75 CVE-2008-2316.patch.gz
|
||||
3984d29be539e2b98828a55c432fc318 CVE-2008-3142.patch.gz
|
||||
7c4bcfb76a6994aa373aef12c234958e CVE-2008-3144.patch.gz
|
||||
afb5451049eda91fbde10bd5a4b7fadc Python-2.5.2.tar.bz2
|
||||
6d78d63802ecace8bbe50353862b92cf python-2.5.2.patch
|
||||
49666f0ab3e4b6d8bd54e35c6913af35 Python-2.6rc2.tar.bz2
|
||||
f1db504e47f716f058b6082309a45d15 python-2.6.patch
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,35 +1,35 @@
|
||||
# Description: Python interpreter, version 2.5
|
||||
# Description: Python interpreter, version 2.6
|
||||
# URL: http://www.python.org
|
||||
# Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de
|
||||
# Depends on: db gdbm ncurses openssl readline bzip2 zlib
|
||||
# Depends on: db gdbm ncurses openssl readline bzip2 zlib sqlite3
|
||||
|
||||
name=python
|
||||
version=2.5.2
|
||||
release=3
|
||||
source=(http://www.python.org/ftp/$name/$version/Python-$version.tar.bz2 \
|
||||
$name-$version.patch CVE-2008-{2315,2316,3142,3144}.patch.gz)
|
||||
version=2.6rc2
|
||||
release=1
|
||||
source=(http://www.python.org/ftp/$name/2.6/Python-$version.tar.bz2
|
||||
$name-2.6.patch)
|
||||
|
||||
build () {
|
||||
cd Python-$version
|
||||
|
||||
patch -p1 -i $SRC/$name-$version.patch
|
||||
gunzip -c $SRC/CVE*.patch.gz | patch -p1
|
||||
patch -p1 -i $SRC/$name-2.6.patch
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
--enable-shared \
|
||||
--with-threads \
|
||||
--enable-ipv6
|
||||
make
|
||||
|
||||
make EXTRA_CFLAGS="$CFLAGS"
|
||||
make -j1 DESTDIR=$PKG install
|
||||
|
||||
ln -sf python2.5 $PKG/usr/bin/python
|
||||
ln -s python2.5 $PKG/usr/lib/python
|
||||
ln -s python2.5 $PKG/usr/include/python
|
||||
ln -s /usr/lib/libpython2.5.so $PKG/usr/lib/python2.5/config/libpython2.5.so
|
||||
ln -sf python2.6 $PKG/usr/bin/python
|
||||
ln -s python2.6 $PKG/usr/lib/python
|
||||
ln -s python2.6 $PKG/usr/include/python
|
||||
ln -s /usr/lib/libpython2.6.so $PKG/usr/lib/python2.6/config/libpython2.6.so
|
||||
|
||||
rm -r $PKG/usr/lib/python/{bsddb,ctypes,email,sqlite3}/test
|
||||
rm -r $PKG/usr/lib/python/distutils/tests
|
||||
rm -r $PKG/usr/lib/python/{distutils,json,lib2to3}/tests
|
||||
rm $PKG/usr/lib/python/{distutils,site-packages,test}/README
|
||||
rm $PKG/usr/lib/python/idlelib/{ChangeLog,{NEWS,README,TODO}.txt}
|
||||
rm $PKG/usr/lib/python/ctypes/macholib/README.ctypes
|
||||
|
@ -1,42 +0,0 @@
|
||||
diff -Nru Python-2.5.2.orig/Lib/cgi.py Python-2.5.2/Lib/cgi.py
|
||||
--- Python-2.5.2.orig/Lib/cgi.py 2008-03-11 16:05:14.000000000 +0100
|
||||
+++ Python-2.5.2/Lib/cgi.py 2008-03-11 16:05:25.000000000 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/local/bin/python
|
||||
+#! /usr/bin/python
|
||||
|
||||
# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
|
||||
# intentionally NOT "/usr/bin/env python". On many systems
|
||||
diff -Nru Python-2.5.2.orig/Modules/Setup.dist Python-2.5.2/Modules/Setup.dist
|
||||
--- Python-2.5.2.orig/Modules/Setup.dist 2008-03-11 16:05:14.000000000 +0100
|
||||
+++ Python-2.5.2/Modules/Setup.dist 2008-03-11 16:05:25.000000000 +0100
|
||||
@@ -149,7 +149,7 @@
|
||||
# modules are to be built as shared libraries (see above for more
|
||||
# detail; also note that *static* reverses this effect):
|
||||
|
||||
-#*shared*
|
||||
+*shared*
|
||||
|
||||
# GNU readline. Unlike previous Python incarnations, GNU readline is
|
||||
# now incorporated in an optional module, configured in the Setup file
|
||||
@@ -381,7 +381,7 @@
|
||||
#
|
||||
# First, look at Setup.config; configure may have set this for you.
|
||||
|
||||
-#dbm dbmmodule.c # dbm(3) may require -lndbm or similar
|
||||
+dbm dbmmodule.c -DHAVE_NDBM_H -lgdbm_compat -lgdbm # dbm(3) may require -lndbm or similar
|
||||
|
||||
# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
|
||||
#
|
||||
diff -Nru Python-2.5.2.orig/configure Python-2.5.2/configure
|
||||
--- Python-2.5.2.orig/configure 2008-03-11 16:05:14.000000000 +0100
|
||||
+++ Python-2.5.2/configure 2008-03-11 16:07:10.000000000 +0100
|
||||
@@ -4442,7 +4442,7 @@
|
||||
# debug builds.
|
||||
OPT="-g -Wall $STRICT_PROTO"
|
||||
else
|
||||
- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
|
||||
+ OPT="$CFLAGS $WRAP -Wall $STRICT_PROTO"
|
||||
fi
|
||||
;;
|
||||
*)
|
30
python/python-2.6.patch
Normal file
30
python/python-2.6.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff -Nru Python-2.6.orig/Lib/cgi.py Python-2.6/Lib/cgi.py
|
||||
--- Python-2.6.orig/Lib/cgi.py 2008-09-03 13:30:35.000000000 +0200
|
||||
+++ Python-2.6/Lib/cgi.py 2008-09-03 13:32:35.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/local/bin/python
|
||||
+#! /usr/bin/python
|
||||
|
||||
# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
|
||||
# intentionally NOT "/usr/bin/env python". On many systems
|
||||
diff -Nru Python-2.6.orig/Modules/Setup.dist Python-2.6/Modules/Setup.dist
|
||||
--- Python-2.6.orig/Modules/Setup.dist 2008-09-03 13:30:34.000000000 +0200
|
||||
+++ Python-2.6/Modules/Setup.dist 2008-09-03 13:32:35.000000000 +0200
|
||||
@@ -152,7 +152,7 @@
|
||||
# modules are to be built as shared libraries (see above for more
|
||||
# detail; also note that *static* reverses this effect):
|
||||
|
||||
-#*shared*
|
||||
+*shared*
|
||||
|
||||
# GNU readline. Unlike previous Python incarnations, GNU readline is
|
||||
# now incorporated in an optional module, configured in the Setup file
|
||||
@@ -385,7 +385,7 @@
|
||||
#
|
||||
# First, look at Setup.config; configure may have set this for you.
|
||||
|
||||
-#dbm dbmmodule.c # dbm(3) may require -lndbm or similar
|
||||
+dbm dbmmodule.c -DHAVE_NDBM_H -lgdbm_compat -lgdbm # dbm(3) may require -lndbm or similar
|
||||
|
||||
# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
|
||||
#
|
Loading…
x
Reference in New Issue
Block a user