This is an attempt to regularise the dependencies of cyrus-sasl, the

package will now reliably use BerkeleyDB 4.3 (like cyrus-imapd and
unlike the previous incarnation which failed to even look for it).
It will also *not* link against libpam - this would happen before if
libpam was built, but it is extremely unlikely at present that libpam
works correctly on any OE system.

diff --git a/packages/cyrus-sasl/cyrus-sasl-2.1.19/.mtn2git_empty b/packages/cyrus-sasl/cyrus-sasl-2.1.19/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/cyrus-sasl/cyrus-sasl-2.1.19/berkdb.m4.patch b/packages/cyrus-sasl/cyrus-sasl-2.1.19/berkdb.m4.patch
new file mode 100644 (file)
index 0000000..abfc347
--- /dev/null
+++ b/packages/cyrus-sasl/cyrus-sasl-2.1.19/berkdb.m4.patch
@@ -0,0 +1,13 @@
+# This patch adds config support for recognising (and therefore using)
+# version 4.3 of the BerkelyDB
+--- cyrus-sasl-2.1.19/cmulocal/berkdb.m4.orig  2005-07-10 23:09:33.323172813 -0700
++++ cyrus-sasl-2.1.19/cmulocal/berkdb.m4       2005-07-10 23:09:49.866665096 -0700
+@@ -211,7 +211,7 @@
+           BDB_LIBADD=""
+       fi
+ 
+-        for dbname in 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.3 db4.3 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
+             AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
+               dblib="berkeley"; break, dblib="no")

diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
index ca34acb..19f1206 100644 (file)
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
@@ -1,10 +1,11 @@
 SECTION = "console/network"
-DEPENDS = "db3"
+DEPENDS = "db openssl"
 DESCRIPTION = "Generic client/server library for SASL authentication."
 LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \
+          file://berkdb.m4.patch;patch=1"
 
 inherit autotools 
 
@@ -12,10 +13,12 @@ acpaths = "-I ${S}/cmulocal -I ${S}/config -I ."
 CFLAGS_append = " -I${S}/include -I${S}/saslauthd/include"
 EXTRA_OECONF = "--enable-shared --enable-static --with-dblib=berkeley \
                --with-bdb-libdir=${STAGING_LIBDIR} \
-               --with-bdb-incdir=${STAGING_INCDIR} \
+               --with-bdb-incdir=${STAGING_INCDIR}/db4 \
+               --without-pam \
                --without-opie --without-des"
 
 FILES_${PN} += "${prefix}/lib/sasl2/*.so*"
+FILES_${PN}-dev += "${libdir}/sasl2/*.la ${libdir}/sasl2/*.a"
 
 do_configure_prepend () {
        rm -f acinclude.m4 config/libtool.m4