author: Sergei Kolobov <sergei@FreeBSD.org> 2003-11-20 22:10:36 +0000
committer: Sergei Kolobov <sergei@FreeBSD.org> 2003-11-20 22:10:36 +0000
commit: 268db76822cd2fa59ec03837b93bd791bd536eb8 (patch)
tree: 0da756e8e672a0fb9426802d95a300d7d95779f7 /mail/mailscanner
parent: f1b089f8cdc9cc1ff6e37f523ce4c65fb410d1ab (diff)
download: ports-268db76822cd2fa59ec03837b93bd791bd536eb8.tar.gz
ports-268db76822cd2fa59ec03837b93bd791bd536eb8.zip
19 files changed, 464 insertions, 4528 deletions
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 5819df92f627..1deb5655fcb7 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,79 +1,190 @@
-# New ports collection makefile for:  	MailScanner
-# Date created:                		17 March 2003
-# Whom:                        		Jan-Peter Koopmann <j.koopmann@seceidos.de>
+# New ports collection makefile for:	MailScanner
+# Date created:				17 March 2003
+# Whom:					Jan-Peter Koopmann <j.koopmann@seceidos.de>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mailscanner
-PORTVERSION=	4.22.5
-PORTREVISION=	0
+PORTVERSION=	4.24.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
-DISTNAME=	MailScanner-4.22-5
+DISTNAME=	MailScanner-4.24-5
 
 MAINTAINER=	j.koopmann@seceidos.de
