Fri Feb 5 19:53:08 2010 UTC ()
Update to mimedefang 2.67, thanks to Klaus Heinz

Release 2.67 adds the following features since 2.65 (there was no public
2.66 release):
* The ability for mimedefang-multiplexor to use poll rather than select.
  This removes the FD_SETSIZE limit on the number of file descriptors
  the multiplexor can handle.
* Support for FPROTD version 6 daemonized virus scanner.

2.65
There is only one change since 2.64: An error in the way the embedded
perl interpreter was initialized has been fixed. This fixes problems
on the Debian HPPA architecture and possibly others.

2.64
This is a minor bugfix release;
* Add support for NOD32 command-line scanner
* Add support for Sophos "savscan" scanner


(markd)
diff -r1.40 -r1.41 pkgsrc/mail/mimedefang/Makefile
diff -r1.17 -r1.18 pkgsrc/mail/mimedefang/distinfo
diff -r1.6 -r0 pkgsrc/mail/mimedefang/patches/patch-ab
diff -r1.6 -r1.7 pkgsrc/mail/mimedefang/patches/patch-ac
cvs diff -r1.40 -r1.41 pkgsrc/mail/mimedefang/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mimedefang/Makefile 2010/01/30 23:08:00 1.40
+++ pkgsrc/mail/mimedefang/Makefile 2010/02/05 19:53:08 1.41
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.40 2010/01/30 23:08:00 heinz Exp $ 1# $NetBSD: Makefile,v 1.41 2010/02/05 19:53:08 markd Exp $
2 2
3DISTNAME= mimedefang-2.63 3DISTNAME= mimedefang-2.67
4CATEGORIES= mail 4CATEGORIES= mail
5MASTER_SITES= http://www.mimedefang.org/static/ 5MASTER_SITES= http://www.mimedefang.org/static/
6 6
7MAINTAINER= markd@NetBSD.org 7MAINTAINER= markd@NetBSD.org
8HOMEPAGE= http://www.mimedefang.org/ 8HOMEPAGE= http://www.mimedefang.org/
9COMMENT= To inspect/modify e-mail as it passes through your mail relay 9COMMENT= To inspect/modify e-mail as it passes through your mail relay
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12DEPENDS+= p5-Digest-SHA1>=2.00:../../security/p5-Digest-SHA1 12DEPENDS+= p5-Digest-SHA1>=2.00:../../security/p5-Digest-SHA1
13DEPENDS+= p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser 13DEPENDS+= p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser
14DEPENDS+= p5-HTML-Tagset>=3.03:../../www/p5-HTML-Tagset 14DEPENDS+= p5-HTML-Tagset>=3.03:../../www/p5-HTML-Tagset
15DEPENDS+= p5-IO-stringy>=2.108:../../devel/p5-IO-stringy 15DEPENDS+= p5-IO-stringy>=2.108:../../devel/p5-IO-stringy
16DEPENDS+= p5-MailTools>=1.44:../../mail/p5-MailTools 16DEPENDS+= p5-MailTools>=1.44:../../mail/p5-MailTools
17DEPENDS+= p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64 17DEPENDS+= p5-MIME-Base64>=3.03:../../converters/p5-MIME-Base64
18DEPENDS+= p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools 18DEPENDS+= p5-MIME-tools>=5.413:../../mail/p5-MIME-tools
19DEPENDS+= spamassassin>=2.31:../../mail/spamassassin 19DEPENDS+= spamassassin>=2.31:../../mail/spamassassin
20 20
21PKG_DESTDIR_SUPPORT= user-destdir 21PKG_DESTDIR_SUPPORT= user-destdir
22 22
23.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
24 24
25USE_TOOLS+= perl:run 25USE_TOOLS+= perl:run
26GNU_CONFIGURE= YES 26GNU_CONFIGURE= YES
27PKG_SYSCONFSUBDIR?= mimedefang 27PKG_SYSCONFSUBDIR?= mimedefang
28 28
29DEFANG_SPOOLDIR?= ${VARBASE}/spool/MIMEDefang 29DEFANG_SPOOLDIR?= ${VARBASE}/spool/MIMEDefang
30DEFANG_USER?= defang 30DEFANG_USER?= defang
31DEFANG_GROUP?= defang 31DEFANG_GROUP?= defang
@@ -43,27 +43,27 @@ SHAREDIR= ${PREFIX}/share/mimedefang @@ -43,27 +43,27 @@ SHAREDIR= ${PREFIX}/share/mimedefang
43 43
44FILES_SUBST+= SHAREDIR=${SHAREDIR:Q} 44FILES_SUBST+= SHAREDIR=${SHAREDIR:Q}
45FILES_SUBST+= DEFANG_USER=${DEFANG_USER:Q} 45FILES_SUBST+= DEFANG_USER=${DEFANG_USER:Q}
46FILES_SUBST+= DEFANG_SPOOLDIR=${DEFANG_SPOOLDIR:Q} 46FILES_SUBST+= DEFANG_SPOOLDIR=${DEFANG_SPOOLDIR:Q}
47 47
48RCD_SCRIPTS= mimedefang-multiplexor mimedefang 48RCD_SCRIPTS= mimedefang-multiplexor mimedefang
49 49
50OWN_DIRS_PERMS+= ${DEFANG_SPOOLDIR} ${DEFANG_USER} ${DEFANG_GROUP} 0700 50OWN_DIRS_PERMS+= ${DEFANG_SPOOLDIR} ${DEFANG_USER} ${DEFANG_GROUP} 0700
51 51
52CONF_FILES+= ${EGDIR}/mimedefang-filter ${PKG_SYSCONFDIR}/mimedefang-filter 52CONF_FILES+= ${EGDIR}/mimedefang-filter ${PKG_SYSCONFDIR}/mimedefang-filter
53CONF_FILES+= ${EGDIR}/sa-mimedefang.cf ${PKG_SYSCONFDIR}/sa-mimedefang.cf 53CONF_FILES+= ${EGDIR}/sa-mimedefang.cf ${PKG_SYSCONFDIR}/sa-mimedefang.cf
54 54
55CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 55CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
56CONFIGURE_ARGS+= --with-confsubdir= 56CONFIGURE_ARGS+= --with-confsubdir=${PKG_SYSCONFSUBDIR:Q}
57CONFIGURE_ARGS+= --with-milterinc=${BUILDLINK_PREFIX.libmilter}/include 57CONFIGURE_ARGS+= --with-milterinc=${BUILDLINK_PREFIX.libmilter}/include
58CONFIGURE_ARGS+= --with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib 58CONFIGURE_ARGS+= --with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib
59CONFIGURE_ARGS+= --with-spooldir=${DEFANG_SPOOLDIR:Q} 59CONFIGURE_ARGS+= --with-spooldir=${DEFANG_SPOOLDIR:Q}
60CONFIGURE_ARGS+= --with-quarantinedir=${DEFANG_SPOOLDIR:Q} 60CONFIGURE_ARGS+= --with-quarantinedir=${DEFANG_SPOOLDIR:Q}
61CONFIGURE_ARGS+= --with-user=${DEFANG_USER:Q} 61CONFIGURE_ARGS+= --with-user=${DEFANG_USER:Q}
62# CONFIGURE_ARGS+= --disable-anti-virus 62# CONFIGURE_ARGS+= --disable-anti-virus
63# list the paths where they _would_ be installed, so they 63# list the paths where they _would_ be installed, so they
64# can be found at runtime. -- they have to be listed 64# can be found at runtime. -- they have to be listed
65# in the environment, as the --enable-<> flags don't work 65# in the environment, as the --enable-<> flags don't work
66CONFIGURE_ENV+= CLAMD=${PREFIX}/sbin/clamd 66CONFIGURE_ENV+= CLAMD=${PREFIX}/sbin/clamd
67CONFIGURE_ENV+= CLAMSCAN=${PREFIX}/bin/clamscan 67CONFIGURE_ENV+= CLAMSCAN=${PREFIX}/bin/clamscan
68CONFIGURE_ENV+= FPROT=${PREFIX}/bin/f-prot 68CONFIGURE_ENV+= FPROT=${PREFIX}/bin/f-prot
69CONFIGURE_ENV+= NAI=${PREFIX}/bin/uvscan 69CONFIGURE_ENV+= NAI=${PREFIX}/bin/uvscan
cvs diff -r1.17 -r1.18 pkgsrc/mail/mimedefang/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mimedefang/distinfo 2007/08/15 04:50:40 1.17
+++ pkgsrc/mail/mimedefang/distinfo 2010/02/05 19:53:08 1.18
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.17 2007/08/15 04:50:40 markd Exp $ 1$NetBSD: distinfo,v 1.18 2010/02/05 19:53:08 markd Exp $
2 2
3SHA1 (mimedefang-2.63.tar.gz) = e6ea60fb63613ff50c46578a49564146105b242c 3SHA1 (mimedefang-2.67.tar.gz) = 88105c8ffa68340fcaec0e0000c063618e670d0b
4RMD160 (mimedefang-2.63.tar.gz) = 06d9cd093ad772a809eb948cd0534cf38d592fc8 4RMD160 (mimedefang-2.67.tar.gz) = 6a11119fae9d9d4762fbe2536d91fca19d96123c
5Size (mimedefang-2.63.tar.gz) = 328357 bytes 5Size (mimedefang-2.67.tar.gz) = 338779 bytes
6SHA1 (patch-ab) = ec16d2aeff8ceec7e61ff3a6b3fc6e3db35a62bf 6SHA1 (patch-ac) = 8733dca9408f29f63d71f6a0f3af817ef6b9a148
7SHA1 (patch-ac) = e678bd349a6b2aea67ce5fbbf8b3a4493757241c 
File Deleted: pkgsrc/mail/mimedefang/patches/Attic/patch-ab
cvs diff -r1.6 -r1.7 pkgsrc/mail/mimedefang/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/mimedefang/patches/Attic/patch-ac 2007/08/15 04:50:40 1.6
+++ pkgsrc/mail/mimedefang/patches/Attic/patch-ac 2010/02/05 19:53:08 1.7
@@ -1,47 +1,54 @@ @@ -1,47 +1,54 @@
1$NetBSD: patch-ac,v 1.6 2007/08/15 04:50:40 markd Exp $ 1$NetBSD: patch-ac,v 1.7 2010/02/05 19:53:08 markd Exp $
2 2
3--- mimedefang.pl.in.orig 2007-08-14 01:50:18.000000000 +1200 3--- mimedefang.pl.in.orig 2009-01-05 20:37:38.000000000 +0000
4+++ mimedefang.pl.in 4+++ mimedefang.pl.in
5@@ -121,25 +121,25 @@ $VirusScannerRoutinesInitialized = 0; 5@@ -121,29 +121,29 @@ $VirusScannerRoutinesInitialized = 0;
6 $SALocalTestsOnly = 1; 6 $SALocalTestsOnly = 1;
7 $DoStatusTags = 0; 7 $DoStatusTags = 0;
8  8
9-$Features{'Virus:AVP'} = ('@AVP@' ne '/bin/false' ? '@AVP@' : 0); 9-$Features{'Virus:AVP'} = ('@AVP@' ne '/bin/false' ? '@AVP@' : 0);
10-$Features{'Virus:AVP5'} = ('@AVP5@' ne '/bin/false' ? '@AVP5@' : 0); 10-$Features{'Virus:AVP5'} = ('@AVP5@' ne '/bin/false' ? '@AVP5@' : 0);
11-$Features{'Virus:KAVSCANNER'} = ('@KAVSCANNER@' ne '/bin/false' ? '@KAVSCANNER@' : 0); 11-$Features{'Virus:KAVSCANNER'} = ('@KAVSCANNER@' ne '/bin/false' ? '@KAVSCANNER@' : 0);
12-$Features{'Virus:CLAMAV'} = ('@CLAMSCAN@' ne '/bin/false' ? '@CLAMSCAN@' : 0); 12-$Features{'Virus:CLAMAV'} = ('@CLAMSCAN@' ne '/bin/false' ? '@CLAMSCAN@' : 0);
13-$Features{'Virus:CLAMD'} = ('@CLAMD@' ne '/bin/false' ? '@CLAMD@' : 0); 13-$Features{'Virus:CLAMD'} = ('@CLAMD@' ne '/bin/false' ? '@CLAMD@' : 0);
14-$Features{'Virus:FPROT'} = ('@FPROT@' ne '/bin/false' ? '@FPROT@' : 0); 14-$Features{'Virus:FPROT'} = ('@FPROT@' ne '/bin/false' ? '@FPROT@' : 0);
 15-$Features{'Virus:FPSCAN'} = ('@FPSCAN@' ne '/bin/false' ? '@FPSCAN@' : 0);
