Update mail/courier-mta to version 0.58.0. Changes from version 0.57.1

include:

+ Add full DESTDIR support.

+ Don't create empty, unused directories under
  ${PREFIX}/share/examples/courier.

+ Teach mkesmtpdcert generate certificates and keys using the either
  GNUTLS or OpenSSL tools.

* Fix a memory stomp in local delivery agent.

* Get rid of the hard 30 minute timeout in sendmail(8).

* Rewrite input processing for submit(8) process to use non-blocking
  I/O to read standard input. When the message source is local (or
  dsn), get rid of the hard 30 minute timeout, and poll stdin with a
  5 minute poll() timeout, at which point the timestamps on all open
  control and data files are pinged, to keep courierd from purging
  them based on their old timestamp.  Continue to use a hard timeout
  for all non-local mail.

9 files changed, 116 insertions, 56 deletions

diff --git a/mail/courier-mta/patches/patch-aa b/mail/courier-mta/patches/patch-aa
index 0b2d5614b31..6957c39bd85 100644
--- a/mail/courier-mta/patches/patch-aa
+++ b/mail/courier-mta/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $
 
---- courier/Makefile.in.orig	Sat Sep 29 14:57:58 2007
+--- courier/Makefile.in.orig	2007-11-23 22:26:43.000000000 -0500
 +++ courier/Makefile.in
 @@ -46,16 +46,16 @@ build_triplet = @build@
  host_triplet = @host@
@@ -84,7 +84,13 @@ $NetBSD: patch-aa,v 1.4 2007/10/15 15:37:14 jlam Exp $
  sort.h:
  	echo '#define SORT "$(SORT)"' >sort.h
  
-@@ -1834,33 +1837,16 @@ install-exec-hook:
+@@ -1828,39 +1831,21 @@ dist-hook:
+ 
+ install-exec-hook:
+ 	for d in $(bindir) $(sbindir) $(libexecdir) $(libexecdir)/courier \
+-		$(sysconfdir)/filters \
+ 		$(localstatedir) $(localstatedir)/tmp\
+ 		$(webmaildir)\
  		$(localstatedir)/track\
  		$(localstatedir)/msgs $(localstatedir)/msgq ; do \
  			$(mkinstalldirs) $(DESTDIR)$$d || :; done
@@ -120,7 +126,7 @@ $NetBSD: patch-aa,v 1.4 2007/10/15 15:37:14 jlam Exp $
  	test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \
  		echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering
  	test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \
-@@ -1872,10 +1858,6 @@ install-data-hook:
+@@ -1872,10 +1857,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-ab b/mail/courier-mta/patches/patch-ab
index 0eeaee25fed..fccf66711f2 100644
--- a/mail/courier-mta/patches/patch-ab
+++ b/mail/courier-mta/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2008/02/19 18:45:24 jlam Exp $
 
---- courier/configure.orig	Sat Sep 29 14:57:58 2007
+--- courier/configure.orig	2007-11-23 22:26:42.000000000 -0500
 +++ courier/configure
-@@ -22280,9 +22280,9 @@ done
+@@ -22366,9 +22366,9 @@ done
  
  if test "$testmode" = "0"
  then
diff --git a/mail/courier-mta/patches/patch-ac b/mail/courier-mta/patches/patch-ac
index 12a7872c82f..c3f3ca585a5 100644
--- a/mail/courier-mta/patches/patch-ac
+++ b/mail/courier-mta/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2008/02/19 18:45:24 jlam Exp $
 
---- courier/doc/Makefile.in.orig	Sun Jul 22 01:32:34 2007
+--- courier/doc/Makefile.in.orig	2007-11-17 19:48:53.000000000 -0500
 +++ courier/doc/Makefile.in
 @@ -151,7 +151,7 @@ top_srcdir = @top_srcdir@
  version = @version@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $
  		draft-varshavchik-exdata-smtpext.txt \
  		draft-varshavchik-verp-smtpext.txt \
  		draft-varshavchik-security-smtpext.txt \
-@@ -189,66 +189,39 @@ htmlin = \
+@@ -189,66 +189,38 @@ htmlin = \
  		courier.html \
  		courierldapaliasd.html \
  		couriermlm.html \
