diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-07-08 20:31:40 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-07-08 20:31:40 +0000 |
| commit | cd3d9e6455e2dd75b37d8e28d8502b20fd4e7eae (patch) | |
| tree | 59d858e19c69ae2218bac91c44dae152c4e52eef /mail/mailscanner | |
| parent | 775ddef518e5da0c879b922f665de0c8fe3a0263 (diff) | |
| download | ports-cd3d9e6455e2dd75b37d8e28d8502b20fd4e7eae.tar.gz ports-cd3d9e6455e2dd75b37d8e28d8502b20fd4e7eae.zip | |
Notes
Diffstat (limited to 'mail/mailscanner')
| -rw-r--r-- | mail/mailscanner/Makefile | 3 | ||||
| -rw-r--r-- | mail/mailscanner/distinfo | 4 | ||||
| -rw-r--r-- | mail/mailscanner/files/patch-docs:man:MailScanner.8 | 8 | ||||
| -rw-r--r-- | mail/mailscanner/files/patch-docs:man:MailScanner.8.html | 8 | ||||
| -rw-r--r-- | mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 | 178 | ||||
| -rw-r--r-- | mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html | 404 | ||||
| -rw-r--r-- | mail/mailscanner/pkg-plist | 5 |
7 files changed, 197 insertions, 413 deletions
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index e89b12cac408..39a84ad0a1df 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -6,8 +6,7 @@ # PORTNAME= MailScanner -PORTVERSION= 4.42.9 -PORTREVISION= 1 +PORTVERSION= 4.43.8 CATEGORIES= mail MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/ DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL} diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo index b0bb181bc76f..b326862f8bd2 100644 --- a/mail/mailscanner/distinfo +++ b/mail/mailscanner/distinfo @@ -1,2 +1,2 @@ -MD5 (MailScanner-install-4.42.9-1.tar.gz) = 893eda4833586b61b5b78af95d0f2f0d -SIZE (MailScanner-install-4.42.9-1.tar.gz) = 4775108 +MD5 (MailScanner-install-4.43.8-1.tar.gz) = 274cab190e703851716a3bd4d3d7f58f +SIZE (MailScanner-install-4.43.8-1.tar.gz) = 4791190 diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.8 b/mail/mailscanner/files/patch-docs:man:MailScanner.8 index f73083cbd672..3e12b9fd21f1 100644 --- a/mail/mailscanner/files/patch-docs:man:MailScanner.8 +++ b/mail/mailscanner/files/patch-docs:man:MailScanner.8 @@ -1,8 +1,8 @@ ---- ../MailScanner-install-4.42.9.orig/docs/man/MailScanner.8 Wed Jun 1 11:24:25 2005 -+++ docs/man/MailScanner.8 Wed Jun 1 11:30:08 2005 +--- ../MailScanner-install-4.43.8.orig/docs/man/MailScanner.8 Fri Jul 8 14:17:05 2005 ++++ docs/man/MailScanner.8 Fri Jul 8 14:17:28 2005 @@ -1,4 +1,4 @@ --.TH "MailScanner" "8" "4.38.2" "Julian Field" "Mail" -+.TH "MailScanner" "8" "4.42.9" "Julian Field" "Mail" +-.TH "MailScanner" "8" "4.42.9" "Julian Field" "Mail" ++.TH "MailScanner" "8" "4.43.8" "Julian Field" "Mail" .SH "NAME" .LP MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.8.html b/mail/mailscanner/files/patch-docs:man:MailScanner.8.html index d7e4d99a2405..8452cc3b16cf 100644 --- a/mail/mailscanner/files/patch-docs:man:MailScanner.8.html +++ b/mail/mailscanner/files/patch-docs:man:MailScanner.8.html @@ -1,9 +1,9 @@ ---- ../MailScanner-install-4.42.9.orig/docs/man/MailScanner.8.html Wed Jun 1 11:24:25 2005 -+++ docs/man/MailScanner.8.html Wed Jun 1 11:30:10 2005 +--- ../MailScanner-install-4.43.8.orig/docs/man/MailScanner.8.html Fri Jul 8 14:17:05 2005 ++++ docs/man/MailScanner.8.html Fri Jul 8 14:17:30 2005 @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.19 --> --<!-- CreationDate: Mon Jan 17 15:53:41 2005 --> -+<!-- CreationDate: Wed Jun 1 11:29:47 2005 --> +-<!-- CreationDate: Wed Jun 1 11:29:47 2005 --> ++<!-- CreationDate: Fri Jul 8 14:16:24 2005 --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 index 46a89f48bd82..2e1ab3bf0ab8 100644 --- a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 +++ b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 @@ -1,177 +1,77 @@ ---- ../MailScanner-install-4.42.9.orig/docs/man/MailScanner.conf.5 Wed Jun 1 11:24:25 2005 -+++ docs/man/MailScanner.conf.5 Wed Jun 1 11:30:13 2005 +--- ../MailScanner-install-4.43.8.orig/docs/man/MailScanner.conf.5 Fri Jul 8 14:17:05 2005 ++++ docs/man/MailScanner.conf.5 Fri Jul 8 14:17:23 2005 @@ -1,4 +1,4 @@ --.TH "MailScanner.conf" "5" "4.38.2" "Julian Field" "Mail" -+.TH "MailScanner.conf" "5" "4.42.9" "Julian Field" "Mail" +-.TH "MailScanner.conf" "5" "4.42.9" "Julian Field" "Mail" ++.TH "MailScanner.conf" "5" "4.43.8" "Julian Field" "Mail" .SH "NAME" .LP MailScanner.conf \- Main configuration for MailScanner -@@ -27,7 +27,9 @@ - Many of the options can also be the filename of a ruleset, which can be used to control features depending on the addresses of the message, and/or the IP address where the message came from. You will find some examples of rulesets and an explanation of them in the "rules" directories within the MailScanner installation and in the section "RULESETS" later in this manpage. - - .LP --The options are best listed in a few categories. This is also the order in which you will find them in the MailScanner.conf file. If this list looks very large then don't worry, the supplied MailScanner.conf file (or MailScanner.conf.sample) contains sensible defaults for all the values. You will probably only need to change a very few of them to start with. -+The options are best listed in a few categories. If this list looks very large then don't worry, the supplied MailScanner.conf file (or MailScanner.conf.sample) contains sensible defaults for all the values. You will probably only need to change a very few of them to start with. -+ -+Starting with version 4.40.10 of MailScanner you can use shell environment variables such as $HOSTNAME or ${HOSTNAME} in MailScanner.conf and its relatives. - - .LP - You should define the following variables: -@@ -74,6 +76,22 @@ - Enter a short identifying name for your organisation below, this is used to make the X\-MailScanner headers unique for your organisation. Multiple servers within one site should use an identical value here to avoid adding multiple redundant headers where mail has passed through several servers within your organisation. +@@ -1701,12 +1701,64 @@ .br - Note: Some Symantec scanners complain (incorrectly) about "." characters appearing in the names of headers. -+ -+.TP -+\fB%org\-long\-name%\fR -+Default: Your Organisation Name Here -+.br -+ -+.br -+Enter the full name of your organisation below, this is used in the signature placed at the bottom of report messages sent by MailScanner. It can include pretty much any text you like. You can make the result span several lines by including "\n" sequences in the text. These will be replaced by line\-breaks. -+ -+.TP -+\fB%web\-site%\fR -+Default: www.your\-organisation.com -+.br -+ -+.br -+Enter the location of your organisation's web site below. This is used in the signature placed at the bottom of report messages sent by MailScanner. It should preferably be the location of a page that you have written explaining why you might have rejected the mail and what the recipient and/or sender should do about it. - .SH "System Settings" - .TP - \fBMax Children\fR -@@ -370,6 +388,23 @@ + .br - The maximum length of time the "file" command is allowed to run for one batch of messages (in seconds). +-# 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 ++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. -+ -+.TP -+\fBUnrar Command\fR -+Default: /usr/bin/unrar -+.br -+ -+.br -+Where the "unrar" command is installed. If you haven't got this command, look at www.rarlab.com. This is used for unpacking rar archives so that the contents can be checked for banned filenames and filetypes, and also that the archive can be tested to see if it is password\-protected. Virus scanning the contents of rar archives is still left to the virus scanner, with one exception: If using the clavavmodule virus scanner, this adds external RAR checking to that scanner which is needed for archives which are RAR version 3. -+ -+.TP -+\fBUnrar Timeout\fR -+Default: 50 -+.br -+ -+.br -+The maximum length of time the "unrar" command is allowed to run for 1 RAR archive (in seconds) -+ - .TP - \fBBlock Encrypted Messages\fR - Default: no -@@ -562,6 +597,41 @@ - .br - ClamAVModule only: monitor each of these files for changes in size to detect when a ClamAV update has happened. This is only used by the "clamavmodule" virus scanner, not the "clamav" scanner setting. + ++.SH "Custom Spam Scanner Plugin" +.TP -+\fBClamAVmodule Maximum Recursion Level\fR -+Default: 5 ++\fBUse Custom Spam Scanner\fR ++Default: no +.br + +.br -+ClamAVModule only: The maximum recursion level of archives. This setting *cannot* be the filename of a ruleset, only a simple number. -+ -+.TP -+\fBClamAVmodule Maximum Files\fR -+Default: 100 ++Use the Custom Spam Scanner. This is code you will have to write yourself, a function called "GenericSpamScanner" stored in the file "MailScanner/lib/MailScanner/CustomFunctions/GenericSpamScanner.pm". A sample function is given in the correct file in the distribution. This sample function also includes code to show you how to make it run an external program to produce a spam score. This can also be the filename of a ruleset. The function will be passed +.br -+ ++.RS 7 ++.IP \(bu 4 ++$IP \- the numeric IP address of the system on the remote end of the SMTP connections ++.IP \(bu 4 ++$From \- the address of the envelope sender of the message ++.IP \(bu 4 ++$To \- a perl reference to the envelope recipients of the message ++.IP \(bu 4 ++$Message \- a perl reference to the list of line of the message ++.RE +.br -+ClamAVModule only: The maximum number of files per batch. This setting *cannot* be the filename of a ruleset, only a simple number. + + +.TP -+\fBClamAVmodule Maximum File Size\fR -+Default: 10000000 ++\fBMax Custom Spam Scanner Size\fR ++Default: 20000 +.br + +.br -+ClamAVModule only: The maximum file of each file (Default = 10MB). This setting *cannot* be the filename of a ruleset, only a simple number. -+ ++How much of the message should be passed tot he Custom Spam Scanner. Most spam tools only need the first 20kbytes of the message to determine if it is spam or not. Passing more than is necessary only slows things down. This can also be the filename of a ruleset. + +.TP -+\fB\fRClamAVmodule Maximum Compression Ratio -+Default: 250 -+.br -+ -+.br -+ClamAVModule only: The maximum compression ration of archives. This setting *cannot* be the filename of a ruleset, only a simple number. -+ - .SH "Removing/Logging dangerous or potentially offensive content" - .TP - \fBAllow Partial Messages\fR -@@ -601,6 +671,15 @@ - - - .TP -+\fBPhishing Safe Sites File\fR -+Default: %etc\-dir%/phishing.safe.sites.conf ++\fBCustom Spam Scanner Timeout\fR ++Default: 20 +.br + +.br -+There are some companies, such as banks, that insist on sending out email messages with links in them that are caught by the "Find Phishing Fraud" test described above. This is the name of a file which contains a list of link destinations which should be ignored in the test. This may, for example, contain the known websites of some banks. See the file itself for more information. This can only be the name of the file containing the list, it *cannot* be the filename of a ruleset. ++How long should the custom spam scanner take to run? If it takes more seconds than this, then it should be considered to have crashed and should be killed. This stops denial\-of\-service attacks. + + +.TP - \fBAllow IFrame Tags\fR - Default: no - .br -@@ -1233,6 +1312,23 @@ - .br - This is the text inserted at the start of the "Subject:" line if the "Content Modify Subject" option is set. - -+.TP -+\fBDisarmed Modify Subject\fR -+Default: yes ++\fBMax Custom Spam Scanner Timeouts\fR ++Default: 10 +.br + +.br -+If HTML tags in the message were "disarmed" by using the HTML "Allow" options above with the "disarm" settings, do you want to modify the subject line? This can also be the filename of a ruleset. -+ ++If the Custom Spam Scanner times out more times in a row than this, then it will be marked as "unavailable" until MailScanner next re\-starts itself. + +.TP -+\fBDisarmed Subject Text\fR -+Default: {Disarmed} ++\fBCustom Spam Scanner Timeout History\fR ++Default: 20 +.br + +.br -+This is the text to add to the start of the subject if the "Disarmed Modify Subject" option is set. This can also be the filename of a ruleset. -+ - ++The total number of Custom Spam Scanner attempts during which "Max Custom Spam Scanner Timeouts" will cause the Custom Spam Scanner to be marked as "unavailable". See the previous comment for more information. The default values of 10 and 20 mean that 10 timeouts in any sequence of 20 attempts will trigger the behaviour described above, until the next periodic restart (see "Restart Every"). + .SH "What to do with spam" .TP - \fBSpam Modify Subject\fR -@@ -1415,6 +1511,15 @@ - This provides a space\-separated list of "Spam Lists" (or RBL's or DNSBL'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 "Spam List Definitions" file mentioned above. - - .TP -+\fBSpam Lists To Be Spam\fR -+Default: 1 -+.br -+ -+.br -+If a message appears in at least this number of "Spam Lists" (as defined above), then the message will be treated as spam and so the "Spam Actions" will happen, unless the message reaches the levels for "High Scoring Spam". By default this is set to 1 to mimic the previous behaviour, which means that appearing in any "Spam Lists" will cause the message to be treated as spam. This can also be the filename of a ruleset. -+ -+ -+.TP - \fBSpam Lists To Reach High Score\fR - Default: 5 - .br -@@ -1753,6 +1858,12 @@ - - .br - Log all occurrences of "Silent Viruses" as defined above? This can only be a simple yes/no value, not a ruleset. -+ -+.TP -+\fBLog Dangerous HTML Tags\fR -+Default: no -+.br -+Log all occurrences of HTML tags found in messages, that can be blocked. This will help you build up your whitelist of message sources for which particular HTML tags should be allowed, such as mail from newsletters and daily cartoon strips. This can also be the filename of 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. - + \fBSpam Actions\fR diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html index 72a307d09392..f7d67eb8710a 100644 --- a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html +++ b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html @@ -1,70 +1,43 @@ ---- ../MailScanner-install-4.42.9.orig/docs/man/MailScanner.conf.5.html Wed Jun 1 11:24:25 2005 -+++ docs/man/MailScanner.conf.5.html Wed Jun 1 11:30:17 2005 +--- ../MailScanner-install-4.43.8.orig/docs/man/MailScanner.conf.5.html Fri Jul 8 14:17:05 2005 ++++ docs/man/MailScanner.conf.5.html Fri Jul 8 14:17:25 2005 @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.19 --> --<!-- CreationDate: Mon Jan 17 15:53:41 2005 --> -+<!-- CreationDate: Wed Jun 1 11:29:47 2005 --> +-<!-- CreationDate: Wed Jun 1 11:29:47 2005 --> ++<!-- CreationDate: Fri Jul 8 14:16:24 2005 --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> -@@ -120,13 +120,15 @@ - directories within the MailScanner installation and in the - section "RULESETS" later in this manpage.</p> +@@ -34,6 +34,7 @@ + <a href="#Definitions of virus scanners and spam detectors">Definitions of virus scanners and spam detectors</a><br> + <a href="#Spam detection and spam lists (DNS blocklists)">Spam detection and spam lists (DNS blocklists)</a><br> + <a href="#SpamAssassin">SpamAssassin</a><br> ++<a href="#Custom Spam Scanner Plugin">Custom Spam Scanner Plugin</a><br> + <a href="#What to do with spam">What to do with spam</a><br> + <a href="#System logging">System logging</a><br> + <a href="#Advanced SpamAssassin Settings">Advanced SpamAssassin Settings</a><br> +@@ -4909,10 +4910,239 @@ + <td width="78%"> + <p>Default: no</p> <!-- INDENTATION --> --<p>The options are best listed in a few categories. This is --also the order in which you will find them in the --MailScanner.conf file. If this list looks very large then --don’t worry, the supplied MailScanner.conf file (or --MailScanner.conf.sample) contains sensible defaults for all --the values. You will probably only need to change a very few --of them to start with.</p> -+<p>The options are best listed in a few categories. If this -+list looks very large then don’t worry, the supplied -+MailScanner.conf file (or MailScanner.conf.sample) contains -+sensible defaults for all the values. You will probably only -+need to change a very few of them to start with.</p> -+<!-- INDENTATION --> -+<p>Starting with version 4.40.10 of MailScanner you can use -+shell environment variables such as $HOSTNAME or ${HOSTNAME} -+in MailScanner.conf and its relatives.</p> - <!-- INDENTATION --> - <p>You should define the following variables:</p> - </td> -@@ -220,6 +222,54 @@ - headers.</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>%org−long−name%</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: Your Organisation Name Here</p> -+<!-- INDENTATION --> -+<p>Enter the full name of your organisation below, this is -+used in the signature placed at the bottom of report -+messages sent by MailScanner. It can include pretty much any -+text you like. You can make the result span several lines by -+including "0 sequences in the text. These will be -+replaced by line−breaks.</p> +-<p># 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</p> ++<p>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.</p> +</td> +</table> ++<a name="Custom Spam Scanner Plugin"></a> ++<h2>Custom Spam Scanner Plugin</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>%web−site%</b></p></td> ++<p><b>Use Custom Spam Scanner</b></p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" @@ -72,170 +45,117 @@ +<tr valign="top" align="left"> +<td width="22%"></td> +<td width="78%"> -+<p>Default: www.your−organisation.com</p> -+<!-- INDENTATION --> -+<p>Enter the location of your organisation’s web site -+below. This is used in the signature placed at the bottom of -+report messages sent by MailScanner. It should preferably be -+the location of a page that you have written explaining why -+you might have rejected the mail and what the recipient -+and/or sender should do about it.</p> ++<p>Default: no</p> ++<!-- INDENTATION --> ++<p>Use the Custom Spam Scanner. This is code you will have ++to write yourself, a function called ++"GenericSpamScanner" stored in the file ++"MailScanner/lib/MailScanner/CustomFunctions/GenericSpamScanner.pm". ++A sample function is given in the correct file in the ++distribution. This sample function also includes code to ++show you how to make it run an external program to produce a ++spam score. This can also be the filename of a ruleset. The ++function will be passed</p> +</td> +</table> - <a name="System Settings"></a> - <h2>System Settings</h2> - <!-- INDENTATION --> -@@ -1071,6 +1121,54 @@ - <tr valign="top" align="left"> - <td width="11%"></td> - <td width="89%"> -+<p><b>Unrar Command</b></p></td> -+</table> -+<!-- INDENTATION --> ++<!-- TABS --> +<table width="100%" border=0 rules="none" frame="void" -+ cols="2" cellspacing="0" cellpadding="0"> ++ cols="5" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="22%"></td> -+<td width="78%"> -+<p>Default: /usr/bin/unrar</p> -+<!-- INDENTATION --> -+<p>Where the "unrar" command is installed. If you -+haven’t got this command, look at www.rarlab.com. This -+is used for unpacking rar archives so that the contents can -+be checked for banned filenames and filetypes, and also that -+the archive can be tested to see if it is -+password−protected. Virus scanning the contents of rar -+archives is still left to the virus scanner, with one -+exception: If using the clavavmodule virus scanner, this -+adds external RAR checking to that scanner which is needed -+for archives which are RAR version 3.</p> ++<td width="1%"> ++ ++<p>•</p> ++</td> ++<td width="5%"></td> ++<td width="4%"> ++ ++<p>$IP</p> ++</td> ++<td width="68%"> +</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>Unrar Timeout</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: 50</p> -+<!-- INDENTATION --> -+<p>The maximum length of time the "unrar" command -+is allowed to run for 1 RAR archive (in seconds)</p> ++<td width="1%"></td> ++<td width="5%"></td> ++<td width="4%"> ++</td> ++<td width="68%"> ++ ++<p>− the numeric IP address of the system on the ++remote end of the SMTP connections</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>Block Encrypted Messages</b></p></td> - </table> - <!-- INDENTATION --> -@@ -1638,6 +1736,90 @@ - scanner, not the "clamav" scanner setting.</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>ClamAVmodule Maximum Recursion Level</b></p></td> -+</table> -+<!-- INDENTATION --> ++<!-- TABS --> +<table width="100%" border=0 rules="none" frame="void" -+ cols="2" cellspacing="0" cellpadding="0"> ++ cols="7" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="22%"></td> -+<td width="78%"> -+<p>Default: 5</p> -+<!-- INDENTATION --> -+<p>ClamAVModule only: The maximum recursion level of -+archives. This setting *cannot* be the filename of a -+ruleset, only a simple number.</p> ++<td width="1%"> ++ ++<p>•</p> ++</td> ++<td width="5%"></td> ++<td width="7%"> ++ ++<p>$From</p> ++</td> ++<td width="2%"></td> ++<td width="8%"> ++ ++<p>− the address of the envelope sender of the ++message</p> ++</td> ++<td width="55%"> +</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>ClamAVmodule Maximum Files</b></p></td> -+</table> -+<!-- INDENTATION --> ++<!-- TABS --> +<table width="100%" border=0 rules="none" frame="void" -+ cols="2" cellspacing="0" cellpadding="0"> ++ cols="6" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="22%"></td> -+<td width="78%"> -+<p>Default: 100</p> -+<!-- INDENTATION --> -+<p>ClamAVModule only: The maximum number of files per batch. -+This setting *cannot* be the filename of a ruleset, only a -+simple number.</p> ++<td width="1%"> ++ ++<p>•</p> ++</td> ++<td width="5%"></td> ++<td width="9%"> ++ ++<p>$To</p> ++</td> ++<td width="8%"></td> ++<td width="55%"> +</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>ClamAVmodule Maximum File Size</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: 10000000</p> -+<!-- INDENTATION --> -+<p>ClamAVModule only: The maximum file of each file (Default -+= 10MB). This setting *cannot* be the filename of a ruleset, -+only a simple number.</p> ++<td width="1%"></td> ++<td width="5%"></td> ++<td width="9%"> ++</td> ++<td width="8%"> ++ ++<p>− a perl reference to the envelope recipients of ++the message</p> ++</td> ++<td width="55%"> +</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>ClamAVmodule Maximum Compression Ratio</p></td> -+</table> -+<!-- INDENTATION --> ++<!-- TABS --> +<table width="100%" border=0 rules="none" frame="void" -+ cols="2" cellspacing="0" cellpadding="0"> ++ cols="5" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="22%"></td> -+<td width="78%"> -+<p>Default: 250</p> -+<!-- INDENTATION --> -+<p>ClamAVModule only: The maximum compression ration of -+archives. This setting *cannot* be the filename of a -+ruleset, only a simple number.</p> ++<td width="1%"> ++ ++<p>•</p> ++</td> ++<td width="5%"></td> ++<td width="12%"> ++ ++<p>$Message</p> ++</td> ++<td width="60%"> +</td> -+</table> - <a name="Removing/Logging dangerous or potentially offensive content"></a> - <h2>Removing/Logging dangerous or potentially offensive content</h2> - <!-- INDENTATION --> -@@ -1761,6 +1943,33 @@ - <tr valign="top" align="left"> - <td width="11%"></td> - <td width="89%"> -+<p><b>Phishing Safe Sites File</b></p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" @@ -243,18 +163,8 @@ +<tr valign="top" align="left"> +<td width="22%"></td> +<td width="78%"> -+<p>Default: %etc−dir%/phishing.safe.sites.conf</p> -+<!-- INDENTATION --> -+<p>There are some companies, such as banks, that insist on -+sending out email messages with links in them that are -+caught by the "Find Phishing Fraud" test described -+above. This is the name of a file which contains a list of -+link destinations which should be ignored in the test. This -+may, for example, contain the known websites of some banks. -+See the file itself for more information. This can only be -+the name of the file containing the list, it *cannot* be the -+filename of a ruleset.</p> -+</td> ++<p>− a perl reference to the list of line of the ++message</p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" @@ -262,14 +172,7 @@ +<tr valign="top" align="left"> +<td width="11%"></td> +<td width="89%"> - <p><b>Allow IFrame Tags</b></p></td> - </table> - <!-- INDENTATION --> -@@ -3617,6 +3826,50 @@ - <tr valign="top" align="left"> - <td width="11%"></td> - <td width="89%"> -+<p><b>Disarmed Modify Subject</b></p></td> ++<p><b>Max Custom Spam Scanner Size</b></p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" @@ -277,13 +180,13 @@ +<tr valign="top" align="left"> +<td width="22%"></td> +<td width="78%"> -+<p>Default: yes</p> ++<p>Default: 20000</p> +<!-- INDENTATION --> -+<p>If HTML tags in the message were "disarmed" by -+using the HTML "Allow" options above with the -+"disarm" settings, do you want to modify the -+subject line? This can also be the filename of a -+ruleset.</p> ++<p>How much of the message should be passed tot he Custom ++Spam Scanner. Most spam tools only need the first 20kbytes ++of the message to determine if it is spam or not. Passing ++more than is necessary only slows things down. This can also ++be the filename of a ruleset.</p> +</td> +</table> +<!-- INDENTATION --> @@ -292,7 +195,7 @@ +<tr valign="top" align="left"> +<td width="11%"></td> +<td width="89%"> -+<p><b>Disarmed Subject Text</b></p></td> ++<p><b>Custom Spam Scanner Timeout</b></p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" @@ -300,11 +203,12 @@ +<tr valign="top" align="left"> +<td width="22%"></td> +<td width="78%"> -+<p>Default: {Disarmed}</p> ++<p>Default: 20</p> +<!-- INDENTATION --> -+<p>This is the text to add to the start of the subject if -+the "Disarmed Modify Subject" option is set. This -+can also be the filename of a ruleset.</p> ++<p>How long should the custom spam scanner take to run? If ++it takes more seconds than this, then it should be ++considered to have crashed and should be killed. This stops ++denial−of−service attacks.</p> +</td> +</table> +<!-- INDENTATION --> @@ -313,14 +217,7 @@ +<tr valign="top" align="left"> +<td width="11%"></td> +<td width="89%"> - <p><b>Spam Modify Subject</b></p></td> - </table> - <!-- INDENTATION --> -@@ -4118,6 +4371,33 @@ - <tr valign="top" align="left"> - <td width="11%"></td> - <td width="89%"> -+<p><b>Spam Lists To Be Spam</b></p></td> ++<p><b>Max Custom Spam Scanner Timeouts</b></p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" @@ -328,32 +225,11 @@ +<tr valign="top" align="left"> +<td width="22%"></td> +<td width="78%"> -+<p>Default: 1</p> -+<!-- INDENTATION --> -+<p>If a message appears in at least this number of -+"Spam Lists" (as defined above), then the message -+will be treated as spam and so the "Spam Actions" -+will happen, unless the message reaches the levels for -+"High Scoring Spam". By default this is set to 1 -+to mimic the previous behaviour, which means that appearing -+in any "Spam Lists" will cause the message to be -+treated as spam. This can also be the filename of a -+ruleset.</p> -+</td> -+</table> ++<p>Default: 10</p> +<!-- 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 Lists To Reach High Score</b></p></td> - </table> - <!-- INDENTATION --> -@@ -5122,6 +5402,28 @@ - <p>Log all occurrences of "Silent Viruses" as - defined above? This can only be a simple yes/no value, not a - ruleset.</p> ++<p>If the Custom Spam Scanner times out more times in a row ++than this, then it will be marked as "unavailable" ++until MailScanner next re−starts itself.</p> +</td> +</table> +<!-- INDENTATION --> @@ -362,7 +238,7 @@ +<tr valign="top" align="left"> +<td width="11%"></td> +<td width="89%"> -+<p><b>Log Dangerous HTML Tags</b></p></td> ++<p><b>Custom Spam Scanner Timeout History</b></p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" @@ -370,12 +246,16 @@ +<tr valign="top" align="left"> +<td width="22%"></td> +<td width="78%"> -+<p>Default: no<br> -+Log all occurrences of HTML tags found in messages, that can -+be blocked. This will help you build up your whitelist of -+message sources for which particular HTML tags should be -+allowed, such as mail from newsletters and daily cartoon -+strips. This can also be the filename of a ruleset.</p> ++<p>Default: 20</p> ++<!-- INDENTATION --> ++<p>The total number of Custom Spam Scanner attempts during ++which "Max Custom Spam Scanner Timeouts" will ++cause the Custom Spam Scanner to be marked as ++"unavailable". See the previous comment for more ++information. The default values of 10 and 20 mean that 10 ++timeouts in any sequence of 20 attempts will trigger the ++behaviour described above, until the next periodic restart ++(see "Restart Every").</p> </td> </table> - <a name="Advanced SpamAssassin Settings"></a> + <a name="What to do with spam"></a> diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist index 04543e839b88..054fa0367d34 100644 --- a/mail/mailscanner/pkg-plist +++ b/mail/mailscanner/pkg-plist @@ -18,11 +18,13 @@ lib/MailScanner/MailScanner/BinHex.pm lib/MailScanner/MailScanner/Config.pm lib/MailScanner/MailScanner/ConfigDefs.pl lib/MailScanner/MailScanner/CustomConfig.pm +lib/MailScanner/MailScanner/CustomFunctions/GenericSpamScanner.pm lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm lib/MailScanner/MailScanner/CustomFunctions/DavidHooton.pm lib/MailScanner/MailScanner/CustomFunctions/ZMRouterDirHash.pm lib/MailScanner/MailScanner/Exim.pm lib/MailScanner/MailScanner/EximDiskStore.pm +lib/MailScanner/MailScanner/GenericSpam.pm lib/MailScanner/MailScanner/Lock.pm lib/MailScanner/MailScanner/Log.pm lib/MailScanner/MailScanner/MCP.pm @@ -492,12 +494,15 @@ libexec/MailScanner/vexira-wrapper.sample %%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/Conf.pm.patch.3.0.3 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.0.0 +%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.0.3 %%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/PerMsgStatus.pm.patch.3.0.3 %%PORTDOCS%%%%DOCSDIR%%/install/mcp/index.html %%PORTDOCS%%@exec mkdir -p %D/%%DOCSDIR%%/install/tcp %%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch.txt |