Update mail/maildrop to version 1.8.0. Changes from version 1.3.9

include:

* Support for MySQL and LDAP lookups via courier-authlib.
* Honor maildir delivery quotas.
* Bug fixes in MIME handling.
* Plug memory leaks.
* Replace dotlock with lockmail, which supports more types of locking.

6 files changed, 148 insertions, 74 deletions

diff --git a/mail/maildrop/DESCR b/mail/maildrop/DESCR
index dc3ddf7cd9b..4adaab173cd 100644
--- a/mail/maildrop/DESCR
+++ b/mail/maildrop/DESCR
@@ -1,9 +1,13 @@
-maildrop is a replacement for your local mail delivery agent.  maildrop
+Maildrop is a replacement for your local mail delivery agent.  maildrop
 reads a mail message from standard input, then delivers the message to your
 mailbox.  maildrop knows how to deliver mail to mbox-style mailboxes, and
 maildirs.  "maildir" is a mailbox format used by the Qmail MTA.
 
-maildrop will optionally read instructions from a file, which describes
+Maildrop will optionally read instructions from a file, which describes
 how to filter incoming mail.  Instructions can be provided having mail
 delivered to alternate mailboxes, or forwarded somewhere else.  Unlike
 procmail, maildrop uses a structured filtering language.
+
+This package differs from a vanilla Maildrop installation in that the
+files are installed at locations that more closely correspond to a
+Courier installation.
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index cdf0db06ea0..527f7f06336 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,35 +1,53 @@
-# $NetBSD: Makefile,v 1.21 2004/11/15 17:54:49 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/02/18 22:12:53 jlam Exp $
 
-DISTNAME=	maildrop-1.3.9
-PKGREVISION=	2
-EXTRACT_SUFX=	.tar.gz
+DISTNAME=	maildrop-1.8.0
+PKGBASE=	${DISTNAME:C/-[^-]*$//}
+CATEGORIES=     security
+MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX=   .tar.bz2
+
+MAINTAINER=	jlam@NetBSD.org
 COMMENT=	Courier mail delivery agent with filtering abilities
-HOMEPAGE=	http://www.flounder.net/~mrsam/maildrop/
+HOMEPAGE=	http://www.courier-mta.org/maildrop/
 
-PERL5_REQD+=	5.6.0
-USE_PERL5=	build
-DEPENDS+=	courier-maildir>=0.45.6:../../mail/courier-maildir
+DEPENDS+=	courier-maildir>=0.48.2:../../mail/courier-maildir
 
-USE_BUILDLINK3=	yes
-USE_DB185=	yes
-BDB_ACCEPTED=	db2
-USE_LANGUAGES=	c c++
+USE_GNU_TOOLS+=		make
+USE_LANGUAGES=		c c++
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
 
-.include "../../mail/courier-auth/Makefile.common"
+PKG_SUPPORTED_OPTIONS+=	authlib
+PKG_DEFAULT_OPTIONS+=	authlib
 
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--disable-userdb
+.include "../../mail/courier-maildir/Makefile.common"
+.include "../../security/courier-authlib/Makefile.common"
+
+# These are the users that may invoke maildrop with the "-d user"
+# argument (mailbox delivery mode).
+#
+MAILDROP_TRUSTED_USERS?=	${ROOT_USER} ${COURIER_USER} qmaild
 
-.if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)
-INSTALL_TARGET=		install-strip
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--enable-maildirquota
+CONFIGURE_ARGS+=	--enable-maildrop-uid=${ROOT_USER}
+CONFIGURE_ARGS+=	--enable-maildrop-gid=${COURIER_GROUP}
+CONFIGURE_ARGS+=	--enable-trusted-users='${MAILDROP_TRUSTED_USERS}'
+CONFIGURE_ARGS+=	--enable-trusted-groups='${COURIER_GROUP}'
+CONFIGURE_ARGS+=	--enable-syslog=1
+
+.if !empty(PKG_OPTIONS:Mauthlib)
+CONFIGURE_ARGS+=	--enable-authlib
+.  include "../../security/courier-authlib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-authlib
 .endif
 
+SPECIAL_PERMS=	${PREFIX}/bin/maildrop ${ROOT_USER} ${COURIER_GROUP} 4711
+
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}/README.maildrop
 	${INSTALL_DATA} ${WRKSRC}/README.postfix ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/maildroptips.txt ${DOCDIR}
 
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/maildrop/PLIST b/mail/maildrop/PLIST
index 83de77f9305..e6f79f7f35f 100644
--- a/mail/maildrop/PLIST
+++ b/mail/maildrop/PLIST
@@ -1,33 +1,31 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/22 22:09:41 jlam Exp $
-bin/dotlock
+@comment $NetBSD: PLIST,v 1.3 2005/02/18 22:12:53 jlam Exp $
+bin/lockmail
 bin/mailbot
 bin/maildrop
 bin/makemime
 bin/reformail
 bin/reformime
