- Update to 4.37.7

PR:		ports/76354
Submitted by:	maintainer

7 files changed, 143 insertions, 46 deletions

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index e70dcb2df4b8..885c25eb8d6a 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	MailScanner
-PORTVERSION=	4.36.4
-PORTREVISION=	1
+PORTVERSION=	4.37.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -210,6 +209,8 @@ do-install:
 	   ${ECHO} "Changes in MailScanner.conf found. Please look at \
 		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION}" ; \
 	fi
+.endif
+	# Languages.conf update
 	@for LANG_DIR in ${DATADIR}/reports/*; do \
 		if [ -f $${LANG_DIR}/languages.conf ]; then \
 			${ECHO} -n Upgrading $${LANG_DIR}/languages.conf... Please wait...; \
@@ -220,14 +221,13 @@ do-install:
 				2> /dev/null ; \
 			if diff -b -B -q $${LANG_DIR}/languages.conf \
 				$${LANG_DIR}/languages.conf.new.${PORTVERSION} ; \
-			  then  ${ECHO} " no changes"; \
+			  then	${ECHO} " no changes"; \
 				${RM} $${LANG_DIR}/languages.conf.new.${PORTVERSION} ; \
-			  else  ${ECHO} " done"; \
+			  else	${ECHO} " done"; \
 				${CP} $${LANG_DIR}/languages.conf.new.${PORTVERSION} $${LANG_DIR}/languages.conf ; \
 			fi; \
 		fi; \
 	done
-.endif
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},' pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
@@ -249,5 +249,12 @@ initial-config: renew-wrapper renew-autoupdate renew-reports
 		${PREFIX}/etc/MailScanner
 	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
 		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules
+	@${ECHO} "******************************************************************************"
+	@${ECHO} "The provided default configuration requires several directories to be created:"
+	@${ECHO} "/var/spool/MailScanner/incoming"
+	@${ECHO} "/var/spool/MailScanner/quarantine"
+	@${ECHO} "/var/spool/mqueue"
+	@${ECHO} "Either create those directories or change the configuration."
+	@${ECHO} "******************************************************************************"
 
 .include <bsd.port.post.mk>
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index b754581077fa..89e42582999f 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,2 +1,2 @@
-MD5 (MailScanner-install-4.36.4-1.tar.gz) = 322f1b5d8f7e5f0f0bbf53046f1d2a20
-SIZE (MailScanner-install-4.36.4-1.tar.gz) = 5622620
+MD5 (MailScanner-install-4.37.7-1.tar.gz) = 07a12541361ec9a38e58e090dc6fb184
+SIZE (MailScanner-install-4.37.7-1.tar.gz) = 5616070
diff --git a/mail/mailscanner/files/patch-docs:man:MailScanner.8 b/mail/mailscanner/files/patch-docs:man:MailScanner.8
index 01a8554699ef..b513e8b5e007 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.36.4.orig/docs/man/MailScanner.8	Wed Dec 15 20:31:43 2004
-+++ docs/man/MailScanner.8	Wed Dec 15 20:32:20 2004
+--- ../MailScanner-install-4.37.7.orig/docs/man/MailScanner.8	Mon Jan 17 12:58:50 2005
++++ docs/man/MailScanner.8	Mon Jan 17 13:00:43 2005
 @@ -1,4 +1,4 @@
 -.TH "MailScanner" "8" "4.34.8" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.36.4" "Julian Field" "Mail"
++.TH "MailScanner" "8" "4.37.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 3b3e9fa91b61..8c43c241cb1d 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.36.4.orig/docs/man/MailScanner.8.html	Wed Dec 15 20:31:43 2004
-+++ docs/man/MailScanner.8.html	Wed Dec 15 20:32:06 2004
+--- ../MailScanner-install-4.37.7.orig/docs/man/MailScanner.8.html	Mon Jan 17 12:58:50 2005
++++ docs/man/MailScanner.8.html	Mon Jan 17 13:00:45 2005
 @@ -1,5 +1,5 @@
  <!-- Creator     : groff version 1.19 -->
 -<!-- CreationDate: Fri Oct 15 15:13:21 2004 -->
-+<!-- CreationDate: Mon Nov  1 18:00:16 2004 -->
++<!-- CreationDate: Wed Dec 15 21:29:27 2004 -->
  <!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 b635ac216b41..d54e1258f3f7 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.36.4.orig/docs/man/MailScanner.conf.5	Wed Dec 15 20:31:43 2004
-+++ docs/man/MailScanner.conf.5	Wed Dec 15 20:32:29 2004
+--- ../MailScanner-install-4.37.7.orig/docs/man/MailScanner.conf.5	Mon Jan 17 13:18:55 2005
++++ docs/man/MailScanner.conf.5	Mon Jan 17 13:19:08 2005
 @@ -1,4 +1,4 @@
 -.TH "MailScanner.conf" "5" "4.34.8" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.36.4" "Julian Field" "Mail"
++.TH "MailScanner.conf" "5" "4.37.7" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner.conf \- Main configuration for MailScanner
@@ -15,7 +15,23 @@
  .br 
  
  .br 
-@@ -1266,12 +1266,11 @@
+@@ -781,6 +781,15 @@
+ When an entire message is saved in the quarantine for any reason, do you want to save it as the raw data files out of the mail queue (which can be processed with the df2mbox script, and which is easier to send to its original recipients), or do you want a conventional message file consisting of the header followed by the body of the message. If the previous option is switched off, then this will only affect archived mail and quarantined spam. If the previous option is on, then this also affects quarantined infections. 
+ 
+ .TP 
++\fBKeep Spam And MCP Archive Clean\fR
++Default: no
++.br 
++
++.br 
++Do you want to stop any virus\-infected spam getting into the spam or MCP archives? If you have a system where users can release messages from the spam or MCP archives, then you probably want to stop them being able to release any infected messages, so set this to yes. It is set to no by default as it causes a small hit in performance, and many people don't allow users to access the spam quarantine, so don't need it. This can also be the filename of a ruleset.
++
++
++.TP 
+ \fBLanguage Strings\fR
+ Default: %reports\-dir%/languages.conf
+ .br 
+@@ -1266,12 +1275,11 @@
  
  .TP 
  \fBAttachment Encoding Charset\fR
@@ -30,7 +46,40 @@
  .SH "Mail archiving and monitoring"
  .TP 
  \fBArchive Mail\fR
-@@ -1725,8 +1724,16 @@
+@@ -1595,22 +1603,24 @@
+ .br 
+ .RS 7
+ .IP  \(bu 4
+-"deliver" \- the message is delivered to the recipient as normal 
++deliver \- the message is delivered to the recipient as normal 
+ .IP  \(bu 4
+-"delete" \- the message is deleted 
++delete \- the message is deleted 
+ .IP  \(bu 4
+-"store" \- the message is stored in the quarantine 
++store \- the message is stored in the quarantine 
+ 
+ .IP  \(bu 4
+-"forward" \- an email address is supplied, to which the message is forwarded 
++forward \- an email address is supplied, to which the message is forwarded 
+ .IP  \(bu 4
+-"notify" \- Send the recipients a short notification that spam addressed to them was not delivered. They can then take action to request retrieval of the orginal message if they think it was not spam.
++notify \- Send the recipients a short notification that spam addressed to them was not delivered. They can then take action to request retrieval of the orginal message if they think it was not spam.
+ .IP  \(bu 4
+-"striphtml" \- convert all in\-line HTML content in the message to be stripped to plain text, which removes all images and scripts and so can be used to protect your users from offensive spam. Note that using this action on its own does not imply that the message will be delivered, you will need to specify "deliver" or "forward" to actually deliver the message. 
++striphtml \- convert all in\-line HTML content in the message to be stripped to plain text, which removes all images and scripts and so can be used to protect your users from offensive spam. Note that using this action on its own does not imply that the message will be delivered, you will need to specify "deliver" or "forward" to actually deliver the message. 
+ .IP  \(bu 4
+-"attachment" \- Convert the original message into an attachment of the message. This means the user has to take an extra step to open the spam, and stops "web bugs" very effectively.
++attachment \- Convert the original message into an attachment of the message. This means the user has to take an extra step to open the spam, and stops "web bugs" very effectively.
+ .IP  \(bu 4
+-"bounce" \- bounce the spam message. This option should not be used and must be enabled with the "Enable Spam Bounce" option first.
++bounce \- bounce the spam message. This option should not be used and must be enabled with the "Enable Spam Bounce" option first.
++.IP  \(bu 4
++header "name: value" \- Add the header "name: value" to the message. name must not contain any spaces.
+ .RE
+ 
+ .TP 
+@@ -1725,8 +1735,16 @@
  
  .br 
  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.
@@ -48,7 +97,7 @@
  
  .TP 
  \fBSpamAssassin User State Dir\fR
-@@ -1734,7 +1741,7 @@
+@@ -1734,7 +1752,7 @@
  .br 
  
  .br 
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 b8ec85079357..dfe4f3f37439 100644
--- a/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html
+++ b/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html
@@ -1,13 +1,13 @@
---- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.conf.5.html	Wed Dec 15 20:31:43 2004
-+++ docs/man/MailScanner.conf.5.html	Wed Dec 15 20:32:12 2004
+--- ../MailScanner-install-4.37.7.orig/docs/man/MailScanner.conf.5.html	Mon Jan 17 13:18:55 2005
++++ docs/man/MailScanner.conf.5.html	Mon Jan 17 13:19:11 2005
 @@ -1,5 +1,5 @@
  <!-- Creator     : groff version 1.19 -->
 -<!-- CreationDate: Fri Oct 22 08:13:20 2004 -->
-+<!-- CreationDate: Mon Nov  1 18:00:15 2004 -->
++<!-- CreationDate: Mon Jan 17 13:18:36 2005 -->
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
  "http://www.w3.org/TR/html4/loose.dtd">
  <html>
-@@ -397,4 +397,5740 @@
+@@ -397,4 +397,5780 @@
  <td width="3%"></td>
  <td width="72%">
  
@@ -1953,6 +1953,33 @@
 +<tr valign="top" align="left">
 +<td width="11%"></td>
 +<td width="89%">
++<p><b>Keep Spam And MCP Archive Clean</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 -->
++<p>Do you want to stop any virus&minus;infected spam getting
++into the spam or MCP archives? If you have a system where
++users can release messages from the spam or MCP archives,
++then you probably want to stop them being able to release
++any infected messages, so set this to yes. It is set to no
++by default as it causes a small hit in performance, and many
++people don&rsquo;t allow users to access the spam
++quarantine, so don&rsquo;t need 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>Language Strings</b></p></td>
 +</table>
 +<!-- INDENTATION -->
@@ -4226,8 +4253,8 @@
 +<td width="5%"></td>
 +<td width="72%">
 +
-+<p>&quot;deliver&quot; &minus; the message is delivered to
-+the recipient as normal</p>
++<p>deliver &minus; the message is delivered to the
++recipient as normal</p>
 +</td>
 +<tr valign="top" align="left">
 +<td width="22%"></td>
@@ -4238,7 +4265,7 @@
 +<td width="5%"></td>
 +<td width="72%">
 +
-+<p>&quot;delete&quot; &minus; the message is deleted</p>
++<p>delete &minus; the message is deleted</p>
 +</td>
 +<tr valign="top" align="left">
 +<td width="22%"></td>
@@ -4249,7 +4276,7 @@
 +<td width="5%"></td>
 +<td width="72%">
 +
-+<p>&quot;store&quot; &minus; the message is stored in the
++<p>store &minus; the message is stored in the
 +quarantine</p>
 +</td>
 +<tr valign="top" align="left">
@@ -4261,8 +4288,8 @@
 +<td width="5%"></td>
 +<td width="72%">
 +
-+<p>&quot;forward&quot; &minus; an email address is
-+supplied, to which the message is forwarded</p>
++<p>forward &minus; an email address is supplied, to which
++the message is forwarded</p>
 +</td>
 +<tr valign="top" align="left">
 +<td width="22%"></td>
@@ -4273,10 +4300,10 @@
 +<td width="5%"></td>
 +<td width="72%">
 +
-+<p>&quot;notify&quot; &minus; Send the recipients a short
-+notification that spam addressed to them was not delivered.
-+They can then take action to request retrieval of the
-+orginal message if they think it was not spam.</p>
++<p>notify &minus; Send the recipients a short notification
++that spam addressed to them was not delivered. They can then
++take action to request retrieval of the orginal message if
++they think it was not spam.</p>
 +</td>
 +<tr valign="top" align="left">
 +<td width="22%"></td>
@@ -4287,12 +4314,12 @@
 +<td width="5%"></td>
 +<td width="72%">
 +
-+<p>&quot;striphtml&quot; &minus; convert all in&minus;line
-+HTML content in the message to be stripped to plain text,
-+which removes all images and scripts and so can be used to
-+protect your users from offensive spam. Note that using this
-+action on its own does not imply that the message will be
-+delivered, you will need to specify &quot;deliver&quot; or
++<p>striphtml &minus; convert all in&minus;line HTML content
++in the message to be stripped to plain text, which removes
++all images and scripts and so can be used to protect your
++users from offensive spam. Note that using this action on
++its own does not imply that the message will be delivered,
++you will need to specify &quot;deliver&quot; or
 +&quot;forward&quot; to actually deliver the message.</p>
 +</td>
 +<tr valign="top" align="left">
@@ -4304,10 +4331,23 @@
 +<td width="5%"></td>
 +<td width="72%">
 +
-+<p>&quot;attachment&quot; &minus; Convert the original
-+message into an attachment of the message. This means the
-+user has to take an extra step to open the spam, and stops
-+&quot;web bugs&quot; very effectively.</p>
++<p>attachment &minus; Convert the original message into an
++attachment of the message. This means the user has to take
++an extra step to open the spam, and stops &quot;web
++bugs&quot; very effectively.</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>bounce &minus; bounce the spam message. This option
++should not be used and must be enabled with the &quot;Enable
++Spam Bounce&quot; option first.</p>
 +</td>
 +<tr valign="top" align="left">
 +<td width="22%"></td>
@@ -4318,9 +4358,9 @@
 +<td width="5%"></td>
 +<td width="72%">
 +
-+<p>&quot;bounce&quot; &minus; bounce the spam message. This
-+option should not be used and must be enabled with the
-+&quot;Enable Spam Bounce&quot; option first.</p>
++<p>header &quot;name: value&quot; &minus; Add the header
++&quot;name: value&quot; to the message. name must not
++contain any spaces.</p>
 +</td>
 +</table>
 +<!-- INDENTATION -->
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index 94c4b8e5b521..e4a7f8e286b0 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -452,6 +452,7 @@ libexec/MailScanner/vexira-wrapper.sample
 %%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
 %%PORTDOCS%%%%DOCSDIR%%/book.cover.gif
 %%PORTDOCS%%%%DOCSDIR%%/building.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs.html
 %%PORTDOCS%%%%DOCSDIR%%/donations.shtml
 %%PORTDOCS%%%%DOCSDIR%%/downloadgraphs.shtml
 %%PORTDOCS%%%%DOCSDIR%%/downloads.shtml