Update mail/courier-mta to 0.53.2. Changes from version 0.53.1 include:

   * [SECURITY] Fix bug in encoding of usernames that contain '='.  This
     fixes the security advisories noted here:

	http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-2659
	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=368834
	http://secunia.com/advisories/20519/

   * Implemented "Purge" option for mail filters.

   * Invoke Courier filters in alphabetical order, and uses 050 exit code
     to accept a message without running the remaining filters, which gets
     converted to a 250 ESMTP code.

   * Fix improper parsing of ident/pfix tokens in SPF.

   * New command line tool "aliaslookup" to look up mail aliases.

   * Added support for the koi8-u character set.

7 files changed, 39 insertions, 34 deletions

diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index 60b90d18c6e..77f591d22fb 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2006/05/01 02:57:58 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/06/09 22:12:18 jlam Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
-PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +12,7 @@ COMMENT=	Courier mail transport agent
 HOMEPAGE=	http://www.courier-mta.org/
 
 DEPENDS+=	courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
+DEPENDS+=	couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd
 DEPENDS+=	maildrop>=2.0.2:../../mail/maildrop
 
 USE_TOOLS+=		gmake perl:run
diff --git a/mail/courier-mta/Makefile.common b/mail/courier-mta/Makefile.common
index b2edc78b8b1..1dac3edebce 100644
--- a/mail/courier-mta/Makefile.common
+++ b/mail/courier-mta/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+# $NetBSD: Makefile.common,v 1.2 2006/06/09 22:12:18 jlam Exp $
 #
 # Package Makefiles should include this file after setting PKGNAME and
 # PKG_SUPPORTED_OPTIONS.
 
-COURIER_VERSION=	0.53.1
+COURIER_VERSION=	0.53.2
 
 .if !defined(PKGNAME)
 PKG_FAIL_REASON+=	"[courier/Makefile.common] PKGNAME must be set."
diff --git a/mail/courier-mta/PLIST b/mail/courier-mta/PLIST
index a4e5891b010..ab4366c0980 100644
--- a/mail/courier-mta/PLIST
+++ b/mail/courier-mta/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/30 18:20:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/06/09 22:12:18 jlam Exp $
 bin/cancelmsg
 bin/courier-config
 bin/couriermlm
@@ -27,6 +27,7 @@ man/man1/sendmail.1
 man/man1/testmxlookup.1
 man/man5/dot-courier.5
 man/man7/localmailfilter.7
+man/man8/aliaslookup.8
 man/man8/courier.8
 man/man8/courierfilter.8
 man/man8/courierldapaliasd.8
@@ -44,6 +45,7 @@ man/man8/makesmtpaccess.8
 man/man8/mkesmtpdcert.8
 man/man8/pop3d.8
 man/man8/submit.8
+sbin/aliaslookup
 sbin/courier
 sbin/courierfilter
 sbin/filterctl
@@ -136,6 +138,7 @@ share/courier/makehosteddomains
 share/courier/perlfilter-wrapper.pl
 share/courier/perlfilter-example.pl
 share/doc/courier/FAQ.html
+share/doc/courier/aliaslookup.html
 share/doc/courier/aliases.html
 share/doc/courier/bg.gif
 share/doc/courier/cancelmsg.html
diff --git a/mail/courier-mta/distinfo b/mail/courier-mta/distinfo
index 1ed1770ae41..1d7f49e59ee 100644
--- a/mail/courier-mta/distinfo
+++ b/mail/courier-mta/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+$NetBSD: distinfo,v 1.2 2006/06/09 22:12:18 jlam Exp $
 
-SHA1 (courier-0.53.1.tar.bz2) = 40c6a732efd9e74b524230ae08ce75166032a8d8
-RMD160 (courier-0.53.1.tar.bz2) = a2f016d67b2e360111d2ebc4811a35c2ed23fb01
-Size (courier-0.53.1.tar.bz2) = 6940783 bytes
-SHA1 (patch-aa) = fceb62d41e0f133ad26660e24c7ca254c5f98d0b
+SHA1 (courier-0.53.2.tar.bz2) = 89c6a9a57467adf8c1ac815a5ffacf47e5e694a3
+RMD160 (courier-0.53.2.tar.bz2) = a6efce3a8d6572923190ea49ed6085906317ebd8
+Size (courier-0.53.2.tar.bz2) = 6942557 bytes
+SHA1 (patch-aa) = 13c353d22a0c14fb0f769658223795c1d4d8fcf4
 SHA1 (patch-ab) = d02d396512cec5be8e3cedceb36da0127461a533
