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 Thu Aug 12 14:47:59 2004 +++ /server-root/ports/mail/mailscanner-devel/Makefile Fri Oct 22 08:07:09 2004 @@ -6,7 +6,7 @@ # PORTNAME= MailScanner -PORTVERSION= 4.32.4 +PORTVERSION= 4.35.5 CATEGORIES= mail MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/ PKGNAMESUFFIX= -devel @@ -61,6 +61,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 \ @@ -141,7 +143,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-devel.orig/distinfo /server-root/ports/mail/mailscanner-devel/distinfo --- /server-root/ports/mail/mailscanner-devel.orig/distinfo Wed Jul 28 19:54:28 2004 +++ /server-root/ports/mail/mailscanner-devel/distinfo Fri Oct 22 08:07:28 2004 @@ -1,2 +1,2 @@ -MD5 (MailScanner-install-4.32.4-1.tar.gz) = 477ee1cef68783da3a33706d20283874 -SIZE (MailScanner-install-4.32.4-1.tar.gz) = 5328078 +MD5 (MailScanner-install-4.35.5-1.tar.gz) = 11ee29729d98e315eb3a925cb407251c +SIZE (MailScanner-install-4.35.5-1.tar.gz) = 5266876 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 Wed Jul 28 19:54:28 2004 +++ /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8 Fri Oct 22 08:14:30 2004 @@ -1,26 +1,8 @@ ---- ../MailScanner-install-4.32.4.orig/docs/man/MailScanner.8 Wed Jul 28 13:28:57 2004 -+++ docs/man/MailScanner.8 Wed Jul 28 13:29:39 2004 -@@ -1,10 +1,10 @@ --.TH "MailScanner" "8" "4.32.2" "Julian Field" "Mail" -+.TH "MailScanner" "8" "4.32.4" "Julian Field" "Mail" +--- ../MailScanner-install-4.35.5.orig/docs/man/MailScanner.8 Fri Oct 22 08:13:43 2004 ++++ docs/man/MailScanner.8 Fri Oct 22 08:13:55 2004 +@@ -1,4 +1,4 @@ +-.TH "MailScanner" "8" "4.34.8" "Julian Field" "Mail" ++.TH "MailScanner" "8" "4.35.5" "Julian Field" "Mail" .SH "NAME" .LP MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix - .SH "SYNOPSIS" - .LP --\fBMailScanner\fR [\fIconfigfile\fR] -+\fBMailScanner\fR [\fI\-v\fR] [\fIconfigfile\fR] - - .SH "DESCRIPTION" - .LP -@@ -24,6 +24,10 @@ - - .LP - The main process then spawns \fIn\fR number of child processes. \fIn\fR is configured in [\fIconfigfile\fR] with the option "Max Children". Each process waits for messages to appear in the "Incoming Queue Dir", processes these messages and then puts them in the "Outgoing Queue Dir". You may need to adjust the configuration of your MTA (or the startup of your MTA) to make it work with MailScanner. -+ -+.TP -+\fB\-v\fR -+Prints version information for Mailscanner and all used perl\-modules. - - .SH "MTA SETUP" - .LP 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 Wed Jul 28 19:54:28 2004 +++ /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html Fri Oct 22 08:14:30 2004 @@ -1,42 +1,9 @@ ---- ../MailScanner-install-4.32.4.orig/docs/man/MailScanner.8.html Wed Jul 28 13:28:57 2004 -+++ docs/man/MailScanner.8.html Wed Jul 28 13:29:15 2004 +--- ../MailScanner-install-4.35.5.orig/docs/man/MailScanner.8.html Fri Oct 22 08:13:44 2004 ++++ docs/man/MailScanner.8.html Fri Oct 22 08:13:57 2004 @@ -1,5 +1,5 @@ -- -+ +- ++ -@@ -39,7 +39,8 @@ - - - --

MailScanner [configfile]

-+

MailScanner [−v] -+[configfile]

- - - -@@ -70,6 +71,22 @@ - the "Outgoing Queue Dir". You may need to adjust - the configuration of your MTA (or the startup of your MTA) - to make it work with MailScanner.

-+ -+ -+ -+ -+ -+ -+ -+ -+ -
-+ -+

−v

-+		 -+ -+