15-$Features{'Virus:FSAV'} = ('@FSAV@' ne '/bin/false' ? '@FSAV@' : 0); 16-$Features{'Virus:FSAV'} = ('@FSAV@' ne '/bin/false' ? '@FSAV@' : 0);
16-$Features{'Virus:HBEDV'} = ('@HBEDV@' ne '/bin/false' ? '@HBEDV@' : 0); 17-$Features{'Virus:HBEDV'} = ('@HBEDV@' ne '/bin/false' ? '@HBEDV@' : 0);
17-$Features{'Virus:VEXIRA'} = ('@VEXIRA@' ne '/bin/false' ? '@VEXIRA@' : 0); 18-$Features{'Virus:VEXIRA'} = ('@VEXIRA@' ne '/bin/false' ? '@VEXIRA@' : 0);
18-$Features{'Virus:NAI'} = ('@NAI@' ne '/bin/false' ? '@NAI@' : 0); 19-$Features{'Virus:NAI'} = ('@NAI@' ne '/bin/false' ? '@NAI@' : 0);
19-$Features{'Virus:BDC'} = ('@BDC@' ne '/bin/false' ? '@BDC@' : 0); 20-$Features{'Virus:BDC'} = ('@BDC@' ne '/bin/false' ? '@BDC@' : 0);
20-$Features{'Virus:NVCC'} = ('@NVCC@' ne '/bin/false' ? '@NVCC@' : 0); 21-$Features{'Virus:NVCC'} = ('@NVCC@' ne '/bin/false' ? '@NVCC@' : 0);
21+$Features{'Virus:AVP'} = ((('@AVP@' ne '/bin/false') and (-x '@AVP@')) ? '@AVP@' : 0); 22+$Features{'Virus:AVP'} = ((('@AVP@' ne '/bin/false') and (-x '@AVP@')) ? '@AVP@' : 0);
22+$Features{'Virus:AVP5'} = ((('@AVP5@' ne '/bin/false') and (-x '@AVP5@')) ? '@AVP5@' : 0); 23+$Features{'Virus:AVP5'} = ((('@AVP5@' ne '/bin/false') and (-x '@AVP5@')) ? '@AVP5@' : 0);
23+$Features{'Virus:KAVSCANNER'} = ((('@KAVSCANNER@' ne '/bin/false') and (-x '@KAVSCANNER@')) ? '@KAVSCANNER@' : 0); 24+$Features{'Virus:KAVSCANNER'} = ((('@KAVSCANNER@' ne '/bin/false') and (-x '@KAVSCANNER@')) ? '@KAVSCANNER@' : 0);
24+$Features{'Virus:CLAMAV'} = ((('@CLAMSCAN@' ne '/bin/false') and (-x '@CLAMSCAN@')) ? '@CLAMSCAN@' : 0); 25+$Features{'Virus:CLAMAV'} = ((('@CLAMSCAN@' ne '/bin/false') and (-x '@CLAMSCAN@')) ? '@CLAMSCAN@' : 0);
25+$Features{'Virus:CLAMD'} = ((('@CLAMD@' ne '/bin/false') and (-x '@CLAMD@')) ? '@CLAMD@' : 0); 26+$Features{'Virus:CLAMD'} = ((('@CLAMD@' ne '/bin/false') and (-x '@CLAMD@')) ? '@CLAMD@' : 0);
26+$Features{'Virus:FPROT'} = ((('@FPROT@' ne '/bin/false') and (-x '@FPROT@')) ? '@FPROT@' : 0); 27+$Features{'Virus:FPROT'} = ((('@FPROT@' ne '/bin/false') and (-x '@FPROT@')) ? '@FPROT@' : 0);
 28+$Features{'Virus:FPSCAN'} = ((('@FPSCAN@' ne '/bin/false') and (-x '@FPSCAN@')) ? '@FPSCAN@' : 0);
