[MAINTAINER] mail/MailScanner: update to 4.49.7

- Update to 4.49.7

	* New Features and Improvements *
	- Speed improvements for sendmail systems by changing the
	  way temporary files are handled and how attachments are parsed. This
	  should be really noticeable if I've got it right.
	  Thanks for the great help of the Vodafone SHARK team.
	- Added speed improvements for Exim.
	- Added speed improvements for Postfix.
	- Now changes the command line listed in `ps` (ie $0) to show what
	  MailScanner is doing. Should help diagnose slow system problems.
	- 4 new configuration options, which list patterns against which filenames
	  and filetypes are matched to see if we should allow them or block them.
	  This is implemented for the benefit of web-based configuration systems for
	  MailScanner, it is not really intended for human use as it will complicate
	  the filename/filetype matching unless you understand it. Read the comments
	  in the MailScanner.conf and suggest better explanations!
	  "Allow Filenames", "Deny Filenames", "Allow Filetypes", "Deny Filetypes".
	  Note: There are 2 new entries in languages.conf so remember to
		run an upgrade_languages_conf.
	- Upgraded tnef program to 1.3.4.
	- Added message 'actions' property for MailWatch reporting.
	- Custom Function filenames must end in .pm or .pl. Others will be logged
	  and skipped.
	- Various minor speed improvements.

	* Fixes *
	- Changed Postfix code to better support latest revision of Perl.
	- Now stops MailScanner more reliably on SuSE systems.
	- Logging of <img> tags only done if logging HTML tags.
	- Fixed minor array ref problem in Perl 5.8.7 on FreeBSD 6.0 (which is not
	  a public stable release anyway).

PR:		ports/91306
Submitted by:	Jan-Peter Koopmann <j.koopmann@seceidos.de>

