Attachment 50077 Details for Bug 76357 – MailScanner-devel-4.38.2.patch

[patch] MailScanner-devel-4.38.2.patch

MailScanner-devel-4.38.2.patch (text/plain), 17.95 KB, created by Jan-Peter Koopmann on 2005-01-17 16:20:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan-Peter Koopmann

Created: 2005-01-17 16:20:25 UTC

Size: 17.95 KB

patch

obsolete

>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/Makefile /server-root/ports/mail/mailscanner-devel/Makefile
>--- /server-root/ports/mail/mailscanner-devel.orig/Makefile	Wed Dec 22 12:42:09 2004
>+++ /server-root/ports/mail/mailscanner-devel/Makefile	Mon Jan 17 15:46:29 2005
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	MailScanner
>-PORTVERSION=	4.37.3
>-PORTREVISION=	1
>+PORTVERSION=	4.38.2
> CATEGORIES=	mail
> MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
> PKGNAMESUFFIX=	-devel
>@@ -250,5 +249,12 @@
> 		${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 -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/distinfo /server-root/ports/mail/mailscanner-devel/distinfo
>--- /server-root/ports/mail/mailscanner-devel.orig/distinfo	Fri Dec 17 09:24:24 2004
>+++ /server-root/ports/mail/mailscanner-devel/distinfo	Mon Jan 17 15:46:37 2005
>@@ -1,2 +1,2 @@
>-MD5 (MailScanner-install-4.37.3-1.tar.gz) = 27033636c42193a1f9dd3417d1533d16
>-SIZE (MailScanner-install-4.37.3-1.tar.gz) = 5628665
>+MD5 (MailScanner-install-4.38.2-1.tar.gz) = d3849865be7518c1b3d5915df9753a48
>+SIZE (MailScanner-install-4.38.2-1.tar.gz) = 5618312
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.8 /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
>--- /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.8	Fri Dec 17 09:24:24 2004
>+++ /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8	Mon Jan 17 15:54:21 2005
>@@ -1,8 +1,8 @@
>---- ../MailScanner-install-4.37.3.orig/docs/man/MailScanner.8	Wed Dec 15 21:17:17 2004
>-+++ docs/man/MailScanner.8	Wed Dec 15 21:29:54 2004
>+--- ../MailScanner-install-4.38.2.orig/docs/man/MailScanner.8	Mon Jan 17 15:49:00 2005
>++++ docs/man/MailScanner.8	Mon Jan 17 15:54:03 2005
> @@ -1,4 +1,4 @@
> -.TH "MailScanner" "8" "4.34.8" "Julian Field" "Mail"
>-+.TH "MailScanner" "8" "4.37.3" "Julian Field" "Mail"
>++.TH "MailScanner" "8" "4.38.2" "Julian Field" "Mail"
> .SH "NAME"
> .LP 
> MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.8.html /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html
>--- /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.8.html	Fri Dec 17 09:24:24 2004
>+++ /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html	Mon Jan 17 15:54:21 2005
>@@ -1,9 +1,9 @@
>---- ../MailScanner-install-4.37.3.orig/docs/man/MailScanner.8.html	Wed Dec 15 21:17:17 2004
>-+++ docs/man/MailScanner.8.html	Wed Dec 15 21:29:56 2004
>+--- ../MailScanner-install-4.38.2.orig/docs/man/MailScanner.8.html	Mon Jan 17 15:49:00 2005
>++++ docs/man/MailScanner.8.html	Mon Jan 17 15:54:04 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-devel.orig/files/patch-docs:man:MailScanner.conf.5 /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
>--- /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.conf.5	Fri Dec 17 09:24:24 2004
>+++ /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5	Mon Jan 17 15:54:21 2005
>@@ -1,8 +1,8 @@
>---- ../MailScanner-install-4.37.3.orig/docs/man/MailScanner.conf.5	Wed Dec 15 21:17:17 2004
>-+++ docs/man/MailScanner.conf.5	Wed Dec 15 21:30:00 2004
>+--- ../MailScanner-install-4.38.2.orig/docs/man/MailScanner.conf.5	Mon Jan 17 15:49:00 2005
>++++ docs/man/MailScanner.conf.5	Mon Jan 17 15:54:08 2005
> @@ -1,4 +1,4 @@
> -.TH "MailScanner.conf" "5" "4.34.8" "Julian Field" "Mail"
>-+.TH "MailScanner.conf" "5" "4.37.3" "Julian Field" "Mail"
>++.TH "MailScanner.conf" "5" "4.38.2" "Julian Field" "Mail"
> .SH "NAME"
> .LP 
> MailScanner.conf \- Main configuration for MailScanner
>@@ -15,7 +15,31 @@
> .br 
> 
> .br 
>-@@ -781,6 +781,15 @@
>+@@ -585,13 +585,22 @@
>+ 
>+ .TP 
>+ \fBFind Phishing Fraud\fR
>+-Default: no
>++Default: yes
>+ .br 
>+ 
>+ .br 
>+ Do you want to check for "Phishing" attacks? These are attacks that look like a genuine email message from your bank, which contain a link to click on to take you to the web site where you will be asked to type in personal information such as your account number or credit card details. Except it is not the real bank's web site at all, it is a very good copy of it run by thieves who want to steal your personal information or credit card details. These can be spotted because the real address of the link in the message is not the same as the text that appears to be the link. Note: This does cause significant extra load, particularly on systems receiving lots of spam such as secondary MX hosts. This *cannot* be the filename of a ruleset, it must be 'yes' or 'no'.
>+ 
>+ .TP 
>++\fBAlso Find Numeric Phishing\fR
>++Default: yes
>++.br 
>++
>++.br 
>++While detecting "Phishing" attacks, do you also want to point out links to numeric IP addresses. Genuine links to totally numeric IP addresses are very rare, so this option is set to "yes" by default. If a numeric IP address is found in a link, the same phishing warning message is used as in the Find Phishing Fraud option above. This value cannot be the name of a ruleset, only a simple yes or no.
>++
>++
>++.TP 
>+ \fBAllow IFrame Tags\fR
>+ Default: no
>+ .br 
>+@@ -781,6 +790,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 
>@@ -31,7 +55,7 @@
> \fBLanguage Strings\fR
> Default: %reports\-dir%/languages.conf
> .br 
>-@@ -1266,12 +1275,11 @@
>+@@ -1266,12 +1284,11 @@
> 
> .TP 
> \fBAttachment Encoding Charset\fR
>@@ -46,7 +70,53 @@
> .SH "Mail archiving and monitoring"
> .TP 
> \fBArchive Mail\fR
>-@@ -1725,8 +1733,16 @@
>+@@ -1294,9 +1311,10 @@
>+ 
>+ .br 
>+ If you give this option a ruleset, you can control exactly whose mail is archived or forwarded. If you do this, beware of the legal implications as this could be deemed to be illegal interception unless the police have asked you to do this.
>++.br 
>+ 
>+-
>+-
>++.br 
>++Any of the items above can contain the magic string _DATE_ in them which will be replaced with the current date in yyyymmdd format. This will make archive\-rolling and maintenance much easier, as you can guarantee that yesterday's mail archive will not be in active use today.
>+ .SH "Notices to system administrators"
>+ .TP 
>+ \fBSend Notices\fR
>+@@ -1595,22 +1613,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 +1745,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.
>@@ -64,7 +134,7 @@
> 
> .TP 
> \fBSpamAssassin User State Dir\fR
>-@@ -1734,7 +1750,7 @@
>+@@ -1734,7 +1762,7 @@
> .br 
> 
> .br 
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.conf.5.html /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html
>--- /server-root/ports/mail/mailscanner-devel.orig/files/patch-docs:man:MailScanner.conf.5.html	Fri Dec 17 09:24:24 2004
>+++ /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html	Mon Jan 17 15:54:21 2005
>@@ -1,13 +1,13 @@
>---- ../MailScanner-install-4.37.3.orig/docs/man/MailScanner.conf.5.html	Wed Dec 15 21:17:17 2004
>-+++ docs/man/MailScanner.conf.5.html	Wed Dec 15 21:30:02 2004
>+--- ../MailScanner-install-4.38.2.orig/docs/man/MailScanner.conf.5.html	Mon Jan 17 15:49:00 2005
>++++ docs/man/MailScanner.conf.5.html	Mon Jan 17 15:54:10 2005
> @@ -1,5 +1,5 @@
> 
> -
>-+
>++
> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
> "http://www.w3.org/TR/html4/loose.dtd">
> <html>
>-@@ -397,4 +397,5767 @@
>+@@ -397,4 +397,5813 @@
> <td width="3%"></td>
> <td width="72%">
> 
>@@ -1326,7 +1326,7 @@
> +<tr valign="top" align="left">
> +<td width="22%"></td>
> +<td width="78%">
>-+Default: no
>++Default: yes
> +
> +Do you want to check for &quot;Phishing&quot; attacks?
> +These are attacks that look like a genuine email message
>@@ -1351,6 +1351,32 @@
> +<tr valign="top" align="left">
> +<td width="11%"></td>
> +<td width="89%">
>++Also Find Numeric Phishing</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%">
>++Default: yes
>++
>++While detecting &quot;Phishing&quot; attacks, do you also
>++want to point out links to numeric IP addresses. Genuine
>++links to totally numeric IP addresses are very rare, so this
>++option is set to &quot;yes&quot; by default. If a numeric IP
>++address is found in a link, the same phishing warning
>++message is used as in the Find Phishing Fraud option above.
>++This value cannot be the name of a ruleset, only a simple
>++yes or no.
>++</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%">
> +Allow IFrame Tags</td>
> +</table>
> +
>@@ -3418,6 +3444,13 @@
> +beware of the legal implications as this could be deemed to
> +be illegal interception unless the police have asked you to
> +do this.
>++
>++Any of the items above can contain the magic string
>++_DATE_ in them which will be replaced with the current date
>++in yyyymmdd format. This will make archive&minus;rolling and
>++maintenance much easier, as you can guarantee that
>++yesterday&rsquo;s mail archive will not be in active use
>++today.
> +</td>
> +</table>
> +<a name="Notices to system administrators"></a>
>@@ -4253,8 +4286,8 @@
> +<td width="5%"></td>
> +<td width="72%">
> +
>-+&quot;deliver&quot; &minus; the message is delivered to
>-+the recipient as normal
>++deliver &minus; the message is delivered to the
>++recipient as normal
> +</td>
> +<tr valign="top" align="left">
> +<td width="22%"></td>
>@@ -4265,7 +4298,7 @@
> +<td width="5%"></td>
> +<td width="72%">
> +
>-+&quot;delete&quot; &minus; the message is deleted
>++delete &minus; the message is deleted
> +</td>
> +<tr valign="top" align="left">
> +<td width="22%"></td>
>@@ -4276,7 +4309,7 @@
> +<td width="5%"></td>
> +<td width="72%">
> +
>-+&quot;store&quot; &minus; the message is stored in the
>++store &minus; the message is stored in the
> +quarantine
> +</td>
> +<tr valign="top" align="left">
>@@ -4288,8 +4321,8 @@
> +<td width="5%"></td>
> +<td width="72%">
> +
>-+&quot;forward&quot; &minus; an email address is
>-+supplied, to which the message is forwarded
>++forward &minus; an email address is supplied, to which
>++the message is forwarded
> +</td>
> +<tr valign="top" align="left">
> +<td width="22%"></td>
>@@ -4300,10 +4333,10 @@
> +<td width="5%"></td>
> +<td width="72%">
> +
>-+&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.
>++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.
> +</td>
> +<tr valign="top" align="left">
> +<td width="22%"></td>
>@@ -4314,12 +4347,12 @@
> +<td width="5%"></td>
> +<td width="72%">
> +
>-+&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
>++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.
> +</td>
> +<tr valign="top" align="left">
>@@ -4331,10 +4364,23 @@
> +<td width="5%"></td>
> +<td width="72%">
> +
>-+&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.
>++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.
>++</td>
>++<tr valign="top" align="left">
>++<td width="22%"></td>
>++<td width="1%">
>++
>++&bull;
>++</td>
>++<td width="5%"></td>
>++<td width="72%">
>++
>++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.
> +</td>
> +<tr valign="top" align="left">
> +<td width="22%"></td>
>@@ -4345,9 +4391,9 @@
> +<td width="5%"></td>
> +<td width="72%">
> +
>-+&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.
>++header &quot;name: value&quot; &minus; Add the header
>++&quot;name: value&quot; to the message. name must not
>++contain any spaces.
> +</td>
> +</table>
> +
>diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner-devel.orig/pkg-message /server-root/ports/mail/mailscanner-devel/pkg-message
>--- /server-root/ports/mail/mailscanner-devel.orig/pkg-message	Fri Dec 17 09:24:24 2004
>+++ /server-root/ports/mail/mailscanner-devel/pkg-message	Mon Jan 17 15:39:10 2005
>@@ -31,10 +31,6 @@
> 	to update your virus-wrappers, autoupdates, reports and
> 	languages.conf
> 
>-	The english languages.conf is updated automatically. For all
>-	other versions use the update_languages_conf tool found
>-	in the work directory of this port.
>-
> 	Sophos users: Please take a look at the Sophos install
> 	script %%PREFIX%%/share/doc/MailScanner/Sophos.install.freebsd

Actions: View | Diff

Attachments on bug 76357: 50077