Fix cyrus-sasl to work with db4

4 files changed, 95 insertions, 2 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 999434ee663a..9666280dcf27 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.34 2003/02/12 06:02:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.35 2003/05/28 11:34:58 pauldv Exp $
+
+  28 May 2003; Paul de Vrieze <pauldv@gentoo.org> cyrus-sasl-2.1.12.ebuild:
+  Fix cyrus-sasl to compile with db4
 
 *cyrus-sasl-2.1.12 (06 Feb 2003)
 
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
new file mode 100644
index 000000000000..f803fe2fd83e
--- /dev/null
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -0,0 +1,48 @@
+MD5 3ca78b2863ace837b3a8e033f4d27243 ChangeLog 7140
+MD5 b1e9974990d241c05f9cd91942d7a6ef cyrus-sasl-1.5.27-r4.ebuild 2540
+MD5 45aef0e2226751668e546b334e90ae44 cyrus-sasl-1.5.27-r5.ebuild 2692
+MD5 3f81216b8fbe549b9c885473bfab579d cyrus-sasl-1.5.27-r6.ebuild 2774
+MD5 5bcfd89895270267a066c1d3a9b28923 cyrus-sasl-2.1.10-r1.ebuild 3208
+MD5 d78a79a5a68744d17bbd6fc13cb679ee cyrus-sasl-2.1.10-r2.ebuild 3301
+MD5 99dd77b1e254cd23ba82c875ff69b40b cyrus-sasl-2.1.10.ebuild 3123
+MD5 72f59bb22937f65913dc0e50e80ad541 cyrus-sasl-2.1.12.ebuild 3268
+MD5 1db741b5018ea1107a49eeae3f245814 cyrus-sasl-2.1.5-r2.ebuild 2037
+MD5 82f2f9eae0de9e914c19537bbdc060bc cyrus-sasl-2.1.7-r1.ebuild 2456
+MD5 885bdd779ddd0a5c3c8126a2a7e106ce cyrus-sasl-2.1.7-r2.ebuild 2783
+MD5 174169b4da3b9e7f87c15faeca7079ab cyrus-sasl-2.1.7-r3.ebuild 2994
+MD5 5f916ae424e35bdd452b0c81f12a6426 cyrus-sasl-2.1.7.ebuild 1976
+MD5 ddebad3ab49453cdec1b900bb7af4788 cyrus-sasl-2.1.9-r1.ebuild 3126
+MD5 4f59f3c881888f97cd442cda2362391e cyrus-sasl-2.1.9.ebuild 2796
+MD5 b688f52b3c129bd50da0140b5d732e74 files/crypt.diff 529
+MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
+MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
+MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
+MD5 5f2cc406af0465a53e2a4e72b6e79a12 files/cyrus-sasl-2.1.12-kerberos.patch 1529
+MD5 6d3c58ecd8d6d3da231db3e44d345bbe files/cyrus-sasl-2.1.6-iovec.diff 1405
+MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
+MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
+MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
+MD5 0a6a28252ab81d3b3765967b11517fa8 files/cyrus-sasl-iovec.diff 1405
+MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
+MD5 c1e3be15214652c1d1036f7cb84fe8fe files/cyrus-sasl2-heimdal-deps.patch 1478
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r4 69
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
+MD5 85390378a069cb37e50f662926f5fc99 files/digest-cyrus-sasl-2.1.10 70
+MD5 85390378a069cb37e50f662926f5fc99 files/digest-cyrus-sasl-2.1.10-r1 70
+MD5 85390378a069cb37e50f662926f5fc99 files/digest-cyrus-sasl-2.1.10-r2 70
+MD5 dbedf561a9c3b5295a76a31225d3dfcf files/digest-cyrus-sasl-2.1.12 70
+MD5 db12b1e88db9041a08cce7987e6e5183 files/digest-cyrus-sasl-2.1.5-r2 69
+MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7 69
+MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7-r1 69
+MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7-r2 69
+MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7-r3 69
+MD5 110e3bc4f49c0b2b791b9bca087b66a5 files/digest-cyrus-sasl-2.1.9 69
+MD5 110e3bc4f49c0b2b791b9bca087b66a5 files/digest-cyrus-sasl-2.1.9-r1 69
+MD5 e13f74e7ff91c036fa377c50fefe223b files/digestmd5.patch 2839
+MD5 38fca8679fe76370d26c76b9063c25b8 files/gssapi-sefault.patch 1311
+MD5 1c211557e54537ad23feb847b3a23b48 files/pwcheck.rc6 557
+MD5 5cae6fb7465603cab6243e14d0382543 files/saslauthd.confd 909
+MD5 0ab944570bf61ce0ee9e907d7b1f9657 files/saslauthd.rc6 536
+MD5 a715288937fdb0b62beff17dfa5bd3d4 files/saslauthd2.rc6 536
+MD5 a302e1b2ed33b7965de1a307cd25a32d files/cyrus-sasl-2.1.12-db4.patch 1902
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.12.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.12.ebuild
index 3616572915cc..e68872523908 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.12.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.12.ebuild,v 1.2 2003/02/13 10:36:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.12.ebuild,v 1.3 2003/05/28 11:34:58 pauldv Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}; cd ${S}
 	epatch ${FILESDIR}/${P}-kerberos.patch
+	epatch ${FILESDIR}/${P}-db4.patch
 }
 
 src_compile() {
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.12-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.12-db4.patch
new file mode 100644
index 000000000000..15944f38ce9c
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.12-db4.patch
@@ -0,0 +1,41 @@
+diff -ur cyrus-sasl-2.1.12.orig/cmulocal/berkdb.m4 cyrus-sasl-2.1.12/cmulocal/berkdb.m4
+--- cyrus-sasl-2.1.12.orig/cmulocal/berkdb.m4	2003-02-03 18:51:12.000000000 +0100
++++ cyrus-sasl-2.1.12/cmulocal/berkdb.m4	2003-05-28 11:39:52.000000000 +0200
+@@ -211,12 +211,20 @@
+ 	    BDB_LIBADD=""
+ 	fi
+ 
+-        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
++        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db
+           do
+-            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
+-              dblib="berkeley"; break, dblib="no")
++            AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++              dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++		dblib="berkeley"; break, dblib="no"))
+           done
+         if test "$dblib" = "no"; then
++          for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
++            do
++              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++                dblib="berkeley"; break, dblib="no")
++            done
++	fi
++        if test "$dblib" = "no"; then
+           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
+             dblib="berkeley"; dbname=db,
+             dblib="no")
+diff -ur cyrus-sasl-2.1.12.orig/cmulocal/sasl2.m4 cyrus-sasl-2.1.12/cmulocal/sasl2.m4
+--- cyrus-sasl-2.1.12.orig/cmulocal/sasl2.m4	2003-05-28 11:35:58.000000000 +0200
++++ cyrus-sasl-2.1.12/cmulocal/sasl2.m4	2003-05-28 11:46:11.000000000 +0200
+@@ -23,7 +23,9 @@
+   dnl
+   dnl The choice is reflected in GSSAPIBASE_LIBS
+   dnl we might need libdb
+-  AC_CHECK_LIB(db, db_open)
++  AC_CHECK_LIB(db, db_open,,
++	AC_CHECK_LIB(db, db_open_4001,,
++	AC_CHECK_LIB(db, db_open_4000)))
+ 
+   gss_impl="mit";
+   AC_CHECK_LIB(resolv,res_search)