Update to 1.12, addressing PR pkg/34765. From the changelog:

1.12:
- Fixed problem with overwriting existing session data items.
- Fixed several problems with handling of databytes in rules.
- Fixed crash in plugin cvm-validate when the lookup secret was unset.
- pop3front-auth now supports a no-argument variant on the AUTH command,
    used by KMail to test for authentication modes, and documented
    in http://www.tools.ietf.org/html/draft-myers-sasl-pop3-05
    Thanks Bernhard Graf for the initial patch
- pop3front-auth and -maildir now support the CAPA command.
    Thanks Bernhard Graf for the initial patch
- Made imapfront-auth more compatible with Courier IMAP by adding extra
    bits to the CAPABILITY command.  Thanks Bernhard Graf.
- plugin-cvm-validate handles modules that provide an "out of scope"
    fact by passing to the next plugin.
- Fixed handling of addresses without a domain in @file rules.
    Thanks Jorge Valdes

1.11:
- Fixed the main mailfront program to clean up temporary files properly.
- Modified the SMTP protocol module to export the SASL authentication
    information internally.
- Modified the check-fqdn plugin to append $DEFAULTHOST and
    $DEFAULTDOMAIN to addresses if necessary.
- Added separate connect and send timeouts and a maximum message size to
    the ClamAV plugin, and fixed a bug with handling port numbers
    when using multiple IPs.
- Modified the ClamAV plugin to prefer $CLAMAV_* settings over $CLAMD_*
- Added plugin API documentation.

1.10:
- Added a ClamAV virus scanner plugin.  Note: Using this plugin will
    cause mailfront to save messages to temporary files.  See
    mailfront.html for details.
- Modified the plugin API to add a version code, a flags word, and to
    (optionally) save messages to a temporary file.
- Fixed a few cases where the UCSPI-TCP protocol was assumed.
- Fixed pop3front-maildir breakage on dietlibc/uClibc and empty
    maildirs.  Thanks Wayne Marshall.

1.01:
- Fixed a bug in the counters plugin that triggered a problem in the
    SMTP protocol when handling the SIZE=# parameter.
- Reversed the order of cvm-validate and qmail-validate in the wrapper
    scripts (and documentation) due to the semantics of the two plugins.
- Added a list of built-in plugins.  The list currently contains the
    three accept* plugins, which are extremely trivial.

1.0:

Mailfront has been rewritten to be totally modular.  The core mailfront
program loads the protocol, backend, and all plugin behaviors at run
time from shared objects.

The previous commands, such as smtpfront-qmail, are now shell script
wrappers for the main "mailfront" command, and as such are depricated in
favor of using "mailfront" directly.  The *front-qmail wrappers preload
all the plugins that were previously compiled into the corresponding
programs:

	check-fqdn counters mailrules relayclient cvm-validate
	qmail-validate add-received patterns accept-sender

NOTE: The *front-reject backends have been dropped in favor of a plugin.
In addition, the $REQUIRE_AUTH feature has been moved to another plugin.
If you used this backend or feature you will need to adjust your
configuration accordingly.

4 files changed, 90 insertions, 21 deletions

diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index 95ca780ccc1..25ec27828b7 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2008/03/17 11:41:46 obache Exp $
+# $NetBSD: Makefile,v 1.10 2009/04/08 01:44:04 schmonz Exp $
 #
 
-DISTNAME=		mailfront-0.98.1
-PKGREVISION=		1
+DISTNAME=		mailfront-1.12
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}archive/
 
@@ -10,18 +9,30 @@ MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://untroubled.org/mailfront/
 COMMENT=		Mail server network protocol front-ends
 
-DEPENDS+=		cvm-[0-9]*:../../security/cvm
 DEPENDS+=		daemontools-[0-9]*:../../sysutils/daemontools
 DEPENDS_QMAIL=		qmail>=1.03nb8:../../mail/qmail
 DEPENDS+=		${DEPENDS_QMAIL}
 
 DJB_RESTRICTED=		NO
 DJB_MAKE_TARGETS=	NO
+DJB_CONFIG_CMDS+=	${ECHO} ${PREFIX}/include > conf-include;	\
+			${ECHO} ${PREFIX}/lib/${PKGBASE} > conf-modules;\
+			${ECHO} ${PREFIX}/lib > conf-cvmlibs
 
 RCD_SCRIPTS=		smtpfront
+INSTALLATION_DIRS=	share/doc/mailfront
 
 .include "../../mk/bsd.prefs.mk"
 
+post-install:
+	cd ${WRKSRC};							\
+	for f in *.html; do						\
+		${INSTALL_DATA} $${f} ${PREFIX}/share/doc/mailfront;	\
+	done;								\
+	for f in ANNOUNCEMENT NEWS README; do				\
+		${INSTALL_DATA} $${f} ${PREFIX}/share/doc/mailfront;	\
+	done
+
 # Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
 # config files there and refer to them from rc.d scripts.
 #
diff --git a/mail/mailfront/PLIST b/mail/mailfront/PLIST
index 5f41913148a..0dac09f9f5e 100644
--- a/mail/mailfront/PLIST
+++ b/mail/mailfront/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/07/20 03:30:19 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/04/08 01:44:04 schmonz Exp $
 bin/imapfront-auth
+bin/mailfront
 bin/pop3front-auth
 bin/pop3front-maildir
 bin/qmqpfront-echo
@@ -8,5 +9,58 @@ bin/qmtpfront-echo
 bin/qmtpfront-qmail
 bin/smtpfront-echo
 bin/smtpfront-qmail
