Update mimedefang to 2.54

Changes 2.54:
  a few minor enhancements and fixes.
Changes 2.53:
  mostly work around bugs and deficiencies in third-party packages
  commonly used with MIMEDefang.

4 files changed, 19 insertions, 18 deletions

diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 398a209801f..53f902e3137 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/10 22:14:14 markd Exp $
 
-DISTNAME=		mimedefang-2.52
-PKGREVISION=		1
+DISTNAME=		mimedefang-2.54
 CATEGORIES=		mail
 MASTER_SITES=		http://www.mimedefang.org/static/
 
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index 0999d147781..41abbf759d6 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2005/06/05 22:31:35 markd Exp $
+$NetBSD: distinfo,v 1.13 2005/12/10 22:14:14 markd Exp $
 
-SHA1 (mimedefang-2.52.tar.gz) = fd331e3245666b4b8caad47f7090a35d926424ee
-RMD160 (mimedefang-2.52.tar.gz) = 24c1fede1319cf121ff88b99b33d3cc57683bdca
-Size (mimedefang-2.52.tar.gz) = 303637 bytes
-SHA1 (patch-ab) = d3aad74681427dc30a851ce9bd1708b61d0f7529
-SHA1 (patch-ac) = 2ac9762a68b48092aa73ee166d3456a94d10b6ca
+SHA1 (mimedefang-2.54.tar.gz) = 702d696018bd74cb48850d97cb1257fd798be26d
+RMD160 (mimedefang-2.54.tar.gz) = 319e260080e6e5d9335cae159e1f5034833b656e
+Size (mimedefang-2.54.tar.gz) = 308267 bytes
+SHA1 (patch-ab) = 855a939cca7af09fd418da41589fc585750dae58
+SHA1 (patch-ac) = f6ca90301aa9dfac0e12733cead18ff91816aa6f
diff --git a/mail/mimedefang/patches/patch-ab b/mail/mimedefang/patches/patch-ab
index ff91ac497fb..c8c21d9a854 100644
--- a/mail/mimedefang/patches/patch-ab
+++ b/mail/mimedefang/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2003/04/28 12:47:12 markd Exp $
+$NetBSD: patch-ab,v 1.4 2005/12/10 22:14:15 markd Exp $
 
---- Makefile.in.orig	2003-04-22 03:53:14.000000000 +1200
+--- Makefile.in.orig	2005-09-15 05:14:59.000000000 +1200
 +++ Makefile.in
-@@ -110,7 +110,7 @@ mimedefang-multiplexor.o: mimedefang-mul
+@@ -134,7 +134,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
--	@CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o @LIBMILTER@ @LIBS@
-+	@CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o @LDFLAGS@ @LIBMILTER@ @LIBS@
+-	@CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o @LIBMILTERACTUAL@ @LIBS@
++	@CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o syslog-fac.o @LDFLAGS@ @LIBMILTERACTUAL@ @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 60619ec043b..70dee2415cb 100644
--- a/mail/mimedefang/patches/patch-ac
+++ b/mail/mimedefang/patches/patch-ac
@@ -1,24 +1,26 @@
-$NetBSD: patch-ac,v 1.2 2004/11/10 10:48:33 markd Exp $
+$NetBSD: patch-ac,v 1.3 2005/12/10 22:14:15 markd Exp $
 
---- mimedefang.pl.in.orig	2004-11-10 01:09:25.000000000 +1300
+--- mimedefang.pl.in.orig	2005-12-11 08:49:06.000000000 +1300
 +++ mimedefang.pl.in
-@@ -100,26 +100,26 @@ $VirusScannerRoutinesInitialized = 0;
+@@ -126,27 +126,27 @@ $VirusScannerRoutinesInitialized = 0;
  $SALocalTestsOnly = 1;
  $DoStatusTags = 0;
  
 -$Features{'Virus:AVP'}      = ('@AVP@' ne '/bin/false' ? '@AVP@' : 0);
 -$Features{'Virus:AVP5'}      = ('@AVP5@' ne '/bin/false' ? '@AVP5@' : 0);
+-$Features{'Virus:KAVSCANNER'} = ('@KAVSCANNER@' ne '/bin/false' ? '@KAVSCANNER@' : 0);
 -$Features{'Virus:CLAMAV'}   = ('@CLAMSCAN@' ne '/bin/false' ? '@CLAMSCAN@' : 0);
 -$Features{'Virus:CLAMD'}    = ('@CLAMD@' ne '/bin/false' ? '@CLAMD@' : 0);
 -$Features{'Virus:FPROT'}    = ('@FPROT@' ne '/bin/false' ? '@FPROT@' : 0);
 -$Features{'Virus:FSAV'}     = ('@FSAV@' ne '/bin/false' ? '@FSAV@' : 0);
 +$Features{'Virus:AVP'}      = ((('@AVP@' ne '/bin/false') and (-x '@AVP@')) ? '@AVP@' : 0);
 +$Features{'Virus:AVP5'}      = ((('@AVP5@' ne '/bin/false') and (-x '@AVP5@')) ? '@AVP5@' : 0);
++$Features{'Virus:KAVSCANNER'} = ((('@KAVSCANNER@' ne '/bin/false') and (-x '@KAVSCANNER@')) ? '@KAVSCANNER@' : 0);
 +$Features{'Virus:CLAMAV'}   = ((('@CLAMSCAN@' ne '/bin/false') and (-x '@CLAMSCAN@')) ? '@CLAMSCAN@' : 0);
 +$Features{'Virus:CLAMD'}    = ((('@CLAMD@' ne '/bin/false') and (-x '@CLAMD@')) ? '@CLAMD@' : 0);
 +$Features{'Virus:FPROT'}    = ((('@FPROT@' ne '/bin/false') and (-x '@FPROT@')) ? '@FPROT@' : 0);
 +$Features{'Virus:FSAV'}     = ((('@FSAV@' ne '/bin/false') and (-x '@FSAV@')) ? '@FSAV@' : 0);
- $Features{'Virus:FileScan'} = $Features{'File::Scan'};
+ $Features{'Virus:FileScan'} = 0; # Will be set by detect_and_load_perl_modules
 -$Features{'Virus:HBEDV'}    = ('@HBEDV@' ne '/bin/false' ? '@HBEDV@' : 0);
 -$Features{'Virus:VEXIRA'}   = ('@VEXIRA@' ne '/bin/false' ? '@VEXIRA@' : 0);
 -$Features{'Virus:NAI'}      = ('@NAI@' ne '/bin/false' ? '@NAI@' : 0);