pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/mail/mimedefang
Module Name: pkgsrc
Committed By: bouyer
Date: Tue Feb 28 11:33:03 UTC 2023
Modified Files:
pkgsrc/mail/mimedefang: MESSAGE Makefile PLIST distinfo
pkgsrc/mail/mimedefang/files: mimedefang-multiplexor.sh mimedefang.sh
Added Files:
pkgsrc/mail/mimedefang/patches: patch-Makefile.in
patch-mimedefang.pl.in
Removed Files:
pkgsrc/mail/mimedefang/patches: patch-ac patch-ad
Log Message:
Update mimedefang to 3.3. Main changes from 2.78:
* add is_public_ip6_address to check if an ipv6 address
is local
* add md_authres method to generate a basic Authentication-Results
header for the message
* add md_arc_sign method to sign email messages
with DKIM ARC signatures
* add md_dkim_verify method to verify DKIM signatures
* add md_dkim_sign method to sign email messages
with DKIM signatures
* add anonymize_uri to remove utm_* parameters
from uris.
* split mimedefang.pl code in Perl modules
* add re_match_in_7zip_directory to check for files
inside 7zip archives
* fallback to plaintext when md_check_against_smtp_server
fails SSL connection for unknown reasons
* add experimental support to scan emails with Rspamd antispam
* Obtain the Queue-ID as early as possible in the SMTP
session. Requires the "-y" command-line option to mimedefang.
* mimedefang.pl: Add support for a configuration file
to separate data from code
* mimedefang.pl: Add support to scan messages for viruses on a remote
Clamav server using clamdscan client.
* mimedefang.pl: Add re_match_in_rar_directory function to match
unwanted file names extensions inside a rar archive file.
* mimedefang.pl: Added TLS support to md_check_against_smtp_server
* mimedefang-multiplexor: Make "workerinfo nnn" show how long ago
the last state change was for a given worker.
* mimedefang.pl: Do not add a Message-ID: header when handing a
message to SpamAssassin if the original message lacks such a
header.
* Add a new -V maxLifetime option to mimedefang-multiplexor that
terminates worker processes after maxLifetime seconds (approximately).
This is in addition to the -r maxRequests option.
* Log the lifetime and number of requests processed when we terminate
a worker process.
* Make mimedefang and mimedefang-multiplexor write their PID files
as root to avoid an unprivileged user tampering with the pidfiles.
Thanks to Michael Orlitzky for pointing this issue out.
* mimedefang.pl: Add an extra level of subdirectories in the quarantine
to avoid 32K subdirectory limit on ext3. Idea by Kevin McGrail.
* Add the --data-dump option to scripts/mimedefang-util
And various bug fixes and minor improvements.
pkgsrc changes: make the rc.d script use the new -o option and move the pid
files to $VARBASE/run/, keeping the lock and socket files in
$VARBASE/spool/MIMEdefang/
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/mimedefang/MESSAGE
cvs rdiff -u -r1.70 -r1.71 pkgsrc/mail/mimedefang/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/mimedefang/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mail/mimedefang/distinfo
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/mail/mimedefang/files/mimedefang-multiplexor.sh \
pkgsrc/mail/mimedefang/files/mimedefang.sh
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/mimedefang/patches/patch-Makefile.in
cvs rdiff -u -r1.7 -r0 pkgsrc/mail/mimedefang/patches/patch-ac
cvs rdiff -u -r1.1 -r0 pkgsrc/mail/mimedefang/patches/patch-ad
cvs rdiff -u -r0 -r1.3 pkgsrc/mail/mimedefang/patches/patch-mimedefang.pl.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/mail/mimedefang/MESSAGE
diff -u pkgsrc/mail/mimedefang/MESSAGE:1.3 pkgsrc/mail/mimedefang/MESSAGE:1.4
--- pkgsrc/mail/mimedefang/MESSAGE:1.3 Wed Sep 28 14:15:49 2005
+++ pkgsrc/mail/mimedefang/MESSAGE Tue Feb 28 11:33:03 2023
@@ -1,5 +1,10 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2005/09/28 14:15:49 rillig Exp $
+$NetBSD: MESSAGE,v 1.4 2023/02/28 11:33:03 bouyer Exp $
+
+Starting with version 2.81 mimedefang and mimedefang-multiplexor write their
+PID files as root. You should move your PID files out of the MIMEDefang spool
+directory and into a standard root-owned directory like /var/run.
+Use the -o option to create lock files in the spool directory.
From version 2.52 mimedefang.pl doesn't detect and load Perl modules until
the detect_and_load_perl_modules() function is called.
Index: pkgsrc/mail/mimedefang/Makefile
diff -u pkgsrc/mail/mimedefang/Makefile:1.70 pkgsrc/mail/mimedefang/Makefile:1.71
--- pkgsrc/mail/mimedefang/Makefile:1.70 Tue Jun 28 11:34:23 2022
+++ pkgsrc/mail/mimedefang/Makefile Tue Feb 28 11:33:03 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2022/06/28 11:34:23 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2023/02/28 11:33:03 bouyer Exp $
-DISTNAME= mimedefang-2.78
-PKGREVISION= 8
+DISTNAME= mimedefang-3.3
CATEGORIES= mail
-MASTER_SITES= http://www.mimedefang.org/static/
+MASTER_SITES= https://mimedefang.org/releases/
MAINTAINER= pettai%NetBSD.org@localhost
HOMEPAGE= https://www.mimedefang.org/
@@ -15,7 +14,6 @@ DEPENDS+= p5-HTML-Parser>=3.26:../../ww
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+= {perl>=5.8.6,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
@@ -71,22 +69,11 @@ CONFIGURE_ENV+= NAI=${PREFIX}/bin/uvsca
PTHREAD_OPTS+= require native
INSTALLATION_DIRS= bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
-do-install:
+
+post-install:
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
${INSTALL_DATA} ${WRKSRC}/gen-ip-validator.pl ${DESTDIR}${SHAREDIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/md-mx-ctrl ${DESTDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/mimedefang-multiplexor ${DESTDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/mimedefang ${DESTDIR}${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/watch-mimedefang ${DESTDIR}${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/mimedefang.pl ${DESTDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/md-mx-ctrl.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/mimedefang.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/mimedefang.pl.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/mimedefang-multiplexor.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/watch-mimedefang.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
- ${INSTALL_DATA} ${WRKSRC}/mimedefang-filter.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
- ${INSTALL_DATA} ${WRKSRC}/mimedefang-protocol.7 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7
${INSTALL_DATA} ${WRKSRC}/examples/suggested-minimum-filter-for-windows-clients ${DESTDIR}${EGDIR}/mimedefang-filter
${INSTALL_DATA} ${WRKSRC}/SpamAssassin/spamassassin.cf ${DESTDIR}${EGDIR}/sa-mimedefang.cf
Index: pkgsrc/mail/mimedefang/PLIST
diff -u pkgsrc/mail/mimedefang/PLIST:1.8 pkgsrc/mail/mimedefang/PLIST:1.9
--- pkgsrc/mail/mimedefang/PLIST:1.8 Tue Mar 11 14:05:04 2014
+++ pkgsrc/mail/mimedefang/PLIST Tue Feb 28 11:33:03 2023
@@ -1,16 +1,47 @@
-@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:05:04 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.9 2023/02/28 11:33:03 bouyer Exp $
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/Actions.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/Antispam.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/Antivirus.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/Authres.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/DKIM.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/DKIM/ARC.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/MIME.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/Mail.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/Net.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/RFC2822.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/Unit.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Mail/MIMEDefang/Utils.pm
bin/md-mx-ctrl
bin/mimedefang
bin/mimedefang-multiplexor
+bin/mimedefang-util
bin/mimedefang.pl
bin/watch-mimedefang
+bin/watch-multiple-mimedefangs.tcl
+man/man1/mimedefang-util.1
+man/man3/Mail::MIMEDefang.3
+man/man3/Mail::MIMEDefang::Actions.3
+man/man3/Mail::MIMEDefang::Antispam.3
+man/man3/Mail::MIMEDefang::Antivirus.3
+man/man3/Mail::MIMEDefang::Authres.3
+man/man3/Mail::MIMEDefang::DKIM.3
+man/man3/Mail::MIMEDefang::DKIM::ARC.3
+man/man3/Mail::MIMEDefang::MIME.3
+man/man3/Mail::MIMEDefang::Mail.3
+man/man3/Mail::MIMEDefang::Net.3
+man/man3/Mail::MIMEDefang::RFC2822.3
+man/man3/Mail::MIMEDefang::Unit.3
+man/man3/Mail::MIMEDefang::Utils.3
man/man5/mimedefang-filter.5
+man/man7/mimedefang-notify.7
man/man7/mimedefang-protocol.7
man/man8/md-mx-ctrl.8
man/man8/mimedefang-multiplexor.8
man/man8/mimedefang.8
man/man8/mimedefang.pl.8
man/man8/watch-mimedefang.8
+man/man8/watch-multiple-mimedefangs.8
share/examples/mimedefang/mimedefang-filter
share/examples/mimedefang/sa-mimedefang.cf
share/mimedefang/gen-ip-validator.pl
Index: pkgsrc/mail/mimedefang/distinfo
diff -u pkgsrc/mail/mimedefang/distinfo:1.31 pkgsrc/mail/mimedefang/distinfo:1.32
--- pkgsrc/mail/mimedefang/distinfo:1.31 Tue Oct 26 10:54:08 2021
+++ pkgsrc/mail/mimedefang/distinfo Tue Feb 28 11:33:03 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.31 2021/10/26 10:54:08 nia Exp $
+$NetBSD: distinfo,v 1.32 2023/02/28 11:33:03 bouyer Exp $
-BLAKE2s (mimedefang-2.78.tar.gz) = 0c6dea20267d9de76d4ea7a3bbf6eb238b69a8dd9f06125266102d0a0b4d42e4
-SHA512 (mimedefang-2.78.tar.gz) = 037a6f33a6a721e923c8d7242e6cd7eac6d249b4024e9fbe5aa2583675fd1fd710c8ff0ffd3ed331d1637c5e07373b264781b378b2e44e50ae13d30c1b7bff47
-Size (mimedefang-2.78.tar.gz) = 364501 bytes
-SHA1 (patch-ac) = 8733dca9408f29f63d71f6a0f3af817ef6b9a148
-SHA1 (patch-ad) = 1130dad09875d069ca246db8f8f567366e0af5be
+BLAKE2s (mimedefang-3.3.tar.gz) = f464307b1a34e15e9879ba3bc1622841743fa28dcb47f17f1f05747152c54311
+SHA512 (mimedefang-3.3.tar.gz) = f973d6bf8e5bb5043f6d255961dcf3f4f8208c7fb159694f5d62884e4dd480ab2d04cf6b71c8f48f56f368aa31b7ce54ec499503a4a3f55b9bf0696299a240ef
+Size (mimedefang-3.3.tar.gz) = 495544 bytes
+SHA1 (patch-Makefile.in) = 14d53b305bc1bb099624d02cc8bca63ab7226ace
+SHA1 (patch-mimedefang.pl.in) = d46c79ad616a6abc5c2791d32c678c5988ed64c9
Index: pkgsrc/mail/mimedefang/files/mimedefang-multiplexor.sh
diff -u pkgsrc/mail/mimedefang/files/mimedefang-multiplexor.sh:1.1 pkgsrc/mail/mimedefang/files/mimedefang-multiplexor.sh:1.2
--- pkgsrc/mail/mimedefang/files/mimedefang-multiplexor.sh:1.1 Sun Mar 7 11:18:33 2004
+++ pkgsrc/mail/mimedefang/files/mimedefang-multiplexor.sh Tue Feb 28 11:33:03 2023
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: mimedefang-multiplexor.sh,v 1.1 2004/03/07 11:18:33 markd Exp $
+# $NetBSD: mimedefang-multiplexor.sh,v 1.2 2023/02/28 11:33:03 bouyer Exp $
#
# mimedefang-multiplexor handles communications between sendmail and
# the real processor
@@ -23,12 +23,13 @@ fi
name="mimedefang_multiplexor"
rcvar="$name"
-mimedefang_multiplexor_user=${mimedefang_multiplexor_user-"@DEFANG_USER@"}
defangdir="@DEFANG_SPOOLDIR@"
command="@PREFIX@/bin/mimedefang-multiplexor"
-pidfile="${defangdir}/${name}.pid"
-command_args="-p ${pidfile}"
+pidfile="@VARBASE@/run/${name}.pid"
+lockfile="${defangdir}/${name}.lock"
+defang_user=${defang_user-"@DEFANG_USER@"}
+command_args="-p ${pidfile} -o ${lockfile} -U ${defang_user}"
# default values, may be overridden on NetBSD by setting them in /etc/rc.conf
mimedefang_multiplexor_flags=${mimedefang_multiplexor_flags-\
Index: pkgsrc/mail/mimedefang/files/mimedefang.sh
diff -u pkgsrc/mail/mimedefang/files/mimedefang.sh:1.1 pkgsrc/mail/mimedefang/files/mimedefang.sh:1.2
--- pkgsrc/mail/mimedefang/files/mimedefang.sh:1.1 Sun Mar 7 11:18:33 2004
+++ pkgsrc/mail/mimedefang/files/mimedefang.sh Tue Feb 28 11:33:03 2023
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: mimedefang.sh,v 1.1 2004/03/07 11:18:33 markd Exp $
+# $NetBSD: mimedefang.sh,v 1.2 2023/02/28 11:33:03 bouyer Exp $
#
# mimedefang does "in-stream" spam and virus checking using
# sendmail's MailFilter interfaces.
@@ -25,9 +25,10 @@ defangdir="@DEFANG_SPOOLDIR@"
name="mimedefang"
rcvar=$name
command="@PREFIX@/bin/mimedefang"
-pidfile="${defangdir}/${name}.pid"
-mimedefang_user=${mimedefang_user-"@DEFANG_USER@"}
-command_args="-P ${pidfile}"
+pidfile="@VARBASE@/run/${name}.pid"
+lockfile="${defangdir}/${name}.lock"
+defang_user=${defang_user-"@DEFANG_USER@"}
+command_args="-P ${pidfile} -o ${lockfile} -U ${defang_user}"
# default values, may be overridden on NetBSD by setting them in /etc/rc.conf
mimedefang_flags=${mimedefang_flags-"-p ${defangdir}/mimedefang.sock \
Added files:
Index: pkgsrc/mail/mimedefang/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/mail/mimedefang/patches/patch-Makefile.in:1.1
--- /dev/null Tue Feb 28 11:33:03 2023
+++ pkgsrc/mail/mimedefang/patches/patch-Makefile.in Tue Feb 28 11:33:03 2023
@@ -0,0 +1,61 @@
+$NetBSD: patch-Makefile.in,v 1.1 2023/02/28 11:33:03 bouyer Exp $
+Don't force-install the config files.
+
+--- Makefile.in.orig 2023-02-27 14:54:44.712145757 +0100
++++ Makefile.in 2023-02-27 14:56:10.630669189 +0100
+@@ -229,26 +229,6 @@
+
+ install: all
+ $(INSTALL) -m 755 -d $(DESTDIR)${CONFDIR}
+- -if test "$(IP_HEADER)" = "yes" -a ! -f "$(DESTDIR)${CONFDIR}/mimedefang-ip-key" ; then \
+- $(PERL) ./gen-ip-validator.pl > $(DESTDIR)${CONFDIR}/mimedefang-ip-key ;\
+- -chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 ; \
+- fi
+-
+- if test "$(DEFANGUSER)" != "" ; then \
+- if id "$(DEFANGUSER)" > /dev/null 2>&1 ; then \
+- chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 || true; \
+- test ! -d $(DESTDIR)$(SPOOLDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(SPOOLDIR) > /dev/null 2>&1 || true; \
+- test ! -d $(DESTDIR)$(QDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(QDIR) > /dev/null 2>&1 || true; \
+- fi \
+- else \
+- echo ""; \
+- echo "Please create the spool directory, '$(SPOOLDIR)',"; \
+- echo "if it does not exist. Give it mode 700 or 750, and make"; \
+- echo "it owned by the user and group you intend to run MIMEDefang as."; \
+- if test "$(QDIR)" != "$(SPOOLDIR)" ; then \
+- echo "Please do the same with the quarantine directory, '$(QDIR)'."; \
+- fi; \
+- fi
+
+ $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
+ $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man1
+@@ -256,14 +236,7 @@
+ $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man5
+ $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man7
+ $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man8
+- -test ! -d $(DESTDIR)$(SPOOLDIR) && mkdir -p $(DESTDIR)$(SPOOLDIR) && chmod 750 $(DESTDIR)$(SPOOLDIR) || true
+- -test ! -d $(DESTDIR)$(QDIR) && mkdir -p $(DESTDIR)$(QDIR) && chmod 750 $(DESTDIR)$(QDIR) || true
+
+- if test -f $(DESTDIR)${CONFDIR}/mimedefang-filter ; then \
+- $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter.example || exit 1; \
+- else \
+- $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter || exit 1; \
+- fi
+
+ $(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) mimedefang-multiplexor $(DESTDIR)$(prefix)/bin/mimedefang-multiplexor
+ $(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) md-mx-ctrl $(DESTDIR)$(prefix)/bin/md-mx-ctrl
+@@ -301,13 +274,6 @@
+ $(INSTALL) -m 644 mimedefang-filter.5 $(DESTDIR)$(MANDIR)/man5/mimedefang-filter.5
+ $(INSTALL) -m 644 mimedefang-protocol.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-protocol.7
+ $(INSTALL) -m 644 mimedefang-notify.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-notify.7
+- if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \
+- if test -f $(DESTDIR)${CONFDIR}/sa-mimedefang.cf ; then \
+- $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
+- else \
+- $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf || exit 1; \
+- fi \
+- fi
+
+ distro: FORCE
+ mkdir mimedefang-$(VERSION)
Index: pkgsrc/mail/mimedefang/patches/patch-mimedefang.pl.in
diff -u /dev/null pkgsrc/mail/mimedefang/patches/patch-mimedefang.pl.in:1.3
--- /dev/null Tue Feb 28 11:33:03 2023
+++ pkgsrc/mail/mimedefang/patches/patch-mimedefang.pl.in Tue Feb 28 11:33:03 2023
@@ -0,0 +1,57 @@
+$NetBSD: patch-mimedefang.pl.in,v 1.3 2023/02/28 11:33:03 bouyer Exp $
+
+Dynamically check virus scanner availability
+
+--- mimedefang.pl.in.orig 2022-12-28 17:19:31.000000000 +0100
++++ mimedefang.pl.in 2023-02-27 15:46:16.986658353 +0100
+@@ -64,30 +64,30 @@
+ $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: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:CLAMDSCAN'} = ('/bin/false' ne '/bin/false' ? '/bin/false' : 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);
+-$Features{'Virus:NAI'} = ('@NAI@' ne '/bin/false' ? '@NAI@' : 0);
+-$Features{'Virus:BDC'} = ('@BDC@' ne '/bin/false' ? '@BDC@' : 0);
+-$Features{'Virus:NVCC'} = ('@NVCC@' ne '/bin/false' ? '@NVCC@' : 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);
++$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: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@';
Home |
Main Index |
Thread Index |
Old Index