Update to version 2.30.

Changes:
        * mimedefang-multiplexor.c: On systems that support wait3 and fill
        in the usage structure, we log the slave's system and user CPU
        usage when it exits.  The autoconf test is not too reliable on
        Solaris; sorry...

        * Create the temporary spool directory before calling filter_relay;
        store it in $CWD for filter_relay, filter_sender, filter_recipient,
        and the other filter functions, so we can pass state around.

        * Officially deprecated non-use of the multiplexor.  I plan
        on dropping support for non-multiplexor operation by 31 July 2003.

        * mimedefang.c: Added -M option to protect work directory
        creation with a mutex.

        * mimedefang.pl.in: resend_message returns a meaningful value
        (true on success; false on failure.)

        * mimedefang.c (envfrom): Fix potential descriptor leak.  Problem
        noted by Nik Clayton.

        * mimedefang.c (envfrom): Fixed some incorrect syslog messages.
        Problem noted by Nik Clayton.

        * mimedefang-multiplexor.c: Add handling for filter_cleanup, that
        lets you run Perl code just before a slave is killed.  Based on
        a suggestion by Brian Landers.

       * Version 2.29 RELEASED

        * mimedefang.pl.in (send_mail): Redirect sendmail's STDOUT to
        STDERR; otherwise, complaints from Sendmail can mess up the
        communication between the multiplexor and the slaves.

       * mimedefang.pl.in: Add support for Trophie scanning library.
        (Jason Englander)

        * Version 2.28 RELEASED

        * mimedefang.pl.in (spam_assassin_mail): Synthesize "Return-Path:"
        and "Received:" headers for SpamAssassin (Nels Lindquist).

       * mimedefang-multiplexor.c (MAX_CMD_LEN): Increased MAX_CMD_LEN
        to 4096 from 512.

        * mimedefang.pl.in (recipient_ok): Set global variables in
        filter_relay, filter_sender and filter_recipient based on the
        information available so far in the SMTP transaction. (Anne Bennet)

        * Version 2.26 RELEASED

        * Quarantine notifications no longer sent unless you explicitly
        ask for them.

                      *** INCOMPATIBILITY ***

        * mimedefang.pl.in (md_check_against_smtp_server): Added
        md_check_against_smtp_server to check recipient addresses
        before accepting them.

       * Version 2.25 RELEASED

        * mimedefang.pl.in: Added $RealRelayAddr and $RealRelayHostname
        which give the actual relay host, ignoring the IP address
        validation header.  (Used by CanIt.)

        *mimedefang.pl.in: Remove append_boilerplate

           *** INCOMPATIBILITY ***

           The append_boilerplate function is gone.  It never really
           worked properly.  Instead, use append_text_boilerplate and
           append_html_boilerplate.

        * mimedefang.pl.in (message_contains_virus_clamd): Let clamd
        recurse through work directory.  Make sure you run Clam AntiVirus
        version 0.52 or higher! (Jason Englander)

        * watch-mimedefang: Now generated at configure time from
        watch-mimedefang.in.  Let's us specify @SPOOLDIR@
        (Jason Englander)

3 files changed, 10 insertions, 6 deletions

diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index c1c0b4c90bc..46ce22a31e8 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:34 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/11 14:12:49 markd Exp $
 
-DISTNAME=		mimedefang-2.24
+DISTNAME=		mimedefang-2.30
 CATEGORIES=		mail
 MASTER_SITES=		http://www.roaringpenguin.com/mimedefang/
 
@@ -60,11 +60,13 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/md-mx-ctrl ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mimedefang-multiplexor ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mimedefang ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/watch-mimedefang ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/mimedefang.pl ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/md-mx-ctrl.8 ${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/mimedefang.8 ${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/mimedefang.pl.8 ${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/mimedefang-multiplexor.8 ${PREFIX}/man/man8
+	${INSTALL_DATA} ${WRKSRC}/watch-mimedefang.8 ${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/mimedefang-filter.5 ${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/mimedefang-protocol.7 ${PREFIX}/man/man7
 	${INSTALL_DATA} ${WRKSRC}/examples/suggested-minimum-filter-for-windows-clients ${EGDIR}/mimedefang-filter
diff --git a/mail/mimedefang/PLIST b/mail/mimedefang/PLIST
index 4d08153a30e..78f07bc6fc1 100644
--- a/mail/mimedefang/PLIST
+++ b/mail/mimedefang/PLIST
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/30 09:50:24 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/11 14:12:49 markd Exp $
 bin/md-mx-ctrl
 bin/mimedefang
 bin/mimedefang-multiplexor
 bin/mimedefang.pl
+bin/watch-mimedefang
 man/man5/mimedefang-filter.5
 man/man7/mimedefang-protocol.7
 man/man8/md-mx-ctrl.8
 man/man8/mimedefang-multiplexor.8
 man/man8/mimedefang.8
 man/man8/mimedefang.pl.8
+man/man8/watch-mimedefang.8
 share/examples/mimedefang/mimedefang-filter
 share/examples/mimedefang/sa-mimedefang.cf
 share/mimedefang/gen-ip-validator.pl
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index dbfb9f566db..3b9bd728610 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/10/30 09:50:24 markd Exp $
+$NetBSD: distinfo,v 1.3 2003/03/11 14:12:49 markd Exp $
 
-SHA1 (mimedefang-2.24.tar.gz) = e2475d5a7049112b03630465b92c09041fc5a472
-Size (mimedefang-2.24.tar.gz) = 186609 bytes
+SHA1 (mimedefang-2.30.tar.gz) = d278fec5fffd9f2f4e0c6d2e0441380c237c05ca
+Size (mimedefang-2.30.tar.gz) = 202113 bytes
 SHA1 (patch-ab) = 624a7e562c3d761069b0726e398852288d267937