27+$Features{'Virus:FSAV'} = ((('@FSAV@' ne '/bin/false') and (-x '@FSAV@')) ? '@FSAV@' : 0); 29+$Features{'Virus:FSAV'} = ((('@FSAV@' ne '/bin/false') and (-x '@FSAV@')) ? '@FSAV@' : 0);
28+$Features{'Virus:HBEDV'} = ((('@HBEDV@' ne '/bin/false') and (-x '@HBEDV@')) ? '@HBEDV@' : 0); 30+$Features{'Virus:HBEDV'} = ((('@HBEDV@' ne '/bin/false') and (-x '@HBEDV@')) ? '@HBEDV@' : 0);
29+$Features{'Virus:VEXIRA'} = ((('@VEXIRA@' ne '/bin/false') and (-x '@VEXIRA@')) ? '@VEXIRA@' : 0); 31+$Features{'Virus:VEXIRA'} = ((('@VEXIRA@' ne '/bin/false') and (-x '@VEXIRA@')) ? '@VEXIRA@' : 0);
30+$Features{'Virus:NAI'} = ((('@NAI@' ne '/bin/false') and (-x '@NAI@')) ? '@NAI@' : 0); 32+$Features{'Virus:NAI'} = ((('@NAI@' ne '/bin/false') and (-x '@NAI@')) ? '@NAI@' : 0);
31+$Features{'Virus:BDC'} = ((('@BDC@' ne '/bin/false') and (-x '@BDC@')) ? '@BDC@' : 0); 33+$Features{'Virus:BDC'} = ((('@BDC@' ne '/bin/false') and (-x '@BDC@')) ? '@BDC@' : 0);
32+$Features{'Virus:NVCC'} = ((('@NVCC@' ne '/bin/false') and (-x '@NVCC@')) ? '@NVCC@' : 0); 34+$Features{'Virus:NVCC'} = ((('@NVCC@' ne '/bin/false') and (-x '@NVCC@')) ? '@NVCC@' : 0);
33 $Features{'Virus:SymantecCSS'} = 0; # Ditto 35 $Features{'Virus:SymantecCSS'} = 0; # Ditto
34 $Features{'Virus:FPROTD'} = 0; 36 $Features{'Virus:FPROTD'} = 0;
 37 $Features{'Virus:FPROTD6'} = 0;