@@ -74,11 +74,11 @@ $NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $
 +	dot-forward.1 webmlmd.1
  
 -man8 = aliaslookup.8 courier.8 courierldapaliasd.8 courierpop3d.8 \
+-	deliverquota.8 \
 +man5 = dot-courier.5
 +man7 = localmailfilter.7
 +
 +man8 = aliaslookup.8 courier.8 courierldapaliasd.8 \
- 	deliverquota.8 \
  	esmtpd.8 makeacceptmailfor.8 makehosteddomains.8\
 -	mkesmtpdcert.8 mkimapdcert.8 mkpop3dcert.8 \
 +	mkesmtpdcert.8 \
@@ -88,7 +88,7 @@ $NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $
  
  BUILT_SOURCES = \
  	aliaslookup.html aliaslookup.8 \
-@@ -275,7 +248,7 @@ BUILT_SOURCES = \
+@@ -275,7 +247,7 @@ BUILT_SOURCES = \
  	webmlmd.html.in webmlmd.1.in
  
  EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES)
@@ -97,7 +97,7 @@ $NetBSD: patch-ac,v 1.4 2007/10/15 15:37:14 jlam Exp $
  	$(man1dir)/rmail.1 $(man1dir)/dotforward.1 \
  	$(man8dir)/makesmtpaccess-msa.8 \
  	$(man8dir)/esmtpd-msa.8
-@@ -1156,8 +1129,7 @@ preline.1: preline.1.in
+@@ -1156,8 +1128,7 @@ preline.1: preline.1.in
  
  install-man-extra:
  	cd $(DESTDIR)$(man8dir) ; \
diff --git a/mail/courier-mta/patches/patch-ad b/mail/courier-mta/patches/patch-ad
index b92ce652a45..ab90ca304f6 100644
--- a/mail/courier-mta/patches/patch-ad
+++ b/mail/courier-mta/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2008/02/19 18:45:24 jlam Exp $
 
---- courier/filters/Makefile.in.orig	Sun Jul 22 01:32:33 2007
+--- courier/filters/Makefile.in.orig	2007-11-17 19:49:01.000000000 -0500
 +++ courier/filters/Makefile.in
 @@ -236,11 +236,12 @@ SUBDIRS = libfilter perlfilter
  CLEANFILES = $(htmldoc_DATA) $(man_MANS) filtersocketdir.h filteractivedir.h \
@@ -16,3 +16,20 @@ $NetBSD: patch-ad,v 1.3 2007/10/15 15:37:14 jlam Exp $
  filtersocketdir = $(localstatedir)/filters
  allfiltersocketdir = $(localstatedir)/allfilters
  filterconfdir = $(sysconfdir)/filters