Prints version information for Mailscanner and all used -+perl−modules.

-
- 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 Wed Jul 28 19:54:28 2004 +++ /server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5 Fri Oct 22 08:14:30 2004 @@ -1,255 +1,59 @@ ---- ../MailScanner-install-4.32.4.orig/docs/man/MailScanner.conf.5 Wed Jul 28 13:28:57 2004 -+++ docs/man/MailScanner.conf.5 Wed Jul 28 13:29:47 2004 +--- ../MailScanner-install-4.35.5.orig/docs/man/MailScanner.conf.5 Fri Oct 22 08:13:43 2004 ++++ docs/man/MailScanner.conf.5 Fri Oct 22 08:14:01 2004 @@ -1,4 +1,4 @@ --.TH "MailScanner.conf" "5" "4.32.2" "Julian Field" "Mail" -+.TH "MailScanner.conf" "5" "4.32.4" "Julian Field" "Mail" +-.TH "MailScanner.conf" "5" "4.34.8" "Julian Field" "Mail" ++.TH "MailScanner.conf" "5" "4.35.5" "Julian Field" "Mail" .SH "NAME" .LP MailScanner.conf \- Main configuration for MailScanner -@@ -246,7 +246,15 @@ +@@ -485,7 +485,7 @@ .br .br --If you want to create the quarantine/archive so the files are owned by a user othee: If the "Run As User" is not "root" then you cannot change the user but may still be able to change the group, if the "Run As User" is a member of both of the groups "Run As Group" and "Quarantine Group". -+If you want to create the quarantine/archive so the files are owned by a user other than the "Run As User" setting at the top of this file, you can change that here. Note: If the "Run As User" is not "root" then you cannot change the user but may still be able to change the group, if the "Run As User" is a member of both of the groups "Run As Group" and "Quarantine Group". -+ -+.TP -+\fBQuarantine Group\fR -+Default: -+.br -+ -+.br -+If you want to create the quarantine/archive so the files are owned by a user other than the "Run As User" setting at the top of this file, you can change that here. Note: If the "Run As User" is not "root" then you cannot change the user but may still be able to change the group, if the "Run As User" is a member of both of the groups "Run As Group" and "Quarantine Group". - - .TP - \fBQuarantine Permissions\fR -@@ -440,7 +448,23 @@ - .br - - .br --The director of these files for changes in size to detect when a Sophos update has happened. The date of the Sophos Lib Dir is also monitored. This is only used by the "sophossavi" virus scanner, not the "sophos" scanner setting. -+The directory (or a link to it) containing all the Sophos *.ide files. This is only used by the "sophossavi" virus scanner, and is irrelevant for all other scanners. -+ -+.TP -+\fBSophos Lib Dir\fR -+Default: /usr/local/Sophos/lib -+.br -+ -+.br -+The directory (or a link to it) containing all the Sophos *.so libraries.This is only used by the "sophossavi" virus scanner, and is irrelevant for all other scanners. -+ -+.TP -+\fBMonitors For Sophos Updates\fR -+Default: /usr/local/Sophos/ide/*ides.zip -+.br -+ -+.br -+SophosSAVI only: monitor each of these files for changes in size to detect when a Sophos update has happened. The date of the Sophos Lib Dir is also monitored. This is only used by the "sophossavi" virus scanner, not the "sophos" scanner setting. - - .SH "Virus scanning and vulnerability testing" - .TP -@@ -461,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) -+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. - .br - - .br -@@ -470,6 +494,10 @@ - - .br - Note: If you want to use multiple virus scanners, then this should be a space\-separated list of virus scanners. -+.br -+ -+.br -+Note: Make sure that you check that the base installation directory in the 3rd column of virus.scanners.conf matches the location you have installed each of your virus scanners. The supplied virus.scanners.conf file assumes the default installation locations recommended by each of the virus scanner installation guides. - - .TP - \fBVirus Scanner Timeout\fR -@@ -594,7 +622,28 @@ - .IP \(bu 4 - no => Ban messages containing these tags - .IP \(bu 4 --disarm => Allow these tags, but stop these tags from fR -+disarm => Allow these tags, but stop these tags from working -+.RE -+ -+.TP -+\fBAllow Script Tags\fR -+Default: no -+.br -+ -+.br -+Do you want to allow