Update mimedefang to 2.63

Changes since 2.62:

* mimedefang-multiplexor.c: Relax the umask when creating the unprivileged
  socket ("-a" command-line option.)
* mimedefang.c(eom): If we do not have a queue ID yet, try to obtain one
  in eom. This is designed to improve operation with Postfix, which does
  not assign a queue ID until after the first successful RCPT. Based on a
  patch from Henrik Krohns.
* examples/init-script.in: Added MD_SKIP_BAD_RCPTS init script option
  (suggested by John Nemeth)
* Remove support for OpenAntivirus. It's a dead product.
* mimedefang.pl.in(spam_assassin_status): Call $mail->finish() to prevent
  temporary files from accumulating.
* redhat/mimedefang-init.in: Add configtest routine to check filter
  syntax.

Changes since 2.61:

* A new "change_sender" action lets you change the envelope sender. Only
  works with Sendmail/Milter 8.14.0 and newer!
* Clam interface code has been fixed to work properly with ClamAV 0.90
  and later.
* Other minor improvements and bugfixes.

4 files changed, 17 insertions, 72 deletions

diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 3f39a22c71c..6f6376d69c5 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2007/07/04 20:54:45 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2007/08/15 04:50:39 markd Exp $
 
-DISTNAME=		mimedefang-2.61
+DISTNAME=		mimedefang-2.63
 CATEGORIES=		mail
 MASTER_SITES=		http://www.mimedefang.org/static/
 
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index e21ba405a12..b830c741a50 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2007/03/14 11:21:33 markd Exp $
+$NetBSD: distinfo,v 1.17 2007/08/15 04:50:40 markd Exp $
 
-SHA1 (mimedefang-2.61.tar.gz) = fb64b6f7ff57e095c48fce087211b1d67213a8cb
-RMD160 (mimedefang-2.61.tar.gz) = 982565fb55f0825aee631158d3b6acd3d8a3b3e1
-Size (mimedefang-2.61.tar.gz) = 326722 bytes
-SHA1 (patch-ab) = f6ba8f91126c65af434e6377e7e4873baf5c94ec
-SHA1 (patch-ac) = 9ae301538003ae087da649279167a0dc37273efa
+SHA1 (mimedefang-2.63.tar.gz) = e6ea60fb63613ff50c46578a49564146105b242c
+RMD160 (mimedefang-2.63.tar.gz) = 06d9cd093ad772a809eb948cd0534cf38d592fc8
+Size (mimedefang-2.63.tar.gz) = 328357 bytes
+SHA1 (patch-ab) = ec16d2aeff8ceec7e61ff3a6b3fc6e3db35a62bf
+SHA1 (patch-ac) = e678bd349a6b2aea67ce5fbbf8b3a4493757241c
diff --git a/mail/mimedefang/patches/patch-ab b/mail/mimedefang/patches/patch-ab
index 47db429f605..b9bc667037f 100644
--- a/mail/mimedefang/patches/patch-ab
+++ b/mail/mimedefang/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2007/03/14 11:21:33 markd Exp $
+$NetBSD: patch-ab,v 1.6 2007/08/15 04:50:40 markd Exp $
 
---- Makefile.in.orig	2007-01-20 07:42:17.000000000 +1300
+--- Makefile.in.orig	2007-08-14 01:50:18.000000000 +1200
 +++ Makefile.in
-@@ -136,7 +136,7 @@ mimedefang-multiplexor.o: mimedefang-mul
+@@ -137,7 +137,7 @@ mimedefang-multiplexor.o: mimedefang-mul
  	@CC@ @CFLAGS@ $(DEFS) $(MINCLUDE) -c -o mimedefang-multiplexor.o mimedefang-multiplexor.c
  
- mimedefang: mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o
--	@CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o @LIBMILTERDIR@ -lmilter @LIBS@
-+	@CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o @LDFLAGS@ @LIBMILTERDIR@ -lmilter @LIBS@
+ mimedefang: mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o
+-	@CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o @LIBMILTERDIR@ -lmilter @LIBS@
++	@CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o dynbuf.o milter_cap.o @LDFLAGS@ @LIBMILTERDIR@ -lmilter @LIBS@
  	-test "$(DONT_STRIP)" != "1" && strip mimedefang
  
  mimedefang.o: mimedefang.c mimedefang.h
diff --git a/mail/mimedefang/patches/patch-ac b/mail/mimedefang/patches/patch-ac
index 702383384b8..c06259d6135 100644
--- a/mail/mimedefang/patches/patch-ac
+++ b/mail/mimedefang/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2007/03/14 11:21:33 markd Exp $
+$NetBSD: patch-ac,v 1.6 2007/08/15 04:50:40 markd Exp $
 
---- mimedefang.pl.in.orig	2007-01-19 03:43:12.000000000 +1300
+--- mimedefang.pl.in.orig	2007-08-14 01:50:18.000000000 +1200
 +++ mimedefang.pl.in
