Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/Makefile,v retrieving revision 1.41 diff -u -r1.41 Makefile --- Makefile 23 Oct 2005 02:41:18 -0000 1.41 +++ Makefile 12 Dec 2005 17:06:45 -0000 @@ -6,7 +6,7 @@ # PORTNAME= MailScanner -PORTVERSION= 4.46.2 +PORTVERSION= 4.48.4 CATEGORIES= mail MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/ DISTNAME= ${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL} @@ -232,6 +232,21 @@ fi; \ done @${CAT} ${PKGMESSAGE} + +.if !defined(NO_SPAMASSASSIN_SYMLINK) +post-install: + @if [ -d ${PREFIX}/etc/mail/spamassassin ]; then \ + if [ ! -r ${PREFIX}/etc/mail/spamassassin/mailscanner.cf ]; then \ + if [ ! -r ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf ]; then \ + ${CP} ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf.sample ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf; \ + fi; \ + ${ECHO} ${LN} -s ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf ${PREFIX}/etc/mail/spamassassin/mailscanner.cf; \ + ${LN} -s ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf ${PREFIX}/etc/mail/spamassassin/mailscanner.cf; \ + else \ + ${ECHO} "File ${PREFIX}/etc/mail/spamassassin/mailscanner.cf already exists!"; \ + fi; \ + fi +.endif renew-wrapper: install # Renew virus wrapper scripts Index: distinfo =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/distinfo,v retrieving revision 1.28 diff -u -r1.28 distinfo --- distinfo 23 Oct 2005 02:41:18 -0000 1.28 +++ distinfo 12 Dec 2005 17:06:45 -0000 @@ -1,2 +1,2 @@ -MD5 (MailScanner-install-4.46.2-2.tar.gz) = 71cc984d0b8588fbe8d10936bd240333 -SIZE (MailScanner-install-4.46.2-2.tar.gz) = 5428009 +MD5 (MailScanner-install-4.48.4-2.tar.gz) = d787daabb0a75f369bd1037256307909 +SIZE (MailScanner-install-4.48.4-2.tar.gz) = 5434134 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/pkg-plist,v retrieving revision 1.25 diff -u -r1.25 pkg-plist --- pkg-plist 23 Oct 2005 02:41:18 -0000 1.25 +++ pkg-plist 12 Dec 2005 17:06:45 -0000 @@ -97,6 +97,7 @@ libexec/MailScanner/update_virus_scanners libexec/MailScanner/vexira-autoupdate.sample libexec/MailScanner/vexira-wrapper.sample +%%DATADIR%%/reports/ca/rejection.report.txt.sample %%DATADIR%%/reports/ca/deleted.content.message.txt.sample %%DATADIR%%/reports/ca/deleted.filename.message.txt.sample %%DATADIR%%/reports/ca/deleted.virus.message.txt.sample @@ -134,6 +135,7 @@ %%DATADIR%%/reports/cy+en/recipient.mcp.report.txt.sample %%DATADIR%%/reports/cy+en/recipient.spam.report.txt.sample %%DATADIR%%/reports/cy+en/sender.content.report.txt.sample +%%DATADIR%%/reports/cy+en/rejection.report.txt.sample %%DATADIR%%/reports/cy+en/sender.error.report.txt.sample %%DATADIR%%/reports/cy+en/sender.filename.report.txt.sample %%DATADIR%%/reports/cy+en/sender.mcp.report.txt.sample @@ -159,6 +161,7 @@ %%DATADIR%%/reports/cz/recipient.mcp.report.txt.sample %%DATADIR%%/reports/cz/recipient.spam.report.txt.sample %%DATADIR%%/reports/cz/sender.content.report.txt.sample +%%DATADIR%%/reports/cz/rejection.report.txt.sample %%DATADIR%%/reports/cz/sender.error.report.txt.sample %%DATADIR%%/reports/cz/sender.filename.report.txt.sample %%DATADIR%%/reports/cz/sender.mcp.report.txt.sample @@ -183,6 +186,7 @@ %%DATADIR%%/reports/de/recipient.mcp.report.txt.sample %%DATADIR%%/reports/de/recipient.spam.report.txt.sample %%DATADIR%%/reports/de/sender.content.report.txt.sample +%%DATADIR%%/reports/de/rejection.report.txt.sample %%DATADIR%%/reports/de/sender.error.report.txt.sample %%DATADIR%%/reports/de/sender.filename.report.txt.sample %%DATADIR%%/reports/de/sender.mcp.report.txt.sample @@ -206,6 +210,7 @@ %%DATADIR%%/reports/dk/recipient.mcp.report.txt.sample %%DATADIR%%/reports/dk/recipient.spam.report.txt.sample %%DATADIR%%/reports/dk/sender.content.report.txt.sample +%%DATADIR%%/reports/dk/rejection.report.txt.sample %%DATADIR%%/reports/dk/sender.error.report.txt.sample %%DATADIR%%/reports/dk/sender.filename.report.txt.sample %%DATADIR%%/reports/dk/sender.mcp.report.txt.sample @@ -229,6 +234,7 @@ %%DATADIR%%/reports/en/recipient.mcp.report.txt.sample %%DATADIR%%/reports/en/recipient.spam.report.txt.sample %%DATADIR%%/reports/en/sender.content.report.txt.sample +%%DATADIR%%/reports/en/rejection.report.txt.sample %%DATADIR%%/reports/en/sender.error.report.txt.sample %%DATADIR%%/reports/en/sender.filename.report.txt.sample %%DATADIR%%/reports/en/sender.mcp.report.txt.sample @@ -251,6 +257,7 @@ %%DATADIR%%/reports/es/languages.conf.sample %%DATADIR%%/reports/es/recipient.mcp.report.txt.sample %%DATADIR%%/reports/es/recipient.spam.report.txt.sample +%%DATADIR%%/reports/es/rejection.report.txt.sample %%DATADIR%%/reports/es/sender.content.report.txt.sample %%DATADIR%%/reports/es/sender.error.report.txt.sample %%DATADIR%%/reports/es/sender.filename.report.txt.sample @@ -274,6 +281,7 @@ %%DATADIR%%/reports/fr/languages.conf.sample %%DATADIR%%/reports/fr/recipient.mcp.report.txt.sample %%DATADIR%%/reports/fr/recipient.spam.report.txt.sample +%%DATADIR%%/reports/fr/rejection.report.txt.sample %%DATADIR%%/reports/fr/sender.content.report.txt.sample %%DATADIR%%/reports/fr/sender.error.report.txt.sample %%DATADIR%%/reports/fr/sender.filename.report.txt.sample @@ -297,6 +305,7 @@ %%DATADIR%%/reports/hu/languages.conf.sample %%DATADIR%%/reports/hu/recipient.mcp.report.txt.sample %%DATADIR%%/reports/hu/recipient.spam.report.txt.sample +%%DATADIR%%/reports/hu/rejection.report.txt.sample %%DATADIR%%/reports/hu/sender.content.report.txt.sample %%DATADIR%%/reports/hu/sender.error.report.txt.sample %%DATADIR%%/reports/hu/sender.filename.report.txt.sample @@ -320,6 +329,7 @@ %%DATADIR%%/reports/it/languages.conf.sample %%DATADIR%%/reports/it/recipient.mcp.report.txt.sample %%DATADIR%%/reports/it/recipient.spam.report.txt.sample +%%DATADIR%%/reports/it/rejection.report.txt.sample %%DATADIR%%/reports/it/sender.content.report.txt.sample %%DATADIR%%/reports/it/sender.error.report.txt.sample %%DATADIR%%/reports/it/sender.filename.report.txt.sample @@ -343,6 +353,7 @@ %%DATADIR%%/reports/nl/languages.conf.sample %%DATADIR%%/reports/nl/recipient.mcp.report.txt.sample %%DATADIR%%/reports/nl/recipient.spam.report.txt.sample +%%DATADIR%%/reports/nl/rejection.report.txt.sample %%DATADIR%%/reports/nl/sender.content.report.txt.sample %%DATADIR%%/reports/nl/sender.error.report.txt.sample %%DATADIR%%/reports/nl/sender.filename.report.txt.sample @@ -366,6 +377,7 @@ %%DATADIR%%/reports/pt_br/languages.conf.sample %%DATADIR%%/reports/pt_br/recipient.mcp.report.txt.sample %%DATADIR%%/reports/pt_br/recipient.spam.report.txt.sample +%%DATADIR%%/reports/pt_br/rejection.report.txt.sample %%DATADIR%%/reports/pt_br/sender.content.report.txt.sample %%DATADIR%%/reports/pt_br/sender.error.report.txt.sample %%DATADIR%%/reports/pt_br/sender.filename.report.txt.sample @@ -389,6 +401,7 @@ %%DATADIR%%/reports/ro/languages.conf.sample %%DATADIR%%/reports/ro/recipient.mcp.report.txt.sample %%DATADIR%%/reports/ro/recipient.spam.report.txt.sample +%%DATADIR%%/reports/ro/rejection.report.txt.sample %%DATADIR%%/reports/ro/sender.content.report.txt.sample %%DATADIR%%/reports/ro/sender.error.report.txt.sample %%DATADIR%%/reports/ro/sender.filename.report.txt.sample @@ -413,6 +426,7 @@ %%DATADIR%%/reports/se/languages.conf.sample %%DATADIR%%/reports/se/recipient.mcp.report.txt.sample %%DATADIR%%/reports/se/recipient.spam.report.txt.sample +%%DATADIR%%/reports/se/rejection.report.txt.sample %%DATADIR%%/reports/se/sender.content.report.txt.sample %%DATADIR%%/reports/se/sender.error.report.txt.sample %%DATADIR%%/reports/se/sender.filename.report.txt.sample @@ -436,6 +450,7 @@ %%DATADIR%%/reports/sk/languages.conf.sample %%DATADIR%%/reports/sk/recipient.mcp.report.txt.sample %%DATADIR%%/reports/sk/recipient.spam.report.txt.sample +%%DATADIR%%/reports/sk/rejection.report.txt.sample %%DATADIR%%/reports/sk/sender.content.report.txt.sample %%DATADIR%%/reports/sk/sender.error.report.txt.sample %%DATADIR%%/reports/sk/sender.filename.report.txt.sample Index: files/patch-docs:man:MailScanner.8 =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8,v retrieving revision 1.24 diff -u -r1.24 patch-docs:man:MailScanner.8 --- files/patch-docs:man:MailScanner.8 31 Aug 2005 13:19:02 -0000 1.24 +++ files/patch-docs:man:MailScanner.8 12 Dec 2005 17:06:45 -0000 @@ -1,8 +1,8 @@ ---- ../MailScanner-install-4.44.6.orig/docs/man/MailScanner.8 Mon Aug 22 16:18:05 2005 -+++ docs/man/MailScanner.8 Mon Aug 22 16:18:20 2005 +--- ../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 @@ -1,4 +1,4 @@ -.TH "MailScanner" "8" "4.42.9" "Julian Field" "Mail" -+.TH "MailScanner" "8" "4.44.6" "Julian Field" "Mail" ++.TH "MailScanner" "8" "4.45.1" "Julian Field" "Mail" .SH "NAME" .LP MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix Index: files/patch-docs:man:MailScanner.8.html =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8.html,v retrieving revision 1.17 diff -u -r1.17 patch-docs:man:MailScanner.8.html --- files/patch-docs:man:MailScanner.8.html 31 Aug 2005 13:19:02 -0000 1.17 +++ files/patch-docs:man:MailScanner.8.html 12 Dec 2005 17:06:45 -0000 @@ -1,9 +1,9 @@ ---- ../MailScanner-install-4.44.6.orig/docs/man/MailScanner.8.html Mon Aug 22 16:18:05 2005 -+++ docs/man/MailScanner.8.html Mon Aug 22 16:18:23 2005 +--- ../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 @@ -1,5 +1,5 @@ - -+ ++ Index: files/patch-docs:man:MailScanner.conf.5 =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5,v retrieving revision 1.24 diff -u -r1.24 patch-docs:man:MailScanner.conf.5 --- files/patch-docs:man:MailScanner.conf.5 31 Aug 2005 13:19:02 -0000 1.24 +++ files/patch-docs:man:MailScanner.conf.5 12 Dec 2005 17:06:45 -0000 @@ -1,12 +1,12 @@ ---- ../MailScanner-install-4.44.6.orig/docs/man/MailScanner.conf.5 Mon Aug 22 16:18:05 2005 -+++ docs/man/MailScanner.conf.5 Mon Aug 22 16:18:27 2005 +--- ../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 @@ -1,4 +1,4 @@ -.TH "MailScanner.conf" "5" "4.42.9" "Julian Field" "Mail" -+.TH "MailScanner.conf" "5" "4.44.6" "Julian Field" "Mail" ++.TH "MailScanner.conf" "5" "4.48.4" "Julian Field" "Mail" .SH "NAME" .LP MailScanner.conf \- Main configuration for MailScanner -@@ -326,6 +326,16 @@ +@@ -326,6 +326,23 @@ .br If more messages are found in the queue than this, then switch to an "accelerated" mode of processing messages. This will cause it to stop scanning messages in strict date order, but in the order it finds them in the queue. If your queue is bigger than this size a lot of the time, then some messages could be greatly delayed. So treat this option as "in emergency only". @@ -19,11 +19,51 @@ +.br +If this is set to yes, then email messages passing through MailScanner will be processed and checked, and all the other options in this file will be used to control what checks are made on the message. If this is set to no, then email messages will NOT be processed or checked *at all*, and so any viruses or other problems will be ignored. + ++.TP ++\fBReject Messages\fR ++Default: no ++.br ++ ++.br ++You may not want to receive mail from certain addresses and/or to certain addresses. If so, you can do this with your email transport (sendmail, Postfix, etc) but that will just send a one\-line message which is not helpful to the user sending the message. If this is set to yes, then the message set by the "Rejection Report" will be sent instead, and the incoming message will be deleted. If you want to store a copy of the original incoming message then use the "Archive Mail" setting to archive a copy of it. The purpose of this option is to set it to be a ruleset, so that you can reject messages from a few offending addresses where you need to send a polite reply instead of just a brief 1\-line rejection message. + .TP \fBMaximum Attachments Per Message\fR Default: 200 -@@ -1701,12 +1711,64 @@ +@@ -853,6 +870,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 ++\fBQuarantine Modified Body\fR ++Default: no ++.br ++ ++.br ++Do you want to store copies of messages which have been disarmed by having their HTML modified at all? This can also be the filename of a ruleset. ++ ++ ++.TP + \fBQuarantine Whole Message\fR + Default: no + .br +@@ -885,6 +911,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. + ++ ++.TP ++\fBRejection Report\fR ++Default: %reports\-dir%/rejection.report.txt ++.br ++ ++.br ++Set where to find the message text sent to users who triggered the ruleset you are using with the "Reject Message" option. ++ ++ + .TP + \fBDeleted Bad Filename Message Report\fR + Default: %reports\-dir%/deleted.filename.message.txt +@@ -1701,12 +1737,64 @@ .br .br @@ -55,16 +95,16 @@ +$Message \- a perl reference to the list of line of the message +.RE +.br - - ++ ++ +.TP +\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 Index: files/patch-docs:man:MailScanner.conf.5.html =================================================================== RCS file: /home/ncvs/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html,v retrieving revision 1.20 diff -u -r1.20 patch-docs:man:MailScanner.conf.5.html --- files/patch-docs:man:MailScanner.conf.5.html 31 Aug 2005 13:19:02 -0000 1.20 +++ files/patch-docs:man:MailScanner.conf.5.html 12 Dec 2005 17:06:45 -0000 @@ -1,9 +1,9 @@ ---- ../MailScanner-install-4.44.6.orig/docs/man/MailScanner.conf.5.html Mon Aug 22 16:18:05 2005 -+++ docs/man/MailScanner.conf.5.html Mon Aug 22 16:18:30 2005 +--- ../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 @@ -1,5 +1,5 @@ - -+ ++ @@ -15,7 +15,7 @@ What to do with spam
System logging
Advanced SpamAssassin Settings
-@@ -953,6 +954,30 @@ +@@ -953,6 +954,61 @@ @@ -43,10 +43,97 @@ + + + ++

