- Update to 4.35.5

- Sync with mail/mailscanner port PR: ports/72991 Submitted by: Jan-Peter Koopmann (maintainer)
svn path=/head/; revision=119972
2004-10-22 14:11:28 +00:00 · 2004-10-22 14:11:28 +00:00 · d693452fe3 · 2021-03-31 03:12:20 +00:00
commit d693452fe3
parent f15952d8a2
7 changed files with 159 additions and 996 deletions
--- a/mail/mailscanner-devel/Makefile
+++ b/mail/mailscanner-devel/Makefile
@ -6,7 +6,7 @@
 #

 PORTNAME=	MailScanner
-PORTVERSION=	4.32.4
+PORTVERSION=	4.35.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 PKGNAMESUFFIX=	-devel
@ -61,6 +61,8 @@ 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
+MCP_FILES=	mcp.spam.assassin.prefs.conf \
+		10_example.cf
 USRLOCAL_FILES_LIB=	\
 		bitdefender-autoupdate f-prot-autoupdate \
 		f-secure-wrapper inoculan-autoupdate \
@ -141,7 +143,12 @@ do-install:
 		${INSTALL_DATA} EXAMPLES README ${PREFIX}/etc/MailScanner/rules
 	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
 		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules.sample
-
+	${MKDIR} ${PREFIX}/etc/MailScanner/mcp
+	${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner/mcp
+.for FILE in ${MCP_FILES}
+	${INSTALL_DATA} ${WRKSRC}/etc/mcp/${FILE} \
+		${PREFIX}/etc/MailScanner/mcp/${FILE}.sample
+.endfor
 	#
 	# Step 3: Install files in share
 	#
--- a/mail/mailscanner-devel/distinfo
+++ b/mail/mailscanner-devel/distinfo
@ -1,2 +1,2 @@
-MD5 (MailScanner-install-4.32.4-1.tar.gz) = 477ee1cef68783da3a33706d20283874
-SIZE (MailScanner-install-4.32.4-1.tar.gz) = 5328078
+MD5 (MailScanner-install-4.35.5-1.tar.gz) = 11ee29729d98e315eb3a925cb407251c
+SIZE (MailScanner-install-4.35.5-1.tar.gz) = 5266876
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
@ -1,26 +1,8 @@
--- ../MailScanner-install-4.32.4.orig/docs/man/MailScanner.8	Wed Jul 28 13:28:57 2004
-+++ docs/man/MailScanner.8	Wed Jul 28 13:29:39 2004
-@@ -1,10 +1,10 @@
-.TH "MailScanner" "8" "4.32.2" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.32.4" "Julian Field" "Mail"
+--- ../MailScanner-install-4.35.5.orig/docs/man/MailScanner.8	Fri Oct 22 08:13:43 2004
+++ docs/man/MailScanner.8	Fri Oct 22 08:13:55 2004
+@@ -1,4 +1,4 @@
+-.TH "MailScanner" "8" "4.34.8" "Julian Field" "Mail"
+.TH "MailScanner" "8" "4.35.5" "Julian Field" "Mail"
 .SH "NAME"
 .LP 
 MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
- .SH "SYNOPSIS"
- .LP 
-\fBMailScanner\fR [\fIconfigfile\fR]
-+\fBMailScanner\fR [\fI\-v\fR] [\fIconfigfile\fR]
- 
- .SH "DESCRIPTION"
- .LP 
-@@ -24,6 +24,10 @@
- 
- .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.
-+
-+.TP 
-+\fB\-v\fR
-+Prints version information for Mailscanner and all used perl\-modules.
- 
- .SH "MTA SETUP"
- .LP 
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html
@ -1,42 +1,9 @@
--- ../MailScanner-install-4.32.4.orig/docs/man/MailScanner.8.html	Wed Jul 28 13:28:57 2004
-+++ docs/man/MailScanner.8.html	Wed Jul 28 13:29:15 2004
+--- ../MailScanner-install-4.35.5.orig/docs/man/MailScanner.8.html	Fri Oct 22 08:13:44 2004
+++ docs/man/MailScanner.8.html	Fri Oct 22 08:13:57 2004
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.19 -->
-<!-- CreationDate: Mon Jul 12 14:19:46 2004 -->
-+<!-- CreationDate: Wed Jul 28 13:28:03 2004 -->
+-<!-- CreationDate: Fri Oct 15 15:13:21 2004 -->
+<!-- CreationDate: Fri Oct 22 08:13:20 2004 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-@@ -39,7 +39,8 @@
- <tr valign="top" align="left">
- <td width="11%"></td>
- <td width="89%">
-<p><b>MailScanner</b> [<i>configfile</i>]</p>
-+<p><b>MailScanner</b> [<i>&minus;v</i>]
-+[<i>configfile</i>]</p>
- </td>
- </table>
- <a name="DESCRIPTION"></a>
-@@ -70,6 +71,22 @@
- the &quot;Outgoing Queue Dir&quot;. You may need to adjust
- the configuration of your MTA (or the startup of your MTA)
- to make it work with MailScanner.</p>
-+</td>
-+</table>
-+<!-- TABS -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="4" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="3%">
-+
-+<p><b>&minus;v</b></p>
-+</td>
-+<td width="8%"></td>
-+<td width="78%">
-+
-+<p>Prints version information for Mailscanner and all used
-+perl&minus;modules.</p>
- </td>
- </table>
- <a name="MTA SETUP"></a>
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
@ -1,255 +1,59 @@
--- ../MailScanner-install-4.32.4.orig/docs/man/MailScanner.conf.5	Wed Jul 28 13:28:57 2004
-+++ docs/man/MailScanner.conf.5	Wed Jul 28 13:29:47 2004
+--- ../MailScanner-install-4.35.5.orig/docs/man/MailScanner.conf.5	Fri Oct 22 08:13:43 2004
+++ docs/man/MailScanner.conf.5	Fri Oct 22 08:14:01 2004
@@ -1,4 +1,4 @@
-.TH "MailScanner.conf" "5" "4.32.2" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.32.4" "Julian Field" "Mail"
+-.TH "MailScanner.conf" "5" "4.34.8" "Julian Field" "Mail"
+.TH "MailScanner.conf" "5" "4.35.5" "Julian Field" "Mail"
 .SH "NAME"
 .LP 
 MailScanner.conf \- Main configuration for MailScanner
-@@ -246,7 +246,15 @@
+@@ -485,7 +485,7 @@
 .br 
 
 .br 
-If you want to create the quarantine/archive so the files are owned by a user othee: If the "Run As User" is not "root" then you cannot change the user but may still be able to change the group, if the "Run As User" is a member of both of the groups "Run As Group" and "Quarantine Group".
-+If you want to create the quarantine/archive so the files are owned by a user other than the "Run As User" setting at the top of this file, you can change that here. Note: If the "Run As User" is not "root" then you cannot change the user but may still be able to change the group, if the "Run As User" is a member of both of the groups "Run As Group" and "Quarantine Group".
-+
-+.TP 
-+\fBQuarantine Group\fR
-+Default:
-+.br 
-+
-+.br 
-+If you want to create the quarantine/archive so the files are owned by a user other than the "Run As User" setting at the top of this file, you can change that here. Note: If the "Run As User" is not "root" then you cannot change the user but may still be able to change the group, if the "Run As User" is a member of both of the groups "Run As Group" and "Quarantine Group".
+-Which Virus Scanning package to use. Possible choices are sophos, sophossavi, mcafee, command, bitdefender, kaspersky, kaspersky\-4.5, kavdaemonclient, inoculate, inoculan, nod32, nod32\-1.99, f\-secure, f\-prot, panda, rav, antivir, clamav, clamavmodule, css, trend, norman, avg, vexira, none (no virus scanning at all). This *cannot* be the filename of a ruleset.
+Which Virus Scanning package to use. Possible choices are sophos, sophossavi, mcafee, command, bitdefender, kaspersky, kaspersky\-4.5, kavdaemonclient, inoculate, inoculan, nod32, nod32\-1.99, f\-secure, f\-prot, panda, rav, antivir, clamav, clamavmodule, css, trend, norman, avg, vexira, symscanengine, generic, none (no virus scanning at all). This *cannot* be the filename of a ruleset.
+ .br 
+ 
+ .br 
+@@ -1266,12 +1266,11 @@
 
 .TP 
- \fBQuarantine Permissions\fR
-@@ -440,7 +448,23 @@
+ \fBAttachment Encoding Charset\fR
+-Default: us\-ascii
+Default: ISO\-8859\-1
 .br 
 
 .br 
-The director of these files for changes in size to detect when a Sophos update has happened. The date of the Sophos Lib Dir is also monitored. This is only used by the "sophossavi" virus scanner, not the "sophos" scanner setting.
-+The directory (or a link to it) containing all the Sophos *.ide files. This is only used by the "sophossavi" virus scanner, and is irrelevant for all other scanners.
-+
-+.TP 
-+\fBSophos Lib Dir\fR
-+Default: /usr/local/Sophos/lib
-+.br 
-+
-+.br 
-+The directory (or a link to it) containing all the Sophos *.so libraries.This is only used by the "sophossavi" virus scanner, and is irrelevant for all other scanners.
-+
-+.TP 
-+\fBMonitors For Sophos Updates\fR
-+Default: /usr/local/Sophos/ide/*ides.zip
-+.br 
-+
-+.br 
-+SophosSAVI only: monitor each of these files for changes in size to detect when a Sophos update has happened. The date of the Sophos Lib Dir is also monitored. This is only used by the "sophossavi" virus scanner, not the "sophos" scanner setting.
- 
- .SH "Virus scanning and vulnerability testing"
+-This is the name of the encoding character set used for the contents of "VirusWarning.txt" attachments. If your users do not use English as their preferred language, you may want to set this to "ISO\-8859\-1". 
+-
+This is the name of the encoding character set used for the contents of "VirusWarning.txt" attachments. 
+ .SH "Mail archiving and monitoring"
 .TP 
-@@ -461,7 +485,7 @@
- .br 
+ \fBArchive Mail\fR
+@@ -1725,8 +1724,16 @@
 
 .br 
-Which Virus Scanning package to use. Possible choices are sophos, sophossavi, mcafee, command, bitdefender, kaspersky, kaspersky\-4.5, kavdaemonclient, inoculate, inoculan, nod32, nod32\-1.99, f\-secure, f\-prot, panda, rav, antivir, clamav, clamavmodule, css, trend, norman, avg, vexira, none (no virus scanning at all)
-+Which Virus Scanning package to use. Possible choices are sophos, sophossavi, mcafee, command, bitdefender, kaspersky, kaspersky\-4.5, kavdaemonclient, inoculate, inoculan, nod32, nod32\-1.99, f\-secure, f\-prot, panda, rav, antivir, clamav, clamavmodule, css, trend, norman, avg, vexira, none (no virus scanning at all). This *cannot* be the filename of a ruleset.
- .br 
- 
- .br 
-@@ -470,6 +494,10 @@
- 
- .br 
- Note: If you want to use multiple virus scanners, then this should be a space\-separated list of virus scanners.
-+.br 
-+
-+.br 
-+Note: Make sure that you check that the base installation directory in the 3rd column of virus.scanners.conf matches the location you have installed each of your virus scanners. The supplied virus.scanners.conf file assumes the default installation locations recommended by each of the virus scanner installation guides.
- 
- .TP 
- \fBVirus Scanner Timeout\fR
-@@ -594,7 +622,28 @@
- .IP  \(bu 4
- no     => Ban messages containing these tags
- .IP  \(bu 4
-disarm => Allow these tags, but stop these tags from fR
-+disarm => Allow these tags, but stop these tags from working
-+.RE
+ Log all the filenames that are allowed by the Filetype Rules, or just the filetypes that are denied? This can also be the filename of a ruleset.
 +
 +.TP 
-+\fBAllow Script Tags\fR
+\fBLog Silent Viruses\fR
 +Default: no
 +.br 
 +
 +.br 
-+Do you want to allow <Script> tags in email messages? This is a bad idea as these are used to exploit vulnerabilities in email applications and web browsers. This can also be the filename of a ruleset. Possible values:
-+.br 
-+.RS 7
-+.IP  \(bu 4
-+yes    => Allow these tags to be in the message
-+.IP  \(bu 4
-+no     => Ban messages containing these tags
-+.IP  \(bu 4
-+disarm => Allow these tags, but stop these tags from working
-+.RE
-+
-+.TP 
-+\fBAllow WebBugs\fR
- Default: disarm
- .br 
- 
-@@ -785,7 +834,15 @@
- .br 
- 
- .br 
-If the "Sign Clean Messages" option is set, then the contents of this file will be appended to the end of the body of every message that is scanned by MailScanner. You can use this to inform your users that MailScanner has scanned it, and you can also add any disclaimers you feel should be on mail travelling through your servers. This option corresponds to the contents ext messages.
-+If the "Sign Clean Messages" option is set, then the contents of this file will be appended to the end of the body of every message that is scanned by MailScanner. You can use this to inform your users that MailScanner has scanned it, and you can also add any disclaimers you feel should be on mail travelling through your servers. This option corresponds to the contents that is appended to HTML messages.
-+
-+.TP 
-+\fBInline Text Signature\fR
-+Default: %reports\-dir%/inline.sig.txt
-+.br 
-+
-+.br 
-+If the "Sign Clean Messages" option is set, then the contents of this file will be appended to the end of the body of every message that is scanned by MailScanner. You can use this to inform your users that MailScanner has scanned it, and you can also add any disclaimers you feel should be on mail travelling through your servers. This option corresponds to the contents that is appended to text messages.
+Log all occurrences of "Silent Viruses" as defined above? This can only be a simple yes/no value, not a ruleset.
+ .SH "Advanced SpamAssassin Settings"
+-If you are using Postfix you may well need to use some of the settings below, as the home directory for the "postfix" user cannot be written to by the "postfix" user. You may also need to use these if you have installed SpamAssassin somewhere other than the default location.
+If you are using Postfix you may well need to use some of the settings below, as the home directory for the "postfix" user cannot be written to by the "postfix" user. You may also need to use these if you have installed SpamAssassin somewhere other than the default location. 
 
 .TP 
- \fBSender Error Report\fR
-@@ -1015,7 +1072,15 @@
+ \fBSpamAssassin User State Dir\fR
+@@ -1734,7 +1741,7 @@
 .br 
 
 .br 
-If this option is set, then any message which is not scanned by MailScanner gets the "Mail Header" added to it with the stritomers/clients. 
-+If this option is set, then any message which is not scanned by MailScanner gets the "Mail Header" added to it with the string contained in the "Unscanned Header Value" option. This can be used to advertise your MailScanner service to customers/clients who are currently not using it. 
-+
-+.TP 
-+\fBUnscanned Header Value\fR
-+Default: Not scanned: please contact your Internet E\-Mail Service Provider for details
-+.br 
-+
-+.br 
-+This supplies the text that is placed in the "Mail Header" of messages that have not been scanned, if the option "Mark Unscanned Messages" is set. It is a useful place to advertise your MailScanner service to new customers/clients. 
+-The per\-user files (bayes, auto\-whitelist, user_prefs) are looked for here and in ~/.spamassassin/. Note the files are mutable. If this is unset then no extra places are searched for. If using Postfix, you probably want to set this to /var/spool/MailScanner/spamassassin and do
+The per\-user files (bayes, auto\-whitelist, user_prefs) are looked for here and in ~/.spamassassin/. Note the files are mutable. If this is unset then no extra places are searched for. NOTE: SpamAssassin is always called from MailScanner as the same user, and that is the "Run As" user specified in MailScanner.conf. So you can only have 1 set of "per\-user" files, it's just that you might possibly need to modify this location. You should not normally need to set this at all. If using Postfix, you probably want to set this to /var/spool/MailScanner/spamassassin and do
 
- .TP 
- \fBDeliver Cleaned Messages\fR
-@@ -1272,7 +1337,16 @@
- .br 
- 
- .br 
-When virus warn
-+When virus warnings are sent to any users, this is the email address used as the "From:" header in the messages. 
-+.SH "Definitions of virus scanners and spam detectors"
-+.TP 
-+\fBSpam List Definitions\fR
-+Default: %etc\-dir%/spam.lists.conf
-+.br 
-+
-+.br 
-+This file contains all the definitions of the "Spam Lists" (also known as RBL's or DNSBL's) which can be used to try to detect spam based on where each message came from. Many more spam lists can be added to this file, but it contains the most popular ones to get you started. 
-+
- .TP 
- \fBVirus Scanner Definitions\fR
- Default: %etc\-dir%/virus.scanners.conf
-@@ -1479,7 +1553,24 @@
- .br 
- 
- .br 
-If you are using the Bayesian statistics engine on a busy server, you ma deliver
-+If you are using the Bayesian statistics engine on a busy server, you may well need to force a Bayesian database rebuild and expiry at regular intervals. This is measures in seconds. 24 hours = 86400 seconds. To disable this feature set this to 0.
-+
-+.TP 
-+\fBWait During Bayes Rebuild\fR
-+Default: no
-+.br 
-+
-+.br 
-+# The Bayesian database rebuild and expiry may take a 2 or 3 minutes
-+# to complete. During this time you can either wait, or simply
-+# disable SpamAssassin checks until it has completed.
-+WaitDuringBayesRebuild = no
-+
-+
-+.SH "What to do with spam"
-+.TP 
-+\fBSpam Actions\fR
-+Default: deliver
- .br 
- 
- .br 
-@@ -1683,6 +1774,25 @@
- .RE
- .SH "Advanced Settings"
- .TP 
-+\fBSpam Score Number Format\fR
-+Default: %d
-+.br 
-+
-+.br 
-+When putting the value of the spam score of a message into the headers, how do you want to format it. If you don't know how to use sprintf() or printf() in C, please *do not modify* this value. This can also be the filename of a ruleset. A few examples for you:
-+.RS 7
-+.TP 
-+%d
-+==> 12
-+.TP 
-+%5.2f
-+==> 12.34
-+.TP 
-+%05.1f
-+==> 012.3
-+.RE
-+
-+.TP 
- \fBDebug\fR
- Default: no
- .br 
-@@ -1718,7 +1828,25 @@
- \fBLDAP Base\fR
- Default:
- .br 
-ssing a batch of messages. It is designed to be used in conjunction with a Custom Function. The Custom Function should then be written to have a "side effect" of doing something useful such as logging lots of information about the batch of messages to a file or an SQL database. 
-+
-+.br 
-+If you are using an LDAP server to read the configuration, these are the details required for the LDAP connection. The connection is anonymous. Example: o=fsl
-+
-+.TP 
-+\fBLDAP Site\fR
-+Default:
-+.br 
-+
-+.br 
-+If you are using an LDAP server to read the configuration, these are the details required for the LDAP connection. The connection is anonymous. Example: default
-+
-+.TP 
-+\fBAlways Looked Up Last\fR
-+Default: no
-+.br 
-+
-+.br 
-+The value of the option is actually never used, but it is evaluated at the end of processing a batch of messages. It is designed to be used in conjunction with a Custom Function. The Custom Function should then be written to have a "side effect" of doing something useful such as logging lots of information about the batch of messages to a file or an SQL database. 
- 
- .TP 
- \fBDeliver in Background\fR
-@@ -1892,7 +2020,22 @@
- .LP 
- Many Windows e\-mail programs (eg. Microsoft Outlook) hide common file extensions in an attempt to not baffle the user. The result is that while an attachment called "Your Document.doc" is helpfully displayed as "Your Document", a more sinister attachment just as "Looks Safe.txt.pif" will appear simply as "Looks Safe.txt". Many users recognise the .txt filename extension as applying to plain text files, which they know are safe. So even an experienced user may well double\-click on this attachment thinking it is just going to start Notepad and display the text file. However, the file is really an MS\-Dos shortcut (.pif file) and can execute any arbitrary commands the author wanted: all without any indication to the unwitting user. 
- .LP 
-The rules are matched in order from the top to the bottom of the file, and the first rule containing a matching regular expression is used. Each line of the file is either blank, a comment (in which case it starts with a '#' character) or is a rule made up of 4 fields separated by one o
-+The rules are matched in order from the top to the bottom of the file, and the first rule containing a matching regular expression is used. Each line of the file is either blank, a comment (in which case it starts with a '#' character) or is a rule made up of 4 fields separated by one or more TAB characters:
-+
-+.TP 
-+allow / deny
-+Accept or reject the attachment if its filename matches the regular expression 
-+
-+.TP 
-+regular expression 
-+The rule is executed if the attachment matches this expression. It may optionally be surrounded in '/' characters. 
-+.TP 
-+log text 
-+If the rule matches, this text is placed in the syslog. If the text is "\-", no string is logged. 
-+
-+.TP 
-+user text 
-+If the rule matches, this text is placed in the text message sent to the user. If the text is "\-", no text is used. 
- 
- .LP 
- Please have a look at the filename.rules.conf or filename.rules.conf.sample file provided with this distribution/package/port.
+ .RS 10
+ mkdir /var/spool/MailScanner/spamassassin
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html
@ -1,172 +1,54 @@
--- ../MailScanner-install-4.32.4.orig/docs/man/MailScanner.conf.5.html	Wed Jul 28 13:28:57 2004
-+++ docs/man/MailScanner.conf.5.html	Wed Jul 28 13:29:22 2004
+--- ../MailScanner-install-4.35.5.orig/docs/man/MailScanner.conf.5.html	Fri Oct 22 08:13:44 2004
+++ docs/man/MailScanner.conf.5.html	Fri Oct 22 08:14:03 2004
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.19 -->
-<!-- CreationDate: Mon Jul 12 14:19:46 2004 -->
-+<!-- CreationDate: Wed Jul 28 13:28:02 2004 -->
+-<!-- CreationDate: Fri Oct 15 15:13:21 2004 -->
+<!-- CreationDate: Fri Oct 22 08:13:20 2004 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-@@ -220,7 +220,25 @@
- headers.</p>
- </td>
- </table>
-<a name="System Settingsnner uses your server efficiently by running
-+<a name="System Settings"></a>
-+<h2>System Settings</h2>
-+<!-- 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>Max Children</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: 5</p>
-+<!-- INDENTATION -->
-+<p>MailScanner uses your server efficiently by running
- several identical processes at the same time, all processing
- mail. This is the number of these processes to run at once.
- Turning this figure will optimise the performance of your
-@@ -497,7 +515,31 @@
- <!-- INDENTATION -->
- <p>To avoid resource leaks the MailScanner parent process
- stops and restarts its child processes from time to time.
-Set the amount of seconds ea"top" align="left">
-+Set the amount of seconds each child process is supposed to
-+live here.</p>
-+</td>
-+</table>
-+<!-- TABS -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="5" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="4%">
-+
-+<p><b>MTA</b></p>
-+</td>
-+<td width="7%"></td>
-+<td width="26%">
-+
-+<p>Default: sendmail</p>
-+</td>
-+<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="22%"></td>
- <td width="78%">
- <p>MailScanner works with sendmail and exim. Since the queue
-@@ -730,7 +772,20 @@
- <!-- INDENTATION -->
- <p>If you want processes running under the same *group* as
- MailScanner to be able to read the quarantined files (and
-list what is in the directories, of course), set to 06="2" cellspacing="0" cellpadding="0">
-+list what is in the directories, of course), set to 0640. If
-+you want *all* other users to be able to read them, set to
-+0644. For a detailed description, if you&rsquo;re not
-+already familiar with it, refer to &lsquo;man 2
-+chmod&lsquo;. Typical use: let the webserver have access to
-+the files so users can download them if they really want to.
-+Use with care, you may well open security holes.</p>
-+</td>
-+</table>
-+<a name="Process Incoming Mail"></a>
-+<h2>Process Incoming Mail</h2>
-+<!-- 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%">
-@@ -975,7 +1030,22 @@
- <td width="89%">
- <p><b>File Command</b></p></td>
- </table>
-<!-- INDENTATIoid"
-+<!-- 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: /usr/bin/file</p>
-+<!-- INDENTATION -->
-+<p>Where the &quot;file&quot; command is installed. This is
-+used for checking the content type of files, regardless of
-+their filename. To disable Filetype checking, set this value
-+to blank.</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>
-@@ -1216,7 +1286,23 @@
- <tr valign="top" align="left">
- <td width="22%"></td>
- <td width="78%">
-<p>Default: /usr/l100%" border=0 rules="none" frame="void"
-+<p>Default: /usr/local/Sophos/ide</p>
-+<!-- INDENTATION -->
-+<p>The directory (or a link to it) containing all the Sophos
-+*.ide files. This is only used by the &quot;sophossavi&quot;
-+virus scanner, and is irrelevant for all other scanners.</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>Sophos Lib Dir</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>
-@@ -1303,7 +1389,8 @@
+@@ -1389,8 +1389,9 @@
 kaspersky&minus;4.5, kavdaemonclient, inoculate, inoculan,
 nod32, nod32&minus;1.99, f&minus;secure, f&minus;prot,
 panda, rav, antivir, clamav, clamavmodule, css, trend,
-norman, avg, vexira, none (no virus scanning at all)</p>
-+norman, avg, vexira, none (no virus scanning at all). This
-+*cannot* be the filename of a ruleset.</p>
+-norman, avg, vexira, none (no virus scanning at all). This
+-*cannot* be the filename of a ruleset.</p>
+norman, avg, vexira, symscanengine, generic, none (no virus
+scanning at all). This *cannot* be the filename of a
+ruleset.</p>
 <!-- INDENTATION -->
 <p>Note for McAfee users: Do NOT use any symlinks with
 McAfee at all. It is very strange but McAfee may not detect
-@@ -1313,6 +1400,13 @@
- <p>Note: If you want to use multiple virus scanners, then
- this should be a space&minus;separated list of virus
- scanners.</p>
-+<!-- INDENTATION -->
-+<p>Note: Make sure that you check that the base installation
-+directory in the 3rd column of virus.scanners.conf matches
-+the location you have installed each of your virus scanners.
-+The supplied virus.scanners.conf file assumes the default
-+installation locations recommended by each of the virus
-+scanner installation guides.</p>
+@@ -3709,13 +3710,11 @@
+ <tr valign="top" align="left">
+ <td width="22%"></td>
+ <td width="78%">
+-<p>Default: us&minus;ascii</p>
+<p>Default: ISO&minus;8859&minus;1</p>
+ <!-- INDENTATION -->
+ <p>This is the name of the encoding character set used for
+-the contents of &quot;VirusWarning.txt&quot; attachments. If
+-your users do not use English as their preferred language,
+-you may want to set this to
+-&quot;ISO&minus;8859&minus;1&quot;.</p>
+the contents of &quot;VirusWarning.txt&quot;
+attachments.</p>
 </td>
 </table>
- <!-- INDENTATION -->
-@@ -1468,7 +1562,19 @@
- <p><b>Still Deliver Silent Viruses</b></p></td>
+ <a name="Mail archiving and monitoring"></a>
+@@ -5031,6 +5030,27 @@
+ be the filename of a ruleset.</p>
+ </td>
 </table>
- <!-- INDENTATION -->
-<table width=t your users (and your management)
+<!-- 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>Log Silent Viruses</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">
@ -174,521 +56,29 @@
 +<td width="78%">
 +<p>Default: no</p>
 +<!-- INDENTATION -->
-+<p>If this is set to yes then disinfected messsages that
-+originally contained one of the &quot;silent&quot; viruses
-+will still be delivered to the original recipients, even
-+those addresses were chosen at random by the infected PC and
-+do not correspond to anything a user intended to send. Set
-+this to yes so that your users (and your management)
- appreciate how much MailScanner is doing to protect them,
- but set it to no if they complain a lot about receiving lots
- of virus warnings.</p>
-@@ -1710,7 +1816,32 @@
- </td>
- </table>
- <!-- TABS -->
-<table width="100td>
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="4" cellspacing="0" cellpadding="0">
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="1%">
-+
-+<p>&bull;</p>
-+</td>
-+<td width="5%"></td>
-+<td width="72%">
-+
-+<p>yes =&gt; Allow these tags to be in the message</p>
-+</td>
-+<tr valign="top" align="left">
-+<td width="22%"></td>
-+<td width="1%">
-+
-+<p>&bull;</p>
-+</td>
-+<td width="5%"></td>
-+<td width="72%">
-+
-+<p>no =&gt; Ban messages containing these tags</p>
-+</td>
-+<tr valign="top" align="left">
-+<td width="22%"></td>
- <td width="1%">
- 
- <p>&bull;</p>
-@@ -2009,7 +2140,24 @@
- <p>Default: no</p>
- <!-- INDENTATION -->
- <p>Do you want to allow &lt;Form&gt; tags in email messages?
-This is a bad idea as these are used as order=0 rules="none" frame="void"
-+This is a bad idea as these are used as scams to pursuade
-+people to part with credit card information and other
-+personal data. This can also be the filename of a
+<p>Log all occurrences of &quot;Silent Viruses&quot; as
+defined above? This can only be a simple yes/no value, not a
 +ruleset.</p>
 +</td>
 +</table>
-+<a name="Attachment filename checking"></a>
-+<h2>Attachment filename checking</h2>
-+<!-- 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>Filename Rules</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>
-@@ -2244,7 +2392,23 @@
- example of each of which is contained in the supplied sample
- file.</p>
- </td>
-<ssage.txt</p>
-+</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:
-+/%reports&minus;dir%/deleted.content.message.txt</p>
+ <a name="Advanced SpamAssassin Settings"></a>
+ <h2>Advanced SpamAssassin Settings</h2>
 <!-- INDENTATION -->
- <p>This report is sent when a message is deleted because it
- contained bad or dangerous content. A few variable
-@@ -2484,7 +2648,23 @@
- <td width="78%">
- <p>Default: X&minus;MailScanner:</p>
- <!-- INDENTATION -->
-<p>Extra header that should be added to all scanned me cols="2" cellspacing="0" cellpadding="0">
-+<p>Extra header that should be added to all scanned messages
-+to show they have been scanned. You might want to add an
-+abbreviation of your site name to this, so that you can find
-+headers that are added by your MailScanner server.</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 Header</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%">
-@@ -2737,7 +2917,24 @@
- SpamAssassin score. This means that people who only filter
- on the &quot;Spam Stars&quot; will still be able to catch
- messages which receive a very low SpamAssassin score. Set
-this valdth="78%">
-+this value to 0 to disable it. This can also be the filename
-+of a ruleset.</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>Clean header Value</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: Found to be clean</p>
- <!-- INDENTATION -->
- <p>This is the text that is added to the &quot;Mail
-@@ -2977,7 +3174,23 @@
- E&minus;Mail Service Provider for details</p>
- <!-- INDENTATION -->
- <p>This supplies the text that is placed in the &quot;Mail
-Header&quot; of messages that have not been scanned, if"0" cellpadding="0">
-+Header&quot; of messages that have not been scanned, if the
-+option &quot;Mark Unscanned Messages&quot; is set. It is a
-+useful place to advertise your MailScanner service to new
-+customers/clients.</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>Deliver Cleaned Messages</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%">
-@@ -3227,7 +3440,23 @@
- <tr valign="top" align="left">
- <td width="11%"></td>
- <td width="89%">
-<void"
-+<p><b>Filename 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: {Virus?}</p>
-+<!-- INDENTATION -->
-+<p>This is the text inserted at the start of the
-+&quot;Subject:&quot; line if the &quot;Filename 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>
-@@ -3483,7 +3712,22 @@
- format suitable for most Unix mail systems. These files must
- already exist since MailScanner will not create them!</p>
- <!-- INDENTATION -->
-<p>If you give this option a ruleset, you can  Notices</b></p></td>
-+<p>If you give this option a ruleset, you can control
-+exactly whose mail is archived or forwarded. If you do this,
-+beware of the legal implications as this could be deemed to
-+be illegal interception unless the police have asked you to
-+do this.</p>
-+</td>
-+</table>
-+<a name="Notices to system administrators"></a>
-+<h2>Notices to system administrators</h2>
-+<!-- 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>Send Notices</b></p></td>
- </table>
- <!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-@@ -3732,7 +3976,21 @@
- <tr valign="top" align="left">
- <td width="11%"></td>
- <td width="89%">
-<p><b>Spam D be defined in the &quot;Spam List
-+<p><b>Spam Domain List</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:</p>
-+<!-- INDENTATION -->
-+<p>This provides a space&minus;separated list of &quot;Spam
-+Lists&quot; (or RBL&rsquo;s or DNSBL&rsquo;s) which are
-+checked for each message. These lists are based on the
-+domain name of the sender address of each message. Every
-+list used here must be defined in the &quot;Spam List
- Definitions&quot; file mentioned above.</p>
- </td>
- </table>
-@@ -3974,7 +4232,23 @@
- <!-- INDENTATION -->
- <p>SpamAssassin is quite slow when processing very large
- messages. To work round this problem, this option provides a
-maximum size for messages that are processed">
-+maximum size for messages that are processed with
-+SpamAssassin. Most real spam is usually less than about
-+50,000 bytes per message.</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>Required Spam Assassin Score</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: 6</p>
-@@ -4216,7 +4490,24 @@
- <!-- INDENTATION -->
- <p>If you are using the Bayesian statistics engine on a busy
- server, you may well need to force a Bayesian database
-rebuild and expiry at regular intervals. This is measuth="22%"></td>
-+rebuild and expiry at regular intervals. This is measures in
-+seconds. 24 hours = 86400 seconds. To disable this feature
-+set this to 0.</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>Wait During Bayes Rebuild</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 -->
-@@ -4502,7 +4793,23 @@
- <td width="11%"></td>
- <td width="89%">
- <p><b>Recipient Spam 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:
-+%reports&minus;dir%/recipient.spam.report.txt</p>
-+<!-- INDENTATION -->
-+<p>If you use the &rsquo;notify&rsquo; Spam Action or High
-+Scoring Spam Action then this is the location of the
-+notification message that is sent to the original recipients
-+of the message.</p>
-+</td>
-+</table>
-+<!-- INDENTATION -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="2" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
-@@ -4748,7 +5055,22 @@
- <p><b>SpamAssassin Local Rules Dir</b></p></td>
- </table>
- <!-- INDENTATION -->
-<table width="100%" border=0 rules="none" frame=dding="0">
-+<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:</p>
-+<!-- INDENTATION -->
-+<p>This tells MailScanner where to look for the
-+site&minus;local rules. If this is set it adds to the list
-+of places that are searched. MailScanner will always look at
-+the following places (even if this option is not set):</p>
-+</td>
-+</table>
-+<!-- TABS -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="5" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
- <td width="22%"></td>
- <td width="1%">
-@@ -4913,27 +5235,94 @@
- </table>
- <a name="Advanced Settings"></a>
- <h2>Advanced Settings</h2>
-+<!-- 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 Score Number Format</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: %d</p>
-+<!-- INDENTATION -->
-+<p>When putting the value of the spam score of a message
-+into the headers, how do you want to format it. If you
-+don&rsquo;t know how to use sprintf() or printf() in C,
-+please *do not modify* this value. This can also be the
-+filename of a ruleset. A few examples for you:</p>
-+</td>
-+</table>
- <!-- TABS -->
- <table width="100%" border=0 rules="none" frame="void"
-        cols="5" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
- <td width="11%"></td>
-<td width="7%">
-+<td width="20%">
- 
-<p><b>Debug</b></p>
-+<p>%d</p>
- </td>
-<td width="4%"></td>
-<td width="16%">
-+<td width="1%"></td>
-+<td width="14%">
- 
-<p>Default: no</p>
-+<p>==&gt; 12</p>
- </td>
-<td width="62%">
-+<td width="54%">
-+</td>
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="20%">
-+
-+<p>%5.2f</p>
-+</td>
-+<td width="1%"></td>
-+<td width="14%">
-+
-+<p>==&gt; 12.34</p>
-+</td>
-+<td width="54%">
-+</td>
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="20%">
-+
-+<p>%05.1f</p>
-+</td>
-+<td width="1%"></td>
-+<td width="14%">
-+
-+<p>==&gt; 012.3</p>
-+</td>
-+<td width="54%">
-+</td>
-+<tr valign="top" align="left">
-+<td width="11%"></td>
-+<td width="20%">
-+
-+<p><b>Debug</b></p>
-+</td>
-+<td width="1%"></td>
-+<td width="14%"></td>
-+<td width="54%">
+@@ -5066,9 +5086,14 @@
+ <p>The per&minus;user files (bayes, auto&minus;whitelist,
+ user_prefs) are looked for here and in ~/.spamassassin/.
+ Note the files are mutable. If this is unset then no extra
+-places are searched for. If using Postfix, you probably want
+-to set this to /var/spool/MailScanner/spamassassin and
+-do</p>
+places are searched for. NOTE: SpamAssassin is always called
+from MailScanner as the same user, and that is the &quot;Run
+As&quot; user specified in MailScanner.conf. So you can only
+have 1 set of &quot;per&minus;user&quot; files, it&rsquo;s
+just that you might possibly need to modify this location.
+You should not normally need to set this at all. If using
+Postfix, you probably want to set this to
+/var/spool/MailScanner/spamassassin and do</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>Default: no</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>Not for use by normal users. Setting this option to
-@@ -5085,7 +5474,23 @@
- <p><b>Deliver in Background</b></p></td>
- </table>
- <!-- INDENTATION -->
-<table width="100%" border=0 rules="none" fr width="100%" border=0 rules="none" frame="void"
-+<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>When attempting delivery of any messages (when the
-+&quot;Delivery Method = batch&quot;) the sendmail/Exim
-+command will be run in the background so that MailScanner
-+does not have to wait for the delivery attempt to complete.
-+There are very few good reasons for setting this to
-+&quot;no&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="11%"></td>
-@@ -5361,7 +5766,23 @@
- end in &quot;.rules&quot; wherever possible.</p>
- <!-- INDENTATION -->
- <p>All blank lines are ignored, and comments start with
-&quot;#&quot; and continue to the end of the liing="0">
-+&quot;#&quot; and continue to the end of the line, like
-+this: # This line is just a comment</p>
-+<!-- INDENTATION -->
-+<p>Other than that, every line is a rule and looks like this
-+example: From: john.doe@domain.com yes</p>
-+<!-- INDENTATION -->
-+<p>As you can see, each rule has 3 fields:<br>
-+1. Direction<br>
-+2. Pattern to match<br>
-+3. Result value (or values)</p>
-+<!-- INDENTATION -->
-+<p>1. Direction should be one of the following:</p>
-+</td>
-+</table>
-+<!-- TABS -->
-+<table width="100%" border=0 rules="none" frame="void"
-+       cols="5" cellspacing="0" cellpadding="0">
- <tr valign="top" align="left">
- <td width="11%"></td>
- <td width="7%">
-@@ -5610,4 +6031,22 @@
- <tr valign="top" align="left">
- <td width="11%"></td>
- <td width="89%">
-<p>Please have a look at the filename.rules.co
-\ No newline at end of file
-+<p>Please have a look at the filename.rules.conf or
-+filename.rules.conf.sample file provided with this
-+distribution/package/port.</p>
-+</td>
-+</table>
-+<a name="SEE ALSO"></a>
-+<h2>SEE ALSO</h2>
-+<!-- 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>MailScanner(8)</p>
-+</td>
-+</table>
-+<hr>
-+</body>
-+</html>
--- a/mail/mailscanner-devel/pkg-plist
+++ b/mail/mailscanner-devel/pkg-plist
@ -2,6 +2,8 @@
 etc/MailScanner/MailScanner.conf.sample
 etc/MailScanner/filename.rules.conf.sample
 etc/MailScanner/filetype.rules.conf.sample
+etc/MailScanner/mcp/10_example.cf.sample
+etc/MailScanner/mcp/mcp.spam.assassin.prefs.conf.sample
 etc/MailScanner/rules/EXAMPLES
 etc/MailScanner/rules/README
 etc/MailScanner/rules/spam.whitelist.rules.sample
@ -15,6 +17,7 @@ lib/MailScanner/MailScanner/BinHex.pm
 lib/MailScanner/MailScanner/Config.pm
 lib/MailScanner/MailScanner/ConfigDefs.pl
 lib/MailScanner/MailScanner/CustomConfig.pm
+lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
 lib/MailScanner/MailScanner/Exim.pm
 lib/MailScanner/MailScanner/EximDiskStore.pm
 lib/MailScanner/MailScanner/Lock.pm
@ -43,7 +46,6 @@ lib/MailScanner/MailScanner/WorkArea.pm
 lib/MailScanner/MailScanner/ZMDiskStore.pm
 lib/MailScanner/MailScanner/ZMailer.pm
 lib/MailScanner/MailScanner/notes.txt
-lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
 libexec/MailScanner/MailScanner
 libexec/MailScanner/antivir-autoupdate.sample
 libexec/MailScanner/antivir-wrapper.sample
@ -54,8 +56,8 @@ libexec/MailScanner/bitdefender-wrapper.sample
 libexec/MailScanner/clamav-autoupdate.sample
 libexec/MailScanner/clamav-wrapper.sample
 libexec/MailScanner/command-wrapper.sample
-libexec/MailScanner/css-wrapper.sample
 libexec/MailScanner/css-autoupdate.sample
+libexec/MailScanner/css-wrapper.sample
 libexec/MailScanner/drweb-wrapper.sample
 libexec/MailScanner/etrust-autoupdate.sample
 libexec/MailScanner/etrust-wrapper.sample
@ -63,6 +65,8 @@ 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/generic-autoupdate.sample
+libexec/MailScanner/generic-wrapper.sample
 libexec/MailScanner/inoculan-autoupdate.sample
 libexec/MailScanner/inoculan-wrapper.sample
 libexec/MailScanner/inoculate-wrapper.sample
@ -80,11 +84,14 @@ libexec/MailScanner/rav-autoupdate.sample
 libexec/MailScanner/rav-wrapper.sample
 libexec/MailScanner/sophos-autoupdate.sample
 libexec/MailScanner/sophos-wrapper.sample
+libexec/MailScanner/symscanengine-autoupdate.sample
+libexec/MailScanner/symscanengine-wrapper.sample
 libexec/MailScanner/trend-autoupdate.sample
 libexec/MailScanner/trend-wrapper.sample
-libexec/MailScanner/vexira-wrapper.sample
-libexec/MailScanner/vexira-autoupdate.sample
 libexec/MailScanner/update_virus_scanners
+libexec/MailScanner/vexira-autoupdate.sample
+libexec/MailScanner/vexira-wrapper.sample
+%%DATADIR%%/reports/ca/deleted.content.message.txt.sample
 %%DATADIR%%/reports/ca/deleted.filename.message.txt.sample
 %%DATADIR%%/reports/ca/deleted.virus.message.txt.sample
 %%DATADIR%%/reports/ca/disinfected.report.txt.sample
@ -96,18 +103,17 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/ca/languages.conf.sample
 %%DATADIR%%/reports/ca/recipient.mcp.report.txt.sample
 %%DATADIR%%/reports/ca/recipient.spam.report.txt.sample
+%%DATADIR%%/reports/ca/sender.content.report.txt.sample
 %%DATADIR%%/reports/ca/sender.error.report.txt.sample
 %%DATADIR%%/reports/ca/sender.filename.report.txt.sample
+%%DATADIR%%/reports/ca/sender.mcp.report.txt.sample
 %%DATADIR%%/reports/ca/sender.spam.rbl.report.txt.sample
 %%DATADIR%%/reports/ca/sender.spam.report.txt.sample
 %%DATADIR%%/reports/ca/sender.spam.sa.report.txt.sample
 %%DATADIR%%/reports/ca/sender.virus.report.txt.sample
+%%DATADIR%%/reports/ca/stored.content.message.txt.sample
 %%DATADIR%%/reports/ca/stored.filename.message.txt.sample
 %%DATADIR%%/reports/ca/stored.virus.message.txt.sample
-%%DATADIR%%/reports/ca/deleted.content.message.txt.sample
-%%DATADIR%%/reports/ca/sender.content.report.txt.sample
-%%DATADIR%%/reports/ca/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/ca/stored.content.message.txt.sample
 %%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
@ -118,6 +124,8 @@ libexec/MailScanner/update_virus_scanners
 %%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/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/cy+en/recipient.spam.report.txt.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
@ -129,8 +137,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/cy+en/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/cy+en/recipient.spam.report.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
@ -141,6 +147,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/cz/inline.warning.html.sample
 %%DATADIR%%/reports/cz/inline.warning.txt.sample
 %%DATADIR%%/reports/cz/languages.conf.sample
+%%DATADIR%%/reports/cz/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/cz/recipient.spam.report.txt.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
@ -152,8 +160,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/cz/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/cz/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/de/README.1ST.sample
 %%DATADIR%%/reports/de/deleted.content.message.txt.sample
 %%DATADIR%%/reports/de/deleted.filename.message.txt.sample
@ -165,6 +171,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/de/inline.warning.html.sample
 %%DATADIR%%/reports/de/inline.warning.txt.sample
 %%DATADIR%%/reports/de/languages.conf.sample
+%%DATADIR%%/reports/de/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/de/recipient.spam.report.txt.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
@ -176,8 +184,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/de/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/de/recipient.mcp.report.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
@ -188,6 +194,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/dk/inline.warning.html.sample
 %%DATADIR%%/reports/dk/inline.warning.txt.sample
 %%DATADIR%%/reports/dk/languages.conf.sample
+%%DATADIR%%/reports/dk/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/dk/recipient.spam.report.txt.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
@ -199,8 +207,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/dk/recipient.spam.report.txt.sample
-%%DATADIR%%/reports/dk/recipient.mcp.report.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
@ -211,6 +217,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/en/inline.warning.html.sample
 %%DATADIR%%/reports/en/inline.warning.txt.sample
 %%DATADIR%%/reports/en/languages.conf.sample
+%%DATADIR%%/reports/en/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/en/recipient.spam.report.txt.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
@ -222,8 +230,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/en/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/en/recipient.spam.report.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
@ -234,6 +240,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/es/inline.warning.html.sample
 %%DATADIR%%/reports/es/inline.warning.txt.sample
 %%DATADIR%%/reports/es/languages.conf.sample
+%%DATADIR%%/reports/es/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/es/recipient.spam.report.txt.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
@ -245,8 +253,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/es/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/es/recipient.spam.report.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
@ -257,6 +263,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/fr/inline.warning.html.sample
 %%DATADIR%%/reports/fr/inline.warning.txt.sample
 %%DATADIR%%/reports/fr/languages.conf.sample
+%%DATADIR%%/reports/fr/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/fr/recipient.spam.report.txt.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
@ -268,8 +276,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/fr/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/fr/recipient.spam.report.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
@ -280,6 +286,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/hu/inline.warning.html.sample
 %%DATADIR%%/reports/hu/inline.warning.txt.sample
 %%DATADIR%%/reports/hu/languages.conf.sample
+%%DATADIR%%/reports/hu/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/hu/recipient.spam.report.txt.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
@ -291,8 +299,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/hu/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/hu/recipient.spam.report.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
@ -303,6 +309,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/it/inline.warning.html.sample
 %%DATADIR%%/reports/it/inline.warning.txt.sample
 %%DATADIR%%/reports/it/languages.conf.sample
+%%DATADIR%%/reports/it/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/it/recipient.spam.report.txt.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
@ -314,8 +322,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/it/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/it/recipient.spam.report.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
@ -326,6 +332,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/nl/inline.warning.html.sample
 %%DATADIR%%/reports/nl/inline.warning.txt.sample
 %%DATADIR%%/reports/nl/languages.conf.sample
+%%DATADIR%%/reports/nl/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/nl/recipient.spam.report.txt.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
@ -337,8 +345,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/nl/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/nl/recipient.spam.report.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
@ -349,6 +355,8 @@ libexec/MailScanner/update_virus_scanners
 %%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/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/pt_br/recipient.spam.report.txt.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
@ -360,8 +368,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/pt_br/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/pt_br/recipient.spam.report.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
@ -372,6 +378,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/ro/inline.warning.html.sample
 %%DATADIR%%/reports/ro/inline.warning.txt.sample
 %%DATADIR%%/reports/ro/languages.conf.sample
+%%DATADIR%%/reports/ro/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/ro/recipient.spam.report.txt.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
@ -383,8 +391,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/ro/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/ro/recipient.spam.report.txt.sample
 %%DATADIR%%/reports/se/README.sample
 %%DATADIR%%/reports/se/deleted.content.message.txt.sample
 %%DATADIR%%/reports/se/deleted.filename.message.txt.sample
@ -396,6 +402,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/se/inline.warning.html.sample
 %%DATADIR%%/reports/se/inline.warning.txt.sample
 %%DATADIR%%/reports/se/languages.conf.sample
+%%DATADIR%%/reports/se/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/se/recipient.spam.report.txt.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
@ -407,8 +415,6 @@ libexec/MailScanner/update_virus_scanners
 %%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/se/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/se/recipient.spam.report.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
@ -419,6 +425,8 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/sk/inline.warning.html.sample
 %%DATADIR%%/reports/sk/inline.warning.txt.sample
 %%DATADIR%%/reports/sk/languages.conf.sample
+%%DATADIR%%/reports/sk/recipient.mcp.report.txt.sample
+%%DATADIR%%/reports/sk/recipient.spam.report.txt.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
@ -430,8 +438,6 @@ libexec/MailScanner/update_virus_scanners
 %%DATADIR%%/reports/sk/stored.content.message.txt.sample
 %%DATADIR%%/reports/sk/stored.filename.message.txt.sample
 %%DATADIR%%/reports/sk/stored.virus.message.txt.sample
-%%DATADIR%%/reports/sk/recipient.mcp.report.txt.sample
-%%DATADIR%%/reports/sk/recipient.spam.report.txt.sample
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FreeBSD.html
@ -443,12 +449,13 @@ libexec/MailScanner/update_virus_scanners
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
 %%PORTDOCS%%%%DOCSDIR%%/README.sql-logging
 %%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
+%%PORTDOCS%%%%DOCSDIR%%/book.cover.gif
 %%PORTDOCS%%%%DOCSDIR%%/building.txt
 %%PORTDOCS%%%%DOCSDIR%%/donations.shtml
 %%PORTDOCS%%%%DOCSDIR%%/downloadgraphs.shtml
 %%PORTDOCS%%%%DOCSDIR%%/downloads.shtml
-%%PORTDOCS%%%%DOCSDIR%%/ellen2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/ecs.css
+%%PORTDOCS%%%%DOCSDIR%%/ellen2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/faq.shtml
 %%PORTDOCS%%%%DOCSDIR%%/images/JulianField1_small.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/bigmailscannerlogo.gif
@ -458,6 +465,7 @@ libexec/MailScanner/update_virus_scanners
 %%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField4.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField5.jpg
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.new.html
 %%PORTDOCS%%%%DOCSDIR%%/install/ClamAVModule.shtml
 %%PORTDOCS%%%%DOCSDIR%%/install/OS-virus-scan-web.htm
 %%PORTDOCS%%%%DOCSDIR%%/install/README.trend
@ -476,10 +484,13 @@ libexec/MailScanner/update_virus_scanners
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.60
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.61
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.63
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.3.0.0
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.0.0
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.55
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.60
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.61
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.63
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.3.0.0
 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch.txt
 %%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch2.txt
@ -502,7 +513,6 @@ libexec/MailScanner/update_virus_scanners
 %%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.8.html
 %%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5
 %%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/qmail/qmail-queue.zip
 %%PORTDOCS%%%%DOCSDIR%%/mrtg.shtml
 %%PORTDOCS%%%%DOCSDIR%%/newinv4.shtml
 %%PORTDOCS%%%%DOCSDIR%%/nextversion.shtml
@ -514,6 +524,8 @@ libexec/MailScanner/update_virus_scanners
 %%PORTDOCS%%%%DOCSDIR%%/poweredby.transtec.gif
 %%PORTDOCS%%%%DOCSDIR%%/presentations.html
 %%PORTDOCS%%%%DOCSDIR%%/press.html
+%%PORTDOCS%%%%DOCSDIR%%/pressreleases.html
+%%PORTDOCS%%%%DOCSDIR%%/qmail/qmail-queue.zip
 %%PORTDOCS%%%%DOCSDIR%%/readme.shtml
 %%PORTDOCS%%%%DOCSDIR%%/reject.html
 %%PORTDOCS%%%%DOCSDIR%%/sobig.html
@ -549,5 +561,6 @@ libexec/MailScanner/update_virus_scanners
@dirrm lib/MailScanner/MailScanner/CustomFunctions
@dirrm lib/MailScanner/MailScanner
@dirrm lib/MailScanner
+@dirrm etc/MailScanner/mcp
@dirrm etc/MailScanner/rules
@dirrm etc/MailScanner