Fix db searching bug

(Portage version: 2.1_rc3-r1)

4 files changed, 73 insertions, 3 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 6d0e0df9c026..1086f39536c4 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/maildrop
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.56 2006/03/01 22:27:19 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.57 2006/05/29 10:28:08 pauldv Exp $
+
+  29 May 2006; <pauldv@gentoo.org> +files/maildrop-1.8.0-db4-r1.patch,
+  maildrop-2.0.2.ebuild:
+  Make the checking of db libraries compatible with db-4.4 and db-4.3. 
+  Fixes bug #124982
 
 *maildrop-2.0.2 (01 Mar 2006)
 
diff --git a/mail-filter/maildrop/files/digest-maildrop-2.0.2 b/mail-filter/maildrop/files/digest-maildrop-2.0.2
index 39f6cfdd7da8..e3920606d06b 100644
--- a/mail-filter/maildrop/files/digest-maildrop-2.0.2
+++ b/mail-filter/maildrop/files/digest-maildrop-2.0.2
@@ -1 +1,3 @@
 MD5 69c7cb0c93669c0831eb3ee304da8eac maildrop-2.0.2.tar.bz2 2139549
+RMD160 7b2bd7fc0b3d9e7f8cefd9236e7e387d9d5ae1ce maildrop-2.0.2.tar.bz2 2139549
+SHA256 6f10d3b503a8bf878b8d270543a15acca645667504803c586a2a0cc0642413cd maildrop-2.0.2.tar.bz2 2139549
diff --git a/mail-filter/maildrop/files/maildrop-1.8.0-db4-r1.patch b/mail-filter/maildrop/files/maildrop-1.8.0-db4-r1.patch
new file mode 100644
index 000000000000..574355fdc9eb
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-1.8.0-db4-r1.patch
@@ -0,0 +1,63 @@
+--- bdbobj/configure.in.orig	2001-09-18 18:26:28.000000000 -0700
++++ bdbobj/configure.in	2004-08-20 22:55:04.468505515 -0700
+@@ -21,15 +21,19 @@
+ dnl Checks for libraries.
+ 
+ saveLIBS="$LIBS"
+-AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-	))
++for dbname in db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++  do
++        AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++          AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++            AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++              AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
+ 
++  done
+ FOUND_DB=0
+-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
+-AC_CHECK_FUNC(db_open, FOUND_DB=1)
+-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
++AC_CHECK_FUNC(db_create, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
+--- configure.in.orig	2004-07-26 18:36:40.000000000 -0700
++++ configure.in	2004-08-20 22:52:27.419757049 -0700
+@@ -80,18 +80,21 @@
+ 	MAILBOT=mailbot
+ 	;;
+ db)
+-	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-		AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-		AC_CHECK_LIB(db, db_env_create,
+-					[ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-		))
+-
+-	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
++  for dbname in db-4.4 db-4.3 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++    do
++	AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	  AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	    AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	      AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
++    done
++  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
++
+ 	if test "$HAVE_BDB" != "1"
+ 	then
+-		AC_MSG_ERROR(GDBM library not found)
++		AC_MSG_ERROR(DB library not found)
+ 	fi
+ 	MAILBOT=mailbot
+ 	;;
diff --git a/mail-filter/maildrop/maildrop-2.0.2.ebuild b/mail-filter/maildrop/maildrop-2.0.2.ebuild
index c7e2333f1a06..0440e6f377bc 100644
--- a/mail-filter/maildrop/maildrop-2.0.2.ebuild
+++ b/mail-filter/maildrop/maildrop-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.0.2.ebuild,v 1.2 2006/04/12 00:35:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.0.2.ebuild,v 1.3 2006/05/29 10:28:08 pauldv Exp $
 
 inherit eutils flag-o-matic
 
@@ -48,7 +48,7 @@ src_unpack() {
 	if use gdbm ; then
 		use berkdb && einfo "Both gdbm and berkdb selected. Using gdbm."
 	elif use berkdb ; then
-			epatch "${FILESDIR}"/${PN}-1.8.0-db4.patch
+			epatch "${FILESDIR}"/${PN}-1.8.0-db4-r1.patch
 			cd "${S}"/bdbobj
 			libtoolize --copy --force
 			WANT_AUTOCONF=2.59 autoconf || die "recreate configure failed (bdbobj)"