Reject Messages

++ ++ ++ ++ ++ ++ ++
++

Default: no

++ ++

You may not want to receive mail from certain addresses ++and/or to certain addresses. If so, you can do this with ++your email transport (sendmail, Postfix, etc) but that will ++just send a one−line message which is not helpful to ++the user sending the message. If this is set to yes, then ++the message set by the "Rejection Report" will be ++sent instead, and the incoming message will be deleted. If ++you want to store a copy of the original incoming message ++then use the "Archive Mail" setting to archive a ++copy of it. The purpose of this option is to set it to be a ++ruleset, so that you can reject messages from a few ++offending addresses where you need to send a polite reply ++instead of just a brief 1−line rejection message.

++
++ ++ ++ ++ ++

Maximum Attachments Per Message
-@@ -4909,10 +4934,239 @@ +@@ -2523,6 +2579,27 @@ + + + ++

Quarantine Modified Body

++ ++ ++ ++ ++ ++ ++
++

Default: no

++ ++

Do you want to store copies of messages which have been ++disarmed by having their HTML modified at all? This can also ++be the filename of a ruleset.

++
++ ++ ++ ++ ++ +
+

Quarantine Whole Message

+ +@@ -2621,6 +2698,27 @@ + + + ++

Rejection Report

++ ++ ++ ++ ++ ++ ++
++

Default: %reports−dir%/rejection.report.txt

++ ++

Set where to find the message text sent to users who ++triggered the ruleset you are using with the "Reject ++Message" option.

++
++ ++ ++ ++ ++ +
+

Deleted Bad Filename Message Report

+ +@@ -4909,10 +5007,239 @@

Default: no