Attachment 52736 Details for Bug 79854 – MailScanner-4.40.11.patch

[patch] MailScanner-4.40.11.patch

MailScanner-4.40.11.patch (text/plain), 16.85 KB, created by Jan-Peter Koopmann on 2005-04-13 10:50:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan-Peter Koopmann

Created: 2005-04-13 10:50:12 UTC

Size: 16.85 KB

patch

obsolete

>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/Makefile /server-root/ports/mail/mailscanner/Makefile
>--- /server-root/ports/mail/mailscanner.orig/Makefile	Tue Mar 15 23:08:19 2005
>+++ /server-root/ports/mail/mailscanner/Makefile	Wed Apr 13 11:44:14 2005
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	MailScanner
>-PORTVERSION=	4.39.6
>+PORTVERSION=	4.40.11
> CATEGORIES=	mail
> MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
> DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
>@@ -30,7 +30,8 @@
> 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
> 		${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef \
> 		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
>-		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
>+		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
>+		${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar
> 
> CONFLICTS=	MailScanner-devel-[0-9]*
> 
>@@ -84,7 +85,9 @@
> 		s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
> 		s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
> 		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g; \
>-		s,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g;' \
>+		s,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g; \
>+		s,/usr/bin/unrar,${LOCALBASE}/bin/unrar,g; \
>+		s,/etc/mail/spamassassin,${LOCALBASE}/etc/mail/spamassassin,g;' \
> 		${WRKSRC}/etc/MailScanner.conf
> 	${PERL} -pi -e \
> 		's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g; \
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/distinfo /server-root/ports/mail/mailscanner/distinfo
>--- /server-root/ports/mail/mailscanner.orig/distinfo	Tue Mar 15 23:08:19 2005
>+++ /server-root/ports/mail/mailscanner/distinfo	Wed Apr 13 11:38:26 2005
>@@ -1,2 +1,2 @@
>-MD5 (MailScanner-install-4.39.6-1.tar.gz) = efe4a1eec0b072febbb3d6037a65470d
>-SIZE (MailScanner-install-4.39.6-1.tar.gz) = 4854418
>+MD5 (MailScanner-install-4.40.11-1.tar.gz) = afcf9a62303becc81b9661cbde81862a
>+SIZE (MailScanner-install-4.40.11-1.tar.gz) = 4888691
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.8 /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8
>--- /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.8	Tue Mar 15 23:08:19 2005
>+++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8	Wed Apr 13 11:37:43 2005
>@@ -1,8 +1,8 @@
>---- ../MailScanner-install-4.39.6.orig/docs/man/MailScanner.8	Mon Mar 14 23:05:12 2005
>-+++ docs/man/MailScanner.8	Mon Mar 14 23:05:22 2005
>+--- ../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
> @@ -1,4 +1,4 @@
> -.TH "MailScanner" "8" "4.38.2" "Julian Field" "Mail"
>-+.TH "MailScanner" "8" "4.39.6" "Julian Field" "Mail"
>++.TH "MailScanner" "8" "4.40.10" "Julian Field" "Mail"
>  .SH "NAME"
>  .LP 
>  MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.8.html /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8.html
>--- /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.8.html	Tue Mar 15 23:08:19 2005
>+++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8.html	Wed Apr 13 11:37:43 2005
>@@ -1,9 +1,9 @@
>---- ../MailScanner-install-4.39.6.orig/docs/man/MailScanner.8.html	Mon Mar 14 23:05:12 2005
>-+++ docs/man/MailScanner.8.html	Mon Mar 14 23:05:25 2005
>+--- ../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
> @@ -1,5 +1,5 @@
>  
> -
>-+
>++
>  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
>  "http://www.w3.org/TR/html4/loose.dtd">
>  <html>
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.conf.5 /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5
>--- /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.conf.5	Tue Mar 15 23:08:19 2005
>+++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5	Wed Apr 13 11:37:43 2005
>@@ -1,12 +1,70 @@
>---- ../MailScanner-install-4.39.6.orig/docs/man/MailScanner.conf.5	Mon Mar 14 23:05:12 2005
>-+++ docs/man/MailScanner.conf.5	Mon Mar 14 23:05:30 2005
>+--- ../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
> @@ -1,4 +1,4 @@
> -.TH "MailScanner.conf" "5" "4.38.2" "Julian Field" "Mail"
>-+.TH "MailScanner.conf" "5" "4.39.6" "Julian Field" "Mail"
>++.TH "MailScanner.conf" "5" "4.40.10" "Julian Field" "Mail"
>  .SH "NAME"
>  .LP 
>  MailScanner.conf \- Main configuration for MailScanner
>-@@ -562,6 +562,41 @@
>+@@ -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. 
>+ .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).
>+ 
>++
>++.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.
>@@ -48,7 +106,7 @@
>  .SH "Removing/Logging dangerous or potentially offensive content"
>  .TP 
>  \fBAllow Partial Messages\fR
>-@@ -601,6 +636,15 @@
>+@@ -601,6 +671,15 @@
>  
>  
>  .TP 
>@@ -64,7 +122,7 @@
>  \fBAllow IFrame Tags\fR
>  Default: no
>  .br 
>-@@ -1753,6 +1797,12 @@
>+@@ -1753,6 +1832,12 @@
>  
>  .br 
>  Log all occurrences of "Silent Viruses" as defined above? This can only be a simple yes/no value, not a ruleset.
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.conf.5.html /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html
>--- /server-root/ports/mail/mailscanner.orig/files/patch-docs:man:MailScanner.conf.5.html	Tue Mar 15 23:08:19 2005
>+++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html	Wed Apr 13 11:37:43 2005
>@@ -1,13 +1,146 @@
>---- ../MailScanner-install-4.39.6.orig/docs/man/MailScanner.conf.5.html	Mon Mar 14 23:05:12 2005
>-+++ docs/man/MailScanner.conf.5.html	Mon Mar 14 23:05:33 2005
>+--- ../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
> @@ -1,5 +1,5 @@
>  
> -
>-+
>++
>  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
>  "http://www.w3.org/TR/html4/loose.dtd">
>  <html>
>-@@ -1638,6 +1638,90 @@
>+@@ -120,13 +120,15 @@
>+ directories within the MailScanner installation and in the
>+ section &quot;RULESETS&quot; later in this manpage.</p>
>+ 
>+-<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&rsquo;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&rsquo;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>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>
>+ 
>+ <p>You should define the following variables:</p>
>+ </td>
>+@@ -220,6 +222,54 @@
>+ headers.</p>
>+ </td>
>+ </table>
>++
>++<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&minus;long&minus;name%</b></p></td>
>++</table>
>++
>++<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>
>++
>++<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 &quot;0 sequences in the text. These will be
>++replaced by line&minus;breaks.</p>
>++</td>
>++</table>
>++
>++<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&minus;site%</b></p></td>
>++</table>
>++
>++<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: www.your&minus;organisation.com</p>
>++
>++<p>Enter the location of your organisation&rsquo;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>
>++</td>
>++</table>
>+ <a name="System Settings"></a>
>+ <h2>System Settings</h2>
>+ 
>+@@ -1071,6 +1121,54 @@
>+ <tr valign="top" align="left">
>+ <td width="11%"></td>
>+ <td width="89%">
>++<p><b>Unrar Command</b></p></td>
>++</table>
>++
>++<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/unrar</p>
>++
>++<p>Where the &quot;unrar&quot; command is installed. If you
>++haven&rsquo;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&minus;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>
>++</table>
>++
>++<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>
>++
>++<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>
>++
>++<p>The maximum length of time the &quot;unrar&quot; command
>++is allowed to run for 1 RAR archive (in seconds)</p>
>++</td>
>++</table>
>++
>++<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>
>+ 
>+@@ -1638,6 +1736,90 @@
>  scanner, not the &quot;clamav&quot; scanner setting.</p>
>  </td>
>  </table>
>@@ -98,7 +231,7 @@
>  <a name="Removing/Logging dangerous or potentially offensive content"></a>
>  <h2>Removing/Logging dangerous or potentially offensive content</h2>
>  
>-@@ -1761,6 +1845,33 @@
>+@@ -1761,6 +1943,33 @@
>  <tr valign="top" align="left">
>  <td width="11%"></td>
>  <td width="89%">
>@@ -132,7 +265,7 @@
>  <p><b>Allow IFrame Tags</b></p></td>
>  </table>
>  
>-@@ -5122,6 +5233,28 @@
>+@@ -5122,6 +5331,28 @@
>  <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>
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/pkg-plist /server-root/ports/mail/mailscanner/pkg-plist
>--- /server-root/ports/mail/mailscanner.orig/pkg-plist	Tue Mar 15 23:08:19 2005
>+++ /server-root/ports/mail/mailscanner/pkg-plist	Wed Apr 13 11:38:22 2005
>@@ -1,4 +1,4 @@
>-@comment $FreeBSD: ports/mail/mailscanner/pkg-plist,v 1.20 2005/03/15 22:08:19 pav Exp $
>+@comment $FreeBSD: ports/mail/mailscanner/pkg-plist,v 1.19 2005/02/16 16:11:36 vs Exp $
> etc/MailScanner/MailScanner.conf.sample
> etc/MailScanner/filename.rules.conf.sample
> etc/MailScanner/filetype.rules.conf.sample
>@@ -20,6 +20,7 @@
> lib/MailScanner/MailScanner/CustomConfig.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/Lock.pm
>@@ -524,6 +525,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/oldnews.shtml
> %%PORTDOCS%%%%DOCSDIR%%/osdir.png
> %%PORTDOCS%%%%DOCSDIR%%/performance.shtml
>+%%PORTDOCS%%%%DOCSDIR%%/phishing3.png
> %%PORTDOCS%%%%DOCSDIR%%/poetry.shtml
> %%PORTDOCS%%%%DOCSDIR%%/poweredby.google.gif
> %%PORTDOCS%%%%DOCSDIR%%/poweredby.transtec.gif

Actions: View | Diff

Attachments on bug 79854: 52736