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.

1 files changed, 28 insertions, 5 deletions

diff --git a/mail/courier-mta/options.mk b/mail/courier-mta/options.mk
index 614ee8f2bde..b3a96bdb1a3 100644
--- a/mail/courier-mta/options.mk
+++ b/mail/courier-mta/options.mk
@@ -1,11 +1,14 @@
-# $NetBSD: options.mk,v 1.8 2007/09/21 14:12:19 jlam Exp $
+# $NetBSD: options.mk,v 1.9 2008/02/19 18:45:23 jlam Exp $
 
 # Global and legacy options
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.courier-mta
-PKG_SUPPORTED_OPTIONS=	courier-dsn courier-esmtp courier-local		\
-			courier-uucp inet6 ldap
-PKG_SUGGESTED_OPTIONS=	courier-dsn courier-esmtp courier-local inet6
+PKG_OPTIONS_VAR=		PKG_OPTIONS.courier-mta
+PKG_SUPPORTED_OPTIONS=		courier-dsn courier-esmtp courier-local	\
+				courier-uucp inet6 ldap
+PKG_OPTIONS_OPTIONAL_GROUPS=	tls
+PKG_OPTIONS_GROUP.tls=		gnutls ssl
+PKG_SUGGESTED_OPTIONS=		courier-dsn courier-esmtp courier-local	\
+				inet6 ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -140,3 +143,23 @@ CONF_FILES_PERMS+=	${EGDIR}/ldapaliasrc.dist			\
 FILES_SUBST+=		COURIERLDAPALIASD=
 CONFIGURE_ARGS+=	--without-ldapaliasd
 .endif
+
+######################################################################
+###
+### Default to using the OpenSSL or GNUTLS tools for creating certificates.
+###
+.if !empty(PKG_OPTIONS:Mgnutls) || !empty(PKG_OPTIONS:Mssl)
+SUBST_CLASSES+=		tls
+SUBST_FILES.tls=	courier/module.esmtp/mkesmtpdcert.in
+SUBST_STAGE.tls=	pre-configure
+COURIER_CERTTOOL=	${PREFIX}/bin/certtool
+COURIER_OPENSSL=	${PREFIX}/bin/openssl
+.endif
+.if !empty(PKG_OPTIONS:Mgnutls)
+SUBST_SED.tls=		-e "s|@ssllib@|gnutls|g"
+.endif
+.if !empty(PKG_OPTIONS:Mssl)
+USE_TOOLS+=		openssl:run
+COURIER_OPENSSL=	${TOOLS_OPENSSL}
+SUBST_SED.tls=		-e "s|@ssllib@|openssl|g"
+.endif