Date: Tuesday, October 19, 2010 @ 07:41:43
Author: allan
Revision: 96213
upgpkg: libsasl 2.1.23-5
db-5.1 rebuild
Added:
libsasl/trunk/cyrus-sasl-db.patch
Modified:
libsasl/trunk/PKGBUILD
Deleted:
libsasl/trunk/db-4.7.patch
---------------------+
PKGBUILD | 21 +++++++++++----------
cyrus-sasl-db.patch | 34 ++++++++++++++++++++++++++++++++++
db-4.7.patch | 20 --------------------
3 files changed, 45 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-10-19 11:23:31 UTC (rev 96212)
+++ PKGBUILD 2010-10-19 11:41:43 UTC (rev 96213)
@@ -3,7 +3,7 @@
pkgname=libsasl
pkgver=2.1.23
-pkgrel=4
+pkgrel=5
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
arch=('i686' 'x86_64')
url="http://cyrusimap.web.cmu.edu/downloads.html#sasl";
@@ -12,16 +12,17 @@
optdepends=('cyrus-sasl: saslauthd'
'cyrus-sasl-plugins: authentication plugins other than sasldb')
source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
- cyrus-sasl-2.1.19-checkpw.c.patch db-4.7.patch)
+ cyrus-sasl-2.1.19-checkpw.c.patch
+ cyrus-sasl-db.patch)
options=('!makeflags')
md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
'e27ddff076342e7a3041c4759817d04b'
- '71a3b7454f4d7cc2966b347bdf03f2fc')
+ '0658201497aad359c0d66b0ab8032859')
build() {
cd "${srcdir}/cyrus-sasl-${pkgver}"
- patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch || return 1
- patch -Np0 -i ${srcdir}/db-4.7.patch || return 1
+ patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch
+ patch -Np1 -i ${srcdir}/cyrus-sasl-db.patch
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -32,10 +33,10 @@
--enable-login \
--disable-otp \
--enable-plain \
- --mandir=/usr/share/man || return 1
+ --mandir=/usr/share/man
for dir in include lib sasldb plugins utils; do
- pushd ${dir} || return 1
- make || return 1
+ pushd ${dir}
+ make
popd
done
}
@@ -44,10 +45,10 @@
cd "${srcdir}/cyrus-sasl-${pkgver}"
for dir in include lib sasldb plugins utils; do
pushd ${dir} || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ make DESTDIR="${pkgdir}" install
popd
done
# install license
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
|| return 1
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
}
Added: cyrus-sasl-db.patch
===================================================================
--- cyrus-sasl-db.patch (rev 0)
+++ cyrus-sasl-db.patch 2010-10-19 11:41:43 UTC (rev 96213)
@@ -0,0 +1,34 @@
+diff -urN aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4
cyrus-sasl-2.1.22/cmulocal/berkdb.m4
+--- aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2005-04-26 21:14:07.000000000
+0200
++++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2006-10-02 20:36:17.137852392
+0200
+@@ -213,7 +213,7 @@
+ fi
+
+ saved_LIBS=$LIBS
+- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42
db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2
db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db4.4
db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4
db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ AC_TRY_LINK([#include <db.h>],
+--- cyrus-sasl-2.1.23/sasldb/db_berkeley.c.orig 2009-04-28
17:09:18.000000000 +0200
++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2010-05-18 21:02:20.418940098
+0200
+@@ -100,7 +100,7 @@
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- cyrus-sasl-2.1.23/utils/dbconverter-2.c.orig 2003-02-13
20:56:17.000000000 +0100
++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2010-05-18 21:11:09.982932556
+0200
+@@ -214,7 +214,7 @@
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
Deleted: db-4.7.patch
===================================================================
--- db-4.7.patch 2010-10-19 11:23:31 UTC (rev 96212)
+++ db-4.7.patch 2010-10-19 11:41:43 UTC (rev 96213)
@@ -1,20 +0,0 @@
---- configure 2006-05-18 21:30:13.000000000 +0200
-+++ configure.new 2007-09-29 00:22:42.000000000 +0200
-@@ -5125,7 +5125,7 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42
db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2
db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+ for dbname in db-4.7 db4.7 db47 db-4.54 db4.5 db45 db-4.4 db4.4 db44
db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40
db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
- do
- LIBS="$saved_LIBS -l$dbname"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5882,7 +5882,7 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42
db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2
db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+ for dbname in db-4.7 db4.7 db47 db-4.54 db4.5 db45 db-4.4 db4.4 db44
db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40
db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
- do
- LIBS="$saved_LIBS -l$dbname"
- cat >conftest.$ac_ext <<_ACEOF