-man/man1/dotlock.1
+man/man1/lockmail.1
 man/man1/mailbot.1
 man/man1/maildrop.1
 man/man1/makemime.1
 man/man1/reformail.1
 man/man1/reformime.1
-man/man5/maildropex.5
-man/man5/maildropfilter.5
-man/man5/maildropgdbm.5
-share/doc/courier/README.maildrop
+man/man7/maildropex.7
+man/man7/maildropfilter.7
+man/man7/maildropgdbm.7
 share/doc/courier/README.postfix
 share/doc/courier/maildroptips.txt
-share/doc/html/maildrop/dotlock.html
-share/doc/html/maildrop/mailbot.html
-share/doc/html/maildrop/maildirmake.html
-share/doc/html/maildrop/maildrop.html
-share/doc/html/maildrop/maildropex.html
-share/doc/html/maildrop/maildropfilter.html
-share/doc/html/maildrop/maildropgdbm.html
-share/doc/html/maildrop/makemime.html
-share/doc/html/maildrop/reformail.html
-share/doc/html/maildrop/reformime.html
-share/doc/html/maildrop/rfc2045.html
-share/doc/html/maildrop/rfc822.html
-@dirrm share/doc/html/maildrop
+share/doc/courier/lockmail.html
+share/doc/courier/mailbot.html
+share/doc/courier/maildrop.html
+share/doc/courier/maildropex.html
+share/doc/courier/maildropfilter.html
+share/doc/courier/maildropgdbm.html
+share/doc/courier/makemime.html
+share/doc/courier/manpage.css
+share/doc/courier/reformail.html
+share/doc/courier/reformime.html
+share/doc/courier/rfc2045.html
+share/doc/courier/rfc822.html
 @unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index deed5158180..c08ad9750e6 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/05/20 09:39:17 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/02/18 22:12:53 jlam Exp $
 
-SHA1 (maildrop-1.3.9.tar.gz) = 6d91ae5b93bc0eb93801dd095f8e6e1151936e5c
-Size (maildrop-1.3.9.tar.gz) = 635022 bytes
-SHA1 (patch-aa) = 1c5c62ccbd1b69a4aaf68d81f095171b2c369e7b
+SHA1 (maildrop-1.8.0.tar.bz2) = 3cd9643bdc8527225209179e056320be2088617b
+Size (maildrop-1.8.0.tar.bz2) = 2013203 bytes
+SHA1 (patch-aa) = f7522d9b0443e9a2f4c1a8bc844cfd78ea38c1fe
+SHA1 (patch-ab) = 37d36dfd32cc12f9431a11efe7ad747975215a34
diff --git a/mail/maildrop/patches/patch-aa b/mail/maildrop/patches/patch-aa
index 94ad67c49aa..20cb00b7df3 100644
--- a/mail/maildrop/patches/patch-aa
+++ b/mail/maildrop/patches/patch-aa
@@ -1,41 +1,63 @@
-$NetBSD: patch-aa,v 1.3 2002/01/22 22:09:42 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2005/02/18 22:12:53 jlam Exp $
 
---- Makefile.in.orig	Sat Jan  5 13:28:01 2002
+--- Makefile.in.orig	2004-12-08 21:36:41.000000000 -0500
 +++ Makefile.in