35-$Features{'Virus:SOPHIE'} = ('@SOPHIE@' ne '/bin/false' ? '@SOPHIE@' : 0); 38-$Features{'Virus:SOPHIE'} = ('@SOPHIE@' ne '/bin/false' ? '@SOPHIE@' : 0);
36-$Features{'Virus:SOPHOS'} = ('@SOPHOS@' ne '/bin/false' ? '@SOPHOS@' : 0); 39-$Features{'Virus:SOPHOS'} = ('@SOPHOS@' ne '/bin/false' ? '@SOPHOS@' : 0);
 40-$Features{'Virus:SAVSCAN'} = ('@SAVSCAN@' ne '/bin/false' ? '@SAVSCAN@' : 0);
37-$Features{'Virus:TREND'} = ('@TREND@' ne '/bin/false' ? '@TREND@' : 0); 41-$Features{'Virus:TREND'} = ('@TREND@' ne '/bin/false' ? '@TREND@' : 0);
38-$Features{'Virus:TROPHIE'} = ('@TROPHIE@' ne '/bin/false' ? '@TROPHIE@' : 0); 42-$Features{'Virus:TROPHIE'} = ('@TROPHIE@' ne '/bin/false' ? '@TROPHIE@' : 0);
39-$Features{'Virus:CSAV'} = ('@CSAV@' ne '/bin/false' ? '@CSAV@' : 0); 43-$Features{'Virus:CSAV'} = ('@CSAV@' ne '/bin/false' ? '@CSAV@' : 0);
 44-$Features{'Virus:NOD32'} = ('@NOD32@' ne '/bin/false' ? '@NOD32@' : 0);