+@@ -931,16 +932,12 @@ install-exec-hook:
+ install-data-hook:
+ 	-$(mkinstalldirs) $(DESTDIR)$(filtersocketdir)
+ 	-$(mkinstalldirs) $(DESTDIR)$(allfiltersocketdir)
+-	-$(mkinstalldirs) $(DESTDIR)$(filterconfdir)
+-	-$(mkinstalldirs) $(DESTDIR)$(filteractivedir)
+ 	-$(mkinstalldirs) $(DESTDIR)$(sbindir)
+ 	chmod 500 $(DESTDIR)$(datadir)/filterctl
+ 	rm -f $(DESTDIR)$(sbindir)/filterctl
+ 	$(LN_S) $(datadir)/filterctl $(DESTDIR)$(sbindir)/filterctl
+ 	chmod 750 $(DESTDIR)$(filtersocketdir)
+ 	chmod 750 $(DESTDIR)$(allfiltersocketdir)
+-	chmod 750 $(DESTDIR)$(filterconfdir)
+-	chmod 750 $(DESTDIR)$(filteractivedir)
+ 	-chown @mailuser@ $(DESTDIR)$(filtersocketdir) \
+ 		$(DESTDIR)$(allfiltersocketdir) \
+ 		$(DESTDIR)$(filterconfdir) \
diff --git a/mail/courier-mta/patches/patch-ag b/mail/courier-mta/patches/patch-ag
new file mode 100644
index 00000000000..042c2469c3c
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ag
@@ -0,0 +1,28 @@
+$NetBSD: patch-ag,v 1.3 2008/02/19 18:45:24 jlam Exp $
+
+--- courier/module.esmtp/mkesmtpdcert.in.orig	2007-11-04 16:17:03.000000000 -0500
++++ courier/module.esmtp/mkesmtpdcert.in
+@@ -9,7 +9,13 @@
+ # ESMTP STARTTLS.  Normally this script would get called by an automatic
+ # package installation routine.
+ 
+-if test "@ssllib@" = "openssl"
++case "$1" in
++gnutls)		ssllib=gnutls ;;
++openssl)	ssllib=openssl ;;
++*)		ssllib="@ssllib@" ;;
++esac
++
++if test "$ssllib" = "openssl"
+ then
+ 	test -x @OPENSSL@ || exit 0
+ else
+@@ -32,7 +38,7 @@ cleanup() {
+ 
+ cd @mydatadir@
+ 
+-if test "@ssllib@" = "openssl"
++if test "$ssllib" = "openssl"
+ then
+ 	cp /dev/null @mydatadir@/esmtpd.pem
+ 	chmod 600 @mydatadir@/esmtpd.pem
diff --git a/mail/courier-mta/patches/patch-ai b/mail/courier-mta/patches/patch-ai
index 501e9edf2b5..0df8e498607 100644
--- a/mail/courier-mta/patches/patch-ai
+++ b/mail/courier-mta/patches/patch-ai
@@ -1,35 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2007/10/17 13:50:30 jlam Exp $
+$NetBSD: patch-ai,v 1.4 2008/02/19 18:45:24 jlam Exp $
 
---- courier/module.local/local.c.orig	Sun Oct  7 16:37:52 2007
+--- courier/module.local/local.c.orig	2007-10-16 22:04:01.000000000 -0400
 +++ courier/module.local/local.c
-@@ -391,8 +391,6 @@ toalias:
- 	}
- 
- not_found:
--	if (hostdomain)	free(hostdomain);
--
- 	/*
- 	** When submit is being called by the sendmail command line,
- 	** don't reject unknown addresses, instead accept them (and bounce
-@@ -407,6 +405,8 @@ not_found:
- 	{
- 		free(addr);
- 		(*delfunc)(rwi, rwi->ptr, rwi->ptr);
-+		if (hostdomain)	free(hostdomain);
-+
- 		return;
- 	}
- 
-@@ -420,6 +420,8 @@ not_found:
- 		snprintf(buf, 255, "User <%s> unknown",
- 			 orig_addr ? orig_addr:"");
- 		free(addr);
-+		if (hostdomain)	free(hostdomain);
-+
- 		if (orig_addr)
- 			free(orig_addr);
- 		(*rwi->err_func)(550, buf, rwi);
-@@ -745,6 +747,8 @@ const char *quota;
+@@ -747,6 +747,8 @@ const char *quota;
  					strlen(argv[7])), "SENDER="),
  					argv[7]));
  
diff --git a/mail/courier-mta/patches/patch-aj b/mail/courier-mta/patches/patch-aj
index e7dc06db837..d90614b4d14 100644
--- a/mail/courier-mta/patches/patch-aj
+++ b/mail/courier-mta/patches/patch-aj
@@ -1,19 +1,19 @@
-$NetBSD: patch-aj,v 1.4 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-aj,v 1.5 2008/02/19 18:45:24 jlam Exp $
 
---- courier/perms.sh.in.orig	Sun Jul  1 15:36:31 2007
+--- courier/perms.sh.in.orig	2007-07-01 11:36:31.000000000 -0400
 +++ courier/perms.sh.in
-@@ -11,119 +11,47 @@ exec_prefix="@exec_prefix@"
+@@ -11,119 +11,41 @@ exec_prefix="@exec_prefix@"
  datarootdir="@datarootdir@"
  
  PERMS="
 -.			755
 -
- @localstatedir@		755	x	bin	bin
- @localstatedir@/tmp	770
- @localstatedir@/msgs	750
- @localstatedir@/msgq	750
- @localstatedir@/track	755
- 
+-@localstatedir@		755	x	bin	bin
+-@localstatedir@/tmp	770
+-@localstatedir@/msgs	750
+-@localstatedir@/msgq	750
+-@localstatedir@/track	755
+-
 -@sysconfdir@		755	x
 -@sysconfdir@/aliasdir	755
 -@sysconfdir@/aliases	750
@@ -122,7 +122,7 @@ $NetBSD: patch-aj,v 1.4 2007/10/15 15:37:14 jlam Exp $
  @datadir@/couriermlm		755
  
  @datadir@/couriermlm/adminrequest.tmpl	644
-@@ -191,11 +119,20 @@ do
+@@ -191,11 +113,20 @@ do
  	if test "$USER" = ""
  	then
  		USER="@mailuser@"
@@ -143,7 +143,7 @@ $NetBSD: patch-aj,v 1.4 2007/10/15 15:37:14 jlam Exp $
  	fi
  
  	case $FILE in
-@@ -216,26 +153,7 @@ do
+@@ -216,26 +147,7 @@ do
  	echo $FILE $MODE $USER $GROUP $SPECIAL
  done
  
diff --git a/mail/courier-mta/patches/patch-ax b/mail/courier-mta/patches/patch-ax
new file mode 100644
index 00000000000..c71e668dd4b
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ax
@@ -0,0 +1,22 @@
+$NetBSD: patch-ax,v 1.1 2008/02/19 18:45:24 jlam Exp $
+
+--- courier/module.esmtp/Makefile.in.orig	2007-11-17 19:49:38.000000000 -0500
++++ courier/module.esmtp/Makefile.in
+@@ -870,17 +870,11 @@ install-data-local:
+ 	test -f $(DESTDIR)$(sbindir)/courieresmtpd && exit 0; $(mkinstalldirs) $(DESTDIR)$(sbindir) || :; rm -f $(DESTDIR)$(sbindir)/courieresmtpd && $(LN_S) $(moduledir)/courieresmtpd $(DESTDIR)$(sbindir)/courieresmtpd
+ 	-$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	test -f $(DESTDIR)$(bindir)/addcr && exit 0; rm -f $(DESTDIR)$(bindir)/addcr && $(LN_S) $(moduledir)/addcr $(DESTDIR)$(bindir)/addcr
+-	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/esmtpacceptmailfor.dir
+-	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/esmtppercentrelay.dir
+ 	-$(mkinstalldirs) $(DESTDIR)$(sbindir)
+ 	for f in $(databin_SCRIPTS) ; do \
+ 		rm -f $(DESTDIR)$(sbindir)/$$f ; \
+ 		$(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
+ 	cat </dev/null >>$(DESTDIR)$(sysconfdir)/esmtpauthclient
+-	chmod 600 $(DESTDIR)$(sysconfdir)/esmtpauthclient
+-	test -w /etc || exit 0; \
+-		chown @mailuser@ $(DESTDIR)$(sysconfdir)/esmtpauthclient ; \
+-		chgrp @mailgroup@ $(DESTDIR)$(sysconfdir)/esmtpauthclient
+ 	rm -f $(DESTDIR)$(sbindir)/esmtpd-msa $(DESTDIR)$(sbindir)/makesmtpaccess-msa
+ 	$(LN_S) esmtpd $(DESTDIR)$(sbindir)/esmtpd-msa
+ 	$(LN_S) makesmtpaccess $(DESTDIR)$(sbindir)/makesmtpaccess-msa
diff --git a/mail/courier-mta/patches/patch-ay b/mail/courier-mta/patches/patch-ay
new file mode 100644
index 00000000000..87ee4933a81
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ay
@@ -0,0 +1,14 @@
+$NetBSD: patch-ay,v 1.1 2008/02/19 18:45:24 jlam Exp $
+
+--- webadmin/Makefile.in.orig	2007-11-17 19:53:34.000000000 -0500
++++ webadmin/Makefile.in
+@@ -603,9 +603,6 @@ uninstall-am: uninstall-webadminDATA uni
+ 
+ 
+ install-exec-hook:
+-	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/webadmin/added
+-	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/webadmin/removed
+-	chmod 700 $(DESTDIR)$(sysconfdir)/webadmin
+ 	-chown @mailuser@ $(DESTDIR)$(sysconfdir)/webadmin
+ 	-chown @mailuser@ $(DESTDIR)$(sysconfdir)/webadmin/added
+ 	-chown @mailuser@ $(DESTDIR)$(sysconfdir)/webadmin/removed