-SHA1 (patch-ac) = a44916aa8e92d9e4cf6e5e969e7bdd928830b2b0
+SHA1 (patch-ac) = e20e3af10138adf53628fcb08c1657386b93edd3
 SHA1 (patch-ad) = b0e88586d90e071ac135443634153131f548e05f
 SHA1 (patch-ae) = 5a5d6b6aea3cca9d9f577d8da9ba463dd64e6902
 SHA1 (patch-af) = e17ce772bc92ec45507fed340d33856f71fbe3f6
 SHA1 (patch-ag) = 9044e5f36e9604d4d7b751bcc9042149080d61d2
 SHA1 (patch-ah) = 9f2001e1e309b2557640d8ecc9187ed793d0c5dd
 SHA1 (patch-ai) = 5324b99ebc0492c77f67a8c627ceb3c3efa9d852
-SHA1 (patch-aj) = 11f85f5e3a463e5499e687297cd8e9375bbe5525
+SHA1 (patch-aj) = 4b2901f200f6d68a8377a85f7c3962cf9851ca8f
 SHA1 (patch-ak) = 8ba39a1ef912399e5f5fc224a43d36142780d09c
diff --git a/mail/courier-mta/patches/patch-aa b/mail/courier-mta/patches/patch-aa
index 2b90850127e..4e1245c71f3 100644
--- a/mail/courier-mta/patches/patch-aa
+++ b/mail/courier-mta/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2006/06/09 22:12:18 jlam Exp $
 
---- courier/Makefile.in.orig	2006-02-25 12:28:53.000000000 -0500
+--- courier/Makefile.in.orig	2006-06-09 14:58:20.000000000 -0400
 +++ courier/Makefile.in
-@@ -52,16 +52,16 @@ build_triplet = @build@
+@@ -52,17 +52,17 @@ build_triplet = @build@
  host_triplet = @host@
  target_triplet = @target@
  pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
@@ -18,14 +18,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
 -	courier-config$(EXEEXT) @couriertls@ @EXTRABIN@
 +	courier-config$(EXEEXT)
  sbin_PROGRAMS = courier$(EXEEXT) showconfig$(EXEEXT) \
--	showmodules$(EXEEXT) @COURIERLDAPALIASD@ @EXTRASBIN@
+ 	showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
+-	@EXTRASBIN@ $(am__empty)
 -cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
-+	showmodules$(EXEEXT) @COURIERLDAPALIASD@
++	$(am__empty)
 +cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT)
  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
  	$(srcdir)/courier.h.in $(srcdir)/courierctl.start.in \
-@@ -397,7 +397,7 @@ RFCERRTXTIN = rfcerrheader.txt
+@@ -402,7 +402,7 @@ RFCERRTXTIN = rfcerrheader.txt
  RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt
  extrapkglib = makedatprog courierpop3login pcpd
  pkglibexecdir = $(libexecdir)/courier
@@ -34,7 +35,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
  webmail_SOURCES = 
  sqwebmaild_SOURCES = 
  
-@@ -408,16 +408,14 @@ extrabin = maildrop lockmail reformail r
+@@ -413,16 +413,14 @@ extrabin = maildrop lockmail reformail r
  
  extrasbin = couriertcpd$(EXEEXT)
  sbinscripts = sharedindexsplit sharedindexinstall webmaild
@@ -55,7 +56,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
  
  mlmdatadir = $(datadir)/couriermlm
  mlmdata_DATA = adminrequest.tmpl confsubj.tmpl digestsubj.tmpl fetch.tmpl \
-@@ -1657,27 +1655,10 @@ install-exec-hook:
+@@ -1673,27 +1671,10 @@ install-exec-hook:
  		$(localstatedir)/track\
  		$(localstatedir)/msgs $(localstatedir)/msgq ; do \
  			$(mkinstalldirs) $(DESTDIR)$$d || :; done
@@ -85,7 +86,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
  
  install-data-hook:
  	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliases
-@@ -1695,10 +1676,6 @@ install-data-hook:
+@@ -1711,10 +1692,6 @@ install-data-hook:
  	rm -f $(DESTDIR)$(bindir)/rmail
  	$(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
  	-$(mkinstalldirs) $(DESTDIR)@mandir@/man8
diff --git a/mail/courier-mta/patches/patch-ac b/mail/courier-mta/patches/patch-ac
index b92e73a5e89..e8f2bf1e50e 100644
--- a/mail/courier-mta/patches/patch-ac
+++ b/mail/courier-mta/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2006/06/09 22:12:18 jlam Exp $
 
---- courier/doc/Makefile.in.orig	2006-01-29 12:33:49.000000000 -0500
+--- courier/doc/Makefile.in.orig	2006-04-12 19:26:24.000000000 -0400
 +++ courier/doc/Makefile.in
 @@ -141,7 +141,7 @@ target_alias = @target_alias@
  version = @version@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
  		draft-varshavchik-exdata-smtpext.txt \
  		draft-varshavchik-verp-smtpext.txt \
  		draft-varshavchik-security-smtpext.txt \
-@@ -178,65 +178,37 @@ htmlin = \
+@@ -179,65 +179,37 @@ htmlin = \
  		courier.html \
  		courierldapaliasd.html \
  		couriermlm.html \
@@ -72,12 +72,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
 +	couriermlm.1 testmxlookup.1 \
 +	dot-forward.1
  
--man8 = courier.8 courierldapaliasd.8 courierpop3d.8 \
+-man8 = aliaslookup.8 courier.8 courierldapaliasd.8 courierpop3d.8 \
 -	deliverquota.8 \
 +man5 = dot-courier.5
 +man7 = localmailfilter.7
 +
-+man8 = courier.8 courierldapaliasd.8 \
++man8 = aliaslookup.8 courier.8 courierldapaliasd.8 \
  	esmtpd.8 makeacceptmailfor.8 makehosteddomains.8\
 -	mkesmtpdcert.8 mkimapdcert.8 mkpop3dcert.8 \
 +	mkesmtpdcert.8 \
@@ -86,8 +86,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
 +	pop3d.8 submit.8
  
  BUILT_SOURCES = \
- 	cancelmsg.html cancelmsg.1 \
-@@ -261,7 +233,7 @@ BUILT_SOURCES = \
+ 	aliaslookup.html aliaslookup.8 \
+@@ -263,7 +235,7 @@ BUILT_SOURCES = \
  	testmxlookup.html testmxlookup.1
  
  EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES)
@@ -96,7 +96,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
  	$(man1dir)/rmail.1 $(man1dir)/dotforward.1 \
  	$(man8dir)/makesmtpaccess-msa.8 \
  	$(man8dir)/esmtpd-msa.8
-@@ -1117,8 +1089,7 @@ preline.1: preline.1.in
+@@ -1125,8 +1097,7 @@ preline.1: preline.1.in
  
  install-man-extra:
  	cd $(DESTDIR)$(man8dir) ; \
diff --git a/mail/courier-mta/patches/patch-aj b/mail/courier-mta/patches/patch-aj
index 0492f35f867..1bd9627cab6 100644
--- a/mail/courier-mta/patches/patch-aj
+++ b/mail/courier-mta/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+$NetBSD: patch-aj,v 1.2 2006/06/09 22:12:18 jlam Exp $
 
---- courier/perms.sh.in.orig	2005-01-27 21:53:58.000000000 -0500
+--- courier/perms.sh.in.orig	2006-04-12 20:21:48.000000000 -0400
 +++ courier/perms.sh.in
-@@ -10,114 +10,44 @@ prefix="@prefix@"
+@@ -10,115 +10,45 @@ prefix="@prefix@"
  exec_prefix="@exec_prefix@"
  
  PERMS="
@@ -72,6 +72,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
 -@sbindir@/imapd-ssl		555
 -@sbindir@/sharedindexsplit	555
 -@sbindir@/sharedindexinstall	555
+ @sbindir@/aliaslookup		555
 -@sbindir@/webmaild		555
 -@datadir@/imapd			555	x	bin	bin
 -@datadir@/imapd-ssl		555	x	bin	bin
@@ -119,7 +120,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
  @datadir@/couriermlm		755
  
  @datadir@/couriermlm/adminrequest.tmpl	644
-@@ -167,11 +97,20 @@ do
+@@ -168,11 +98,20 @@ do
  	if test "$USER" = ""
  	then
  		USER="@mailuser@"
@@ -140,7 +141,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
  	fi
  
  	case $FILE in
-@@ -192,26 +131,7 @@ do
+@@ -193,26 +132,7 @@ do
  	echo $FILE $MODE $USER $GROUP $SPECIAL
  done