[arch-commits] CVS update of extra/devel/python (2 files)

[andyrtr at archlinux.org]

    Date: Saturday, February 23, 2008 @ 16:16:35
  Author: andyrtr
    Path: /home/cvs-extra/extra/devel/python

Modified: PKGBUILD (1.51 -> 1.52) db4.6-setup.py-detection.patch (1.1 -> 1.2)

upgpkg: python 2.5.2-2


--------------------------------+
 PKGBUILD                       |    7 +++++--
 db4.6-setup.py-detection.patch |   21 ++++++---------------
 2 files changed, 11 insertions(+), 17 deletions(-)


Index: extra/devel/python/PKGBUILD
diff -u extra/devel/python/PKGBUILD:1.51 extra/devel/python/PKGBUILD:1.52
--- extra/devel/python/PKGBUILD:1.51	Sat Feb 23 15:44:38 2008
+++ extra/devel/python/PKGBUILD	Sat Feb 23 16:16:35 2008
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.51 2008/02/23 20:44:38 andyrtr Exp $
+# $Id: PKGBUILD,v 1.52 2008/02/23 21:16:35 andyrtr Exp $
 # Maintainer: Jason Chu <jason at archlinux.org>
 pkgname=python
 pkgver=2.5.2
-pkgrel=1
+pkgrel=2
 _pybasever=2.5
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -15,16 +15,19 @@
 replaces=('python-ctypes')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
 	Python-2.4.4-gdbm-1.patch
+	db4.6-setup.py-detection.patch
 	python-2.5.CVE-2007-4965-int-overflow.patch
 	python2.6-set_wakeup_fd4.patch)
 md5sums=('afb5451049eda91fbde10bd5a4b7fadc'
          '2b61e06365e9fb5f3af22d946efa8be6'
+         'ad59f0d7c862d9714c7580899bc1c356'
          '491416c1b337fc61b6cdf5981d895a7d'
          'ec56710959deb01b5fa35829cafec6a3')
 
 build() {
   cd ${startdir}/src/Python-${pkgver}
   patch -Np1 -i ${startdir}/src/Python-2.4.4-gdbm-1.patch || return 1
+  patch -Np0 -i ${startdir}/src/db4.6-setup.py-detection.patch || return 1
   # fix http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4965
   patch -Np1 -i ${startdir}/src//python-2.5.CVE-2007-4965-int-overflow.patch || return 1
 
Index: extra/devel/python/db4.6-setup.py-detection.patch
diff -u extra/devel/python/db4.6-setup.py-detection.patch:1.1 extra/devel/python/db4.6-setup.py-detection.patch:1.2
--- extra/devel/python/db4.6-setup.py-detection.patch:1.1	Sat Sep 29 07:37:50 2007
+++ extra/devel/python/db4.6-setup.py-detection.patch	Sat Feb 23 16:16:35 2008
@@ -1,20 +1,11 @@
---- setup.py	2007-02-14 13:53:41.000000000 +0100
-+++ setup.py.new	2007-09-29 13:31:04.000000000 +0200
-@@ -606,7 +606,7 @@
+--- setup.py	2008-02-23 20:58:52.000000000 +0000
++++ setup.py.new	2008-02-23 21:04:18.000000000 +0000
+@@ -608,7 +608,7 @@
          # a release.  Most open source OSes come with one or more
          # versions of BerkeleyDB already installed.
  
 -        max_db_ver = (4, 5)
 +        max_db_ver = (4, 6)
-         min_db_ver = (3, 3)
-         db_setup_debug = False   # verbose debug prints from this script?
- 
-@@ -623,7 +623,7 @@
-             '/sw/include/db3',
-         ]
-         # 4.x minor number specific paths
--        for x in (0,1,2,3,4,5):
-+        for x in (0,1,2,3,4,5,6):
-             db_inc_paths.append('/usr/include/db4%d' % x)
-             db_inc_paths.append('/usr/include/db4.%d' % x)
-             db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
+         # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x
+         # we leave that version disabled by default as it has proven to be
+         # quite a buggy library release on many platforms.