Revision bump. Attemp to fix bug #59608.

6 files changed, 209 insertions, 2 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 58e9da2fc2e9..281a35b30ee3 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/maildrop
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.7 2004/08/06 12:51:04 tomk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.8 2004/08/21 06:14:03 langthang Exp $
+
+*maildrop-1.7.0-r1 (20 Aug 2004)
+
+  20 Aug 2004; Tuan Van <langthang@gentoo.org>
+  +files/maildrop-1.7.0-db4-bdbobj_configure.in.patch,
+  +files/maildrop-1.7.0-db4-configure.in.patch, +maildrop-1.7.0-r1.ebuild:
+  Revision bump. Attemp to fix bug #59608.
+  Add patches to support db-4.x. Remove flag-o-matic.
 
   06 Aug 2004; Tom Knight <tomk@gentoo.org> maildrop-1.5.3-r1.ebuild,
   maildrop-1.7.0.ebuild:
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 6a29d6494f62..03f31ee35718 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,13 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 fb31c25d1d61faf8f4defab191ab24b4 maildrop-1.5.2.ebuild 2548
+MD5 9bcf057465b1ceba9bb438799d2df724 maildrop-1.7.0-r1.ebuild 3296
 MD5 f8e475410c508e77c0cf9dc29cc47c4b maildrop-1.4.0-r1.ebuild 1634
 MD5 14abcd3e6e5c9e3ee533296c63b20312 maildrop-1.7.0.ebuild 2594
 MD5 02359a95f5fd8598379aa92aee334f61 maildrop-1.5.3.ebuild 2525
 MD5 1d30178444a7de11abfd1cc944c13bec maildrop-1.5.3-r1.ebuild 2445
-MD5 64bc652c20ce5858441a303bf74a17d4 ChangeLog 5918
+MD5 98f029a6fbc93472b3dbbe42cb085a0c ChangeLog 6232
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 a0e238f4cd5c4a52dfb06754051b6dfe files/digest-maildrop-1.5.2 67
 MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3 67
 MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0 68
 MD5 953fc332e6ec019b91dba0b85d9745e9 files/digest-maildrop-1.4.0-r1 66
 MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3-r1 67
+MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0-r1 68
+MD5 72eeead0d2cb72de0ee2571af5c63bd5 files/maildrop-1.7.0-db4-configure.in.patch 1290
 MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