6 files changed, 244 insertions, 26 deletions

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 6a43ac7d695d..7bdc9bf28440 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.48.4
+PORTVERSION=	4.49.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -17,6 +17,7 @@ COMMENT=	Powerful virus/spam scanning framework for mail gateways
 BUILD_DEPENDS=	\
 	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
 	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+	${SITE_PERL}/${PERL_ARCH}/Bundle/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 	${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
@@ -26,6 +27,7 @@ BUILD_DEPENDS=	\
 	${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
 	${SITE_PERL}/Convert/BinHex.pm:${PORTSDIR}/converters/p5-Convert-BinHex \
 	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
+	${SITE_PERL}/Net/Ident.pm:${PORTSDIR}/net/p5-Net-Ident \
 	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 	${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
 RUN_DEPENDS=	${BUILD_DEPENDS} \
@@ -41,7 +43,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS} \
 
 CONFLICTS=	MailScanner-devel-[0-9]*
 
-PATCHLEVEL=	2
+PATCHLEVEL=	1
 
 USE_PERL5=	yes
 
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index 49e6f43c6b70..15dd2f74de72 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,2 +1,2 @@
-MD5 (MailScanner-install-4.48.4-2.tar.gz) = d787daabb0a75f369bd1037256307909
-SIZE (MailScanner-install-4.48.4-2.tar.gz) = 5434134
+MD5 (MailScanner-install-4.49.7-1.tar.gz) = 34346abc70d8e6dbe6727e1c9b15e672
+SIZE (MailScanner-install-4.49.7-1.tar.gz) = 5475235
diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.8 b/mail/mailscanner/files/patch-docs:man:MailScanner.8
index 6d5c89b97c5f..f8365902bcc2 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.48.4.orig/docs/man/MailScanner.8	Wed Dec  7 18:33:04 2005
-+++ docs/man/MailScanner.8	Wed Dec  7 18:33:48 2005
+--- ../MailScanner-install-4.49.7.orig/docs/man/MailScanner.8	Wed Jan  4 13:36:45 2006
++++ docs/man/MailScanner.8	Wed Jan  4 13:46:07 2006
 @@ -1,4 +1,4 @@
 -.TH "MailScanner" "8" "4.42.9" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.45.1" "Julian Field" "Mail"
++.TH "MailScanner" "8" "4.49.7" "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 90b758d2a501..5820b1dba194 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.48.4.orig/docs/man/MailScanner.8.html	Wed Dec  7 18:33:04 2005
-+++ docs/man/MailScanner.8.html	Wed Dec  7 18:33:51 2005
+--- ../MailScanner-install-4.49.7.orig/docs/man/MailScanner.8.html	Wed Jan  4 13:36:45 2006
++++ docs/man/MailScanner.8.html	Wed Jan  4 13:46:09 2006
 @@ -1,5 +1,5 @@
  <!-- Creator     : groff version 1.19 -->
 -<!-- CreationDate: Wed Jun  1 11:29:47 2005 -->
-+<!-- CreationDate: Tue Dec  6 20:28:14 2005 -->
++<!-- CreationDate: Wed Jan  4 13:45:56 2006 -->
  <!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 988a5e59840d..670c99c7a468 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.48.4.orig/docs/man/MailScanner.conf.5	Wed Dec  7 18:33:04 2005
-+++ docs/man/MailScanner.conf.5	Wed Dec  7 18:33:54 2005
+--- ../MailScanner-install-4.49.7.orig/docs/man/MailScanner.conf.5	Wed Jan  4 13:36:45 2006
++++ docs/man/MailScanner.conf.5	Wed Jan  4 13:46:12 2006
 @@ -1,4 +1,4 @@
 -.TH "MailScanner.conf" "5" "4.42.9" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.48.4" "Julian Field" "Mail"
++.TH "MailScanner.conf" "5" "4.49.7" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner.conf \- Main configuration for MailScanner
@@ -30,7 +30,81 @@
  .TP 
  \fBMaximum Attachments Per Message\fR
  Default: 200
-@@ -853,6 +870,15 @@
+@@ -819,6 +836,36 @@
+ Do you want to allow <Form> tags in email messages? 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 ruleset.
+ .SH "Attachment filename checking"
+ .TP 
++\fBAllow Filenames\fR
++Default:
++.br 
++
++.br 
++Allow any attachment filenames matching any of the patters listed here. If this setting is empty, it is ignored and no matches are made. This can also be the filename of a ruleset.
++.br 
++
++.br 
++To simplify web\-based configuration systems, there are now two extra settings here. They are both intended for use with normal rulesets that you would expect to find in %rules\-dir%. The first gives a list of patterns to match against the attachment filenames, and a filename is allowed if it matches any of these patterns. The second gives the the equivalent list for patterns that are used to deny filenames. If either of these match at all, then filename.rules.conf is ignored  for that filename. So you can easily have a set like this:
++.br 
++
++.br 
++Allow Filenames = \.txt$ \.pdf$
++.br 
++Deny  Filenames = \.com$ \.exe$ \.cpl$ \.pif$
++.br 
++
++.br 
++which is a lot simpler than having to handle filename.rules.conf! It is far simpler when you want to change the allowed+denied list for different domains/addresses, as you can use the filename of a simple ruleset here instead.
++
++.TP 
++\fBDeny Filenames\fR
++Default: 
++.br 
++
++.br 
++Deny any attachment filenames matching any of the patters listed here. If this setting is empty, it is ignored and no matches are made. This can also be the filename of a ruleset.
++
++.TP 
+ \fBFilename Rules\fR
+ Default: %etc\-dir%/filename.rules.conf
+ .br 
+@@ -827,6 +874,36 @@
+ File in which to store the attachment filename ruleset. This can be a ruleset allowing different filename rules to apply to different users or domains. The syntax of this file is described in section "Attachment Filename Ruleset".
+ 
+ .TP 
++\fBAllow Filetypes\fR
++Default: 
++.br 
++
++.br 
++Allow any attachment filetypes matching any of the patters listed here. If this setting is empty, it is ignored and no matches are made. This can also be the filetype of a ruleset.
++.br 
++
++.br 
++To simplify web\-based configuration systems, there are now two extra settings here. They are both intended for use with normal rulesets that you would expect to find in %rules\-dir%. The first gives a list of patterns to match against the attachment filetypes, and a filetype is allowed if it matches any of these patterns. The second gives the the equivalent list for patterns that are used to deny filetypes. If either of these match at all, then filetype.rules.conf is ignored for that filetype. So you can easily have a set like this:
++.br 
++
++.br 
++Allow Filetypes = \.txt$ \.pdf$
++.br 
++Deny  Filetypes = \.com$ \.exe$ \.cpl$ \.pif$
++.br 
++
++.br 
++which is a lot simpler than having to handle filetype.rules.conf! It is far simpler when you want to change the allowed+denied list for different domains/addresses, as you can use the filetype of a simple ruleset here instead.
++
++.TP 
++\fBDeny Filetypes\fR
++Default: 
++.br 
++
++.br 
++Deny any attachment filetypes matching any of the patters listed here. If this setting is empty, it is ignored and no matches are made. This can also be the filetype of a ruleset.
++
++.TP 
+ \fBFiletype Rules\fR
+ Default: %etc\-dir%/filetype.rules.conf
+ .br 
+@@ -853,6 +930,15 @@
  There is no point quarantining most viruses these days, so if you set this to "no" then no infections listed in your "Silent Viruses" setting will be quarantined, even if you have chosen to quarantine infections in general. This is currently set to "yes" so the behaviour is the same as it was in in previous versions. This can also be the filename of a ruleset.
  
  .TP 
@@ -46,7 +120,7 @@
  \fBQuarantine Whole Message\fR
  Default: no
  .br 
-@@ -885,6 +911,16 @@
+@@ -885,6 +971,16 @@
  .br 
  Set where to find all the strings used so they can be translated into your local language. This can also be the filename of a ruleset so you can produce different languages for different messages.
  
@@ -63,7 +137,7 @@
  .TP 
  \fBDeleted Bad Filename Message Report\fR
  Default: %reports\-dir%/deleted.filename.message.txt
-@@ -1701,12 +1737,64 @@
+@@ -1701,12 +1797,64 @@
  .br 
  
  .br 
@@ -74,13 +148,13 @@
 +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.
 +
 +
-+
+ 
 +.SH "Custom Spam Scanner Plugin"
 +.TP 
 +\fBUse Custom Spam Scanner\fR
 +Default: no
 +.br 
-+
+ 
 +.br 
 +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 
@@ -101,10 +175,10 @@
 +\fBMax Custom Spam Scanner Size\fR
 +Default: 20000
 +.br 
- 
++
 +.br 
 +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 
 +\fBCustom Spam Scanner Timeout\fR
 +Default: 20
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 aa693ea2e20a..3a6099c497c8 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.48.4.orig/docs/man/MailScanner.conf.5.html	Wed Dec  7 18:33:07 2005
-+++ docs/man/MailScanner.conf.5.html	Wed Dec  7 18:34:00 2005
+--- ../MailScanner-install-4.49.7.orig/docs/man/MailScanner.conf.5.html	Wed Jan  4 13:36:45 2006
++++ docs/man/MailScanner.conf.5.html	Wed Jan  4 13:46:14 2006
 @@ -1,5 +1,5 @@
  <!-- Creator     : groff version 1.19 -->
 -<!-- CreationDate: Wed Jun  1 11:29:47 2005 -->
-+<!-- CreationDate: Tue Dec  6 20:28:14 2005 -->
++<!-- CreationDate: Wed Jan  4 13:45:56 2006 -->
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
  "http://www.w3.org/TR/html4/loose.dtd">
  <html>
@@ -77,7 +77,149 @@
  <p><b>Maximum Attachments Per Message</b></p></td>
  </table>
  <!-- INDENTATION -->
-@@ -2523,6 +2579,27 @@
+@@ -2423,6 +2479,70 @@
+ <tr valign="top" align="left">
+ <td width="11%"></td>
+ <td width="89%">
++<p><b>Allow Filenames</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>Allow any attachment filenames matching any of the
++patters listed here. If this setting is empty, it is ignored
++and no matches are made. This can also be the filename of a
++ruleset.</p>
++<!-- INDENTATION -->
++<p>To simplify web&minus;based configuration systems, there
++are now two extra settings here. They are both intended for
++use with normal rulesets that you would expect to find in
++%rules&minus;dir%. The first gives a list of patterns to
++match against the attachment filenames, and a filename is
++allowed if it matches any of these patterns. The second
++gives the the equivalent list for patterns that are used to
++deny filenames. If either of these match at all, then
++filename.rules.conf is ignored for that filename. So you can
++easily have a set like this:</p>
++<!-- INDENTATION -->
++<p>Allow Filenames = .txt$ .pdf$<br>
++Deny Filenames = .com$ .exe$ .cpl$ .pif$</p>
++<!-- INDENTATION -->
++<p>which is a lot simpler than having to handle
++filename.rules.conf! It is far simpler when you want to
++change the allowed+denied list for different
++domains/addresses, as you can use the filename of a simple
++ruleset here instead.</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>Deny Filenames</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>Deny any attachment filenames matching any of the patters
++listed here. If this setting is empty, it is ignored and no
++matches are made. 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>Filename Rules</b></p></td>
+ </table>
+ <!-- INDENTATION -->
+@@ -2446,6 +2566,70 @@
+ <tr valign="top" align="left">
+ <td width="11%"></td>
+ <td width="89%">
++<p><b>Allow Filetypes</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>Allow any attachment filetypes matching any of the
++patters listed here. If this setting is empty, it is ignored
++and no matches are made. This can also be the filetype of a
++ruleset.</p>
++<!-- INDENTATION -->
++<p>To simplify web&minus;based configuration systems, there
++are now two extra settings here. They are both intended for
++use with normal rulesets that you would expect to find in
++%rules&minus;dir%. The first gives a list of patterns to
++match against the attachment filetypes, and a filetype is
++allowed if it matches any of these patterns. The second
++gives the the equivalent list for patterns that are used to
++deny filetypes. If either of these match at all, then
++filetype.rules.conf is ignored for that filetype. So you can
++easily have a set like this:</p>
++<!-- INDENTATION -->
++<p>Allow Filetypes = .txt$ .pdf$<br>
++Deny Filetypes = .com$ .exe$ .cpl$ .pif$</p>
++<!-- INDENTATION -->
++<p>which is a lot simpler than having to handle
++filetype.rules.conf! It is far simpler when you want to
++change the allowed+denied list for different
++domains/addresses, as you can use the filetype of a simple
++ruleset here instead.</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>Deny Filetypes</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>Deny any attachment filetypes matching any of the patters
++listed here. If this setting is empty, it is ignored and no
++matches are made. This can also be the filetype 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>Filetype Rules</b></p></td>
+ </table>
+ <!-- INDENTATION -->
+@@ -2523,6 +2707,27 @@
  <tr valign="top" align="left">
  <td width="11%"></td>
  <td width="89%">
@@ -105,7 +247,7 @@
  <p><b>Quarantine Whole Message</b></p></td>
  </table>
  <!-- INDENTATION -->
-@@ -2621,6 +2698,27 @@
+@@ -2621,6 +2826,27 @@
  <tr valign="top" align="left">
  <td width="11%"></td>
  <td width="89%">
@@ -133,7 +275,7 @@
  <p><b>Deleted Bad Filename Message Report</b></p></td>
  </table>
  <!-- INDENTATION -->
-@@ -4909,10 +5007,239 @@
+@@ -4909,10 +5135,239 @@
  <td width="78%">
  <p>Default: no</p>
  <!-- INDENTATION -->