diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/Makefile /server-root/ports/mail/mailscanner/Makefile
--- /server-root/ports/mail/mailscanner.orig/Makefile Thu Sep 2 15:27:44 2004
+++ /server-root/ports/mail/mailscanner/Makefile Fri Oct 15 16:33:31 2004
@@ -6,7 +6,7 @@
#
PORTNAME= MailScanner
-PORTVERSION= 4.33.3
+PORTVERSION= 4.34.8
CATEGORIES= mail
MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -34,7 +34,7 @@
CONFLICTS= MailScanner-devel-*
-PATCHLEVEL= 1
+PATCHLEVEL= 4
USE_PERL5= yes
@@ -60,6 +60,8 @@
ETC_FILES= MailScanner.conf filename.rules.conf \
filetype.rules.conf spam.assassin.prefs.conf \
spam.lists.conf virus.scanners.conf
+MCP_FILES= mcp.spam.assassin.prefs.conf \
+ 10_example.cf
USRLOCAL_FILES_LIB= \
bitdefender-autoupdate f-prot-autoupdate \
f-secure-wrapper inoculan-autoupdate \
@@ -140,7 +142,12 @@
${INSTALL_DATA} EXAMPLES README ${PREFIX}/etc/MailScanner/rules
${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules.sample
-
+ ${MKDIR} ${PREFIX}/etc/MailScanner/mcp
+ ${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner/mcp
+.for FILE in ${MCP_FILES}
+ ${INSTALL_DATA} ${WRKSRC}/etc/mcp/${FILE} \
+ ${PREFIX}/etc/MailScanner/mcp/${FILE}.sample
+.endfor
#
# Step 3: Install files in share
#
diff -ruN --exclude=CVS /server-root/ports/mail/mailscanner.orig/distinfo /server-root/ports/mail/mailscanner/distinfo
--- /server-root/ports/mail/mailscanner.orig/distinfo Thu Sep 2 15:27:44 2004
+++ /server-root/ports/mail/mailscanner/distinfo Fri Oct 15 15:06:30 2004
@@ -1,2 +1,2 @@
-MD5 (MailScanner-install-4.33.3-1.tar.gz) = a1b1a5e297c849f430c91b12ced59f7a
-SIZE (MailScanner-install-4.33.3-1.tar.gz) = 5339017
+MD5 (MailScanner-install-4.34.8-4.tar.gz) = 417c30ea6628785a3b32d30ade785e54
+SIZE (MailScanner-install-4.34.8-4.tar.gz) = 5277580
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 Sun Aug 8 19:16:18 2004
+++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8 Fri Oct 15 16:50:44 2004
@@ -1,8 +1,8 @@
---- ../MailScanner-install-4.32.5.orig/docs/man/MailScanner.8 Mon Aug 2 12:40:19 2004
-+++ docs/man/MailScanner.8 Mon Aug 2 12:40:48 2004
+--- ../MailScanner-install-4.34.8.orig/docs/man/MailScanner.8 Fri Oct 15 16:50:11 2004
++++ docs/man/MailScanner.8 Fri Oct 15 16:50:24 2004
@@ -1,4 +1,4 @@
-.TH "MailScanner" "8" "4.32.4" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.32.5" "Julian Field" "Mail"
++.TH "MailScanner" "8" "4.34.8" "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 Thu Jan 1 01:00:00 1970
+++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8.html Fri Oct 15 16:50:44 2004
@@ -0,0 +1,9 @@
+--- ../MailScanner-install-4.34.8.orig/docs/man/MailScanner.8.html Fri Oct 15 16:50:11 2004
++++ docs/man/MailScanner.8.html Fri Oct 15 16:50:27 2004
+@@ -1,5 +1,5 @@
+
+-
++
+
+
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 Sun Aug 8 19:16:18 2004
+++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 Fri Oct 15 16:50:44 2004
@@ -1,8 +1,81 @@
---- ../MailScanner-install-4.32.5.orig/docs/man/MailScanner.conf.5 Mon Aug 2 12:40:19 2004
-+++ docs/man/MailScanner.conf.5 Mon Aug 2 12:40:58 2004
+--- ../MailScanner-install-4.34.8.orig/docs/man/MailScanner.conf.5 Fri Oct 15 16:50:11 2004
++++ docs/man/MailScanner.conf.5 Fri Oct 15 16:50:30 2004
@@ -1,4 +1,4 @@
-.TH "MailScanner.conf" "5" "4.32.4" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.32.5" "Julian Field" "Mail"
++.TH "MailScanner.conf" "5" "4.34.8" "Julian Field" "Mail"
.SH "NAME"
.LP
MailScanner.conf \- Main configuration for MailScanner
+@@ -485,7 +485,7 @@
+ .br
+
+ .br
+-Which Virus Scanning package to use. Possible choices are sophos, sophossavi, mcafee, command, bitdefender, kaspersky, kaspersky\-4.5, kavdaemonclient, inoculate, inoculan, nod32, nod32\-1.99, f\-secure, f\-prot, panda, rav, antivir, clamav, clamavmodule, css, trend, norman, avg, vexira, none (no virus scanning at all). This *cannot* be the filename of a ruleset.
++Which Virus Scanning package to use. Possible choices are sophos, sophossavi, mcafee, command, bitdefender, kaspersky, kaspersky\-4.5, kavdaemonclient, inoculate, inoculan, nod32, nod32\-1.99, f\-secure, f\-prot, panda, rav, antivir, clamav, clamavmodule, css, trend, norman, avg, vexira, symscanengine, generic, none (no virus scanning at all). This *cannot* be the filename of a ruleset.
+ .br
+
+ .br
+@@ -584,6 +584,14 @@
+ Setting this option to yes is \fBvery dangerous\fR as it can let viruses in from remote "message body servers".
+
+ .TP
++\fBFind Phishing Fraud\fR
++Default: no
++.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
+ \fBAllow IFrame Tags\fR
+ Default: no
+ .br
+@@ -1083,6 +1091,15 @@
+ This supplies the text that is placed in the "Mail Header" of messages that have not been scanned, if the option "Mark Unscanned Messages" is set. It is a useful place to advertise your MailScanner service to new customers/clients.
+
+ .TP
++\fBRemove These Headers\fR
++Default:
++.br
++
++.br
++If any of these headers are included in a a message, they will be deleted. This is very useful for removing return\-receipt requests and any headers which mean special things to your email client application, such as # X\-Mozilla\-Status. Each header should end in a ":", but MailScanner will add it if you forget. Headers should be separated by commas or spaces. This can also be the filename of a ruleset.
++
++
++.TP
+ \fBDeliver Cleaned Messages\fR
+ Default: yes
+ .br
+@@ -1249,12 +1266,11 @@
+
+ .TP
+ \fBAttachment Encoding Charset\fR
+-Default: us\-ascii
++Default: ISO\-8859\-1
+ .br
+
+ .br
+-This is the name of the encoding character set used for the contents of "VirusWarning.txt" attachments. If your users do not use English as their preferred language, you may want to set this to "ISO\-8859\-1".
+-
++This is the name of the encoding character set used for the contents of "VirusWarning.txt" attachments.
+ .SH "Mail archiving and monitoring"
+ .TP
+ \fBArchive Mail\fR
+@@ -1709,7 +1725,7 @@
+ .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.
+ .SH "Advanced SpamAssassin Settings"
+-If you are using Postfix you may well need to use some of the settings below, as the home directory for the "postfix" user cannot be written to by the "postfix" user. You may also need to use these if you have installed SpamAssassin somewhere other than the default location.
++If you are using Postfix you may well need to use some of the settings below, as the home directory for the "postfix" user cannot be written to by the "postfix" user. You may also need to use these if you have installed SpamAssassin somewhere other than the default location.
+
+ .TP
+ \fBSpamAssassin User State Dir\fR
+@@ -1717,7 +1733,7 @@
+ .br
+
+ .br
+-The per\-user files (bayes, auto\-whitelist, user_prefs) are looked for here and in ~/.spamassassin/. Note the files are mutable. If this is unset then no extra places are searched for. If using Postfix, you probably want to set this to /var/spool/MailScanner/spamassassin and do
++The per\-user files (bayes, auto\-whitelist, user_prefs) are looked for here and in ~/.spamassassin/. Note the files are mutable. If this is unset then no extra places are searched for. NOTE: SpamAssassin is always called from MailScanner as the same user, and that is the "Run As" user specified in MailScanner.conf. So you can only have 1 set of "per\-user" files, it's just that you might possibly need to modify this location. You should not normally need to set this at all. If using Postfix, you probably want to set this to /var/spool/MailScanner/spamassassin and do
+
+ .RS 10
+ mkdir /var/spool/MailScanner/spamassassin
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 Thu Jan 1 01:00:00 1970
+++ /server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html Fri Oct 15 16:50:44 2004
@@ -0,0 +1,129 @@
+--- ../MailScanner-install-4.34.8.orig/docs/man/MailScanner.conf.5.html Fri Oct 15 16:50:11 2004
++++ docs/man/MailScanner.conf.5.html Fri Oct 15 16:50:32 2004
+@@ -1,5 +1,5 @@
+
+-
++
+
+
+@@ -1389,8 +1389,9 @@
+ kaspersky−4.5, kavdaemonclient, inoculate, inoculan,
+ nod32, nod32−1.99, f−secure, f−prot,
+ panda, rav, antivir, clamav, clamavmodule, css, trend,
+-norman, avg, vexira, none (no virus scanning at all). This
+-*cannot* be the filename of a ruleset.
++norman, avg, vexira, symscanengine, generic, none (no virus
++scanning at all). This *cannot* be the filename of a
++ruleset.
+
+ Note for McAfee users: Do NOT use any symlinks with
+ McAfee at all. It is very strange but McAfee may not detect
+@@ -1701,6 +1702,39 @@
+
+ |
+
++ Find Phishing Fraud |
++
++
++
++
++ |
++
++ Default: no
++
++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’.
++ |
++
++
++
++
++ |
++
+ Allow IFrame Tags |
+
+
+@@ -3186,6 +3220,32 @@
+
+ |
+
++ Remove These Headers |
++
++
++
++
++ |
++
++ Default:
++
++If any of these headers are included in a a message, they
++will be deleted. This is very useful for removing
++return−receipt requests and any headers which mean
++special things to your email client application, such as #
++X−Mozilla−Status. Each header should end in a
++":", but MailScanner will add it if you forget.
++Headers should be separated by commas or spaces. This can
++also be the filename of a ruleset.
++ |
++
++
++
++
++ |
++
+ Deliver Cleaned Messages |
+
+
+@@ -3650,13 +3710,11 @@
+
+ |
+
+- Default: us−ascii
++Default: ISO−8859−1
+
+ This is the name of the encoding character set used for
+-the contents of "VirusWarning.txt" attachments. If
+-your users do not use English as their preferred language,
+-you may want to set this to
+-"ISO−8859−1".
++the contents of "VirusWarning.txt"
++attachments.
+ |
+
+
+@@ -5007,9 +5065,14 @@
+ The per−user files (bayes, auto−whitelist,
+ user_prefs) are looked for here and in ~/.spamassassin/.
+ Note the files are mutable. If this is unset then no extra
+-places are searched for. If using Postfix, you probably want
+-to set this to /var/spool/MailScanner/spamassassin and
+-do
++places are searched for. NOTE: SpamAssassin is always called
++from MailScanner as the same user, and that is the "Run
++As" user specified in MailScanner.conf. So you can only
++have 1 set of "per−user" files, it’s
++just that you might possibly need to modify this location.
++You should not normally need to set this at all. If using
++Postfix, you probably want to set this to
++/var/spool/MailScanner/spamassassin and do
+
+
+
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 Thu Sep 2 15:27:44 2004
+++ /server-root/ports/mail/mailscanner/pkg-plist Fri Oct 15 16:34:40 2004
@@ -2,6 +2,8 @@
etc/MailScanner/MailScanner.conf.sample
etc/MailScanner/filename.rules.conf.sample
etc/MailScanner/filetype.rules.conf.sample
+etc/MailScanner/mcp/mcp.spam.assassin.prefs.conf.sample
+etc/MailScanner/mcp/10_example.cf.sample
etc/MailScanner/rules/EXAMPLES
etc/MailScanner/rules/README
etc/MailScanner/rules/spam.whitelist.rules.sample
@@ -44,6 +46,8 @@
lib/MailScanner/MailScanner/ZMailer.pm
lib/MailScanner/MailScanner/notes.txt
lib/MailScanner/MailScanner/CustomFunctions/MyExample.pm
+libexec/MailScanner/generic-wrapper.sample
+libexec/MailScanner/generic-autoupdate.sample
libexec/MailScanner/MailScanner
libexec/MailScanner/antivir-autoupdate.sample
libexec/MailScanner/antivir-wrapper.sample
@@ -478,10 +482,13 @@
%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.60
%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.61
%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.63
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.3.0.0
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Message.pm.patch.3.0.0
%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.55
%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.60
%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.61
%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.63
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.3.0.0
%%PORTDOCS%%%%DOCSDIR%%/install/mcp/index.html
%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch.txt
%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch2.txt
@@ -522,6 +529,8 @@
%%PORTDOCS%%%%DOCSDIR%%/support.html
%%PORTDOCS%%%%DOCSDIR%%/transtec.logo.gif
%%PORTDOCS%%%%DOCSDIR%%/users.shtml
+%%PORTDOCS%%%%DOCSDIR%%/book.cover.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.new.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%/qmail
%%PORTDOCS%%@dirrm %%DOCSDIR%%/man
%%PORTDOCS%%@dirrm %%DOCSDIR%%/install/tcp
@@ -551,5 +560,6 @@
@dirrm lib/MailScanner/MailScanner/CustomFunctions
@dirrm lib/MailScanner/MailScanner
@dirrm lib/MailScanner
+@dirrm etc/MailScanner/mcp
@dirrm etc/MailScanner/rules
@dirrm etc/MailScanner