-COMMENT=	A powerful virus/spam scanning framework for Sendmail and Exim
-
-BUILD_DEPENDS=	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
-		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-		${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \
-		${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
-		${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF
+COMMENT=	Powerful virus/spam scanning framework for Sendmail/Exim
+
+BUILD_DEPENDS=	\
+	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
+	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+	${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+	${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \
+	${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
+	${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
+
+USE_PERL5=	yes
+
 DATADIR=	${PREFIX}/share/MailScanner
 DOCSDIR=	${PREFIX}/share/doc/MailScanner
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAN8=		MailScanner.8
 MAN5=		MailScanner.conf.5
-MLINKS=		MailScanner.8 mailscanner.8 MailScanner.conf.5 mailscanner.conf.5
+MLINKS=		MailScanner.8 mailscanner.8 \
+		MailScanner.conf.5 mailscanner.conf.5
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=   ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 .endif
 
-#    PATCH_DIST_STRIP=      -p1
-
-USE_PERL5=	yes
-
-pre-install:
-	# Delete WRKSRC/.install_*
-	${RM} -rf ${WRKSRC}/.install_*
+DOC_FILES=	INSTALL INSTALL.FreeBSD INSTALL.OpenBSD README
+ETC_FILES=	MailScanner.conf filename.rules.conf \
+		filetype.rules.conf spam.assassin.prefs.conf \
+		spam.lists.conf virus.scanners.conf
+
+do-build:
+	${PERL} -pi -e \
+		's,/opt/MailScanner/lib,'${PREFIX}'/lib/MailScanner,g; \
+		s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+		${WRKSRC}/bin/MailScanner
+	${PERL} -pi -e \
+		's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
+		s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
+		s,/opt/MailScanner/bin,'${PREFIX}'bin,g; \
+		s,/opt/MailScanner/etc/reports,'${DATADIR}'/reports,g; \
+		s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+		${WRKSRC}/etc/MailScanner.conf
+	${PERL} -pi -e \
+		's,/opt/MailScanner/lib,'${PREFIX}'/libexec/MailScanner,g; \
+		s,/bin/false,/usr/bin/false,;' ${WRKSRC}/etc/virus.scanners.conf
+	${PERL} -pi -e \
+		's,/bin/bash,'${PREFIX}'/bash,g; \
+		s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+		${WRKSRC}/bin/update_virus_scanners
+	${PERL} -pi -e \
+		's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
+		s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
+		s,/opt/MailScanner/bin,'${PREFIX}'/bin,g; \
+		s,/opt/MailScanner/etc/reports,'${DATADIR}'/reports,g; \
+		s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+		${WRKSRC}/lib/MailScanner/ConfigDefs.pl
+	${PERL} -pi \
+		-e 's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
 
 do-install:
-	( cd ${WRKSRC} ; ${MAKE} ${INSTALL_TARGET} BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" SHAREOWN="${SHAREOWN}" SHAREGRP="{SHAREGRP}" SHAREMODE="${SHAREMODE}" INSTALL_SCRIPT="${INSTALL_SCRIPT}" INSTALL_DATA="${INSTALL_DATA}" PREFIX="${PREFIX}" WRKSPACE="${WRKSPACE}" OVERWRITE_FILENAMERULES="${OVERWRITE_FILENAMERULES}" OVERWRITE_REPORTS="${OVERWRITE_REPORTS}" )
-
-post-install:
-.for file in ${MAN5}
-	${INSTALL_MAN} ${WRKSRC}/docs/man/${file} ${PREFIX}/man/man5
+	#
+	# Step 1: Install binaries
+	#
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/tnef.linux ${PREFIX}/bin/tnef
+	#
+	# Step 2: Install libexec files
+	#
+	${MKDIR} ${PREFIX}/libexec/MailScanner
+	${CHMOD} -R ${BINMODE} ${PREFIX}/libexec/MailScanner
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${PREFIX}/libexec/MailScanner
+	cd ${WRKSRC}/lib && ${FIND} * -name "*-wrapper" -exec ${INSTALL_SCRIPT} \
+		'{}' ${PREFIX}'/libexec/MailScanner/{}'.sample \;
+	cd ${WRKSRC}/lib && ${FIND} * -name "*-autoupdate" -exec \
+		${INSTALL_SCRIPT} '{}' ${PREFIX}'/libexec/MailScanner/{}'.sample \;
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_virus_scanners \
+		${PREFIX}/libexec/MailScanner/update_virus_scanners
+	#
+	# Step 3: Install etc files
+	#
+	${MKDIR} ${PREFIX}/etc/MailScanner
+	${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner
+.for FILE in ${ETC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} \
+		${PREFIX}/etc/MailScanner/${FILE}.sample
 .endfor
-
-.for file in ${MAN8}
-	${INSTALL_MAN} ${WRKSRC}/docs/man/${file} ${PREFIX}/man/man8
-.endfor
-
+	${MKDIR} ${PREFIX}/etc/MailScanner/rules
+	cd ${WRKSRC}/etc/rules && \
+		${INSTALL_DATA} EXAMPLES README ${PREFIX}/etc/MailScanner/rules
+	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
+		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules.sample
+
+	#
+	# Step 4: Install files in share
+	#
+	@${MKDIR} ${DATADIR}
+	cd ${WRKSRC}/etc && ${FIND} reports -type d -exec \
+		mkdir ${DATADIR}'/{}' \;
+	cd ${WRKSRC}/etc && ${FIND} reports -type f ! -name "*.orig" -exec \
+		${INSTALL_DATA} '{}' ${DATADIR}'/{}'.sample \;
+	${CHMOD} -R ${BINMODE} ${DATADIR}/reports
+	#
+	# Step 5: Install lib
+	#
+	${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm \
+		${PREFIX}/lib/MailScanner/MailScanner.pm
+	cd ${WRKSRC}/lib/MailScanner && ${FIND} * -type f ! -name "*.orig" -exec \
+		${INSTALL_SCRIPT} '{}' ${PREFIX}'/lib/MailScanner/MailScanner/{}' \;
+	#
+	# Step 6: Install Start/Stop scripts
+	#
+	${INSTALL_SCRIPT} ${FILESDIR}/mailscanner.sh \
+		${PREFIX}/etc/rc.d/mailscanner.sh.sample
+	${INSTALL_SCRIPT} ${FILESDIR}/mta.sh ${PREFIX}/etc/rc.d/mta.sh.sample
+	#
+	# Step 7: Docs & Manpages
+	#
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD.port ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
+	cd ${WRKSRC}/docs && \
+		${FIND} * -type d -exec mkdir ${DOCSDIR}'/{}' \; && \
+		${FIND} * -type f ! -name "*.orig" -exec \
+			${INSTALL_DATA} '{}' ${DOCSDIR}'/{}' \;
+	cd ${WRKSRC}/docs/man && \
+		${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5 && \
+		${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
+.endif
 .if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
 	# Upgrading MailScanner.conf file... Please wait
-	@${WRKSRC}/bin/upgrade_MailScanner_conf ${PREFIX}/etc/MailScanner/MailScanner.conf ${PREFIX}/etc/MailScanner/MailScanner.conf.sample > ${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} 2> /dev/null
+	@${WRKSRC}/bin/upgrade_MailScanner_conf \
+		${PREFIX}/etc/MailScanner/MailScanner.conf \
+		${PREFIX}/etc/MailScanner/MailScanner.conf.sample > \
+		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} \
+		2> /dev/null
 	# Diff the files. If the files do not differ, delete the new file
-	@if diff -b -B -q ${PREFIX}/etc/MailScanner/MailScanner.conf ${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} ; \
-	   then ${ECHO} "No changes in MailScanner.conf options found" ; ${RM} ${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} ; \
+	@if diff -b -B -q ${PREFIX}/etc/MailScanner/MailScanner.conf \
+		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} ; \
+	   then ${ECHO} "No changes in MailScanner.conf options found" ; \
+		${RM} ${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} ; \
 	else \
-	   ${ECHO} "Changes in MailScanner.conf found. Please look at ${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION}" ; \
+	   ${ECHO} "Changes in MailScanner.conf found. Please look at \
+		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION}" ; \
 	fi
-
 .endif
-
-	@${SED} -e 's#PREFIX#${PREFIX}#' pkg-message
-
-initial-config:
-	( cd ${WRKSRC} ; ${MAKE} initial-config BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" SHAREOWN="${SHAREOWN}" SHAREGRP="{SHAREGRP}" SHAREMODE="${SHAREMODE}" INSTALL_SCRIPT="${INSTALL_SCRIPT}" INSTALL_DATA="${INSTALL_DATA}" PREFIX="${PREFIX}" WRKSPACE="${WRKSPACE}" OVERWRITE_FILENAMERULES="${OVERWRITE_FILENAMERULES}" OVERWRITE_REPORTS="${OVERWRITE_REPORTS}" )
+	@${SED} -e 's,%%PREFIX%%,${PREFIX},' pkg-message > ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
+
+renew-wrapper: install
+	# Renew virus wrapper scripts
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/*-wrapper ${PREFIX}/libexec/MailScanner
+
+renew-autoupdate: install
+	# Renew autoupdate scripts
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/*-autoupdate ${PREFIX}/libexec/MailScanner
+
+renew-reports: install
+	# Renew reports
+	cd ${WRKSRC}/etc/reports/en && ${FIND} * -type f ! -name "*.orig" \
+		-exec ${INSTALL_DATA} '{}' ${DATADIR}'/reports/en/{}'  \;
+
+initial-config: renew-wrapper renew-autoupdate renew-reports
+	cd ${WRKSRC}/etc && ${INSTALL_DATA} ${ETC_FILES} \
+		${PREFIX}/etc/MailScanner
+	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
+		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules
 
 .include <bsd.port.post.mk>
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index e65b82ff759b..e781e2adb12f 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1 +1 @@
-MD5 (MailScanner-4.22-5.tar.gz) = 1e1cae5094b81306b2a0aad83530506b
+MD5 (MailScanner-4.24-5.tar.gz) = f43e0f6b1febf41aaf843400b1b4b3f5
diff --git a/mail/mailscanner/files/README.FreeBSD.port b/mail/mailscanner/files/README.FreeBSD.port
new file mode 100644
index 000000000000..55b28caaf497
--- /dev/null
+++ b/mail/mailscanner/files/README.FreeBSD.port
@@ -0,0 +1,48 @@
+The MailScanner port is using the original MailScanner tarball from 
+www.mailscanner.info. This tarball puts all the MailScanner files in 
+subdirectories
+
+bin	MailScanner binary / MailScanner start script etc.
+etc	MailScanner config files / rules / report templates
+lib	Virus wrapper and autoupdate scripts / MailScanner Perl libraries
+docs	Documentation
+var	pid file
+
+In order to make this FreeBSD compliant the port installs those files
+in the following directories:
+
+/usr/local/libexec/MailScanner	MailScanner binary, virus wrapper/autoupdate
+/usr/local/lib/MailScanner	MailScanner Perl libraries
+/usr/local/share/MailScanner	MailScanner report templates
+/usr/local/share/doc/MailScanner	Documentation
+/usr/local/etc/MailScanner	MailScanner config files / rules
+/usr/local/etc/rc.d		start/stop scripts
+
+The port installs two start/stop scripts in /usr/local/etc/rc.d:
+
+mailscanner.sh.sample
+mta.sh.sample
+
+My suggestion is to use these scripts instead of the usual FreeBSD MTA startup
+process. This of course means that you will have to disable MTA startup 
+in rc.conf completely. Put this in your rc.conf:
+
+sendmail_enable="NO"
+
+Then adjust sendmail.sh or exim.sh to your configuration. Have a look at the
+MailScanner manpage for MTA setup hints.
+
+When upgrading the port it will try to look for new options/variables in
+MailScanner.conf using Julians upgrade_MailScanner_conf script. If it finds
+changes it will create a newly merged MailScanner.conf and copy it to
+/usr/local/etc/MailScanner/MailScanner.conf.new.PORTVERSION.
+
+
+If you have suggestions for this port please let me know and drop me an e-mail at
+
+j.koopmann@seceidos.de
+
+
+Thanks,
+  Jan-Peter Koopmann
+
diff --git a/mail/mailscanner/files/mailscanner.sh b/mail/mailscanner/files/mailscanner.sh
new file mode 100644
index 000000000000..67b7bbcbe50e
--- /dev/null
+++ b/mail/mailscanner/files/mailscanner.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+msbindir=/usr/local/libexec/MailScanner
+process=MailScanner
+config=/usr/local/etc/MailScanner/MailScanner.conf
+PIDFILE=/var/run/MailScanner.pid
+
+start_ms()
+{
+    pid=`ps -axww |
+         grep '[ ]'$msbindir/$process |
+         awk '{print $1}'`
+
+    if [ "x$pid" = "x" ]; then
+	# Quietly try to raise the open_files limit
+	ulimit -n 2000 >/dev/null 2>&1
+	# Restart it
+	PATH=${msbindir}:$PATH
+	echo Starting MailScanner...
+	cd $msbindir
+	$process $config
+    else
+	echo MailScanner running with pid $pid  
+    fi
+}
+
+stop_ms()
+{
+    echo Stopping MailScanner...
+    kill -TERM -- -`cat $PIDFILE` 2>/dev/null
+    sleep 5
+}
+
+_action=${1:-start}
+
+case ${_action} in
+start)
+	start_ms
+	;;
+
+stop)
+	stop_ms
+	;;
+
+restart)
+	stop_ms
+	start_ms
+	;;
+
+*)
+	echo "Usage: `basename $0` {start|stop|restart}" >&2
+	exit 64
+	;;
+esac
+exit 0
diff --git a/mail/mailscanner/files/mta.sh b/mail/mailscanner/files/mta.sh
new file mode 100644
index 000000000000..7bce65f9d8d8
--- /dev/null
+++ b/mail/mailscanner/files/mta.sh
@@ -0,0 +1,117 @@
+#!/bin/sh
+
+outgoing_queue_time=15m
+mta=exim
+
+case "$mta" in
+	exim)
+		program=/usr/local/sbin/exim
+
+		if [ -f /usr/local/etc/exim/configure.in ]; then
+			incoming_config=/usr/local/etc/exim/configure.in
+		else
+			incoming_config=/usr/local/etc/exim/configure
+		fi
+
+		outgoing_config=/usr/local/etc/exim/configure.out
+
+		inpidfile=/var/run/exim_in.pid
+		outpidfile=/var/run/exim_out.pid
+		subpidfile=
+
+		incoming_args="-C ${incoming_config} -oP ${inpidfile} -bd"
+		outgoing_args="-C ${outgoing_config} -oP ${outpidfile} -q${outgoing_queue_time}"
+		submitqueue_args=
+		;;
+
+	sendmail)
+		program=/usr/sbin/sendmail
+
+		incoming_queue=/var/spool/mqueue.in
+
+		submit_queue_time=${outgoing_queue_time}
+
+		inpidfile=/var/run/sendmail_in.pid
+		outpidfile=/var/run/sendmail_out.pid
+		subpidfile=/var/spool/clientmqueue/sm-client.pid
+
+		incoming_args="-L sm-mta-in -bd \
+				-OPrivacyOptions=noetrn \
+				-OQueueDirectory=${incoming_queue} \
+				-ODeliveryMode=queueonly \
+				-OPidFile=${inpidfile}"
+		outgoing_args="-L sm-mta-out -q${outgoing_queue_time} \
+				-OPidFile=${outpidfile}"
+		submitqueue_args="-L sm-msp-queue -Ac -q${submit_queue_time} \
+				-OPidFile=${subpidfile}"
+		;;
+
+	*)
+		echo "ERROR: I don't know the MTA '$mta'. Check your settings." >&2
+		exit 2
+		;;
+esac
+
+start_mta()
+{
+	echo -n " `basename ${program}`(incoming)"
+	${program} ${incoming_args}
+
+	echo -n " `basename ${program}`(outgoing)"
+	${program} ${outgoing_args}
+}
+
+start_mspq ()
+{
+	if [ "${submitqueue_args}" ]; then
+		echo -n " `basename ${program}`(submitqueue)"
+		${program} ${submitqueue_args}
+	fi
+}
+
+stop_mta()
+{
+	echo "Stopping `basename ${program}` (incoming)"
+	kill -TERM `head -1 ${inpidfile}` 2>/dev/null
+
+	echo "Stopping `basename ${program}` (outgoing)"
+	kill -TERM `head -1 ${outpidfile}` 2>/dev/null
+}
+
+stop_mspq ()
+{
+	if [ "${submitqueue_args}" ]; then
+		echo "Stopping `basename ${program}` (submitqueue)"
+		kill -TERM `head -1 ${subpidfile}` 2>/dev/null
+	fi
+}
+
+
+_action=${1:-start}
+
+case ${_action} in
+start)
+        start_mta
+	start_mspq
+        ;;
+
+stop)
+        stop_mta
+	stop_mspq
+        ;;
+
+restart)
+	stop_mta
+	stop_mspq
+	sleep 5
+	start_mta
+	start_mspq
+	;;
+
+*)
+	echo "Usage: `basename $0` {start|stop|restart}" >&2
+	exit 64
+	;;
+esac
+exit 0
+
diff --git a/mail/mailscanner/files/patch-Makefile b/mail/mailscanner/files/patch-Makefile
deleted file mode 100644
index 786176c9b8b7..000000000000
--- a/mail/mailscanner/files/patch-Makefile
+++ /dev/null
@@ -1,153 +0,0 @@
---- ../MailScanner-4.22-5.old/Makefile	Thu Jan  1 01:00:00 1970
-+++ Makefile	Mon Aug 11 12:36:06 2003
-@@ -0,0 +1,150 @@
-+BINOWN=		root
-+BINGRP=		wheel
-+BINMODE=	555
-+SHAREOWN=	root
-+SHAREGRP=	wheel
-+SHAREMODE=	444
-+
-+
-+INSTALL_SCRIPT=	install -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} 
-+INSTALL_DATA=	install -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE}
-+PREFIX=		/usr/local
-+
-+OVERWRITE_FILENAMERULES=no
-+OVERWRITE_REPORTS=no
-+
-+all:	
-+
-+build:
-+
-+install:	install_libexec install_etc install_share install_lib install_startstop install_bin
-+
-+install_bin:
-+.if !exists(.install_bin_DONE)
-+	${INSTALL_SCRIPT} bin/tnef.linux ${PREFIX}/bin/tnef
-+	touch .install_bin_DONE
-+.endif
-+
-+install_libexec:
-+.if !exists(.install_libexec_DONE)
-+	@-mkdir ${PREFIX}/libexec/MailScanner 2>/dev/null
-+	@-chmod -R ${BINMODE} ${PREFIX}/libexec/MailScanner 2>/dev/null
-+	${INSTALL_SCRIPT} bin/MailScanner ${PREFIX}/libexec/MailScanner
-+
-+	# copy wrapper scripts
-+	( cd lib ; find * -name "*-wrapper" -exec ${INSTALL_SCRIPT} '{}' ${PREFIX}'/libexec/MailScanner/{}'.sample \; ) 
-+
-+	# copy autoupdate scripts
-+	( cd lib ; find * -name "*-autoupdate" -exec ${INSTALL_SCRIPT} '{}' ${PREFIX}'/libexec/MailScanner/{}'.sample \; )
-+
-+	touch .install_libexec_DONE
-+.endif
-+
-+
-+install_etc:
-+.if !exists(.install_etc_DONE)
-+	@-mkdir ${PREFIX}/etc/MailScanner 2>/dev/null
-+	@-chmod -R ${BINMODE} ${PREFIX}/etc/MailScanner 2>/dev/null
-+	${INSTALL_DATA} etc/MailScanner.conf ${PREFIX}/etc/MailScanner/MailScanner.conf.sample
-+
-+	# depending on the setting OVERWRITE_FILENAMERULES we will copy them or append a .sample (default)
-+.if (${OVERWRITE_FILENAMERULES} == "yes")
-+	${INSTALL_DATA} etc/filename.rules.conf ${PREFIX}/etc/MailScanner/filename.rules.conf
-+.else
-+	${INSTALL_DATA} etc/filename.rules.conf ${PREFIX}/etc/MailScanner/filename.rules.conf.sample
-+.endif
-+
-+	${INSTALL_DATA} etc/spam.assassin.prefs.conf ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf.sample
-+	${INSTALL_DATA} etc/spam.lists.conf ${PREFIX}/etc/MailScanner/spam.lists.conf.sample
-+	${INSTALL_DATA} etc/virus.scanners.conf ${PREFIX}/etc/MailScanner/virus.scanners.conf
-+
-+	# rules subdir
-+	@-mkdir ${PREFIX}/etc/MailScanner/rules 2>/dev/null
-+	@-chmod -R ${BINMODE} ${PREFIX}/etc/MailScanner/rules 2>/dev/null
-+	${INSTALL_DATA} etc/rules/EXAMPLES ${PREFIX}/etc/MailScanner/rules/EXAMPLES
-+	${INSTALL_DATA} etc/rules/README ${PREFIX}/etc/MailScanner/rules/README
-+	${INSTALL_DATA} etc/rules/spam.whitelist.rules ${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules.sample
-+
-+	touch .install_etc_DONE
-+.endif
-+	
-+install_share:
-+.if !exists(.install_share_DONE)
-+	@-mkdir ${PREFIX}/share/doc 2>/dev/null
-+
-+	@-mkdir ${PREFIX}/share/MailScanner
-+	@-chmod -R ${BINMODE} ${PREFIX}/share/MailScanner 2>/dev/null
-+
-+	@-mkdir ${PREFIX}/share/doc/MailScanner 2>/dev/null
-+	@-chmod -R ${BINMODE} ${PREFIX}/share/doc/MailScanner 2>/dev/null
-+	
-+	# First we create subdirectories if there are any
-+	( cd docs ; find * -type d -exec mkdir ${PREFIX}'/share/doc/MailScanner/{}' \; )
-+	( cd docs ; find * -type f ! -name "*.orig" -exec ${INSTALL_DATA} '{}' ${PREFIX}'/share/doc/MailScanner/{}' \; )
-+
-+	${INSTALL_DATA} INSTALL ${PREFIX}/share/doc/MailScanner/INSTALL
-+	${INSTALL_DATA} INSTALL.FreeBSD ${PREFIX}/share/doc/MailScanner/INSTALL.FreeBSD
-+	${INSTALL_DATA} INSTALL.OpenBSD ${PREFIX}/share/doc/MailScanner/INSTALL.OpenBSD
-+	${INSTALL_DATA} README ${PREFIX}/share/doc/MailScanner/README
-+
-+        # reports subdir
-+        # Create report subdirectories and set modes
-+	( cd etc ; find reports -type d -exec mkdir ${PREFIX}'/share/MailScanner/{}' \; ) 2>/dev/null
-+	@-chmod -R ${BINMODE} ${PREFIX}/share/MailScanner/reports
-+
-+        # Copy the individual reports
-+        # depending on the setting OVERWRITE_REPORTS we will copy them or append a .sample (default)
-+.if (${OVERWRITE_REPORTS} == "yes")
-+	( cd etc ; find reports -type f ! -name "*.orig" -exec ${INSTALL_DATA} '{}' ${PREFIX}'/share/MailScanner/{}' \; )
-+.else
-+	( cd etc ; find reports -type f ! -name "*.orig" -exec ${INSTALL_DATA} '{}' ${PREFIX}'/share/MailScanner/{}'.sample \; )
-+.endif
-+
-+	touch .install_share_DONE
-+.endif
-+	
-+install_lib:
-+.if !exists(.install_lib_DONE)
-+	@-mkdir ${PREFIX}/lib/MailScanner 2>/dev/null
-+	@-mkdir ${PREFIX}/lib/MailScanner/MailScanner 2>/dev/null
-+	@-chmod -R ${BINMODE} ${PREFIX}/lib/MailScanner 2>/dev/null
-+	@-chmod -R ${BINMODE} ${PREFIX}/lib/MailScanner/MailScanner 2>/dev/null
-+
-+	${INSTALL_SCRIPT} lib/MailScanner.pm ${PREFIX}/lib/MailScanner/MailScanner.pm
-+	
-+	(cd lib/MailScanner ; find * -type f ! -name "*.orig" -exec ${INSTALL_SCRIPT} '{}' ${PREFIX}'/lib/MailScanner/MailScanner/{}' \; )
-+
-+	touch .install_lib_DONE
-+.endif 
-+
-+install_startstop:
-+.if !exists(.install_startstop_DONE)
-+
-+	${INSTALL_SCRIPT} bin/mailscanner.sh ${PREFIX}/etc/rc.d/mailscanner.sh.sample
-+	${INSTALL_SCRIPT} bin/mta.sh ${PREFIX}/etc/rc.d/mta.sh.sample
-+
-+	touch .install_startstop_DONE
-+.endif
-+
-+initial-config:	install
-+	# copy all files needed for standard config
-+
-+	# copy wrapper scripts
-+	( cd lib ; find * -name "*-wrapper" -exec ${INSTALL_SCRIPT} '{}' ${PREFIX}'/libexec/MailScanner/{}' \; )
-+
-+	# copy autoupdate scripts
-+	( cd lib ; find * -name "*-autoupdate" -exec ${INSTALL_SCRIPT} '{}' ${PREFIX}'/libexec/MailScanner/{}' \; )
-+
-+	${INSTALL_DATA} etc/MailScanner.conf ${PREFIX}/etc/MailScanner/MailScanner.conf
-+	${INSTALL_DATA} etc/filename.rules.conf ${PREFIX}/etc/MailScanner/filename.rules.conf
-+
-+
-+	${INSTALL_DATA} etc/spam.assassin.prefs.conf ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf
-+	${INSTALL_DATA} etc/spam.lists.conf ${PREFIX}/etc/MailScanner/spam.lists.conf
-+	${INSTALL_DATA} etc/virus.scanners.conf ${PREFIX}/etc/MailScanner/virus.scanners
-+
-+	${INSTALL_DATA} etc/rules/spam.whitelist.rules ${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules
-+
-+	( cd etc/reports/en ; find * -type f ! -name "*.orig" -exec ${INSTALL_DATA} '{}' ${PREFIX}'/share/MailScanner/reports/en/{}' \; );
-+
-+
diff --git a/mail/mailscanner/files/patch-bin:MailScanner b/mail/mailscanner/files/patch-bin:MailScanner
deleted file mode 100644
index 5b890139399c..000000000000
--- a/mail/mailscanner/files/patch-bin:MailScanner
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../MailScanner-4.22-5.old/bin/MailScanner	Mon Aug 11 12:15:30 2003
-+++ bin/MailScanner	Mon Aug 11 12:36:06 2003
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -I/opt/MailScanner/lib
-+#!/usr/bin/perl -I/usr/local/lib/MailScanner
- #
- #   MailScanner - SMTP E-Mail Virus Scanner
- #   Copyright (C) 2002  Julian Field
-@@ -125,7 +125,7 @@
- 
- # Find the mailscanner.conf file, with a default just in case.
- my $ConfFile = $ARGV[0];
--$ConfFile = '/opt/MailScanner/etc/MailScanner.conf' unless $ConfFile;
-+$ConfFile = '/usr/local/etc/MailScanner/MailScanner.conf' unless $ConfFile;
- 
- # Load the MTA modules we need
- my($MTAmod, $MTADSmod);
diff --git a/mail/mailscanner/files/patch-bin:mailscanner.sh b/mail/mailscanner/files/patch-bin:mailscanner.sh
deleted file mode 100644
index 76a2fbb9cd23..000000000000
--- a/mail/mailscanner/files/patch-bin:mailscanner.sh
+++ /dev/null
@@ -1,58 +0,0 @@
---- ../MailScanner-4.22-5.old/bin/mailscanner.sh	Thu Jan  1 01:00:00 1970
-+++ bin/mailscanner.sh	Mon Aug 11 12:36:06 2003
-@@ -0,0 +1,55 @@
-+#!/bin/sh
-+
-+msbindir=/usr/local/libexec/MailScanner
-+process=MailScanner
-+config=/usr/local/etc/MailScanner/MailScanner.conf
-+PIDFILE=/var/run/MailScanner.pid
-+
-+start_ms()
-+{
-+    pid=`ps -axww |
-+         grep '[ ]'$msbindir/$process |
-+         awk '{print $1}'`
-+
-+    if [ "x$pid" = "x" ]; then
-+	# Quietly try to raise the open_files limit
-+	ulimit -n 2000 >/dev/null 2>&1
-+	# Restart it
-+	PATH=${msbindir}:$PATH
-+	echo Starting MailScanner...
-+	cd $msbindir
-+	$process $config
-+    else
-+	echo MailScanner running with pid $pid  
-+    fi
-+}
-+
-+stop_ms()
-+{
-+    echo Stopping MailScanner...
-+    kill -TERM -- -`cat $PIDFILE` 2>/dev/null
-+    sleep 5
-+}
-+
-+_action=${1:-start}
-+
-+case ${_action} in
-+start)
-+	start_ms
-+	;;
-+
-+stop)
-+	stop_ms
-+	;;
-+
-+restart)
-+	stop_ms
-+	start_ms
-+	;;
-+
-+*)
-+	echo "Usage: `basename $0` {start|stop|restart}" >&2
-+	exit 64
-+	;;
-+esac
-+exit 0
diff --git a/mail/mailscanner/files/patch-bin:mta.sh b/mail/mailscanner/files/patch-bin:mta.sh
deleted file mode 100644
index 94acdaf0af75..000000000000
--- a/mail/mailscanner/files/patch-bin:mta.sh
+++ /dev/null
@@ -1,120 +0,0 @@
---- ../MailScanner-4.22-5.old/bin/mta.sh	Thu Jan  1 01:00:00 1970
-+++ bin/mta.sh	Mon Aug 11 12:36:06 2003
-@@ -0,0 +1,117 @@
-+#!/bin/sh
-+
-+outgoing_queue_time=15m
-+mta=exim
-+
-+case "$mta" in
-+	exim)
-+		program=/usr/local/sbin/exim
-+
-+		if [ -f /usr/local/etc/exim/configure.in ]; then
-+			incoming_config=/usr/local/etc/exim/configure.in
-+		else
-+			incoming_config=/usr/local/etc/exim/configure
-+		fi
-+
-+		outgoing_config=/usr/local/etc/exim/configure.out
-+
-+		inpidfile=/var/run/exim_in.pid
-+		outpidfile=/var/run/exim_out.pid
-+		subpidfile=
-+
-+		incoming_args="-C ${incoming_config} -oP ${inpidfile} -bd"
-+		outgoing_args="-C ${outgoing_config} -oP ${outpidfile} -q${outgoing_queue_time}"
-+		submitqueue_args=
-+		;;
-+
-+	sendmail)
-+		program=/usr/sbin/sendmail
-+
-+		incoming_queue=/var/spool/mqueue.in
-+
-+		submit_queue_time=${outgoing_queue_time}
-+
-+		inpidfile=/var/run/sendmail_in.pid
-+		outpidfile=/var/run/sendmail_out.pid
-+		subpidfile=/var/spool/clientmqueue/sm-client.pid
-+
-+		incoming_args="-L sm-mta-in -bd \
-+				-OPrivacyOptions=noetrn \
-+				-OQueueDirectory=${incoming_queue} \
-+				-ODeliveryMode=queueonly \
-+				-OPidFile=${inpidfile}"
-+		outgoing_args="-L sm-mta-out -q${outgoing_queue_time} \
-+				-OPidFile=${outpidfile}"
-+		submitqueue_args="-L sm-msp-queue -Ac -q${submit_queue_time} \
-+				-OPidFile=${subpidfile}"
-+		;;
-+
-+	*)
-+		echo "ERROR: I don't know the MTA '$mta'. Check your settings." >&2
-+		exit 2
-+		;;
-+esac
-+
-+start_mta()
-+{
-+	echo -n " `basename ${program}`(incoming)"
-+	${program} ${incoming_args}
-+
-+	echo -n " `basename ${program}`(outgoing)"
-+	${program} ${outgoing_args}
-+}
-+
-+start_mspq ()
-+{
-+	if [ "${submitqueue_args}" ]; then
-+		echo -n " `basename ${program}`(submitqueue)"
-+		${program} ${submitqueue_args}
-+	fi
-+}
-+
-+stop_mta()
-+{
-+	echo "Stopping `basename ${program}` (incoming)"
-+	kill -TERM `head -1 ${inpidfile}` 2>/dev/null
-+
-+	echo "Stopping `basename ${program}` (outgoing)"
-+	kill -TERM `head -1 ${outpidfile}` 2>/dev/null
-+}
-+
-+stop_mspq ()
-+{
-+	if [ "${submitqueue_args}" ]; then
-+		echo "Stopping `basename ${program}` (submitqueue)"
-+		kill -TERM `head -1 ${subpidfile}` 2>/dev/null
-+	fi
-+}
-+
-+
-+_action=${1:-start}
-+
-+case ${_action} in
-+start)
-+        start_mta
-+	start_mspq
-+        ;;
-+
-+stop)
-+        stop_mta
-+	stop_mspq
-+        ;;
-+
-+restart)
-+	stop_mta
-+	stop_mspq
-+	sleep 5
-+	start_mta
-+	start_mspq
-+	;;
-+
-+*)
-+	echo "Usage: `basename $0` {start|stop|restart}" >&2
-+	exit 64
-+	;;
-+esac
-+exit 0
-+
diff --git a/mail/mailscanner/files/patch-docs:README.FreeBSD.port b/mail/mailscanner/files/patch-docs:README.FreeBSD.port
deleted file mode 100644
index 5e4af08e3aa0..000000000000
--- a/mail/mailscanner/files/patch-docs:README.FreeBSD.port
+++ /dev/null
@@ -1,51 +0,0 @@
---- ../MailScanner-4.22-5.old/docs/README.FreeBSD.port	Thu Jan  1 01:00:00 1970
-+++ docs/README.FreeBSD.port	Mon Aug 11 12:36:06 2003
-@@ -0,0 +1,48 @@
-+The MailScanner port is using the original MailScanner tarball from 
-+www.mailscanner.info. This tarball puts all the MailScanner files in 
-+subdirectories
-+
-+bin	MailScanner binary / MailScanner start script etc.
-+etc	MailScanner config files / rules / report templates
-+lib	Virus wrapper and autoupdate scripts / MailScanner Perl libraries
-+docs	Documentation
-+var	pid file
-+
-+In order to make this FreeBSD compliant the port installs those files
-+in the following directories:
-+
-+/usr/local/libexec/MailScanner	MailScanner binary, virus wrapper/autoupdate
-+/usr/local/lib/MailScanner	MailScanner Perl libraries
-+/usr/local/share/MailScanner	MailScanner report templates
-+/usr/local/share/doc/MailScanner	Documentation
-+/usr/local/etc/MailScanner	MailScanner config files / rules
-+/usr/local/etc/rc.d		start/stop scripts
-+
-+The port installs two start/stop scripts in /usr/local/etc/rc.d:
-+
-+mailscanner.sh.sample
-+mta.sh.sample
-+
-+My suggestion is to use these scripts instead of the usual FreeBSD MTA startup
-+process. This of course means that you will have to disable MTA startup 
-+in rc.conf completely. Put this in your rc.conf:
-+
-+sendmail_enable="NO"
-+
-+Then adjust sendmail.sh or exim.sh to your configuration. Have a look at the
-+MailScanner manpage for MTA setup hints.
-+
-+When upgrading the port it will try to look for new options/variables in
-+MailScanner.conf using Julians upgrade_MailScanner_conf script. If it finds
-+changes it will create a newly merged MailScanner.conf and copy it to
-+/usr/local/etc/MailScanner/MailScanner.conf.new.PORTVERSION.
-+
-+
-+If you have suggestions for this port please let me know and drop me an e-mail at
-+
-+j.koopmann@seceidos.de
-+
-+
-+Thanks,
-+  Jan-Peter Koopmann
-+
diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.8 b/mail/mailscanner/files/patch-docs:man:MailScanner.8
deleted file mode 100644
index 095a71c43a24..000000000000
--- a/mail/mailscanner/files/patch-docs:man:MailScanner.8
+++ /dev/null
@@ -1,122 +0,0 @@
---- ../MailScanner-4.22-5.old/docs/man/MailScanner.8	Mon Aug 11 12:15:30 2003
-+++ docs/man/MailScanner.8	Mon Aug 11 12:36:06 2003
-@@ -1,102 +1,17 @@
--.TH "MailScanner" "8" "4.22-4" "Julian Field" "Mail"
--.SH "NAME"
--.LP 
--MailScanner \- Virus/Spam Scanner for Sendmail and Exim
--.SH "SYNOPSIS"
--.LP 
--\fBMailScanner\fR [\fIconfigfile\fR]
--
--.SH "DESCRIPTION"
--.LP 
--\fBMailScanner\fR starts the main MailScanner process. [\fIconfigfile\fR] should point to a valid MailScanner configuration file (see MailScanner.conf(3) for details). The default location for this file depends on the operating system.
--.br 
--
--.br 
--Linux: /etc/MailScanner/MailScanner.conf
--.br 
--
--.br 
--FreeBSD: /usr/local/etc/MailScanner/MailScanner.conf
--.br 
--
--.br 
--Other: /opt/MailScanner/etc/MailScanner.conf
--
--.LP 
--The main process then spawns \fIn\fR number of child processes. \fIn\fR is configured in [\fIconfigfile\fR] with the option "Max Children". Each process waits for messages to appear in the "Incoming Queue Dir", processes these messages and then puts them in the "Outgoing Queue Dir". You may need to adjust the configuration of your MTA (or the startup of your MTA) to make it work with MailScanner.
--
--.SH "MTA SETUP"
--.LP 
--It is important that your MTA only queues incoming mail and does not deliver it automatically. You need two mail queues (incoming and outgoing). Moreover you should setup two instances of your MTA. One that accepts incoming mail and puts it to an incoming queue and one that sends out mail that resides in the outgoing queue. 
--
--.LP 
--A common setup for Sendmail could look like this:
--.br 
--
--.br 
--1. Verify that you already have one queue (e.g. in /var/spool/mqueue).
--.br 
--
--.br 
--2. Create a second queue (e.g. /var/spool/mqueue.in) and apply the same owner/group/mode.
--.br 
--
--.br 
--3. Change your sendmail startup from
--.br 
--
--.br 
--    sendmail \-bd \-q15m (or similar)
--.br 
--
--.br 
--   to
--.br 
--
--.br 
--    sendmail \-bd \-OPrivacyOptions=noetrn \-ODeliveryMode=queueonly \-OQueueDirectory=/var/spool/mqueue.in
--.br 
--    sendmail \-q15m
--
--.LP 
--A similar setup for Exim could look like this:
--.br 
--
--.br 
--1. Create two queues (e.g. /var/spool/exim.in and /var/spool/exim.out) with appropriate owner/group/mode (e.g. owner=mailnull, group=mail, mode=750).
--.br 
--
--.br 
--2. Create two exim configurations (e.g. /usr/local/etc/exim/configure.in, /usr/local/etc/exim/configure.out).
--.br 
--
--.br 
--3. Make sure that the incoming exim configuration only queues mails and never delivers mail itself. This can be achieved by using the Exim config option "queue_only = true" and/or a special router definition (Exim 4 syntax):
--.br 
--
--.br 
--    defer_router:
--.br 
--    driver = manualroute
--.br 
--    self = defer   
--.br 
--    transport = remote_smtp
--.br 
--    route_list = *  127.0.0.1  byname
--.br 
--    verify = false
--.br 
--
--.br 
--4. Start two exim instances:
--.br 
--
--.br 
--    exim \-C /usr/local/etc/exim/configure.in
--.br 
--    exim \-C /usr/local/etc/exim/configure.out
--
--.SH "SEE ALSO"
--.LP 
--MailScanner.conf(3)
-+<!-- Creator     : groff version 1.19 -->
-+<!-- CreationDate: Mon Aug 11 12:28:56 2003 -->
-+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-+"http://www.w3.org/TR/html4/loose.dtd">
-+<html>
-+<head>
-+<meta name="generator" content="groff -Thtml, see www.gnu.org">
-+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-+<meta name="Content-Style" content="text/css">
-+<title></title>
-+</head>
-+<body>
-+
-+<hr>
-+<hr>
-+</body>
-+</html>
diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5
deleted file mode 100644
index cee3e58ca2d5..000000000000
--- a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5
+++ /dev/null
@@ -1,187 +0,0 @@
---- ../MailScanner-4.22-5.old/docs/man/MailScanner.conf.5	Mon Aug 11 12:15:30 2003
-+++ docs/man/MailScanner.conf.5	Mon Aug 11 12:36:06 2003
-@@ -1,4 +1,4 @@
--.TH "MailScanner.conf" "5" "4.22-4" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.23" "Julian Field" "Mail"
- .SH "NAME"
- .LP 
- MailScanner.conf \- Main configuration for MailScanner
-@@ -279,9 +279,15 @@
- .br 
- 
- .br 
--Anything on the next line that appears in brackets at the end of a line of output from Sophos will cause the error/infection to be ignored. Use of this option is dangerous, and should only be used if you are having trouble with lots of corrupt PDF files, for example. Example: 
-+Anything on the next line that appears in brackets at the end of a line of output from Sophos will cause the error/infection to be ignored. Use of this option is dangerous, and should only be used if you are having trouble with lots of corrupt PDF files, for example. This option allows for multiple strings as well. In this case, the strings should be put in double quotes (") and each string separated with commas. Examples: 
- .br 
- Allowed Sophos Error Messages = corrupt format not supported
-+.br 
-+Allowed Sophos Error Messages = "corrupt", "format not supported"
-+.br 
-+
-+.br 
-+The first version will match "corrupt format not supported" only. The second version will match "corrupt" and "format not supported".
- 
- .TP 
- \fBSophos IDE Dir\fR
-@@ -358,11 +364,13 @@
- .br 
- 
- .br 
--Messages whose virus reports contain any of the words listed here will be treated as "silent" viruses. No messages will be sent back to the senders of these viruses, and the delivery to the recipient of the message can be controlled by the next option "Still Deliver Silent Viruses". This is primarily designed for viruses such as "Klez" and "Bugbear" which put fake addresses on messages they send, so there is no point informing the sender of the message, as it won't actually be them who sent it anyway. Other words that can be put in this list are the 2 special keywords
-+Messages whose virus reports contain any of the words listed here will be treated as "silent" viruses. No messages will be sent back to the senders of these viruses, and the delivery to the recipient of the message can be controlled by the next option "Still Deliver Silent Viruses". This is primarily designed for viruses such as "Klez" and "Bugbear" which put fake addresses on messages they send, so there is no point informing the sender of the message, as it won't actually be them who sent it anyway. Other words that can be put in this list are the 3 special keywords
- .br 
- HTML\-IFrame: inserting this will stop senders being warned about HTML Iframe tags, when they are not allowed.
- .br 
- HTML\-Codebase: inserting this will stop senders being warned about HTML Object Codebase tags, when they are not allowed.
-+.br 
-+All\-Viruses: inserting this will stop senders being warned about any virus, while still allowing you to warn senders about HTML\-based attacks.
- 
- 
- .TP 
-@@ -539,7 +547,31 @@
- .br 
- 
- .br 
--When an attachment is deleted from a message (and the attachment has been stored in the quarantine) because the filename failed the filename rules in force for the message, it is replaced by the contents of this file. A few variable substitutions can be made in this file, an example of each of which is contained in the supplied sample file. 
-+When an attachment is deleted and stored from a message (and the attachment has been stored in the quarantine) because the filename failed the filename rules in force for the message, it is replaced by the contents of this file. A few variable substitutions can be made in this file, an example of each of which is contained in the supplied sample file. 
-+
-+.TP 
-+\fBDeleted Bad Content Message Report\fR
-+Default: /opt/MailScanner/etc/reports/en/deleted.content.message.txt
-+.br 
-+Default Linux: /etc/MailScanner/reports/en/deleted.content.message.txt
-+.br 
-+Default FreeBSD: /usr/local/share/MailScanner/reports/en/deleted.content.message.txt
-+.br 
-+
-+.br 
-+This report is sent when a message is deleted because it contained bad or dangerous content. A few variable substitutions can be made in this file, an example of each of which is contained in the supplied sample file. 
-+
-+.TP 
-+\fBStored Bad Content Message Report\fR
-+Default: /opt/MailScanner/etc/reports/en/stored.content.message.txt
-+.br 
-+Default Linux: /etc/MailScanner/reports/en/stored.content.message.txt
-+.br 
-+Default FreeBSD: /usr/local/share/MailScanner/reports/en/stored.content.message.txt
-+.br 
-+
-+.br 
-+This report is sent when a message is stored because it contained bad or dangerous content. A few variable substitutions can be made in this file, an example of each of which is contained in the supplied sample file. 
- 
- .TP 
- \fBDisinfected Report\fR
-@@ -600,7 +632,8 @@
- 
- .br 
- When an attachment is trapped by the filename rules, this message is sent back to the sender. 
--:
-+
-+
- .TP 
- \fBSender Virus Report\fR
- Default: /opt/MailScanner/etc/reports/en/sender.virus.report.txt
-@@ -613,6 +646,7 @@
- .br 
- When an attachment is removed because of a virus, this message is sent back to the sender. 
- 
-+
- .TP 
- \fBHide Incoming Work Dir\fR
- Default: yes
-@@ -623,11 +657,13 @@
- 
- .TP 
- \fBInclude Scanner Name in Reports\fR
--Default: no
-+Default: yes
- .br 
- 
- .br 
--Include the name of the virus scanner in each of the scanner reports. Very useful if you use several virus scanners, but a bad idea if you don't want to let your customers know which scanners you use.
-+Include the name of the virus scanner in each of the scanner reports. This also includes the translation of "MailScanner" in each of the report lines resulting from one of MailScanner's own checks such as filename, filetype or dangerous HTML content. To change the name "MailScanner", look in reports/...../languages.conf.
-+.br 
-+Very useful if you use several virus scanners, but a bad idea if you don't want to let your customers know which scanners you use.
- .SH "Changes to message headers"
- .TP 
- \fBMail Header\fR
-@@ -839,17 +875,34 @@
- .br 
- 
- .br 
--If this is set, then the "Subject:" line of a message that had an attachment with a dangerous filename will have the "Virus Subject Text" text inserted at the start. 
-+If this is set, then the "Subject:" line of a message that had an attachment with a dangerous filename will have the "Filename Subject Text" text inserted at the start. 
- 
- .TP 
- \fBFilename Subject Text\fR
--Default: yes
-+Default: {Virus?}
- .br 
- 
- .br 
- This is the text inserted at the start of the "Subject:" line if the "Filename Modify Subject" option is set. 
- 
- .TP 
-+\fBContent Modify Subject\fR
-+Default: yes
-+.br 
-+
-+.br 
-+If this is set, then the "Subject:" line of a message that triggered a content check without anything else wrong in the message will have the "Content Subject Text" text inserted at the start. 
-+
-+.TP 
-+\fBContent Subject Text\fR
-+Default: {Filename?}
-+.br 
-+
-+.br 
-+This is the text inserted at the start of the "Subject:" line if the "Content Modify Subject" option is set. 
-+
-+
-+.TP 
- \fBSpam Modify Subject\fR
- Default: yes
- .br 
-@@ -1081,6 +1134,14 @@
- .br 
- This option would normally be a ruleset. Any messages for which the ruleset result is "yes" will always be marked as spam. This is used to create a spam "blacklist" of addresses of known spammers. 
- 
-+.TP 
-+\fBDefinite Spam Is High Scoring\fR
-+Default: no
-+.br 
-+
-+.br 
-+Setting this to yes means that spam found in the blacklist is treated as "High Scoring Spam" in the "Spam Actions" section below. Setting it to no means that it will be treated as "normal" spam. This can also be the filename of a ruleset.
-+
- .SH "SpamAssassin"
- .TP 
- \fBUse SpamAssassin\fR
-@@ -1411,6 +1472,27 @@
- 
- .br 
- Are you using Exim with split spool directories? If you don't understand this, the answer is probably "no". Refer to the Exim documentation for more information about split spool directories.
-+
-+.TP 
-+\fBUse Default Rules With Multiple Recipients\fR
-+Default: no
-+.br 
-+
-+.br 
-+When trying to work out the value of configuration parameters which are using a ruleset, this controls the behaviour when a rule is checking the  "To:" addresses.  If this option is set to "yes", then the following happens when checking the ruleset:
-+.br 
-+
-+.br 
-+a) 1 recipient. Same behaviour as normal.
-+.br 
-+b) Several recipients, but all in the same domain (domain.com for example). The rules are checked for one that matches the string "*@domain.com".
-+.br 
-+c) Several recipients, not all in the same domain. The rules are checked for one that matches the string "*@*".
-+.br 
-+
-+.br 
-+If this option is set to "no", then some rules will use the result they get from the first matching rule for any of the recipients of a message, so the exact value cannot be predicted for messages with more than 1 recipient. This value *cannot* be the filename of a ruleset.
-+
- .SH "RULESETS"
- .LP 
- Ruleset files should all be put in /opt/MailScanner/etc/rules (FreeBSD: /usr/local/etc/MailScanner/rules) and their filename should end in ".rules" wherever possible.
diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html
deleted file mode 100644
index 2bd02e51127f..000000000000
--- a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html
+++ /dev/null
@@ -1,3570 +0,0 @@
---- ../MailScanner-4.22-5.old/docs/man/MailScanner.conf.5.html	Mon Aug 11 12:15:30 2003
-+++ docs/man/MailScanner.conf.5.html	Mon Aug 11 12:36:06 2003
-@@ -1,8 +1,11 @@
--<!-- Creator     : groff version 1.18.1 -->
--<!-- CreationDate: Tue Jul  1 18:33:27 2003 -->
-+<!-- Creator     : groff version 1.19 -->
-+<!-- CreationDate: Mon Aug 11 12:28:56 2003 -->
-+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-+"http://www.w3.org/TR/html4/loose.dtd">
- <html>
- <head>
- <meta name="generator" content="groff -Thtml, see www.gnu.org">
-+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
- <meta name="Content-Style" content="text/css">
- <title>MailScanner.conf</title>
- </head>
-@@ -42,7 +45,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>MailScanner.conf &minus; Main configuration for
- MailScanner</p>
-@@ -54,7 +57,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>none</p>
- </td>
-@@ -65,7 +68,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>MailScanner is configured using the file
- MailScanner.conf. The location of this file varies from
-@@ -76,24 +79,24 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="5" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="7%">
- 
- <p>Linux:</p>
- </td>
--<td width="7%"></td>
--<td width="7%">
-+<td width="8%"></td>
-+<td width="8%">
- 
- <p>/etc/MailScanner</p>
- </td>
--<td width="67%">
-+<td width="66%">
- </td>
- </table>
- <!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>FreeBSD: /usr/local/etc/MailScanner<br>
- Other: /opt/MailScanner/etc</p>
-@@ -128,7 +131,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Max Children</b></p></td>
- </table>
-@@ -136,8 +139,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 5</p>
- <!-- INDENTATION -->
- <p>MailScanner uses your server efficiently by running
-@@ -153,7 +156,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Run as User</b></p></td>
- </table>
-@@ -161,8 +164,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: not to change user</p>
- <!-- INDENTATION -->
- <p>Provided for Exim users (and anyone not running sendmail
-@@ -174,7 +177,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Run as Group</b></p></td>
- </table>
-@@ -182,8 +185,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: not to change group</p>
- <!-- INDENTATION -->
- <p>Provided for Exim users (and anyone not running sendmail
-@@ -195,7 +198,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Queue Scan Interval</b></p></td>
- </table>
-@@ -203,8 +206,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 5</p>
- <!-- INDENTATION -->
- <p>How often (in seconds) should each process check the
-@@ -219,7 +222,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Incoming Queue Dir</b></p></td>
- </table>
-@@ -227,8 +230,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /var/spool/mqueue.in</p>
- <!-- INDENTATION -->
- <p>Directory in which MailScanner should find e&minus;mail
-@@ -248,7 +251,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Outgoing Queue Dir</b></p></td>
- </table>
-@@ -256,8 +259,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /var/spool/mqueue</p>
- <!-- INDENTATION -->
- <p>Directory in which MailScanner should place scanned
-@@ -269,7 +272,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Incoming work dir</b></p></td>
- </table>
-@@ -277,8 +280,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /opt/MailScanner/var/incoming<br>
- Default FreeBSD: /var/spool/MailScanner/incoming</p>
- <!-- INDENTATION -->
-@@ -290,7 +293,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Quarantine Dir</b></p></td>
- </table>
-@@ -298,8 +301,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /opt/MailScanner/var/quarantine<br>
- Default FreeBSD: /var/spool/MailScanner/quarantine</p>
- <!-- INDENTATION -->
-@@ -312,7 +315,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>PID file</b></p></td>
- </table>
-@@ -320,8 +323,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /opt/MailScanner/var/MailScanner.pid<br>
- Default FreeBSD: /var/run/MailScanner.pid</p>
- <!-- INDENTATION -->
-@@ -335,7 +338,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Restart Every</b></p></td>
- </table>
-@@ -343,8 +346,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 14400</p>
- <!-- INDENTATION -->
- <p>To avoid resource leaks the MailScanner parent process
-@@ -362,20 +365,20 @@
- 
- <p><b>MTA</b></p>
- </td>
--<td width="13%"></td>
--<td width="25%">
-+<td width="7%"></td>
-+<td width="26%">
- 
- <p>Default: sendmail</p>
- </td>
--<td width="45%">
-+<td width="52%">
- </td>
- </table>
- <!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>MailScanner works with sendmail and exim. Since the queue
- handling differs a bit, you have to tell MailScanner which
- MTA you are using. Valid options are sendmail and exim.</p>
-@@ -385,7 +388,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sendmail</b></p></td>
- </table>
-@@ -393,8 +396,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /usr/lib/sendmail<br>
- Default FreeBSD: /usr/sbin/sendmail</p>
- <!-- INDENTATION -->
-@@ -408,7 +411,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sendmail2</b></p></td>
- </table>
-@@ -416,8 +419,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: same value as the Sendmail setting</p>
- <!-- INDENTATION -->
- <p>Sendmail2 is provided for exim users. It is the command
-@@ -433,7 +436,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Max Unscanned Bytes Per Scan</b></p></td>
- </table>
-@@ -441,8 +444,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 100000000</p>
- <!-- INDENTATION -->
- <p>MailScanner handles messages in batches for efficiency.
-@@ -460,7 +463,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Max Unsafe Bytes per Scan</b></p></td>
- </table>
-@@ -468,8 +471,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 50000000</p>
- <!-- INDENTATION -->
- <p>This setting limits the total size of messages per batch
-@@ -480,7 +483,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Max Unscanned Messages Per Scan</b></p></td>
- </table>
-@@ -488,8 +491,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 100</p>
- <!-- INDENTATION -->
- <p>This setting limits the total number of messages per
-@@ -501,7 +504,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Max Unsafe Messages per Scan</b></p></td>
- </table>
-@@ -509,8 +512,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 100</p>
- <!-- INDENTATION -->
- <p>This setting limits the total number of messages per
-@@ -522,7 +525,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Expand TNEF</b></p></td>
- </table>
-@@ -530,8 +533,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>TNEF is primarily used by Microsoft programs such as
-@@ -551,7 +554,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Deliver Unparsable TNEF</b></p></td>
- </table>
-@@ -559,8 +562,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>Rich Text format attachments produced by some versions of
-@@ -578,7 +581,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>TNEF Expander</b></p></td>
- </table>
-@@ -586,8 +589,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /opt/MailScanner/bin/tnef<br>
- Default FreeBSD: /usr/local/bin/tnef</p>
- <!-- INDENTATION -->
-@@ -601,7 +604,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>TNEF Timeout</b></p></td>
- </table>
-@@ -609,8 +612,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 120</p>
- <!-- INDENTATION -->
- <p>The maximum length of time (in seconds) the TNEF Expander
-@@ -621,7 +624,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>File Command</b></p></td>
- </table>
-@@ -629,8 +632,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /usr/bin/file</p>
- <!-- INDENTATION -->
- <p>Where the &quot;file&quot; command is installed. This is
-@@ -643,7 +646,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>File Timeout</b></p></td>
- </table>
-@@ -651,8 +654,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 20</p>
- <!-- INDENTATION -->
- <p>The maximum length of time the &quot;file&quot; command
-@@ -664,7 +667,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Block Encrypted Messages</b></p></td>
- </table>
-@@ -672,8 +675,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>This is inteded for use with a ruleset to ensure that
-@@ -687,7 +690,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Block Unencrypted Messages</b></p></td>
- </table>
-@@ -695,8 +698,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>This is intended for use with a ruleset to ensure that
-@@ -709,7 +712,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Maximum Message Size</b></p></td>
- </table>
-@@ -717,8 +720,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 0</p>
- <!-- INDENTATION -->
- <p>The maximum size of any message including the headers. If
-@@ -735,7 +738,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Allowed Sophos Error Messages</b></p></td>
- </table>
-@@ -743,24 +746,34 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:</p>
- <!-- INDENTATION -->
- <p>Anything on the next line that appears in brackets at the
- end of a line of output from Sophos will cause the
- error/infection to be ignored. Use of this option is
- dangerous, and should only be used if you are having trouble
--with lots of corrupt PDF files, for example. Example:<br>
-+with lots of corrupt PDF files, for example. This option
-+allows for multiple strings as well. In this case, the
-+strings should be put in double quotes (&quot;) and each
-+string separated with commas. Examples:<br>
- Allowed Sophos Error Messages = corrupt format not
--supported</p>
-+supported<br>
-+Allowed Sophos Error Messages = &quot;corrupt&quot;,
-+&quot;format not supported&quot;</p>
-+<!-- INDENTATION -->
-+<p>The first version will match &quot;corrupt format not
-+supported&quot; only. The second version will match
-+&quot;corrupt&quot; and &quot;format not
-+supported&quot;.</p>
- </td>
- </table>
- <!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sophos IDE Dir</b></p></td>
- </table>
-@@ -768,8 +781,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /usr/local/Sophos/ide</p>
- <!-- INDENTATION -->
- <p>The directory (or a link to it) containing all the Sophos
-@@ -781,7 +794,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sophos Lib Dir</b></p></td>
- </table>
-@@ -789,8 +802,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /usr/local/Sophos/lib</p>
- <!-- INDENTATION -->
- <p>The directory (or a link to it) containing all the Sophos
-@@ -803,7 +816,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Monitors For Sophos Updates</b></p></td>
- </table>
-@@ -811,8 +824,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /usr/local/Sophos/ide/*ides.zip</p>
- <!-- INDENTATION -->
- <p>SophosSAVI only: monitor each of these files for changes
-@@ -828,7 +841,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Virus Scanning</b></p></td>
- </table>
-@@ -836,8 +849,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>Do you want to scan email for viruses? A few people
-@@ -856,7 +869,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Virus Scanners</b></p></td>
- </table>
-@@ -864,8 +877,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: none</p>
- <!-- INDENTATION -->
- <p>Which Virus Scanning package to use. Possible choices are
-@@ -888,7 +901,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Virus Scanner Timeout</b></p></td>
- </table>
-@@ -896,8 +909,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 300</p>
- <!-- INDENTATION -->
- <p>The maximum time (in seconds) that the cirus scanner is
-@@ -908,7 +921,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Deliver Disinfected Files</b></p></td>
- </table>
-@@ -916,8 +929,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>Should infected attached documents be automatically
-@@ -928,7 +941,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Silent Viruses</b></p></td>
- </table>
-@@ -936,8 +949,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: Klez Yaha&minus;E Bugbear Braid&minus;A
- WinEvar</p>
- <!-- INDENTATION -->
-@@ -951,20 +964,23 @@
- fake addresses on messages they send, so there is no point
- informing the sender of the message, as it won&rsquo;t
- actually be them who sent it anyway. Other words that can be
--put in this list are the 2 special keywords<br>
-+put in this list are the 3 special keywords<br>
- HTML&minus;IFrame: inserting this will stop senders being
- warned about HTML Iframe tags, when they are not
- allowed.<br>
- HTML&minus;Codebase: inserting this will stop senders being
- warned about HTML Object Codebase tags, when they are not
--allowed.</p>
-+allowed.<br>
-+All&minus;Viruses: inserting this will stop senders being
-+warned about any virus, while still allowing you to warn
-+senders about HTML&minus;based attacks.</p>
- </td>
- </table>
- <!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Still Deliver Silent Viruses</b></p></td>
- </table>
-@@ -972,8 +988,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If this is set to yes then disinfected messsages that
-@@ -993,7 +1009,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Allow Partial Messages</b></p></td>
- </table>
-@@ -1001,8 +1017,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>Do you want to allow partial messages, which only contain
-@@ -1020,7 +1036,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Allow External Message Bodies</b></p></td>
- </table>
-@@ -1028,8 +1044,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>There is a mechanism, very rarely used, in which the body
-@@ -1049,7 +1065,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Allow IFrame Tags</b></p></td>
- </table>
-@@ -1057,8 +1073,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>Do you want to allow HTML &lt;IFrame&gt; tags in email
-@@ -1073,7 +1089,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Log IFrame Tags</b></p></td>
- </table>
-@@ -1081,8 +1097,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>You may receive complaints from your users that HTML
-@@ -1100,7 +1116,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Allow Object Codebase Tags</b></p></td>
- </table>
-@@ -1108,8 +1124,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>Do you want to allow HTML &lt;Object Codebase=...&gt;
-@@ -1123,7 +1139,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Convert Dangerous HTML To Text</b></p></td>
- </table>
-@@ -1131,8 +1147,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>When &lt;IFrame&gt; or &lt;Object Codebase=...&gt; HTML
-@@ -1149,7 +1165,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Convert HTML To Text</b></p></td>
- </table>
-@@ -1157,8 +1173,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>If you have users who are children, or who are offended
-@@ -1175,7 +1191,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Allow Form Tags</b></p></td>
- </table>
-@@ -1183,8 +1199,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>Do you want to allow &lt;Form&gt; tags in email messages?
-@@ -1200,7 +1216,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Filename Rules</b></p></td>
- </table>
-@@ -1208,8 +1224,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /opt/MailScanner/etc/filename.rules.conf<br>
- Default Linux: /etc/MailScanner/filename.rules.conf<br>
- Default FreeBSD:
-@@ -1226,7 +1242,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Filetype Rules</b></p></td>
- </table>
-@@ -1234,8 +1250,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /opt/MailScanner/etc/filetype.rules.conf<br>
- Default Linux: /etc/MailScanner/filetype.rules.conf<br>
- Default FreeBSD:
-@@ -1257,7 +1273,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Quarantine Infections</b></p></td>
- </table>
-@@ -1265,8 +1281,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>Set this to store infected / dangerous attachments in
-@@ -1280,7 +1296,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Quarantine Whole Message</b></p></td>
- </table>
-@@ -1288,8 +1304,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>When an infected message is stored in the quarantine, a
-@@ -1301,7 +1317,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Quarantine Whole Messages As Queue Files</b></p></td>
- </table>
-@@ -1309,8 +1325,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>When an entire message is saved in the quarantine for any
-@@ -1329,7 +1345,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Language Strings</b></p></td>
- </table>
-@@ -1337,8 +1353,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/languages.conf<br>
- Default Linux:
-@@ -1356,7 +1372,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Deleted Bad Filename Message Report</b></p></td>
- </table>
-@@ -1364,8 +1380,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/deleted.filename.message.txt<br>
- Default Linux:
-@@ -1384,7 +1400,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Deleted Virus Message Report</b></p></td>
- </table>
-@@ -1392,8 +1408,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/deleted.virus.message.txt<br>
- Default Linux:
-@@ -1412,7 +1428,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Stored Bad Filename Message Report</b></p></td>
- </table>
-@@ -1420,8 +1436,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/stored.filename.message.txt<br>
- Default Linux:
-@@ -1429,10 +1445,65 @@
- Default FreeBSD:
- /usr/local/share/MailScanner/reports/en/stored.filename.message.txt</p>
- <!-- INDENTATION -->
--<p>When an attachment is deleted from a message (and the
--attachment has been stored in the quarantine) because the
--filename failed the filename rules in force for the message,
--it is replaced by the contents of this file. A few variable
-+<p>When an attachment is deleted and stored from a message
-+(and the attachment has been stored in the quarantine)
-+because the filename failed the filename rules in force for
-+the message, it is replaced by the contents of this file. A
-+few variable substitutions can be made in this file, an
-+example of each of which is contained in the supplied sample
-+file.</p>
-+</td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Deleted Bad Content Message Report</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default:
-+/opt/MailScanner/etc/reports/en/deleted.content.message.txt<br>
-+Default Linux:
-+/etc/MailScanner/reports/en/deleted.content.message.txt<br>
-+Default FreeBSD:
-+/usr/local/share/MailScanner/reports/en/deleted.content.message.txt</p>
-+<!-- INDENTATION -->
-+<p>This report is sent when a message is deleted because it
-+contained bad or dangerous content. A few variable
-+substitutions can be made in this file, an example of each
-+of which is contained in the supplied sample file.</p>
-+</td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Stored Bad Content Message Report</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default:
-+/opt/MailScanner/etc/reports/en/stored.content.message.txt<br>
-+Default Linux:
-+/etc/MailScanner/reports/en/stored.content.message.txt<br>
-+Default FreeBSD:
-+/usr/local/share/MailScanner/reports/en/stored.content.message.txt</p>
-+<!-- INDENTATION -->
-+<p>This report is sent when a message is stored because it
-+contained bad or dangerous content. A few variable
- substitutions can be made in this file, an example of each
- of which is contained in the supplied sample file.</p>
- </td>
-@@ -1441,7 +1512,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Disinfected Report</b></p></td>
- </table>
-@@ -1449,8 +1520,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/disinfected.report.txt<br>
- Default Linux:
-@@ -1470,7 +1541,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Inline HTML Signature</b></p></td>
- </table>
-@@ -1478,8 +1549,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/inline.sig.html<br>
- Default Linux:
-@@ -1501,7 +1572,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Inline Text Signature</b></p></td>
- </table>
-@@ -1509,8 +1580,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/inline.sig.txt<br>
- Default Linux:
-@@ -1532,7 +1603,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sender Error Report</b></p></td>
- </table>
-@@ -1540,8 +1611,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/sender.error.report.txt<br>
- Default Linux:
-@@ -1561,7 +1632,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sender Bad Filename Report</b></p></td>
- </table>
-@@ -1569,8 +1640,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/sender.filename.report.txt<br>
- Default Linux:
-@@ -1579,14 +1650,14 @@
- /usr/local/share/MailScanner/reports/en/sender.filename.report.txt</p>
- <!-- INDENTATION -->
- <p>When an attachment is trapped by the filename rules, this
--message is sent back to the sender. :</p>
-+message is sent back to the sender.</p>
- </td>
- </table>
- <!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sender Virus Report</b></p></td>
- </table>
-@@ -1594,8 +1665,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/sender.virus.report.txt<br>
- Default Linux:
-@@ -1611,7 +1682,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Hide Incoming Work Dir</b></p></td>
- </table>
-@@ -1619,8 +1690,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>When this option is set, the full directory in which the
-@@ -1633,7 +1704,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Include Scanner Name in Reports</b></p></td>
- </table>
-@@ -1641,14 +1712,20 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
--<p>Default: no</p>
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: yes</p>
- <!-- INDENTATION -->
- <p>Include the name of the virus scanner in each of the
--scanner reports. Very useful if you use several virus
--scanners, but a bad idea if you don&rsquo;t want to let your
--customers know which scanners you use.</p>
-+scanner reports. This also includes the translation of
-+&quot;MailScanner&quot; in each of the report lines
-+resulting from one of MailScanner&rsquo;s own checks such as
-+filename, filetype or dangerous HTML content. To change the
-+name &quot;MailScanner&quot;, look in
-+reports/...../languages.conf.<br>
-+Very useful if you use several virus scanners, but a bad
-+idea if you don&rsquo;t want to let your customers know
-+which scanners you use.</p>
- </td>
- </table>
- <a name="Changes to message headers"></a>
-@@ -1657,7 +1734,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Mail Header</b></p></td>
- </table>
-@@ -1665,8 +1742,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: X&minus;MailScanner:</p>
- <!-- INDENTATION -->
- <p>Extra header that should be added to all scanned messages
-@@ -1679,7 +1756,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam Header</b></p></td>
- </table>
-@@ -1687,8 +1764,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: X&minus;MailScanner&minus;SpamCheck:</p>
- <!-- INDENTATION -->
- <p>Name of the header to add to mail detected as spam. The
-@@ -1700,7 +1777,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam Score Header</b></p></td>
- </table>
-@@ -1708,8 +1785,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: X&minus;MailScanner&minus;SpamScore:</p>
- <!-- INDENTATION -->
- <p>If the option &quot;Spam Score&quot; is set, this is the
-@@ -1721,7 +1798,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Information Header</b></p></td>
- </table>
-@@ -1729,8 +1806,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: X&minus;MailScanner&minus;Information:</p>
- <!-- INDENTATION -->
- <p>Name of the header to add to all messages, to be used for
-@@ -1743,7 +1820,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Detailed Spam Report</b></p></td>
- </table>
-@@ -1751,8 +1828,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If this is set to yes then you get the normal fully
-@@ -1766,7 +1843,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Include Scores In SpamAssassin Report</b></p></td>
- </table>
-@@ -1774,8 +1851,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>Do you want to include the numerical scores in the
-@@ -1787,7 +1864,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam Score Character</b></p></td>
- </table>
-@@ -1795,8 +1872,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: s</p>
- <!-- INDENTATION -->
- <p>If the option &quot;Spam Score&quot; is set, this is the
-@@ -1809,7 +1886,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Clean header Value</b></p></td>
- </table>
-@@ -1817,8 +1894,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: Found to be clean</p>
- <!-- INDENTATION -->
- <p>This is the text that is added to the &quot;Mail
-@@ -1830,7 +1907,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Infected Header Value</b></p></td>
- </table>
-@@ -1838,8 +1915,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: Found to be infected</p>
- <!-- INDENTATION -->
- <p>This is the text that is added to the &quot;Mail
-@@ -1851,7 +1928,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Disinfected Header Value</b></p></td>
- </table>
-@@ -1859,8 +1936,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: Disinfected</p>
- <!-- INDENTATION -->
- <p>This is the text that is added to the &quot;Mail
-@@ -1874,7 +1951,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Information Header Value</b></p></td>
- </table>
-@@ -1882,8 +1959,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: Please contact the ISP for more information</p>
- <!-- INDENTATION -->
- <p>This is the text that is added to the &quot;Information
-@@ -1899,7 +1976,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Multiple Headers</b></p></td>
- </table>
-@@ -1907,8 +1984,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: append</p>
- <!-- INDENTATION -->
- <p>When a message passes through more than one MailScanner
-@@ -1924,7 +2001,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Hostname</b></p></td>
- </table>
-@@ -1932,8 +2009,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: the MailScanner</p>
- <!-- INDENTATION -->
- <p>This is the name of the MailScanner server that is put in
-@@ -1946,7 +2023,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sign Messages Already Processed</b></p></td>
- </table>
-@@ -1954,8 +2031,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>If a message has already been processed by another
-@@ -1970,7 +2047,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sign Clean Messages</b></p></td>
- </table>
-@@ -1978,8 +2055,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>If this option is set, then the &quot;Inline HTML/Text
-@@ -1996,7 +2073,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Mark Infected Messages</b></p></td>
- </table>
-@@ -2004,8 +2081,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If this option is set, then the &quot;Inline HTML/Text
-@@ -2020,7 +2097,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Mark Unscanned Messages</b></p></td>
- </table>
-@@ -2028,8 +2105,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If this option is set, then any message which is not
-@@ -2044,7 +2121,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Unscanned Header Value</b></p></td>
- </table>
-@@ -2052,8 +2129,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: Not scanned: please contact your Internet
- E&minus;Mail Service Provider for details</p>
- <!-- INDENTATION -->
-@@ -2068,7 +2145,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Deliver Cleaned Messages</b></p></td>
- </table>
-@@ -2076,8 +2153,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>Once a message has had all viruses and dangerous content
-@@ -2094,7 +2171,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Notify Senders</b></p></td>
- </table>
-@@ -2102,8 +2179,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If this option is set, a message will be sent back to the
-@@ -2116,7 +2193,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Never Notify Senders Of Precedence</b></p></td>
- </table>
-@@ -2124,8 +2201,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: list bulk</p>
- <!-- INDENTATION -->
- <p>This contains a space&minus;separated list of message
-@@ -2142,7 +2219,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Scanned Modify Subject</b></p></td>
- </table>
-@@ -2150,8 +2227,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no # end</p>
- <!-- INDENTATION -->
- <p>If this is set to &quot;start&quot; or &quot;end&quot;
-@@ -2165,7 +2242,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Scanned Subject Text</b></p></td>
- </table>
-@@ -2173,8 +2250,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: {Scanned}</p>
- <!-- INDENTATION -->
- <p>This is the text inserted at the start or the end of the
-@@ -2186,7 +2263,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Virus Modify Subject</b></p></td>
- </table>
-@@ -2194,8 +2271,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If this is set, then the &quot;Subject:&quot; line of a
-@@ -2208,7 +2285,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Virus Subject Text</b></p></td>
- </table>
-@@ -2216,8 +2293,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: {Virus?}</p>
- <!-- INDENTATION -->
- <p>This is the text inserted at the start of the
-@@ -2229,7 +2306,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Filename Modify Subject</b></p></td>
- </table>
-@@ -2237,21 +2314,21 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If this is set, then the &quot;Subject:&quot; line of a
- message that had an attachment with a dangerous filename
--will have the &quot;Virus Subject Text&quot; text inserted
--at the start.</p>
-+will have the &quot;Filename Subject Text&quot; text
-+inserted at the start.</p>
- </td>
- </table>
- <!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Filename Subject Text</b></p></td>
- </table>
-@@ -2259,9 +2336,9 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
--<p>Default: yes</p>
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: {Virus?}</p>
- <!-- INDENTATION -->
- <p>This is the text inserted at the start of the
- &quot;Subject:&quot; line if the &quot;Filename Modify
-@@ -2272,7 +2349,50 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Content Modify Subject</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: yes</p>
-+<!-- INDENTATION -->
-+<p>If this is set, then the &quot;Subject:&quot; line of a
-+message that triggered a content check without anything else
-+wrong in the message will have the &quot;Content Subject
-+Text&quot; text inserted at the start.</p>
-+</td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Content Subject Text</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: {Filename?}</p>
-+<!-- INDENTATION -->
-+<p>This is the text inserted at the start of the
-+&quot;Subject:&quot; line if the &quot;Content Modify
-+Subject&quot; option is set.</p>
-+</td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam Modify Subject</b></p></td>
- </table>
-@@ -2280,8 +2400,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If this is set, then the &quot;Subject:&quot; line of a
-@@ -2294,7 +2414,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam Subject Text</b></p></td>
- </table>
-@@ -2302,8 +2422,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: {Spam?}</p>
- <!-- INDENTATION -->
- <p>This is the text inserted at the start of the
-@@ -2315,7 +2435,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>High Scroing Spam Modify Subject</b></p></td>
- </table>
-@@ -2323,8 +2443,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If this is set, then the &quot;Subject:&quot; line of a
-@@ -2338,7 +2458,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>High Scoring Spam Subject Text</b></p></td>
- </table>
-@@ -2346,8 +2466,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: {Spam?}</p>
- <!-- INDENTATION -->
- <p>This is the text inserted at the start of the
-@@ -2361,7 +2481,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Warning Is Attachment</b></p></td>
- </table>
-@@ -2369,8 +2489,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>When an infected or dangerous attachment is replaced with
-@@ -2383,7 +2503,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Attachment Warning Filename</b></p></td>
- </table>
-@@ -2391,8 +2511,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: VirusWarning.txt</p>
- <!-- INDENTATION -->
- <p>What an infected or dangerous attachment is replaced with
-@@ -2404,7 +2524,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Attachment Encoding Charset</b></p></td>
- </table>
-@@ -2412,8 +2532,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: us&minus;ascii</p>
- <!-- INDENTATION -->
- <p>This is the name of the encoding character set used for
-@@ -2429,7 +2549,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Archive Mail</b></p></td>
- </table>
-@@ -2437,8 +2557,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:</p>
- <!-- INDENTATION -->
- <p>Space&minus;separated list of any combination of</p></td>
-@@ -2448,20 +2568,20 @@
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
- <td width="29%"></td>
--<td width="70%">
-+<td width="71%">
- 
- <p>1. email addresses to which mail should be
- forwarded,</p>
- </td>
- <tr valign="top" align="left">
- <td width="29%"></td>
--<td width="70%">
-+<td width="71%">
- 
- <p>2. directory names where you want mail to be stored,</p>
- </td>
- <tr valign="top" align="left">
- <td width="29%"></td>
--<td width="70%">
-+<td width="71%">
- 
- <p>3. file names to which mail will be appended.</p>
- </td>
-@@ -2470,8 +2590,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>The files (option 3) are using the &quot;mbox&quot;
- format suitable for most Unix mail systems. These files must
- already exist since MailScanner will not create them!</p>
-@@ -2489,7 +2609,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Send Notices</b></p></td>
- </table>
-@@ -2497,8 +2617,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>Should system administrators listed in the &quot;Notices
-@@ -2509,7 +2629,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Notives Include Full Headers</b></p></td>
- </table>
-@@ -2517,8 +2637,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>If this option is set, then the system administrator
-@@ -2531,7 +2651,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Hide Incoming Work Dir in Notices</b></p></td>
- </table>
-@@ -2539,8 +2659,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>When this option is set, the full directory in which the
-@@ -2554,7 +2674,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Notice Signature</b></p></td>
- </table>
-@@ -2562,8 +2682,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: &minus;&minus; \nMailScanner\nEmail Virus
- Scanner\nwww.mailscanner.info</p>
- <!-- INDENTATION -->
-@@ -2578,7 +2698,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Notices From</b></p></td>
- </table>
-@@ -2586,8 +2706,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: MailScanner</p>
- <!-- INDENTATION -->
- <p>The visible part of the email address used in the
-@@ -2600,7 +2720,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Notices To</b></p></td>
- </table>
-@@ -2608,8 +2728,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: postmaster</p>
- <!-- INDENTATION -->
- <p>This option provides a list of the addresses to which
-@@ -2622,7 +2742,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Local Postmaster</b></p></td>
- </table>
-@@ -2630,8 +2750,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: postmaster</p>
- <!-- INDENTATION -->
- <p>When virus warnings are sent to any users, this is the
-@@ -2645,7 +2765,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam List Definitions</b></p></td>
- </table>
-@@ -2653,8 +2773,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /opt/MailScanner/etc/spam.lists.conf<br>
- Defualt Linux: /etc/MailScanner/spam.lists.conf<br>
- Default FreeBSD:
-@@ -2672,7 +2792,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Virus Scanner Definitions</b></p></td>
- </table>
-@@ -2680,8 +2800,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /opt/MailScanner/etc/virus.scanners.conf<br>
- Default Linux: /etc/MailScanner/virus.scanners.conf<br>
- Default FreeBSD:
-@@ -2699,7 +2819,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam Checks</b></p></td>
- </table>
-@@ -2707,8 +2827,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If this option is set, messages will be checked to see if
-@@ -2719,7 +2839,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam List</b></p></td>
- </table>
-@@ -2727,8 +2847,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: ORDB&minus;RBL Infinite&minus;Monkeys</p>
- <!-- INDENTATION -->
- <p>This provides a space&minus;separated list of &quot;Spam
-@@ -2744,7 +2864,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam Domain List</b></p></td>
- </table>
-@@ -2752,8 +2872,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:</p>
- <!-- INDENTATION -->
- <p>This provides a space&minus;separated list of &quot;Spam
-@@ -2768,7 +2888,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam Lists To Reach High Score</b></p></td>
- </table>
-@@ -2776,8 +2896,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 5</p>
- <!-- INDENTATION -->
- <p>If a message appears in at least this number of
-@@ -2794,7 +2914,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam List Timeout</b></p></td>
- </table>
-@@ -2802,8 +2922,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 10</p>
- <!-- INDENTATION -->
- <p>This is the number of seconds to wait for each &quot;Spam
-@@ -2815,7 +2935,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Max Spam List Timeouts</b></p></td>
- </table>
-@@ -2823,8 +2943,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 7</p>
- <!-- INDENTATION -->
- <p>If a &quot;Spam List&quot; lookup times out for this many
-@@ -2840,7 +2960,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Is Definitely Not Spam</b></p></td>
- </table>
-@@ -2848,8 +2968,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/rules/spam.whitelist.rules<br>
- Default Linux:
-@@ -2869,7 +2989,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Is Definitely Spam</b></p></td>
- </table>
-@@ -2877,8 +2997,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>This option would normally be a ruleset. Any messages for
-@@ -2887,13 +3007,36 @@
- &quot;blacklist&quot; of addresses of known spammers.</p>
- </td>
- </table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Definite Spam Is High Scoring</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: no</p>
-+<!-- INDENTATION -->
-+<p>Setting this to yes means that spam found in the
-+blacklist is treated as &quot;High Scoring Spam&quot; in the
-+&quot;Spam Actions&quot; section below. Setting it to no
-+means that it will be treated as &quot;normal&quot; spam.
-+This can also be the filename of a ruleset.</p>
-+</td>
-+</table>
- <a name="SpamAssassin"></a>
- <h2>SpamAssassin</h2>
- <!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Use SpamAssassin</b></p></td>
- </table>
-@@ -2901,8 +3044,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>Do you want to detect spam using the very good
-@@ -2919,7 +3062,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Max SpamAssassin Size</b></p></td>
- </table>
-@@ -2927,8 +3070,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 90000</p>
- <!-- INDENTATION -->
- <p>SpamAssassin is quite slow when processing very large
-@@ -2942,7 +3085,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Required Spam Assassin Score</b></p></td>
- </table>
-@@ -2950,8 +3093,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 5</p>
- <!-- INDENTATION -->
- <p>This gives the minimum SpamAssassin score value above
-@@ -2965,7 +3108,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>High SpamAssassin Score</b></p></td>
- </table>
-@@ -2973,8 +3116,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 20</p>
- <!-- INDENTATION -->
- <p>Messages with a SpamAssassin score greater than this
-@@ -2987,7 +3130,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>SpamAssassin Auto Whitelist</b></p></td>
- </table>
-@@ -2995,8 +3138,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>SpamAssassin has a feature which measures the ratio of
-@@ -3012,7 +3155,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>SpamAssassin Prefs File</b></p></td>
- </table>
-@@ -3020,8 +3163,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/spam.assassin.prefs.conf<br>
- Default Linux: /etc/MailScanner/spam.assassin.prefs.conf<br>
-@@ -3041,7 +3184,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>SpamAssassin Timeout</b></p></td>
- </table>
-@@ -3049,8 +3192,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 30</p>
- <!-- INDENTATION -->
- <p>This option sets the maximum number of seconds to wait
-@@ -3063,7 +3206,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Max SpamAssasin Timeouts</b></p></td>
- </table>
-@@ -3071,8 +3214,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: 20</p>
- <!-- INDENTATION -->
- <p>If several consecutive calls to SpamAssassin time out,
-@@ -3086,7 +3229,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Check SpamAssassin If On Spam List</b></p></td>
- </table>
-@@ -3094,8 +3237,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If a message has already triggered any of the &quot;Spam
-@@ -3109,7 +3252,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Always Include SpamAssasin Report</b></p></td>
- </table>
-@@ -3117,8 +3260,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>If this option is set, then the &quot;Spam Header&quot;
-@@ -3131,7 +3274,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam Score</b></p></td>
- </table>
-@@ -3139,8 +3282,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>If a message is spam, and this option is set, then a
-@@ -3157,7 +3300,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Spam Actions</b></p></td>
- </table>
-@@ -3165,8 +3308,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: deliver</p>
- <!-- INDENTATION -->
- <p>This can be any combination of 1 or more of the following
-@@ -3205,7 +3348,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>High Scoring Spam Actions</b></p></td>
- </table>
-@@ -3213,8 +3356,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: deliver</p>
- <!-- INDENTATION -->
- <p>This is the same as the &quot;Spam Actions&quot; option
-@@ -3227,7 +3370,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Non Spam Actions</b></p></td>
- </table>
-@@ -3235,8 +3378,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: deliver</p>
- <!-- INDENTATION -->
- <p>This is the same as the &quot;Spam Actions&quot; option
-@@ -3249,7 +3392,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sender Spam Report</b></p></td>
- </table>
-@@ -3257,8 +3400,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/sender.spam.report.txt<br>
- Default Linux:
-@@ -3276,7 +3419,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sender Spam List Report</b></p></td>
- </table>
-@@ -3284,8 +3427,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/sender.spam.rbl.report.txt<br>
- Default Linux:
-@@ -3302,7 +3445,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Sender SpamAssassin Report</b></p></td>
- </table>
-@@ -3310,8 +3453,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/sender.spam.sa.report.txt<br>
- Default Linux:
-@@ -3328,7 +3471,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Inline Spam Warning</b></p></td>
- </table>
-@@ -3336,8 +3479,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:
- /opt/MailScanner/etc/reports/en/inline.spam.warning.txt<br>
- Default Linux:
-@@ -3356,7 +3499,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Syslog Facility</b></p></td>
- </table>
-@@ -3364,8 +3507,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: mail</p>
- <!-- INDENTATION -->
- <p>This is the name of the &quot;facility&quot; used by
-@@ -3378,7 +3521,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Log Spam</b></p></td>
- </table>
-@@ -3386,8 +3529,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>If this option is set, then every spam message will be
-@@ -3402,7 +3545,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Log Permitted Filenames</b></p></td>
- </table>
-@@ -3410,8 +3553,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>If this option is set, then every attachment filename
-@@ -3425,7 +3568,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Log Permitted Filetypes</b></p></td>
- </table>
-@@ -3433,8 +3576,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>Log all the filenames that are allowed by the Filetype
-@@ -3448,7 +3591,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>If you are using Postfix you may well need to use some of
- the settings below, as the home directory for the
-@@ -3462,7 +3605,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>SpamAssassin User State Dir</b></p></td>
- </table>
-@@ -3470,8 +3613,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:</p>
- <!-- INDENTATION -->
- <p>The per&minus;user files (bayes, auto&minus;whitelist,
-@@ -3486,13 +3629,13 @@
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
- <td width="29%"></td>
--<td width="70%">
-+<td width="71%">
- 
- <p>mkdir /var/spool/MailScanner/spamassassin</p>
- </td>
- <tr valign="top" align="left">
- <td width="29%"></td>
--<td width="70%">
-+<td width="71%">
- 
- <p>chown postfix.postfix
- /var/spool/MailScanner/spamassassin</p>
-@@ -3502,7 +3645,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>SpamAssassin Install Prefix</b></p></td>
- </table>
-@@ -3510,8 +3653,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:</p>
- <!-- INDENTATION -->
- <p>This setting is useful if SpamAssassin is installed in an
-@@ -3526,7 +3669,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>SpamAssassin Local Rules Dir</b></p></td>
- </table>
-@@ -3534,8 +3677,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:</p>
- <!-- INDENTATION -->
- <p>The site&minus;local rules are searched for here, and in
-@@ -3550,7 +3693,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>SpamAssassin Default Rules Dir</b></p></td>
- </table>
-@@ -3558,8 +3701,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default:</p>
- <!-- INDENTATION -->
- <p>The default rules are searched for here, and in
-@@ -3580,20 +3723,20 @@
- 
- <p><b>Debug</b></p>
- </td>
--<td width="13%"></td>
-+<td width="4%"></td>
- <td width="16%">
- 
- <p>Default: no</p>
- </td>
--<td width="51%">
-+<td width="62%">
- </td>
- </table>
- <!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Not for use by normal users. Setting this option to
- &quot;yes&quot; will put MailScanner into debugging mode, in
- which it creates slightly more output and will not become a
-@@ -3604,7 +3747,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Debug SpamAssassin</b></p></td>
- </table>
-@@ -3612,8 +3755,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>Do you want to debug SpamAssassin from within
-@@ -3624,7 +3767,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Always Looked Up Last</b></p></td>
- </table>
-@@ -3632,8 +3775,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>The value of the option is actually never used, but it is
-@@ -3649,7 +3792,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Deliver in Background</b></p></td>
- </table>
-@@ -3657,8 +3800,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>When attempting delivery of any messages (when the
-@@ -3673,7 +3816,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Lockfile Dir</b></p></td>
- </table>
-@@ -3681,8 +3824,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: /tmp</p>
- <!-- INDENTATION -->
- <p>This is the directory in which lock files are placed to
-@@ -3697,7 +3840,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Lock Type</b></p></td>
- </table>
-@@ -3705,8 +3848,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Do not set this option to anything unless you know
- exactly what you are doing. For sendmail and Exim,
- MailScanner will choose the correct value by default. This
-@@ -3720,7 +3863,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Minimum Code Status</b></p></td>
- </table>
-@@ -3728,8 +3871,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: supported</p>
- <!-- INDENTATION -->
- <p>Some of the virus scanners are not supported by the
-@@ -3747,7 +3890,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p><b>Split Exim Spool</b></p></td>
- </table>
-@@ -3755,8 +3898,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Default: yes</p>
- <!-- INDENTATION -->
- <p>Are you using Exim with split spool directories? If you
-@@ -3765,13 +3908,51 @@
- information about split spool directories.</p>
- </td>
- </table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
-+<p><b>Use Default Rules With Multiple
-+Recipients</b></p></td>
-+</table>
-+<!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
-+<p>Default: no</p>
-+<!-- INDENTATION -->
-+<p>When trying to work out the value of configuration
-+parameters which are using a ruleset, this controls the
-+behaviour when a rule is checking the &quot;To:&quot;
-+addresses. If this option is set to &quot;yes&quot;, then
-+the following happens when checking the ruleset:</p>
-+<!-- INDENTATION -->
-+<p>a) 1 recipient. Same behaviour as normal.<br>
-+b) Several recipients, but all in the same domain
-+(domain.com for example). The rules are checked for one that
-+matches the string &quot;*@domain.com&quot;.<br>
-+c) Several recipients, not all in the same domain. The rules
-+are checked for one that matches the string
-+&quot;*@*&quot;.</p>
-+<!-- INDENTATION -->
-+<p>If this option is set to &quot;no&quot;, then some rules
-+will use the result they get from the first matching rule
-+for any of the recipients of a message, so the exact value
-+cannot be predicted for messages with more than 1 recipient.
-+This value *cannot* be the filename of a ruleset.</p>
-+</td>
-+</table>
- <a name="RULESETS"></a>
- <h2>RULESETS</h2>
- <!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>Ruleset files should all be put in
- /opt/MailScanner/etc/rules (FreeBSD:
-@@ -3795,35 +3976,39 @@
- </table>
- <!-- TABS -->
- <table width="100%" border=0 rules="none" frame="void"
--       cols="4" cellspacing="0" cellpadding="0">
-+       cols="5" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
- <td width="11%"></td>
- <td width="7%">
- 
- <p>From:</p>
- </td>
--<td width="10%"></td>
--<td width="70%">
-+<td width="4%"></td>
-+<td width="78%">
- 
- <p>Matches when the message is from a matching address</p>
- </td>
-+<td width="0%">
-+</td>
- <tr valign="top" align="left">
- <td width="11%"></td>
- <td width="7%">
- 
- <p>To:</p>
- </td>
--<td width="10%"></td>
--<td width="70%">
-+<td width="4%"></td>
-+<td width="78%">
- 
- <p>Matches when the message is to a matching address</p>
- </td>
-+<td width="0%">
-+</td>
- </table>
- <!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>FromOrTo:</p></td>
- </table>
-@@ -3831,8 +4016,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Matches when the message is from or to a matching
- address</p>
- </td>
-@@ -3841,7 +4026,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>FromAndTo:</p></td>
- </table>
-@@ -3849,8 +4034,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Matches when the message is from and to a matching
- address</p>
- </td>
-@@ -3859,7 +4044,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>The syntax of these is very loosely defined. Any word
- containing &quot;from&quot;, any word containing
-@@ -3867,12 +4052,25 @@
- &quot;to&quot; (in either order), and any word containing
- &quot;and&quot; will work just fine. You can put them in
- upper or lower case, it doesn&rsquo;t matter. And any
--additional punctuation will be ignored.</p>
-+additional punctuation will be ignored.</p></td>
-+</table>
- <!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="78%">
- <p>This specifies the whether the rule should be matched
- against the sender&rsquo;s address (or IP address), or the
- recipient&rsquo;s address.</p>
-+</td>
-+</table>
- <!-- INDENTATION -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="2" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="89%">
- <p>2. The pattern describes what messages should match this
- rule. Some examples are:</p>
- <!-- INDENTATION -->
-@@ -3911,7 +4109,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>This is held in the filename pointed to by the
- configuration option Filename rules. It contains a set of
-@@ -3951,7 +4149,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>allow / deny</p></td>
- </table>
-@@ -3959,8 +4157,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>Accept or reject the attachment if its filename matches
- the regular expression</p>
- </td>
-@@ -3969,7 +4167,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>regular expression</p></td>
- </table>
-@@ -3977,8 +4175,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>The rule is executed if the attachment matches this
- expression. It may optionally be surrounded in
- &rsquo;/&rsquo; characters.</p>
-@@ -3988,7 +4186,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>log text</p></td>
- </table>
-@@ -3996,8 +4194,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>If the rule matches, this text is placed in the syslog.
- If the text is &quot;&minus;&quot;, no string is logged.</p>
- </td>
-@@ -4006,7 +4204,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>user text</p></td>
- </table>
-@@ -4014,8 +4212,8 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="21%"></td>
--<td width="77%">
-+<td width="22%"></td>
-+<td width="78%">
- <p>If the rule matches, this text is placed in the text
- message sent to the user. If the text is
- &quot;&minus;&quot;, no text is used.</p>
-@@ -4025,7 +4223,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>Please have a look at the filename.rules.conf or
- filename.rules.conf.sample file provided with this
-@@ -4038,7 +4236,7 @@
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
--<td width="10%"></td>
-+<td width="11%"></td>
- <td width="89%">
- <p>MailScanner(1)</p>
- </td>
diff --git a/mail/mailscanner/files/patch-etc:MailScanner.conf b/mail/mailscanner/files/patch-etc:MailScanner.conf
deleted file mode 100644
index 3ba6297b7128..000000000000
--- a/mail/mailscanner/files/patch-etc:MailScanner.conf
+++ /dev/null
@@ -1,76 +0,0 @@
---- ../MailScanner-4.22-5.old/etc/MailScanner.conf	Mon Aug 11 12:15:32 2003
-+++ etc/MailScanner.conf	Mon Aug 11 12:36:06 2003
-@@ -31,13 +31,13 @@
- #
- 
- # Set the directory containing all the reports in all the languages
--%report-dir% = /opt/MailScanner/etc/reports/en
-+%report-dir% = /usr/local/share/MailScanner/reports/en
- 
- # Configuration directory containing this file
--%etc-dir% = /opt/MailScanner/etc
-+%etc-dir% = /usr/local/etc/MailScanner
- 
- # Rulesets directory containing your ".rules" files
--%rules-dir% = /opt/MailScanner/etc/rules
-+%rules-dir% = /usr/local/etc/MailScanner/rules
- 
- #
- # System settings
-@@ -82,7 +82,7 @@
- #    Example: /var/spool/mqueue.in/*
- # 3. The name of a file containing a list of directory names,
- #    which can in turn contain wildcards.
--#    Example: /opt/MailScanner/etc/mqueue.in.list.conf
-+#    Example: /usr/local/etc/MailScanner/mqueue.in.list.conf
- #
- Incoming Queue Dir = /var/spool/mqueue.in
- 
-@@ -98,7 +98,7 @@
- Quarantine Dir = /var/spool/MailScanner/quarantine
- 
- # Set where to store the process id number so you can stop MailScanner
--PID file = /opt/MailScanner/var/MailScanner.pid
-+PID file = /var/run/MailScanner.pid
- 
- # To avoid resource leaks, re-start periodically
- Restart Every = 14400
-@@ -111,7 +111,7 @@
- # Set how to invoke MTA when sending messages MailScanner has created
- # (e.g. to sender/recipient saying "found a virus in your message")
- # This can also be the filename of a ruleset.
--Sendmail = /usr/lib/sendmail
-+Sendmail = /usr/sbin/sendmail
- 
- # Sendmail2 is provided for Exim users.
- # It is the command used to attempt delivery of outgoing cleaned/disinfected
-@@ -119,9 +119,9 @@
- # This is not usually required for sendmail.
- # This can also be the filename of a ruleset.
- #For Exim users: Sendmail2 = /usr/sbin/exim -C /etc/exim/exim_send.conf
--#For sendmail users: Sendmail2 = /usr/lib/sendmail
-+#For sendmail users: Sendmail2 = /usr/sbin/sendmail
- #Sendmail2 = /usr/sbin/sendmail -C /etc/exim/exim_send.conf
--Sendmail2 = /usr/lib/sendmail
-+Sendmail2 = /usr/sbin/sendmail
- 
- #
- # Processing Incoming Mail
-@@ -165,7 +165,7 @@
- # may be. It helps protect against Denial Of Service attacks in TNEF files.
- #TNEF Expander    = internal
- # This can also be the filename of a ruleset.
--TNEF Expander = /opt/MailScanner/bin/tnef --maxsize=100000000
-+TNEF Expander = /usr/local/bin/tnef --maxsize=100000000
- 
- # The maximum length of time the TNEF Expander is allowed to run for 1 message.
- # (in seconds)
-@@ -1028,7 +1028,7 @@
- # /etc/mail/spamassassin, and maybe others.
- # If this is set then it adds to the list of places that are searched;
- # otherwise it has no effect.
--#SpamAssassin Local Rules Dir = /opt/MailScanner/etc/mail/spamassassin
-+#SpamAssassin Local Rules Dir = /usr/local/etc/MailScanner/mail/spamassassin
- SpamAssassin Local Rules Dir =
- 
- # The default rules are searched for here, and in prefix/share/spamassassin,
diff --git a/mail/mailscanner/files/patch-etc:virus.scanners.conf b/mail/mailscanner/files/patch-etc:virus.scanners.conf
deleted file mode 100644
index 466c19156241..000000000000
--- a/mail/mailscanner/files/patch-etc:virus.scanners.conf
+++ /dev/null
@@ -1,43 +0,0 @@
---- ../MailScanner-4.22-5.old/etc/virus.scanners.conf	Mon Aug 11 12:15:32 2003
-+++ etc/virus.scanners.conf	Mon Aug 11 12:36:06 2003
-@@ -1,21 +1,21 @@
- # This is a list of the names of the virus scanning engines, along with the
- # filename of the command or script to run to invoke each one.
--sophos		/opt/MailScanner/lib/sophos-wrapper
--f-prot		/opt/MailScanner/lib/f-prot-wrapper
--mcafee		/opt/MailScanner/lib/mcafee-wrapper
--rav		/opt/MailScanner/lib/rav-wrapper
--kaspersky	/opt/MailScanner/lib/kaspersky-wrapper
--kavdaemonclient	/opt/MailScanner/lib/kavdaemonclient-wrapper
--panda		/opt/MailScanner/lib/panda-wrapper
--f-secure	/opt/MailScanner/lib/f-secure-wrapper
--clamav		/opt/MailScanner/lib/clamav-wrapper
--trend		/opt/MailScanner/lib/trend-wrapper
--antivir		/opt/MailScanner/lib/antivir-wrapper
--inoculate	/opt/MailScanner/lib/inoculate-wrapper
--inoculan	/opt/MailScanner/lib/inoculan-wrapper
--command		/opt/MailScanner/lib/command-wrapper
--nod32		/opt/MailScanner/lib/nod32-wrapper
--nod32-1.99	/opt/MailScanner/lib/nod32-wrapper
--bitdefender	/opt/MailScanner/lib/bitdefender-wrapper
--sophossavi	/bin/false
--none		/bin/false
-+sophos		/usr/local/libexec/MailScanner/sophos-wrapper
-+f-prot		/usr/local/libexec/MailScanner/f-prot-wrapper
-+mcafee		/usr/local/libexec/MailScanner/mcafee-wrapper
-+rav		/usr/local/libexec/MailScanner/rav-wrapper
-+kaspersky	/usr/local/libexec/MailScanner/kaspersky-wrapper
-+kavdaemonclient	/usr/local/libexec/MailScanner/kavdaemonclient-wrapper
-+panda		/usr/local/libexec/MailScanner/panda-wrapper
-+f-secure	/usr/local/libexec/MailScanner/f-secure-wrapper
-+clamav		/usr/local/libexec/MailScanner/clamav-wrapper
-+trend		/usr/local/libexec/MailScanner/trend-wrapper
-+antivir		/usr/local/libexec/MailScanner/antivir-wrapper
-+inoculate	/usr/local/libexec/MailScanner/inoculate-wrapper
-+inoculan	/usr/local/libexec/MailScanner/inoculan-wrapper
-+command		/usr/local/libexec/MailScanner/command-wrapper
-+nod32		/usr/local/libexec/MailScanner/nod32-wrapper
-+nod32-1.99	/usr/local/libexec/MailScanner/nod32-wrapper
-+bitdefender	/usr/local/libexec/MailScanner/bitdefender-wrapper
-+sophossavi	/usr/bin/false
-+none		/usr/bin/false
diff --git a/mail/mailscanner/files/patch-lib:MailScanner:ConfigDefs.pl b/mail/mailscanner/files/patch-lib:MailScanner:ConfigDefs.pl
deleted file mode 100644
index ac786259a90e..000000000000
--- a/mail/mailscanner/files/patch-lib:MailScanner:ConfigDefs.pl
+++ /dev/null
@@ -1,72 +0,0 @@
---- ../MailScanner-4.22-5.old/lib/MailScanner/ConfigDefs.pl	Mon Aug 11 12:15:30 2003
-+++ lib/MailScanner/ConfigDefs.pl	Mon Aug 11 12:36:06 2003
-@@ -154,9 +154,9 @@
- # Check the first word of these for file existence
- [Simple,File]
- pidfile			/var/run/MailScanner.pid
--spamassassinprefsfile	/opt/MailScanner/etc/spam.assassin.prefs.conf
--SpamListDefinitions	/opt/MailScanner/etc/spam.lists.conf
--VirusScannerDefinitions	/opt/MailScanner/etc/virus.scanners.conf
-+spamassassinprefsfile	/usr/local/etc/MailScanner/spam.assassin.prefs.conf
-+SpamListDefinitions	/usr/local/etc/MailScanner/spam.lists.conf
-+VirusScannerDefinitions	/usr/local/etc/MailScanner/virus.scanners.conf
- 
- # Check these to ensure they are just numbers
- [Simple,Number]
-@@ -197,7 +197,7 @@
- SpamAssassinDefaultRulesDir	
- SpamAssassinInstallPrefix	
- SpamStarsCharacter	s
--TNEFExpander		/opt/MailScanner/bin/tnef --maxsize=100000000
-+TNEFExpander		/usr/local/bin/tnef --maxsize=100000000
- VirusScanners		none  # Space-separated list
- 
- #
-@@ -246,23 +246,23 @@
- WarnSenders		1	no	0	yes	1
- 
- [First,File]
--DeletedFilenameMessage	/opt/MailScanner/etc/reports/en/deleted.filename.message.txt
--DeletedVirusMessage	/opt/MailScanner/etc/reports/en/deleted.virus.message.txt
--DisinfectedReportText	/opt/MailScanner/etc/reports/en/disinfected.report.txt
--inlinehtmlsig		/opt/MailScanner/etc/reports/en/inline.sig.html
--inlinehtmlwarning	/opt/MailScanner/etc/reports/en/inline.warning.html
-+DeletedFilenameMessage	/usr/local/share/MailScanner/reports/en/deleted.filename.message.txt
-+DeletedVirusMessage	/usr/local/share/MailScanner/reports/en/deleted.virus.message.txt
-+DisinfectedReportText	/usr/local/share/MailScanner/reports/en/disinfected.report.txt
-+inlinehtmlsig		/usr/local/share/MailScanner/reports/en/inline.sig.html
-+inlinehtmlwarning	/usr/local/share/MailScanner/reports/en/inline.warning.html
- inlinespamwarning	/etc/MailScanner/reports/en/inline.spam.warning.txt
--inlinetextsig		/opt/MailScanner/etc/reports/en/inline.sig.txt
--inlinetextwarning	/opt/MailScanner/etc/reports/en/inline.warning.txt
-+inlinetextsig		/usr/local/share/MailScanner/reports/en/inline.sig.txt
-+inlinetextwarning	/usr/local/share/MailScanner/reports/en/inline.warning.txt
- languagestrings		
--sendererrorreport 	/opt/MailScanner/etc/reports/en/sender.error.report.txt
--senderfilenamereport	/opt/MailScanner/etc/reports/en/sender.filename.report.txt
--SenderRBLSpamReport	/opt/MailScanner/etc/reports/en/sender.spam.rbl.report.txt
--SenderSASpamReport	/opt/MailScanner/etc/reports/en/sender.spam.sa.report.txt
--SenderBothSpamReport	/opt/MailScanner/etc/reports/en/sender.spam.report.txt
--sendervirusreport 	/opt/MailScanner/etc/reports/en/sender.virus.report.txt
--StoredFilenameMessage	/opt/MailScanner/etc/reports/en/stored.filename.message.txt
--StoredVirusMessage	/opt/MailScanner/etc/reports/en/stored.virus.message.txt
-+sendererrorreport 	/usr/local/share/MailScanner/reports/en/sender.error.report.txt
-+senderfilenamereport	/usr/local/share/MailScanner/reports/en/sender.filename.report.txt
-+SenderRBLSpamReport	/usr/local/share/MailScanner/reports/en/sender.spam.rbl.report.txt
-+SenderSASpamReport	/usr/local/share/MailScanner/reports/en/sender.spam.sa.report.txt
-+SenderBothSpamReport	/usr/local/share/MailScanner/reports/en/sender.spam.report.txt
-+sendervirusreport 	/usr/local/share/MailScanner/reports/en/sender.virus.report.txt
-+StoredFilenameMessage	/usr/local/share/MailScanner/reports/en/stored.filename.message.txt
-+StoredVirusMessage	/usr/local/share/MailScanner/reports/en/stored.virus.message.txt
- 
- [First,Command]
- Sendmail		/usr/sbin/sendmail
-@@ -317,7 +317,7 @@
- UseSpamAssassin		0	no	0	yes	1
- 
- [All,File]
--#FilenameRules		/opt/MailScanner/etc/filename.rules.conf
-+#FilenameRules		/usr/local/etc/MailScanner/filename.rules.conf
- FilenameRules		
- FiletypeRules		
- 
diff --git a/mail/mailscanner/files/patch-lib:MailScanner:SystemDefs.pm b/mail/mailscanner/files/patch-lib:MailScanner:SystemDefs.pm
deleted file mode 100644
index f336bbb70b49..000000000000
--- a/mail/mailscanner/files/patch-lib:MailScanner:SystemDefs.pm
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../MailScanner-4.22-5.old/lib/MailScanner/SystemDefs.pm	Mon Aug 11 12:15:30 2003
-+++ lib/MailScanner/SystemDefs.pm	Mon Aug 11 12:36:06 2003
-@@ -36,6 +36,6 @@
- $global::rm  = '/bin/rm';
- $global::cp  = '/bin/cp';
- $global::cat = '/bin/cat';
--$global::sed = '/bin/sed';
-+$global::sed = '/usr/bin/sed';
- 
- 1;
diff --git a/mail/mailscanner/pkg-message b/mail/mailscanner/pkg-message
index 68ff718962f8..7c4e356d71a7 100644
--- a/mail/mailscanner/pkg-message
+++ b/mail/mailscanner/pkg-message
@@ -5,7 +5,7 @@
 	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |
 	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|
 							
-	See PREFIX/share/doc/MailScanner/README.FreeBSD.port,
+	See %%PREFIX%%/share/doc/MailScanner/README.FreeBSD.port,
 	http://www.mailscanner.info, the man pages MailScanner and
 	MailScanner.conf for further instructions.
 
@@ -21,4 +21,14 @@
 	.sample files instead of real .conf files and report
 	templates.
 
+	If you are upgrading your port you might consider 
+	running
+
+	make renew-wrapper
+	make renew-autoupdate
+	make renew-reports
+
+	to update your virus-wrappers, autoupdates, reports and
+	languages.conf
+
 *************************************************************************
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index 3d4bc1a4f625..4be0e0236bea 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -1,12 +1,14 @@
+@comment $FreeBSD$
 bin/tnef
 etc/MailScanner/MailScanner.conf.sample
 etc/MailScanner/filename.rules.conf.sample
+etc/MailScanner/filetype.rules.conf.sample
 etc/MailScanner/rules/EXAMPLES
 etc/MailScanner/rules/README
 etc/MailScanner/rules/spam.whitelist.rules.sample
 etc/MailScanner/spam.assassin.prefs.conf.sample
 etc/MailScanner/spam.lists.conf.sample
-etc/MailScanner/virus.scanners.conf
+etc/MailScanner/virus.scanners.conf.sample
 etc/rc.d/mailscanner.sh.sample
 etc/rc.d/mta.sh.sample
 lib/MailScanner/MailScanner.pm
@@ -17,6 +19,8 @@ lib/MailScanner/MailScanner/Exim.pm
 lib/MailScanner/MailScanner/EximDiskStore.pm
 lib/MailScanner/MailScanner/Lock.pm
 lib/MailScanner/MailScanner/Log.pm
+lib/MailScanner/MailScanner/MCP.pm
+lib/MailScanner/MailScanner/MCPMessage.pm
 lib/MailScanner/MailScanner/Mail.pm
 lib/MailScanner/MailScanner/Message.pm
 lib/MailScanner/MailScanner/MessageBatch.pm
@@ -45,8 +49,11 @@ libexec/MailScanner/bitdefender-wrapper.sample
 libexec/MailScanner/clamav-autoupdate.sample
 libexec/MailScanner/clamav-wrapper.sample
 libexec/MailScanner/command-wrapper.sample
+libexec/MailScanner/etrust-autoupdate.sample
+libexec/MailScanner/etrust-wrapper.sample
 libexec/MailScanner/f-prot-autoupdate.sample
 libexec/MailScanner/f-prot-wrapper.sample
+libexec/MailScanner/f-secure-autoupdate.sample
 libexec/MailScanner/f-secure-wrapper.sample
 libexec/MailScanner/inoculan-wrapper.sample
 libexec/MailScanner/inoculate-wrapper.sample
@@ -62,7 +69,10 @@ libexec/MailScanner/rav-autoupdate.sample
 libexec/MailScanner/rav-wrapper.sample
 libexec/MailScanner/sophos-autoupdate.sample
 libexec/MailScanner/sophos-wrapper.sample
+libexec/MailScanner/trend-autoupdate.sample
 libexec/MailScanner/trend-wrapper.sample
+libexec/MailScanner/update_virus_scanners
+%%DATADIR%%/reports/cy+en/deleted.content.message.txt.sample
 %%DATADIR%%/reports/cy+en/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/cy+en/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/cy+en/disinfected.report.txt.sample
@@ -72,14 +82,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/cy+en/inline.warning.html.sample
 %%DATADIR%%/reports/cy+en/inline.warning.txt.sample
 %%DATADIR%%/reports/cy+en/languages.conf.sample
+%%DATADIR%%/reports/cy+en/sender.content.report.txt.sample
 %%DATADIR%%/reports/cy+en/sender.error.report.txt.sample
 %%DATADIR%%/reports/cy+en/sender.filename.report.txt.sample
+%%DATADIR%%/reports/cy+en/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/cy+en/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/cy+en/sender.spam.report.txt.sample
 %%DATADIR%%/reports/cy+en/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/cy+en/sender.virus.report.txt.sample
+%%DATADIR%%/reports/cy+en/stored.content.message.txt.sample
 %%DATADIR%%/reports/cy+en/stored.filename.message.txt.sample
 %%DATADIR%%/reports/cy+en/stored.virus.message.txt.sample
+%%DATADIR%%/reports/cz/deleted.content.message.txt.sample
 %%DATADIR%%/reports/cz/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/cz/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/cz/disinfected.report.txt.sample
@@ -89,15 +103,19 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/cz/inline.warning.html.sample
 %%DATADIR%%/reports/cz/inline.warning.txt.sample
 %%DATADIR%%/reports/cz/languages.conf.sample
+%%DATADIR%%/reports/cz/sender.content.report.txt.sample
 %%DATADIR%%/reports/cz/sender.error.report.txt.sample
 %%DATADIR%%/reports/cz/sender.filename.report.txt.sample
+%%DATADIR%%/reports/cz/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/cz/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/cz/sender.spam.report.txt.sample
 %%DATADIR%%/reports/cz/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/cz/sender.virus.report.txt.sample
+%%DATADIR%%/reports/cz/stored.content.message.txt.sample
 %%DATADIR%%/reports/cz/stored.filename.message.txt.sample
 %%DATADIR%%/reports/cz/stored.virus.message.txt.sample
 %%DATADIR%%/reports/de/README.1ST.sample
+%%DATADIR%%/reports/de/deleted.content.message.txt.sample
 %%DATADIR%%/reports/de/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/de/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/de/disinfected.report.txt.sample
@@ -107,14 +125,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/de/inline.warning.html.sample
 %%DATADIR%%/reports/de/inline.warning.txt.sample
 %%DATADIR%%/reports/de/languages.conf.sample
+%%DATADIR%%/reports/de/sender.content.report.txt.sample
 %%DATADIR%%/reports/de/sender.error.report.txt.sample
 %%DATADIR%%/reports/de/sender.filename.report.txt.sample
+%%DATADIR%%/reports/de/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/de/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/de/sender.spam.report.txt.sample
 %%DATADIR%%/reports/de/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/de/sender.virus.report.txt.sample
+%%DATADIR%%/reports/de/stored.content.message.txt.sample
 %%DATADIR%%/reports/de/stored.filename.message.txt.sample
 %%DATADIR%%/reports/de/stored.virus.message.txt.sample
+%%DATADIR%%/reports/dk/deleted.content.message.txt.sample
 %%DATADIR%%/reports/dk/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/dk/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/dk/disinfected.report.txt.sample
@@ -124,14 +146,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/dk/inline.warning.html.sample
 %%DATADIR%%/reports/dk/inline.warning.txt.sample
 %%DATADIR%%/reports/dk/languages.conf.sample
+%%DATADIR%%/reports/dk/sender.content.report.txt.sample
 %%DATADIR%%/reports/dk/sender.error.report.txt.sample
 %%DATADIR%%/reports/dk/sender.filename.report.txt.sample
+%%DATADIR%%/reports/dk/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/dk/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/dk/sender.spam.report.txt.sample
 %%DATADIR%%/reports/dk/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/dk/sender.virus.report.txt.sample
+%%DATADIR%%/reports/dk/stored.content.message.txt.sample
 %%DATADIR%%/reports/dk/stored.filename.message.txt.sample
 %%DATADIR%%/reports/dk/stored.virus.message.txt.sample
+%%DATADIR%%/reports/en/deleted.content.message.txt.sample
 %%DATADIR%%/reports/en/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/en/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/en/disinfected.report.txt.sample
@@ -141,14 +167,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/en/inline.warning.html.sample
 %%DATADIR%%/reports/en/inline.warning.txt.sample
 %%DATADIR%%/reports/en/languages.conf.sample
+%%DATADIR%%/reports/en/sender.content.report.txt.sample
 %%DATADIR%%/reports/en/sender.error.report.txt.sample
 %%DATADIR%%/reports/en/sender.filename.report.txt.sample
+%%DATADIR%%/reports/en/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/en/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/en/sender.spam.report.txt.sample
 %%DATADIR%%/reports/en/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/en/sender.virus.report.txt.sample
+%%DATADIR%%/reports/en/stored.content.message.txt.sample
 %%DATADIR%%/reports/en/stored.filename.message.txt.sample
 %%DATADIR%%/reports/en/stored.virus.message.txt.sample
+%%DATADIR%%/reports/es/deleted.content.message.txt.sample
 %%DATADIR%%/reports/es/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/es/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/es/disinfected.report.txt.sample
@@ -158,14 +188,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/es/inline.warning.html.sample
 %%DATADIR%%/reports/es/inline.warning.txt.sample
 %%DATADIR%%/reports/es/languages.conf.sample
+%%DATADIR%%/reports/es/sender.content.report.txt.sample
 %%DATADIR%%/reports/es/sender.error.report.txt.sample
 %%DATADIR%%/reports/es/sender.filename.report.txt.sample
+%%DATADIR%%/reports/es/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/es/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/es/sender.spam.report.txt.sample
 %%DATADIR%%/reports/es/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/es/sender.virus.report.txt.sample
+%%DATADIR%%/reports/es/stored.content.message.txt.sample
 %%DATADIR%%/reports/es/stored.filename.message.txt.sample
 %%DATADIR%%/reports/es/stored.virus.message.txt.sample
+%%DATADIR%%/reports/fr/deleted.content.message.txt.sample
 %%DATADIR%%/reports/fr/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/fr/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/fr/disinfected.report.txt.sample
@@ -175,14 +209,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/fr/inline.warning.html.sample
 %%DATADIR%%/reports/fr/inline.warning.txt.sample
 %%DATADIR%%/reports/fr/languages.conf.sample
+%%DATADIR%%/reports/fr/sender.content.report.txt.sample
 %%DATADIR%%/reports/fr/sender.error.report.txt.sample
 %%DATADIR%%/reports/fr/sender.filename.report.txt.sample
+%%DATADIR%%/reports/fr/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/fr/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/fr/sender.spam.report.txt.sample
 %%DATADIR%%/reports/fr/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/fr/sender.virus.report.txt.sample
+%%DATADIR%%/reports/fr/stored.content.message.txt.sample
 %%DATADIR%%/reports/fr/stored.filename.message.txt.sample
 %%DATADIR%%/reports/fr/stored.virus.message.txt.sample
+%%DATADIR%%/reports/hu/deleted.content.message.txt.sample
 %%DATADIR%%/reports/hu/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/hu/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/hu/disinfected.report.txt.sample
@@ -192,14 +230,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/hu/inline.warning.html.sample
 %%DATADIR%%/reports/hu/inline.warning.txt.sample
 %%DATADIR%%/reports/hu/languages.conf.sample
+%%DATADIR%%/reports/hu/sender.content.report.txt.sample
 %%DATADIR%%/reports/hu/sender.error.report.txt.sample
 %%DATADIR%%/reports/hu/sender.filename.report.txt.sample
+%%DATADIR%%/reports/hu/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/hu/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/hu/sender.spam.report.txt.sample
 %%DATADIR%%/reports/hu/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/hu/sender.virus.report.txt.sample
+%%DATADIR%%/reports/hu/stored.content.message.txt.sample
 %%DATADIR%%/reports/hu/stored.filename.message.txt.sample
 %%DATADIR%%/reports/hu/stored.virus.message.txt.sample
+%%DATADIR%%/reports/it/deleted.content.message.txt.sample
 %%DATADIR%%/reports/it/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/it/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/it/disinfected.report.txt.sample
@@ -209,14 +251,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/it/inline.warning.html.sample
 %%DATADIR%%/reports/it/inline.warning.txt.sample
 %%DATADIR%%/reports/it/languages.conf.sample
+%%DATADIR%%/reports/it/sender.content.report.txt.sample
 %%DATADIR%%/reports/it/sender.error.report.txt.sample
 %%DATADIR%%/reports/it/sender.filename.report.txt.sample
+%%DATADIR%%/reports/it/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/it/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/it/sender.spam.report.txt.sample
 %%DATADIR%%/reports/it/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/it/sender.virus.report.txt.sample
+%%DATADIR%%/reports/it/stored.content.message.txt.sample
 %%DATADIR%%/reports/it/stored.filename.message.txt.sample
 %%DATADIR%%/reports/it/stored.virus.message.txt.sample
+%%DATADIR%%/reports/nl/deleted.content.message.txt.sample
 %%DATADIR%%/reports/nl/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/nl/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/nl/disinfected.report.txt.sample
@@ -226,14 +272,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/nl/inline.warning.html.sample
 %%DATADIR%%/reports/nl/inline.warning.txt.sample
 %%DATADIR%%/reports/nl/languages.conf.sample
+%%DATADIR%%/reports/nl/sender.content.report.txt.sample
 %%DATADIR%%/reports/nl/sender.error.report.txt.sample
 %%DATADIR%%/reports/nl/sender.filename.report.txt.sample
+%%DATADIR%%/reports/nl/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/nl/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/nl/sender.spam.report.txt.sample
 %%DATADIR%%/reports/nl/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/nl/sender.virus.report.txt.sample
+%%DATADIR%%/reports/nl/stored.content.message.txt.sample
 %%DATADIR%%/reports/nl/stored.filename.message.txt.sample
 %%DATADIR%%/reports/nl/stored.virus.message.txt.sample
+%%DATADIR%%/reports/pt_br/deleted.content.message.txt.sample
 %%DATADIR%%/reports/pt_br/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/pt_br/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/pt_br/disinfected.report.txt.sample
@@ -243,14 +293,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/pt_br/inline.warning.html.sample
 %%DATADIR%%/reports/pt_br/inline.warning.txt.sample
 %%DATADIR%%/reports/pt_br/languages.conf.sample
+%%DATADIR%%/reports/pt_br/sender.content.report.txt.sample
 %%DATADIR%%/reports/pt_br/sender.error.report.txt.sample
 %%DATADIR%%/reports/pt_br/sender.filename.report.txt.sample
+%%DATADIR%%/reports/pt_br/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/pt_br/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/pt_br/sender.spam.report.txt.sample
 %%DATADIR%%/reports/pt_br/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/pt_br/sender.virus.report.txt.sample
+%%DATADIR%%/reports/pt_br/stored.content.message.txt.sample
 %%DATADIR%%/reports/pt_br/stored.filename.message.txt.sample
 %%DATADIR%%/reports/pt_br/stored.virus.message.txt.sample
+%%DATADIR%%/reports/ro/deleted.content.message.txt.sample
 %%DATADIR%%/reports/ro/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/ro/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/ro/disinfected.report.txt.sample
@@ -260,15 +314,19 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/ro/inline.warning.html.sample
 %%DATADIR%%/reports/ro/inline.warning.txt.sample
 %%DATADIR%%/reports/ro/languages.conf.sample
+%%DATADIR%%/reports/ro/sender.content.report.txt.sample
 %%DATADIR%%/reports/ro/sender.error.report.txt.sample
 %%DATADIR%%/reports/ro/sender.filename.report.txt.sample
+%%DATADIR%%/reports/ro/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/ro/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/ro/sender.spam.report.txt.sample
 %%DATADIR%%/reports/ro/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/ro/sender.virus.report.txt.sample
+%%DATADIR%%/reports/ro/stored.content.message.txt.sample
 %%DATADIR%%/reports/ro/stored.filename.message.txt.sample
 %%DATADIR%%/reports/ro/stored.virus.message.txt.sample
 %%DATADIR%%/reports/se/README.sample
+%%DATADIR%%/reports/se/deleted.content.message.txt.sample
 %%DATADIR%%/reports/se/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/se/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/se/disinfected.report.txt.sample
@@ -278,14 +336,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/se/inline.warning.html.sample
 %%DATADIR%%/reports/se/inline.warning.txt.sample
 %%DATADIR%%/reports/se/languages.conf.sample
+%%DATADIR%%/reports/se/sender.content.report.txt.sample
 %%DATADIR%%/reports/se/sender.error.report.txt.sample
 %%DATADIR%%/reports/se/sender.filename.report.txt.sample
+%%DATADIR%%/reports/se/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/se/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/se/sender.spam.report.txt.sample
 %%DATADIR%%/reports/se/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/se/sender.virus.report.txt.sample
+%%DATADIR%%/reports/se/stored.content.message.txt.sample
 %%DATADIR%%/reports/se/stored.filename.message.txt.sample
 %%DATADIR%%/reports/se/stored.virus.message.txt.sample
+%%DATADIR%%/reports/sk/deleted.content.message.txt.sample
 %%DATADIR%%/reports/sk/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/sk/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/sk/disinfected.report.txt.sample
@@ -295,12 +357,15 @@ libexec/MailScanner/trend-wrapper.sample
 %%DATADIR%%/reports/sk/inline.warning.html.sample
 %%DATADIR%%/reports/sk/inline.warning.txt.sample
 %%DATADIR%%/reports/sk/languages.conf.sample
+%%DATADIR%%/reports/sk/sender.content.report.txt.sample
 %%DATADIR%%/reports/sk/sender.error.report.txt.sample
 %%DATADIR%%/reports/sk/sender.filename.report.txt.sample
+%%DATADIR%%/reports/sk/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/sk/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/sk/sender.spam.report.txt.sample
 %%DATADIR%%/reports/sk/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/sk/sender.virus.report.txt.sample
+%%DATADIR%%/reports/sk/stored.content.message.txt.sample
 %%DATADIR%%/reports/sk/stored.filename.message.txt.sample
 %%DATADIR%%/reports/sk/stored.virus.message.txt.sample
 %%DOCSDIR%%/COPYING
@@ -339,6 +404,11 @@ libexec/MailScanner/trend-wrapper.sample
 %%DOCSDIR%%/install/linux.shtml
 %%DOCSDIR%%/install/mailscanner.shtml
 %%DOCSDIR%%/install/mcafee.shtml
+%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.55
+%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.60
+%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.55
+%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.60
+%%DOCSDIR%%/install/mcp/index.html
 %%DOCSDIR%%/install/mime-tools-patch.txt
 %%DOCSDIR%%/install/mime-tools-patch2.txt
 %%DOCSDIR%%/install/mime-tools-patch3.txt
@@ -353,6 +423,7 @@ libexec/MailScanner/trend-wrapper.sample
 %%DOCSDIR%%/install/tnef.shtml
 %%DOCSDIR%%/install/zmailer.shtml
 %%DOCSDIR%%/introduction.shtml
+%%DOCSDIR%%/jobs
 %%DOCSDIR%%/mailscanner_trans.gif
 %%DOCSDIR%%/man/MailScanner.8
 %%DOCSDIR%%/man/MailScanner.8.html
@@ -367,15 +438,18 @@ libexec/MailScanner/trend-wrapper.sample
 %%DOCSDIR%%/poetry.shtml
 %%DOCSDIR%%/poweredby.google.gif
 %%DOCSDIR%%/poweredby.transtec.gif
+%%DOCSDIR%%/presentations.html
 %%DOCSDIR%%/press.html
 %%DOCSDIR%%/readme.shtml
 %%DOCSDIR%%/reject.html
+%%DOCSDIR%%/sobig.html
 %%DOCSDIR%%/support.html
 %%DOCSDIR%%/transtec.logo.gif
 %%DOCSDIR%%/users.shtml
 @dirrm share/nls/en_US.US-ASCII
 @dirrm share/nls/POSIX
 @dirrm %%DOCSDIR%%/man
+@dirrm %%DOCSDIR%%/install/mcp
 @dirrm %%DOCSDIR%%/install
 @dirrm %%DOCSDIR%%/images
 @dirrm %%DOCSDIR%%
author	Sergei Kolobov <sergei@FreeBSD.org>	2003-11-20 22:10:36 +0000
committer	Sergei Kolobov <sergei@FreeBSD.org>	2003-11-20 22:10:36 +0000
commit	268db76822cd2fa59ec03837b93bd791bd536eb8 (patch)
tree	0da756e8e672a0fb9426802d95a300d7d95779f7 /mail/mailscanner
parent	f1b089f8cdc9cc1ff6e37f523ce4c65fb410d1ab (diff)
download	ports-268db76822cd2fa59ec03837b93bd791bd536eb8.tar.gz ports-268db76822cd2fa59ec03837b93bd791bd536eb8.zip