40+$Features{'Virus:SOPHIE'} = ((('@SOPHIE@' ne '/bin/false') and (-x '@SOPHIE@')) ? '@SOPHIE@' : 0); 45+$Features{'Virus:SOPHIE'} = ((('@SOPHIE@' ne '/bin/false') and (-x '@SOPHIE@')) ? '@SOPHIE@' : 0);
41+$Features{'Virus:SOPHOS'} = ((('@SOPHOS@' ne '/bin/false') and (-x '@SOPHOS@')) ? '@SOPHOS@' : 0); 46+$Features{'Virus:SOPHOS'} = ((('@SOPHOS@' ne '/bin/false') and (-x '@SOPHOS@')) ? '@SOPHOS@' : 0);
 47+$Features{'Virus:SAVSCAN'} = ((('@SAVSCAN@' ne '/bin/false') and (-x '@SAVSCAN@')) ? '@SAVSCAN@' : 0);
42+$Features{'Virus:TREND'} = ((('@TREND@' ne '/bin/false') and (-x '@TREND@')) ? '@TREND@' : 0); 48+$Features{'Virus:TREND'} = ((('@TREND@' ne '/bin/false') and (-x '@TREND@')) ? '@TREND@' : 0);
43+$Features{'Virus:TROPHIE'} = ((('@TROPHIE@' ne '/bin/false') and (-x '@TROPHIE@')) ? '@TROPHIE@' : 0); 49+$Features{'Virus:TROPHIE'} = ((('@TROPHIE@' ne '/bin/false') and (-x '@TROPHIE@')) ? '@TROPHIE@' : 0);
44+$Features{'Virus:CSAV'} = ((('@CSAV@' ne '/bin/false') and (-x '@CSAV@')) ? '@CSAV@' : 0); 50+$Features{'Virus:CSAV'} = ((('@CSAV@' ne '/bin/false') and (-x '@CSAV@')) ? '@CSAV@' : 0);
 51+$Features{'Virus:NOD32'} = ((('@NOD32@' ne '/bin/false') and (-x '@NOD32@')) ? '@NOD32@' : 0);
45  52
46 $Features{'Path:SENDMAIL'} = '@SENDMAILPROG@'; 53 $Features{'Path:SENDMAIL'} = '@SENDMAILPROG@';
47 $Features{'Path:QUARANTINEDIR'} = '@QDIR@'; 54 $Features{'Path:QUARANTINEDIR'} = '@QDIR@';