diff options
| -rw-r--r-- | mail/mailscanner/Makefile | 8 | ||||
| -rw-r--r-- | mail/mailscanner/distinfo | 4 | ||||
| -rw-r--r-- | mail/mailscanner/files/patch-docs:man:MailScanner.8 | 6 | ||||
| -rw-r--r-- | mail/mailscanner/files/patch-docs:man:MailScanner.8.html | 6 | ||||
| -rw-r--r-- | mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 | 48 | ||||
| -rw-r--r-- | mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html | 93 | ||||
| -rw-r--r-- | mail/mailscanner/files/patch-lib:clamav-wrapper | 35 |
7 files changed, 178 insertions, 22 deletions
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index 9414c2b5185b..3a40c659e9c2 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -6,7 +6,7 @@ # PORTNAME= MailScanner -PORTVERSION= 4.41.3 +PORTVERSION= 4.42.9 CATEGORIES= mail MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/ DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL} @@ -31,7 +31,11 @@ RUN_DEPENDS= ${BUILD_DEPENDS} \ ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef \ ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ - ${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar + ${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \ + ${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo \ + ${LOCALBASE}/bin/unarj:${PORTSDIR}/archivers/unarj \ + ${LOCALBASE}/bin/unace:${PORTSDIR}/archivers/unace \ + ${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha CONFLICTS= MailScanner-devel-[0-9]* diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo index b1a50e38ad03..b0bb181bc76f 100644 --- a/mail/mailscanner/distinfo +++ b/mail/mailscanner/distinfo @@ -1,2 +1,2 @@ -MD5 (MailScanner-install-4.41.3-1.tar.gz) = 6df068ec74fb07bd1d166c1ad5e69cd6 -SIZE (MailScanner-install-4.41.3-1.tar.gz) = 4925560 +MD5 (MailScanner-install-4.42.9-1.tar.gz) = 893eda4833586b61b5b78af95d0f2f0d +SIZE (MailScanner-install-4.42.9-1.tar.gz) = 4775108 diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.8 b/mail/mailscanner/files/patch-docs:man:MailScanner.8 index 0d905251d1da..f73083cbd672 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.40.10.old/docs/man/MailScanner.8 Fri Apr 1 16:10:19 2005 -+++ docs/man/MailScanner.8 Fri Apr 1 16:10:33 2005 +--- ../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 @@ -1,4 +1,4 @@ -.TH "MailScanner" "8" "4.38.2" "Julian Field" "Mail" -+.TH "MailScanner" "8" "4.41.3" "Julian Field" "Mail" ++.TH "MailScanner" "8" "4.42.9" "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 cf4b49ddb974..d7e4d99a2405 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.40.10.old/docs/man/MailScanner.8.html Fri Apr 1 16:10:19 2005 -+++ docs/man/MailScanner.8.html Fri Apr 1 16:10:35 2005 +--- ../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 @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.19 --> -<!-- CreationDate: Mon Jan 17 15:53:41 2005 --> -+<!-- CreationDate: Fri Apr 1 16:08:30 2005 --> ++<!-- CreationDate: Wed Jun 1 11:29:47 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 102d83691c83..46a89f48bd82 100644 --- a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 +++ b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 @@ -1,8 +1,8 @@ ---- ../MailScanner-install-4.40.10.old/docs/man/MailScanner.conf.5 Fri Apr 1 16:10:19 2005 -+++ docs/man/MailScanner.conf.5 Fri Apr 1 16:10:37 2005 +--- ../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 @@ -1,4 +1,4 @@ -.TH "MailScanner.conf" "5" "4.38.2" "Julian Field" "Mail" -+.TH "MailScanner.conf" "5" "4.41.3" "Julian Field" "Mail" ++.TH "MailScanner.conf" "5" "4.42.9" "Julian Field" "Mail" .SH "NAME" .LP MailScanner.conf \- Main configuration for MailScanner @@ -122,7 +122,47 @@ \fBAllow IFrame Tags\fR Default: no .br -@@ -1753,6 +1832,12 @@ +@@ -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 ++.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. ++ ++ ++.TP ++\fBDisarmed Subject Text\fR ++Default: {Disarmed} ++.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. ++ + + .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. 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 a5caf8ac864f..72a307d09392 100644 --- a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html +++ b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html @@ -1,9 +1,9 @@ ---- ../MailScanner-install-4.40.10.old/docs/man/MailScanner.conf.5.html Fri Apr 1 16:10:19 2005 -+++ docs/man/MailScanner.conf.5.html Fri Apr 1 16:10:40 2005 +--- ../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 @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.19 --> -<!-- CreationDate: Mon Jan 17 15:53:41 2005 --> -+<!-- CreationDate: Fri Apr 1 16:08:30 2005 --> ++<!-- CreationDate: Wed Jun 1 11:29:47 2005 --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> @@ -265,7 +265,92 @@ <p><b>Allow IFrame Tags</b></p></td> </table> <!-- INDENTATION --> -@@ -5122,6 +5331,28 @@ +@@ -3617,6 +3826,50 @@ + <tr valign="top" align="left"> + <td width="11%"></td> + <td width="89%"> ++<p><b>Disarmed Modify Subject</b></p></td> ++</table> ++<!-- INDENTATION --> ++<table width="100%" border=0 rules="none" frame="void" ++ cols="2" cellspacing="0" cellpadding="0"> ++<tr valign="top" align="left"> ++<td width="22%"></td> ++<td width="78%"> ++<p>Default: yes</p> ++<!-- INDENTATION --> ++<p>If 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> ++</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>Disarmed 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: {Disarmed}</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> ++</td> ++</table> ++<!-- INDENTATION --> ++<table width="100%" border=0 rules="none" frame="void" ++ cols="2" cellspacing="0" cellpadding="0"> ++<tr valign="top" align="left"> ++<td width="11%"></td> ++<td width="89%"> + <p><b>Spam Modify Subject</b></p></td> + </table> + <!-- 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> ++</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: 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> ++<!-- 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> diff --git a/mail/mailscanner/files/patch-lib:clamav-wrapper b/mail/mailscanner/files/patch-lib:clamav-wrapper index 697bbfe416da..453ddd25ca47 100644 --- a/mail/mailscanner/files/patch-lib:clamav-wrapper +++ b/mail/mailscanner/files/patch-lib:clamav-wrapper @@ -1,7 +1,5 @@ -$FreeBSD: /tmp/pcvs/ports/mail/mailscanner/files/Attic/patch-lib:clamav-wrapper,v 1.4 2004-08-08 17:16:18 sem Exp $ - ---- ../MailScanner-4.27.5.orig/lib/clamav-wrapper Thu Feb 26 15:25:51 2004 -+++ lib/clamav-wrapper Thu Feb 26 15:26:23 2004 +--- ../MailScanner-install-4.42.9.orig/lib/clamav-wrapper Wed Jun 1 11:24:25 2005 ++++ lib/clamav-wrapper Wed Jun 1 11:31:57 2005 @@ -51,6 +51,9 @@ # You may want to check this script for bash-isms @@ -12,3 +10,32 @@ $FreeBSD: /tmp/pcvs/ports/mail/mailscanner/files/Attic/patch-lib:clamav-wrapper, TempDir="/tmp/clamav.$$" ClamUser="clamav" ClamGroup="clamav" +@@ -98,23 +101,23 @@ + # LESS COMMON unpackers, which probably aren't installed by default + # (hence disabled) + # Uncomment ONE of the following lines if you have unrar installed +-#ExtraScanOptions="$ExtraScanOptions --unrar" ++ExtraScanOptions="$ExtraScanOptions --unrar" + #ExtraScanOptions="$ExtraScanOptions --unrar=/path/to/unrar" + + # Uncomment ONE of the following lines if you have unarj installed +-#ExtraScanOptions="$ExtraScanOptions --unarj" ++ExtraScanOptions="$ExtraScanOptions --unarj" + #ExtraScanOptions="$ExtraScanOptions --unarj=/path/to/unarj" + + # Uncomment ONE of the following lines if you have unace installed +-#ExtraScanOptions="$ExtraScanOptions --unace" ++ExtraScanOptions="$ExtraScanOptions --unace" + #ExtraScanOptions="$ExtraScanOptions --unace=/path/to/unace" + + # Uncomment ONE of the following lines if you have lha installed +-#ExtraScanOptions="$ExtraScanOptions --lha" ++ExtraScanOptions="$ExtraScanOptions --lha" + #ExtraScanOptions="$ExtraScanOptions --lha=/path/to/lha" + + # Uncomment ONE of the following lines if you have zoo installed +-#ExtraScanOptions="$ExtraScanOptions --zoo" ++ExtraScanOptions="$ExtraScanOptions --zoo" + #ExtraScanOptions="$ExtraScanOptions --zoo=/path/to/unzoo" + + # Uncomment next line if you need to disable Clam's DoS protection |