From d91b3d34453947fe02af97dde36422557fd331e4 Mon Sep 17 00:00:00 2001 From: markd Date: Fri, 5 Feb 2010 19:53:08 +0000 Subject: 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 --- mail/mimedefang/Makefile | 10 +++++----- mail/mimedefang/distinfo | 11 +++++------ mail/mimedefang/patches/patch-ab | 13 ------------- mail/mimedefang/patches/patch-ac | 13 ++++++++++--- 4 files changed, 20 insertions(+), 27 deletions(-) delete mode 100644 mail/mimedefang/patches/patch-ab (limited to 'mail/mimedefang') diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile index 4598e55d90c..e10455a4531 100644 --- a/mail/mimedefang/Makefile +++ b/mail/mimedefang/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.40 2010/01/30 23:08:00 heinz Exp $ +# $NetBSD: Makefile,v 1.41 2010/02/05 19:53:08 markd Exp $ -DISTNAME= mimedefang-2.63 +DISTNAME= mimedefang-2.67 CATEGORIES= mail MASTER_SITES= http://www.mimedefang.org/static/ @@ -14,8 +14,8 @@ DEPENDS+= p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser DEPENDS+= p5-HTML-Tagset>=3.03:../../www/p5-HTML-Tagset DEPENDS+= p5-IO-stringy>=2.108:../../devel/p5-IO-stringy DEPENDS+= p5-MailTools>=1.44:../../mail/p5-MailTools -DEPENDS+= p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64 -DEPENDS+= p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools +DEPENDS+= p5-MIME-Base64>=3.03:../../converters/p5-MIME-Base64 +DEPENDS+= p5-MIME-tools>=5.413:../../mail/p5-MIME-tools DEPENDS+= spamassassin>=2.31:../../mail/spamassassin PKG_DESTDIR_SUPPORT= user-destdir @@ -53,7 +53,7 @@ CONF_FILES+= ${EGDIR}/mimedefang-filter ${PKG_SYSCONFDIR}/mimedefang-filter CONF_FILES+= ${EGDIR}/sa-mimedefang.cf ${PKG_SYSCONFDIR}/sa-mimedefang.cf CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --with-confsubdir= +CONFIGURE_ARGS+= --with-confsubdir=${PKG_SYSCONFSUBDIR:Q} CONFIGURE_ARGS+= --with-milterinc=${BUILDLINK_PREFIX.libmilter}/include CONFIGURE_ARGS+= --with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib CONFIGURE_ARGS+= --with-spooldir=${DEFANG_SPOOLDIR:Q} diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo index b830c741a50..c72f642c4ed 100644 --- a/mail/mimedefang/distinfo +++ b/mail/mimedefang/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.17 2007/08/15 04:50:40 markd Exp $ +$NetBSD: distinfo,v 1.18 2010/02/05 19:53:08 markd Exp $ -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 +SHA1 (mimedefang-2.67.tar.gz) = 88105c8ffa68340fcaec0e0000c063618e670d0b +RMD160 (mimedefang-2.67.tar.gz) = 6a11119fae9d9d4762fbe2536d91fca19d96123c +Size (mimedefang-2.67.tar.gz) = 338779 bytes +SHA1 (patch-ac) = 8733dca9408f29f63d71f6a0f3af817ef6b9a148 diff --git a/mail/mimedefang/patches/patch-ab b/mail/mimedefang/patches/patch-ab deleted file mode 100644 index b9bc667037f..00000000000 --- a/mail/mimedefang/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2007/08/15 04:50:40 markd Exp $ - ---- Makefile.in.orig 2007-08-14 01:50:18.000000000 +1200 -+++ Makefile.in -@@ -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 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 c06259d6135..857cab77444 100644 --- a/mail/mimedefang/patches/patch-ac +++ b/mail/mimedefang/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2007/08/15 04:50:40 markd Exp $ +$NetBSD: patch-ac,v 1.7 2010/02/05 19:53:08 markd Exp $ ---- mimedefang.pl.in.orig 2007-08-14 01:50:18.000000000 +1200 +--- mimedefang.pl.in.orig 2009-01-05 20:37:38.000000000 +0000 +++ mimedefang.pl.in -@@ -121,25 +121,25 @@ $VirusScannerRoutinesInitialized = 0; +@@ -121,29 +121,29 @@ $VirusScannerRoutinesInitialized = 0; $SALocalTestsOnly = 1; $DoStatusTags = 0; @@ -12,6 +12,7 @@ $NetBSD: patch-ac,v 1.6 2007/08/15 04:50:40 markd Exp $ -$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:FPSCAN'} = ('@FPSCAN@' ne '/bin/false' ? '@FPSCAN@' : 0); -$Features{'Virus:FSAV'} = ('@FSAV@' ne '/bin/false' ? '@FSAV@' : 0); -$Features{'Virus:HBEDV'} = ('@HBEDV@' ne '/bin/false' ? '@HBEDV@' : 0); -$Features{'Virus:VEXIRA'} = ('@VEXIRA@' ne '/bin/false' ? '@VEXIRA@' : 0); @@ -24,6 +25,7 @@ $NetBSD: patch-ac,v 1.6 2007/08/15 04:50:40 markd Exp $ +$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:FPSCAN'} = ((('@FPSCAN@' ne '/bin/false') and (-x '@FPSCAN@')) ? '@FPSCAN@' : 0); +$Features{'Virus:FSAV'} = ((('@FSAV@' ne '/bin/false') and (-x '@FSAV@')) ? '@FSAV@' : 0); +$Features{'Virus:HBEDV'} = ((('@HBEDV@' ne '/bin/false') and (-x '@HBEDV@')) ? '@HBEDV@' : 0); +$Features{'Virus:VEXIRA'} = ((('@VEXIRA@' ne '/bin/false') and (-x '@VEXIRA@')) ? '@VEXIRA@' : 0); @@ -32,16 +34,21 @@ $NetBSD: patch-ac,v 1.6 2007/08/15 04:50:40 markd Exp $ +$Features{'Virus:NVCC'} = ((('@NVCC@' ne '/bin/false') and (-x '@NVCC@')) ? '@NVCC@' : 0); $Features{'Virus:SymantecCSS'} = 0; # Ditto $Features{'Virus:FPROTD'} = 0; + $Features{'Virus:FPROTD6'} = 0; -$Features{'Virus:SOPHIE'} = ('@SOPHIE@' ne '/bin/false' ? '@SOPHIE@' : 0); -$Features{'Virus:SOPHOS'} = ('@SOPHOS@' ne '/bin/false' ? '@SOPHOS@' : 0); +-$Features{'Virus:SAVSCAN'} = ('@SAVSCAN@' ne '/bin/false' ? '@SAVSCAN@' : 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:NOD32'} = ('@NOD32@' ne '/bin/false' ? '@NOD32@' : 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:SAVSCAN'} = ((('@SAVSCAN@' ne '/bin/false') and (-x '@SAVSCAN@')) ? '@SAVSCAN@' : 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{'Virus:NOD32'} = ((('@NOD32@' ne '/bin/false') and (-x '@NOD32@')) ? '@NOD32@' : 0); $Features{'Path:SENDMAIL'} = '@SENDMAILPROG@'; $Features{'Path:QUARANTINEDIR'} = '@QDIR@'; -- cgit v1.2.3