2 files changed, 63 insertions, 18 deletions
diff --git a/abs/core/libsasl/PKGBUILD b/abs/core/libsasl/PKGBUILD
index d9b49b8..e5ba8e9 100644
--- a/abs/core/libsasl/PKGBUILD
+++ b/abs/core/libsasl/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 5269 2008-07-14 11:33:26Z pierre $
+# $Id: PKGBUILD 96213 2010-10-19 11:41:43Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsasl
-pkgver=2.1.22
-pkgrel=7
+pkgver=2.1.23
+pkgrel=5
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
-arch=(i686 x86_64)
-url="http://asg.web.cmu.edu/cyrus/download/"
+arch=('i686' 'x86_64')
+url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
 license=('custom')
-depends=('db>=4.7')
-install=libsasl.install
+depends=('db>=4.8')
+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)
-md5sums=('45dde9d19193ae9dd388eb68b2027bc9'
-         'e27ddff076342e7a3041c4759817d04b'
-         '71a3b7454f4d7cc2966b347bdf03f2fc')
+	cyrus-sasl-2.1.19-checkpw.c.patch
+	cyrus-sasl-db.patch)
 options=('!makeflags')
+md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
+         'e27ddff076342e7a3041c4759817d04b'
+         '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
+  cd "${srcdir}/cyrus-sasl-${pkgver}"
+  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 \
@@ -30,14 +32,23 @@ build() {
 	--disable-gssapi \
 	--enable-login \
 	--disable-otp \
-	--enable-plain
+	--enable-plain \
+        --mandir=/usr/share/man
+  for dir in include lib sasldb plugins utils; do
+    pushd ${dir}
+    make
+    popd
+  done
+}
+
+package() {
+  cd "${srcdir}/cyrus-sasl-${pkgver}"
   for dir in include lib sasldb plugins utils; do
     pushd ${dir} || return 1
-    make || 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"
 }
diff --git a/abs/core/libsasl/cyrus-sasl-db.patch b/abs/core/libsasl/cyrus-sasl-db.patch
new file mode 100644
index 0000000..08758ab
--- /dev/null
+++ b/abs/core/libsasl/cyrus-sasl-db.patch
@@ -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);