-bin/smtpfront-reject
+include/mailfront/constants.h
+include/mailfront/mailfront.h
+include/mailfront/responses.h
+lib/mailfront/backend-echo.so
+lib/mailfront/backend-qmail.so
+lib/mailfront/plugin-add-received.so
+lib/mailfront/plugin-check-fqdn.so
+lib/mailfront/plugin-clamav.so
+lib/mailfront/plugin-counters.so
+lib/mailfront/plugin-cvm-validate.so
+lib/mailfront/plugin-mailrules.so
+lib/mailfront/plugin-patterns.so
+lib/mailfront/plugin-qmail-validate.so
+lib/mailfront/plugin-reject.so
+lib/mailfront/plugin-relayclient.so
+lib/mailfront/plugin-require-auth.so
+lib/mailfront/protocol-qmqp.so
+lib/mailfront/protocol-qmtp.so
+lib/mailfront/protocol-smtp.so
+share/doc/mailfront/ANNOUNCEMENT
+share/doc/mailfront/NEWS
+share/doc/mailfront/README
+share/doc/mailfront/backend-echo.html
+share/doc/mailfront/backend-qmail.html
+share/doc/mailfront/imapfront.html
+share/doc/mailfront/mailfront.html
+share/doc/mailfront/mailrules.html
+share/doc/mailfront/mailrulesx.html
+share/doc/mailfront/msa.html
+share/doc/mailfront/plugin-accept-recipient.html
+share/doc/mailfront/plugin-accept-sender.html
+share/doc/mailfront/plugin-accept.html
+share/doc/mailfront/plugin-add-received.html
+share/doc/mailfront/plugin-api.html
+share/doc/mailfront/plugin-check-fqdn.html
+share/doc/mailfront/plugin-clamav.html
+share/doc/mailfront/plugin-counters.html
+share/doc/mailfront/plugin-cvm-validate.html
+share/doc/mailfront/plugin-force-file.html
+share/doc/mailfront/plugin-mailrules.html
+share/doc/mailfront/plugin-patterns.html
+share/doc/mailfront/plugin-qmail-validate.html
+share/doc/mailfront/plugin-reject.html
+share/doc/mailfront/plugin-relayclient.html
+share/doc/mailfront/plugin-require-auth.html
+share/doc/mailfront/plugin-template.html
+share/doc/mailfront/pop3front.html
+share/doc/mailfront/protocol-qmqp.html
+share/doc/mailfront/protocol-qmtp.html
+share/doc/mailfront/protocol-smtp.html
+share/doc/mailfront/std-handle.html
 share/examples/rc.d/smtpfront
+@dirrm share/doc/mailfront
+@dirrm lib/mailfront
+@dirrm include/mailfront
diff --git a/mail/mailfront/distinfo b/mail/mailfront/distinfo
index 197f5617964..323684a0211 100644
--- a/mail/mailfront/distinfo
+++ b/mail/mailfront/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2006/08/02 02:42:22 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2009/04/08 01:44:04 schmonz Exp $
 
-SHA1 (mailfront-0.98.1.tar.gz) = 1d3e0e7ca4091226c9d154bfe4a08e879debae29
-RMD160 (mailfront-0.98.1.tar.gz) = 2cad77abb898c29db0768cbb2514d2a0e4905f68
-Size (mailfront-0.98.1.tar.gz) = 77812 bytes
-SHA1 (patch-aa) = 6b9b6c7d546cbadffc8dfee557ff2384ba8b1a45
+SHA1 (mailfront-1.12.tar.gz) = 498cfd1af47dfba45671e731c4f0666fc1c930f9
+RMD160 (mailfront-1.12.tar.gz) = 17f06377d6de8f11d12c1585d55c9e7f8aa97bbc
+Size (mailfront-1.12.tar.gz) = 104598 bytes
+SHA1 (patch-aa) = 3d24a89e07f1d6eae5d80c922b93a35750b3359a
diff --git a/mail/mailfront/patches/patch-aa b/mail/mailfront/patches/patch-aa
index f8151617981..75d6a13a028 100644
--- a/mail/mailfront/patches/patch-aa
+++ b/mail/mailfront/patches/patch-aa
@@ -1,13 +1,17 @@
-$NetBSD: patch-aa,v 1.1 2006/08/02 02:42:22 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2009/04/08 01:44:04 schmonz Exp $
 
---- Makefile.orig	2006-07-18 17:52:22.000000000 -0400
+--- Makefile.orig	2009-02-16 17:35:19.000000000 -0500
 +++ Makefile
-@@ -59,7 +59,7 @@ load: conf-ld conf-bglibs
- 	( bglibs=`head -n 1 conf-bglibs`; \
- 	  echo '#!/bin/sh';\
- 	  echo 'main="$$1"; shift';\
--	  echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
-+	  echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
- 	) >load
- 	chmod 755 load
+@@ -98,10 +98,11 @@ makelib: 
+ makeso: conf-ccso conf-ld conf-bgincs conf-bglibs
+ 	( bgincs=`head -n 1 conf-bgincs`; \
+ 	  bglibs=`head -n 1 conf-bglibs`; \
++	  cvmlibs=`head -n 1 conf-cvmlibs`; \
+ 	  echo '#!/bin/sh'; \
+ 	  echo 'source=$$1; shift'; \
+ 	  echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
+-	  echo exec `head -n 1 conf-ccso` -DSHARED -I. "-I'$${bgincs}'" -L. "-L'$${bglibs}'" '-o $${base}.so $$source $${1+"$$@"}'; \
++	  echo exec `head -n 1 conf-ccso` -DSHARED -I. "-I'$${bgincs}'" -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" "-L'$${cvmlibs}'" "-Wl,-R'$${cvmlibs}'" '-o $${base}.so $$source $${1+"$$@"}'; \
+ 	) >makeso
+ 	chmod 755 makeso