-@@ -87,7 +87,7 @@
- EXTRA_DIST = UPGRADE.html UPGRADE.txt INSTALL.txt README README.postfix maildroptips.txt maildropldap.config maildropmysql.config
- 
+@@ -230,21 +230,18 @@ HTML2TXT = `which lynx 2>/dev/null && ec
+ SUBDIRS = numlib liblock unicode rfc822 rfc2045 gdbmobj bdbobj maildir maildrop
+ EXTRA_DIST = README.html INSTALL.html UPGRADE.html README.postfix maildroptips.txt automake.fix COPYING.GPL manpage.css
  scriptdir = $(pkgdatadir)/scripts
 -htmldir = $(pkgdatadir)/html
-+htmldir = $(prefix)/share/doc/html/@PACKAGE@
- @INSTALL_USERDB_TRUE@USERDBHTML = @INSTALL_USERDB_TRUE@userdb.html makeuserdb.html userdbpw.html
- @INSTALL_USERDB_FALSE@USERDBHTML = 
- @INSTALL_USERDB_TRUE@USERDBMAN = @INSTALL_USERDB_TRUE@userdb.8 makeuserdb.8 userdbpw.8
-@@ -108,9 +108,8 @@
++htmldir = $(prefix)/share/doc/courier
+ DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
+-@INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAHTML = 
+-@INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
+-@INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAMAN = 
+-@INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
+-MAILDROPHTML = lockmail.html maildirmake.html maildropex.html \
+-	maildir.html \
++DELIVERQUOTAHTML = 
++#DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
++DELIVERQUOTAMAN = 
++#DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
++MAILDROPHTML = lockmail.html maildropex.html \
+ 	maildropfilter.html maildropgdbm.html maildrop.html mailbot.html \
  	makemime.html reformail.html reformime.html
  
- 
--MAILDROPMAN = dotlock.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.5 \
--	maildropfilter.5 maildropgdbm.5 makemime.1 reformail.1 reformime.1 \
+-MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \
+-	maildir.5 \
+-	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1 \
 -	maildirquota.7 deliverquota.8
-+MAILDROPMAN = dotlock.1 maildrop.1 mailbot.1 maildropex.5 \
-+	maildropfilter.5 maildropgdbm.5 makemime.1 reformail.1 reformime.1
- 
++MAILDROPMAN = lockmail.1 maildrop.1 mailbot.1 maildropex.7 \
++	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
  
  EXTRA_LIBRARIES = librfc822.a librfc2045.a
-@@ -836,14 +835,13 @@
- 	for f in maildrop mailbot reformail dotlock ; do \
+ @DEVEL_TRUE@DEVEL_MAN = rfc822.3 rfc2045.3
+@@ -1007,15 +1004,15 @@ uninstall-man: uninstall-man1 uninstall-
+ #  where deliverquota will be installed.
+ #  Create a soft link from bindir/deliverquota to libdir/bin/deliverquota
+ 
+-@INSTALL_DELIVERQUOTA_TRUE@install-deliverquota:
+-@INSTALL_DELIVERQUOTA_TRUE@	$(mkinstalldirs) $(DESTDIR)$(bindir)
+-@INSTALL_DELIVERQUOTA_TRUE@	$(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
+-@INSTALL_DELIVERQUOTA_TRUE@	cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
++#install-deliverquota:
++#	$(mkinstalldirs) $(DESTDIR)$(bindir)
++#	$(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
++#	cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
+ 
+ @INSTALL_DELIVERQUOTA_TRUE@uninstall-deliverquota:
+ @INSTALL_DELIVERQUOTA_TRUE@	rm -f $(DESTDIR)$(bindir)/deliverquota
+ 
+-@INSTALL_DELIVERQUOTA_FALSE@install-deliverquota:
++install-deliverquota:
+ 
+ @INSTALL_DELIVERQUOTA_FALSE@uninstall-deliverquota:
+ 
+@@ -1051,7 +1048,6 @@ install-maildrop:
  		$(INSTALL_PROGRAM) maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
  	done
--	$(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/$$f
+ 	$(INSTALL_PROGRAM) liblock/lockmail $(DESTDIR)$(bindir)/lockmail
+-	$(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
  	$(INSTALL_PROGRAM) rfc2045/reformime $(DESTDIR)$(bindir)/reformime
  	$(INSTALL_PROGRAM) rfc2045/makemime $(DESTDIR)$(bindir)/makemime
- 	. maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop dotlock
- 	. maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop dotlock && chmod 755 maildrop dotlock
- 
- uninstall-maildrop:
--	for f in maildrop mailbot maildirmake reformail dotlock makemime reformime ; do \
-+	for f in maildrop mailbot reformail dotlock makemime reformime ; do \
- 		rm -f $(DESTDIR)$(bindir)/$$f ; \
- 	done
- 
+ 	. maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
diff --git a/mail/maildrop/patches/patch-ab b/mail/maildrop/patches/patch-ab
new file mode 100644
index 00000000000..fb5332ab018
--- /dev/null
+++ b/mail/maildrop/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 2005/02/18 22:12:53 jlam Exp $
+
+--- maildrop/configure.orig	2004-10-30 23:15:52.000000000 -0400
++++ maildrop/configure
+@@ -22094,7 +22094,7 @@ fi
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+-if test -d $srcdir/../courier
++if true || test -d $srcdir/../courier
+ then
+ #
+ # This version of maildrop is integrated into Courier mail server
+@@ -22231,7 +22231,7 @@ SPOOLDIR="$DIR"
+ 
+ get_spooldir() {
+ 
+-if test -d $srcdir/../courier
++if true || test -d $srcdir/../courier
+ then
+ 	MBOX_RESET_GID=1
+ 	SPOOLDIR="./Maildir"
+@@ -22299,7 +22299,7 @@ if test "${with_default_maildrop+set}" =
+ else
+   # Courier defaults to ./Maildir
+ 
+-	if test -d $srcdir/../courier
++	if true || test -d $srcdir/../courier
+ 	then
+ 		maildrop_cv_SYS_INSTALL_MBOXDIR=./Maildir
+ 	fi