+MD5 532cc225eb7ae73b01639168857445be files/maildrop-1.7.0-db4-bdbobj_configure.in.patch 1211
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.5 (GNU/Linux)
+
+iD8DBQFBJutV5FrxP71izLARAjAVAJ9exgvJzoLZekM2Q5tLCUG7zjrt+gCgkVOd
+smQxiP5jHNKgjBPaMi4MiDc=
+=WoMk
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/files/digest-maildrop-1.7.0-r1 b/mail-filter/maildrop/files/digest-maildrop-1.7.0-r1
new file mode 100644
index 000000000000..3dee98c621e4
--- /dev/null
+++ b/mail-filter/maildrop/files/digest-maildrop-1.7.0-r1
@@ -0,0 +1 @@
+MD5 fa2dbbb84795e459db36ea0013f6f214 maildrop-1.7.0.tar.bz2 1209721
diff --git a/mail-filter/maildrop/files/maildrop-1.7.0-db4-bdbobj_configure.in.patch b/mail-filter/maildrop/files/maildrop-1.7.0-db4-bdbobj_configure.in.patch
new file mode 100644
index 000000000000..4480a7d5bb82
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-1.7.0-db4-bdbobj_configure.in.patch
@@ -0,0 +1,29 @@
+--- 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.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_4002, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
++AC_CHECK_FUNC(db_create, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
diff --git a/mail-filter/maildrop/files/maildrop-1.7.0-db4-configure.in.patch b/mail-filter/maildrop/files/maildrop-1.7.0-db4-configure.in.patch
new file mode 100644
index 000000000000..38609d7a191e
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-1.7.0-db4-configure.in.patch
@@ -0,0 +1,34 @@
+--- 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.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_4002, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create, 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-1.7.0-r1.ebuild b/mail-filter/maildrop/maildrop-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..00a69daca174
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-1.7.0-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0-r1.ebuild,v 1.1 2004/08/21 06:14:03 langthang Exp $
+
+
+inherit eutils
+IUSE="mysql ldap gdbm berkdb"
+
+DESCRIPTION="Mail delivery agent/filter"
+HOMEPAGE="http://www.flounder.net/~mrsam/maildrop/index.html"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~alpha ~amd64"
+
+DEPEND="dev-lang/perl
+	virtual/mta
+	berkdb? ( >=sys-libs/db-3* )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	ldap? ( >=net-nds/openldap-2.0.23 )"
+PROVIDE="virtual/mda"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# patch for db-4.x detection
+	epatch ${FILESDIR}/maildrop-1.7.0-db4-configure.in.patch \
+		|| die "patch failed."
+	epatch ${FILESDIR}/maildrop-1.7.0-db4-bdbobj_configure.in.patch \
+		|| die "patch failed."
+
+	ebegin "Recreating configure."
+	autoconf || die "recreate configure failed."
+	eend $?
+
+	ebegin "Recreating configure in bdbobj."
+	cd ${S}/bdbobj
+	autoconf || die "recreate configure failed."
+	eend $?
+	cd ${S}
+}
+
+src_compile() {
+	local myconf
+	use mysql \
+		&& myconf="${myconf} --enable-maildropmysql \
+			--with-mysqlconfig=/etc/maildrop/maildropmysql.cf" \
+		|| myconf="${myconf} --disable-maildropmysql"
+
+	use ldap \
+		&& myconf="${myconf} --enable-maildropldap \
+			--with-ldapconfig=/etc/maildrop/maildropldap.cf" \
+		|| myconf="${myconf} --disable-maildropldap"
+
+	if use gdbm; then
+		# both flags present; default to gdbm.
+		einfo "build with GDBM support."
+		myconf="${myconf} --with-db=gdbm \
+		--enable-userdb"
+	elif use berkdb; then
+		einfo "build with DB support."
+		myconf="${myconf} --with-db=db \
+		--enable-userdb"
+	else
+		# without a db library support, can't build this.
+		einfo "moving ${S}/makedat to ${S}/makedat.org"
+		mv ${S}/makedat ${S}/makedat.org || "failed to move makedat."
+		einfo "build without-db."
+		myconf="${myconf} --without-db"
+	fi
+
+	econf \
+		--with-devel \
+		--disable-tempdir \
+		--enable-syslog=1 \
+		--enable-use-flock=1 \
+		--enable-maildirquota \
+		--enable-use-dotlock=1 \
+		--enable-restrict-trusted=1 \
+		--enable-trusted-users='root mail daemon postmaster qmaild mmdf vmail' \
+		--with-default-maildrop=./.maildir/ \
+		--enable-sendmail=/usr/sbin/sendmail \
+		${myconf} || die
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	local i
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README \
+		README.postfix UPGRADE maildroptips.txt
+	mv ${D}/usr/share/maildrop/html ${D}/usr/share/doc/${PF}
+	dohtml {INSTALL,README,UPGRADE}.html
+
+	# this just cleans up /usr/share/maildrop a little bit..
+	for i in makedat makeuserdb pw2userdb userdb userdbpw vchkpw2userdb
+	do
+		rm -f ${D}/usr/bin/$i
+		mv -f ${D}/usr/share/maildrop/scripts/$i \
+			${D}/usr/share/maildrop
+		dosym /usr/share/maildrop/$i /usr/bin/$i
+	done
+	rm -rf ${D}/usr/share/maildrop/scripts
+
+	insinto /etc
+	doins ${FILESDIR}/maildroprc
+
+	insinto /etc/maildrop
+	if use mysql
+	then
+		sed -e "s:/var/lib/mysql/mysql.sock:/var/run/mysqld/mysqld.sock:" \
+		 	${S}/maildropmysql.config > ${S}/maildropmysql.cf
+		newins ${S}/maildropmysql.cf maildropmysql.cf
+	fi
+	use ldap && newins ${S}/maildropldap.config maildropldap.cf
+}
+