summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/mimedefang/Makefile4
-rw-r--r--mail/mimedefang/distinfo8
-rw-r--r--mail/mimedefang/patches/patch-ac10
3 files changed, 12 insertions, 10 deletions
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 8166e3e2eca..6a9fe876e71 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2004/07/18 06:11:14 markd Exp $
+# $NetBSD: Makefile,v 1.19 2004/11/10 10:48:33 markd Exp $
-DISTNAME= mimedefang-2.44
+DISTNAME= mimedefang-2.48
CATEGORIES= mail
MASTER_SITES= http://www.mimedefang.org/static/
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index 9a2c9706edd..1f5f0133330 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2004/07/18 06:11:14 markd Exp $
+$NetBSD: distinfo,v 1.9 2004/11/10 10:48:33 markd Exp $
-SHA1 (mimedefang-2.44.tar.gz) = d98a11b810156fef7af27579ec037dcbc51e2c44
-Size (mimedefang-2.44.tar.gz) = 277642 bytes
+SHA1 (mimedefang-2.48.tar.gz) = e393b56a0756a48c1bd838a3eb16ae4db4bca320
+Size (mimedefang-2.48.tar.gz) = 298905 bytes
SHA1 (patch-ab) = d3aad74681427dc30a851ce9bd1708b61d0f7529
-SHA1 (patch-ac) = e76247df9baf66737d4343db4ce8bb072d26d95b
+SHA1 (patch-ac) = 2ac9762a68b48092aa73ee166d3456a94d10b6ca
diff --git a/mail/mimedefang/patches/patch-ac b/mail/mimedefang/patches/patch-ac
index 5d0bb5a30e4..60619ec043b 100644
--- a/mail/mimedefang/patches/patch-ac
+++ b/mail/mimedefang/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.1 2004/03/07 11:18:33 markd Exp $
+$NetBSD: patch-ac,v 1.2 2004/11/10 10:48:33 markd Exp $
---- mimedefang.pl.in.orig 2004-03-06 04:35:35.000000000 +1300
+--- mimedefang.pl.in.orig 2004-11-10 01:09:25.000000000 +1300
+++ mimedefang.pl.in
-@@ -89,25 +89,25 @@ $VirusScannerRoutinesInitialized = 0;
-
+@@ -100,26 +100,26 @@ $VirusScannerRoutinesInitialized = 0;
$SALocalTestsOnly = 1;
+ $DoStatusTags = 0;
-$Features{'Virus:AVP'} = ('@AVP@' ne '/bin/false' ? '@AVP@' : 0);
-$Features{'Virus:AVP5'} = ('@AVP5@' ne '/bin/false' ? '@AVP5@' : 0);
@@ -36,10 +36,12 @@ $NetBSD: patch-ac,v 1.1 2004/03/07 11:18:33 markd Exp $
-$Features{'Virus:SOPHOS'} = ('@SOPHOS@' ne '/bin/false' ? '@SOPHOS@' : 0);
-$Features{'Virus:TREND'} = ('@TREND@' ne '/bin/false' ? '@TREND@' : 0);
-$Features{'Virus:TROPHIE'} = ('@TROPHIE@' ne '/bin/false' ? '@TROPHIE@' : 0);
+-$Features{'Virus:CSAV'} = ('@CSAV@' ne '/bin/false' ? '@CSAV@' : 0);
+$Features{'Virus:SOPHIE'} = ((('@SOPHIE@' ne '/bin/false') and (-x '@SOPHIE@')) ? '@SOPHIE@' : 0);
+$Features{'Virus:SOPHOS'} = ((('@SOPHOS@' ne '/bin/false') and (-x '@SOPHOS@')) ? '@SOPHOS@' : 0);
+$Features{'Virus:TREND'} = ((('@TREND@' ne '/bin/false') and (-x '@TREND@')) ? '@TREND@' : 0);
+$Features{'Virus:TROPHIE'} = ((('@TROPHIE@' ne '/bin/false') and (-x '@TROPHIE@')) ? '@TROPHIE@' : 0);
++$Features{'Virus:CSAV'} = ((('@CSAV@' ne '/bin/false') and (-x '@CSAV@')) ? '@CSAV@' : 0);
$Features{'Path:SENDMAIL'} = '@SENDMAILPROG@';
$Features{'Path:QUARANTINEDIR'} = '@QDIR@';