-@@ -121,26 +121,26 @@ $VirusScannerRoutinesInitialized = 0;
+@@ -121,25 +121,25 @@ $VirusScannerRoutinesInitialized = 0;
  $SALocalTestsOnly = 1;
  $DoStatusTags = 0;
  
@@ -30,7 +30,6 @@ $NetBSD: patch-ac,v 1.5 2007/03/14 11:21:33 markd Exp $
 +$Features{'Virus:NAI'}      = ((('@NAI@' ne '/bin/false') and (-x '@NAI@')) ? '@NAI@' : 0);
 +$Features{'Virus:BDC'}      = ((('@BDC@' ne '/bin/false') and (-x '@BDC@')) ? '@BDC@' : 0);
 +$Features{'Virus:NVCC'}     = ((('@NVCC@' ne '/bin/false') and (-x '@NVCC@')) ? '@NVCC@' : 0);
- $Features{'Virus:OpenAV'}   = 0;  # Not a good idea but we need a test!
  $Features{'Virus:SymantecCSS'} = 0; # Ditto
  $Features{'Virus:FPROTD'}   = 0;
 -$Features{'Virus:SOPHIE'}   = ('@SOPHIE@' ne '/bin/false' ? '@SOPHIE@' : 0);
@@ -46,57 +45,3 @@ $NetBSD: patch-ac,v 1.5 2007/03/14 11:21:33 markd Exp $
  
  $Features{'Path:SENDMAIL'}  = '@SENDMAILPROG@';
  $Features{'Path:QUARANTINEDIR'} = '@QDIR@';
-@@ -3669,7 +3669,7 @@ sub entity_contains_virus_clamav ($) {
- 
-     # Run clamscan
-     my($code, $category, $action) =
--	run_virus_scanner($Features{'Virus:CLAMAV'} . " --mbox --stdout --disable-summary --infected $path 2>&1");
-+	run_virus_scanner($Features{'Virus:CLAMAV'} . " --stdout --no-summary --infected $path 2>&1");
-     if ($action ne 'proceed') {
- 	return (wantarray ? ($code, $category, $action) : $code);
-     }
-@@ -3693,7 +3693,7 @@ sub message_contains_virus_clamav () {
- 
-     # Run clamscan
-     my($code, $category, $action) =
--	run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --mbox --stdout --disable-summary --infected ./Work 2>&1");
-+	run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --stdout --no-summary --infected ./Work 2>&1");
-     if ($action ne 'proceed') {
- 	return (wantarray ? ($code, $category, $action) : $code);
-     }
-@@ -4506,14 +4506,14 @@ sub entity_contains_virus_clamd ($;$) {
- 	    md_syslog('err', "$MsgID: Clamd returned error: $err_detail");
- 	    # If it's a zip module failure, try falling back on clamscan.
- 	    # This is despicable, but it might work
--	    if ($err_detail =~ /zip module failure/i &&
-+	    if ($err_detail =~ /(?:zip module failure|not supported data format)/i &&
- 		$Features{'Virus:CLAMAV'}) {
- 		my ($code, $category, $action) =
--		run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --mbox --stdout --disable-summary --infected $CWD/Work 2>&1");
-+		run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --unrar --stdout --no-summary --infected $CWD/Work 2>&1");
- 		if ($action ne 'proceed') {
- 			return (wantarray ? ($code, $category, $action) : $code);
- 		}
--		md_syslog('info', "$MsgID: Falling back on clamscan --unzip because of Zip module failure in clamd");
-+		md_syslog('info', "$MsgID: Falling back on clamscan --unzip --unrar because of Zip module failure in clamd");
- 		return (wantarray ? interpret_clamav_code($code) : $code);
- 	    }
- 	    return (wantarray ? (999, 'swerr', 'tempfail') : 1);
-@@ -4603,14 +4603,14 @@ sub message_contains_virus_clamd (;$) {
- 	    md_syslog('err', "$MsgID: Clamd returned error: $err_detail");
- 	    # If it's a zip module failure, try falling back on clamscan.
- 	    # This is despicable, but it might work
--	    if ($err_detail =~ /zip module failure/i &&
-+	    if ($err_detail =~ /(?:zip module failure|not supported data format)/i &&
- 		$Features{'Virus:CLAMAV'}) {
- 		my ($code, $category, $action) =
--		    run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --mbox --stdout --disable-summary --infected $CWD/Work 2>&1");
-+		    run_virus_scanner($Features{'Virus:CLAMAV'} . " -r --unzip --unrar --stdout --no-summary --infected $CWD/Work 2>&1");
- 		if ($action ne 'proceed') {
- 			return (wantarray ? ($code, $category, $action) : $code);
- 		}
--		md_syslog('info', "$MsgID: Falling back on clamscan --unzip because of Zip module failure in clamd");
-+		md_syslog('info', "$MsgID: Falling back on clamscan --unzip --unrar because of Zip module failure in clamd");
- 		return (wantarray ? interpret_clamav_code($code) : $code);
- 	    }
- 	    return (wantarray ? (999, 'swerr', 'tempfail') : 999);