View | Details | Raw Unified | Return to bug 61967
Collapse All | Expand All

(-)/server-root/ports/mail/mailscanner-devel/Makefile (-5 / +23 lines)
Lines 6-19 Link Here
6
#
6
#
7
7
8
PORTNAME=	MailScanner
8
PORTNAME=	MailScanner
9
PORTVERSION=	4.26.4
9
PORTVERSION=	4.26.5
10
CATEGORIES=	mail
10
CATEGORIES=	mail
11
MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
11
MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
12
PKGNAMESUFFIX=	-devel
12
PKGNAMESUFFIX=	-devel
13
DISTNAME=	MailScanner-${PORTVERSION:C/\.([0-9]+)$/-\1/}
14
13
15
MAINTAINER=	j.koopmann@seceidos.de
14
MAINTAINER=	j.koopmann@seceidos.de
16
COMMENT=	Powerful virus/spam scanning framework for Sendmail/Exim
15
COMMENT=	Powerful virus/spam scanning framework for Sendmail/Exim/Postfix
16
17
PATCHLEVEL=	1
18
DISTNAME=	MailScanner-${PORTVERSION}-${PATCHLEVEL}
19
WRKSRC=		${WRKDIR}/MailScanner-${PORTVERSION}
17
20
18
BUILD_DEPENDS=	\
21
BUILD_DEPENDS=	\
19
	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
22
	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
Lines 54-59 Link Here
54
ETC_FILES=	MailScanner.conf filename.rules.conf \
57
ETC_FILES=	MailScanner.conf filename.rules.conf \
55
		filetype.rules.conf spam.assassin.prefs.conf \
58
		filetype.rules.conf spam.assassin.prefs.conf \
56
		spam.lists.conf virus.scanners.conf
59
		spam.lists.conf virus.scanners.conf
60
USRLOCAL_FILES_LIB=	\
61
		bitdefender-autoupdate f-prot-autoupdate \
62
		f-secure-wrapper inoculan-autoupdate \
63
		kavdaemonclient-wrapper mcafee-autoupdate \
64
		nod32-autoupdate rav-autoupdate \
65
		rav-wrapper sophos-autoupdate
57
66
58
do-build:
67
do-build:
59
	${PERL} -pi -e \
68
	${PERL} -pi -e \
Lines 81-88 Link Here
81
		s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
90
		s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
82
		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
91
		s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
83
		${WRKSRC}/lib/MailScanner/ConfigDefs.pl
92
		${WRKSRC}/lib/MailScanner/ConfigDefs.pl
84
	${PERL} -pi \
93
	${PERL} -pi -e \
85
		-e 's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
94
		's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
86
	${PERL} -pi -e \
95
	${PERL} -pi -e \
87
		's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g;' \
96
		's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g;' \
88
		${WRKSRC}/lib/clamav-wrapper
97
		${WRKSRC}/lib/clamav-wrapper
Lines 92-97 Link Here
92
	${PERL} -pi -e \
101
	${PERL} -pi -e \
93
		's,/usr/bin/unzip,${LOCALBASE}/bin/unzip,g;' \
102
		's,/usr/bin/unzip,${LOCALBASE}/bin/unzip,g;' \
94
		${WRKSRC}/lib/sophos-autoupdate
103
		${WRKSRC}/lib/sophos-autoupdate
104
.for FILE in ${USRLOCAL_FILES_LIB}
105
	${PERL} -pi -e \
106
		's,/usr/local,${LOCALBASE},g;' \
107
		${WRKSRC}/lib/${FILE}
108
.endfor
95
109
96
do-install:
110
do-install:
97
	# Step 1: Install libexec files
111
	# Step 1: Install libexec files
Lines 160-165 Link Here
160
		${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
174
		${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
161
	# Sophos install script
175
	# Sophos install script
162
	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
176
	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
177
	${PERL} -pi -e \
178
		's,%%LOCALBASE%%,${LOCALBASE},g; \
179
		s,%%PREFIX%%,${PREFIX},g;' \
180
		${DOCSDIR}/Sophos.install.freebsd
163
.if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
181
.if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
164
	# Upgrading MailScanner.conf file... Please wait
182
	# Upgrading MailScanner.conf file... Please wait
165
	@${WRKSRC}/bin/upgrade_MailScanner_conf \
183
	@${WRKSRC}/bin/upgrade_MailScanner_conf \
(-)/server-root/ports/mail/mailscanner-devel/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (MailScanner-4.26-4.tar.gz) = 6c7ef8fe632f9f490bc63ef5a8972c43
1
MD5 (MailScanner-4.26.5-1.tar.gz) = e6754fe4e210beeb6d04a307cc1fceb4
(-)/server-root/ports/mail/mailscanner-devel/files/Sophos.install.freebsd (-4 / +4 lines)
Lines 1-4 Link Here
1
#!/usr/local/bin/bash
1
!%%LOCALBASE%%/bin/bash
2
#
2
#
3
# $Id: Sophos.install,v 1.13.2.3 2003/06/07 17:20:39 jkf Exp $
3
# $Id: Sophos.install,v 1.13.2.3 2003/06/07 17:20:39 jkf Exp $
4
#
4
#
Lines 8-15 Link Here
8
# and unpacked the Sophos distribution.
8
# and unpacked the Sophos distribution.
9
# Tweaked for FreeBSD.
9
# Tweaked for FreeBSD.
10
10
11
SOPHOS=/usr/local/Sophos
11
SOPHOS=%%LOCALBASE%%/Sophos
12
SCRIPTS=/usr/local/libexec/MailScanner
12
SCRIPTS=%%PREFIX%%/libexec/MailScanner
13
COMPD=freebsd.elf.tar.Z
13
COMPD=freebsd.elf.tar.Z
14
DISTRIB=freebsd.elf.tar
14
DISTRIB=freebsd.elf.tar
15
15
Lines 20-26 Link Here
20
# Clear out any old libs from /usr/local/lib which is where
20
# Clear out any old libs from /usr/local/lib which is where
21
# a default SAVI installation will have left them
21
# a default SAVI installation will have left them
22
echo Clearing out old default Sophos installation libraries
22
echo Clearing out old default Sophos installation libraries
23
rm -f /usr/local/lib/libsavi.so*
23
rm -f %%LOCALBASE%%/lib/libsavi.so*
24
24
25
# Have we got to uncompress the distribution for them?
25
# Have we got to uncompress the distribution for them?
26
if [ -f $COMPD ]; then
26
if [ -f $COMPD ]; then
(-)/server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8 (-5 / +9 lines)
Lines 1-8 Link Here
1
--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.8	Tue Dec  2 22:22:27 2003
1
--- ../MailScanner-4.26.5.orig/docs/man/MailScanner.8	Mon Jan 26 16:20:56 2004
2
+++ docs/man/MailScanner.8	Tue Dec  2 22:23:08 2003
2
+++ docs/man/MailScanner.8	Mon Jan 26 16:21:58 2004
3
@@ -1,4 +1,4 @@
3
@@ -1,7 +1,7 @@
4
-.TH "MailScanner" "8" "4.25-10" "Julian Field" "Mail"
4
-.TH "MailScanner" "8" "4.25-10" "Julian Field" "Mail"
5
+.TH "MailScanner" "8" "4.26-3" "Julian Field" "Mail"
5
+.TH "MailScanner" "8" "4.26.5-1" "Julian Field" "Mail"
6
 .SH "NAME"
6
 .SH "NAME"
7
 .LP 
7
 .LP 
8
 MailScanner \- Virus/Spam Scanner for Sendmail and Exim
8
-MailScanner \- Virus/Spam Scanner for Sendmail and Exim
9
+MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
10
 .SH "SYNOPSIS"
11
 .LP 
12
 \fBMailScanner\fR [\fIconfigfile\fR]
(-)/server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8.html (-3 / +14 lines)
Lines 1-9 Link Here
1
--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.8.html	Tue Dec  2 22:22:27 2003
1
--- ../MailScanner-4.26.5.orig/docs/man/MailScanner.8.html	Mon Jan 26 16:20:56 2004
2
+++ docs/man/MailScanner.8.html	Tue Dec  2 22:23:08 2003
2
+++ docs/man/MailScanner.8.html	Mon Jan 26 16:21:58 2004
3
@@ -1,5 +1,5 @@
3
@@ -1,5 +1,5 @@
4
 <!-- Creator     : groff version 1.19 -->
4
 <!-- Creator     : groff version 1.19 -->
5
-<!-- CreationDate: Wed Nov 19 17:14:30 2003 -->
5
-<!-- CreationDate: Wed Nov 19 17:14:30 2003 -->
6
+<!-- CreationDate: Tue Dec  2 22:22:45 2003 -->
6
+<!-- CreationDate: Mon Jan 26 16:21:15 2004 -->
7
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
7
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
8
 "http://www.w3.org/TR/html4/loose.dtd">
8
 "http://www.w3.org/TR/html4/loose.dtd">
9
 <html>
9
 <html>
10
@@ -27,8 +27,8 @@
11
 <tr valign="top" align="left">
12
 <td width="11%"></td>
13
 <td width="89%">
14
-<p>MailScanner &minus; Virus/Spam Scanner for Sendmail and
15
-Exim</p>
16
+<p>MailScanner &minus; Virus/Spam Scanner for Sendmail, Exim
17
+and Postfix</p>
18
 </td>
19
 </table>
20
 <a name="SYNOPSIS"></a>
(-)/server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5 (-3 / +144 lines)
Lines 1-8 Link Here
1
--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.conf.5	Tue Dec  2 22:22:27 2003
1
--- ../MailScanner-4.26.5.orig/docs/man/MailScanner.conf.5	Mon Jan 26 16:20:56 2004
2
+++ docs/man/MailScanner.conf.5	Tue Dec  2 22:23:08 2003
2
+++ docs/man/MailScanner.conf.5	Mon Jan 26 16:21:58 2004
3
@@ -1,4 +1,4 @@
3
@@ -1,4 +1,4 @@
4
-.TH "MailScanner.conf" "5" "4.25-10" "Julian Field" "Mail"
4
-.TH "MailScanner.conf" "5" "4.25-10" "Julian Field" "Mail"
5
+.TH "MailScanner.conf" "5" "4.26-3" "Julian Field" "Mail"
5
+.TH "MailScanner.conf" "5" "4.26.5-1" "Julian Field" "Mail"
6
 .SH "NAME"
6
 .SH "NAME"
7
 .LP 
7
 .LP 
8
 MailScanner.conf \- Main configuration for MailScanner
8
 MailScanner.conf \- Main configuration for MailScanner
9
@@ -1408,6 +1408,29 @@
10
 
11
 .br 
12
 If a message is spam, and this option is set, then a header will be added to the message containing 1 character for each point in the SpamAssassin score. This allows users to choose for themselves the SpamAssassin scores at which they want to do different things with the message, such as file it or delete it. 
13
+
14
+
15
+.TP 
16
+\fBRebuild Bayes Every\fR
17
+Default: 0
18
+.br 
19
+
20
+.br 
21
+If you are using the Bayesian statistics engine on a busy server, you may well need to force a Bayesian database rebuild and expiry at regular intervals. This is measures in seconds. 24 hours = 86400 seconds. To disable this feature set this to 0.
22
+
23
+
24
+.TP 
25
+\fBWait During Bayes Rebuild\fR
26
+Default: no
27
+.br 
28
+
29
+.br 
30
+# The Bayesian database rebuild and expiry may take a 2 or 3 minutes
31
+# to complete. During this time you can either wait, or simply
32
+# disable SpamAssassin checks until it has completed.
33
+WaitDuringBayesRebuild = no
34
+
35
+
36
 .SH "What to do with spam"
37
 .TP 
38
 \fBSpam Actions\fR
39
@@ -1431,11 +1454,11 @@
40
 .br 
41
 
42
 .br 
43
-"bounce" \- a rejection message is sent back to the sender 
44
+"forward" \- an email address is supplied, to which the message is forwarded 
45
 .br 
46
 
47
 .br 
48
-"forward" \- an email address is supplied, to which the message is forwarded 
49
+"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.
50
 .br 
51
 
52
 .br 
53
@@ -1462,23 +1485,15 @@
54
 
55
 .TP 
56
 \fBSender Spam Report\fR
57
-Default: /opt/MailScanner/etc/reports/en/sender.spam.report.txt
58
-.br 
59
-Default Linux: /etc/MailScanner/reports/en/sender.spam.report.txt
60
-.br 
61
-Default FreeBSD: /usr/local/share/MailScanner/reports/en/sender.spam.report.txt
62
+Default: %reports\-dir%/sender.spam.report.txt
63
 .br 
64
 
65
-.br W
66
-hen the "bounce" spam action is applied to a message that triggered both a "Spam List" check and SpamAssassin, this file gives the text to put in that message. 
67
+.br 
68
+When the "bounce" spam action is applied to a message that triggered both a "Spam List" check and SpamAssassin, this file gives the text to put in that message. 
69
 
70
 .TP 
71
 \fBSender Spam List Report\fR
72
-Default: /opt/MailScanner/etc/reports/en/sender.spam.rbl.report.txt
73
-.br 
74
-Default Linux: /etc/MailScanner/reports/en/sender.spam.rbl.report.txt
75
-.br 
76
-Default FreeBSD: /usr/local/share/MailScanner/reports/en/sender.spam.rbl.report.txt
77
+Default: %reports\-dir%/sender.spam.rbl.report.txt
78
 .br 
79
 
80
 .br 
81
@@ -1486,11 +1501,7 @@
82
  
83
 .TP 
84
 \fBSender SpamAssassin Report\fR
85
-Default: /opt/MailScanner/etc/reports/en/sender.spam.sa.report.txt
86
-.br 
87
-Default Linux: /etc/MailScanner/reports/en/sender.spam.sa.report.txt
88
-.br 
89
-Default FreeBSD: /usr/local/share/MailScanner/reports/en/sender.spam.sa.report.txt
90
+Default: %reports\-dir%/sender.spam.sa.report.txt
91
 .br 
92
 
93
 .br 
94
@@ -1498,15 +1509,20 @@
95
 
96
 .TP 
97
 \fBInline Spam Warning\fR
98
-Default: /opt/MailScanner/etc/reports/en/inline.spam.warning.txt
99
+Default: %reports\-dir%/inline.spam.warning.txt
100
 .br 
101
-Default Linux: /etc/MailScanner/reports/en/inline.spam.warning.txt
102
+
103
 .br 
104
-Default FreeBSD: /usr/local/share/MailScanner/reports/en/inline.spam.warning.txt
105
+If you use the 'attachment' Spam Action or High Scoring Spam Action then this is the location of inline spam report that is inserted at the top of the message.
106
+
107
+.TP 
108
+\fBRecipient Spam Report\fR
109
+Default: %reports\-dir%/recipient.spam.report.txt
110
 .br 
111
 
112
 .br 
113
-If you use the 'attachment' Spam Action or High Scoring Spam Action then this is the location of inline spam report that is inserted at the top of the message.
114
+If you use the 'notify' Spam Action or High Scoring Spam Action then this is the location of the notification message that is sent to the original recipients of the message.
115
+
116
 .SH "System logging"
117
 .TP 
118
 \fBSyslog Facility\fR
119
@@ -1515,12 +1531,12 @@
120
 
121
 .br 
122
 This is the name of the "facility" used by syslogd to log MailScanner's messages. If this doesn't mean anything to you, then either leave it alone or else read the "syslogd" man page. 
123
-.TP
124
+.TP 
125
 \fBLog Speed\fR
126
 Default: no
127
-.br
128
+.br 
129
 
130
-.br
131
+.br 
132
 Do you want to log the processing speed for each section of the code for a batch? This can be very useful for diagnosing speed problems, particularly in spam checking.
133
 
134
 .TP 
135
@@ -1530,6 +1546,14 @@
136
 
137
 .br 
138
 If this option is set, then every spam message will be logged to syslog. If you get a lot of spam, or your server load is high, you will want to leave this option switched off. But if you are having trouble with spam detection, setting this to "yes" temporarily can provide useful debugging output. 
139
+
140
+.TP 
141
+\fBLog Non Spam\fR
142
+Default: no
143
+.br 
144
+
145
+.br 
146
+Do you want all non\-spam to be logged? Useful if you want to see all the SpamAssassin reports of mail that was marked as non\-spam. Note: It will generate a lot of log traffic.
147
 
148
 .TP 
149
 \fBLog Permitted Filenames\fR
(-)/server-root/ports/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5.html (-3 / +188 lines)
Lines 1-9 Link Here
1
--- ../MailScanner-4.25-14.orig/docs/man/MailScanner.conf.5.html	Tue Dec  2 22:22:27 2003
1
--- ../MailScanner-4.26.5.orig/docs/man/MailScanner.conf.5.html	Mon Jan 26 16:20:56 2004
2
+++ docs/man/MailScanner.conf.5.html	Tue Dec  2 22:23:08 2003
2
+++ docs/man/MailScanner.conf.5.html	Mon Jan 26 16:21:58 2004
3
@@ -1,5 +1,5 @@
3
@@ -1,5 +1,5 @@
4
 <!-- Creator     : groff version 1.19 -->
4
 <!-- Creator     : groff version 1.19 -->
5
-<!-- CreationDate: Wed Nov 26 20:07:41 2003 -->
5
-<!-- CreationDate: Wed Nov 26 20:07:41 2003 -->
6
+<!-- CreationDate: Tue Dec  2 22:22:45 2003 -->
6
+<!-- CreationDate: Mon Jan 26 16:21:15 2004 -->
7
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
7
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
8
 "http://www.w3.org/TR/html4/loose.dtd">
8
 "http://www.w3.org/TR/html4/loose.dtd">
9
 <html>
9
 <html>
10
@@ -3780,6 +3780,51 @@
11
 file it or delete it.</p>
12
 </td>
13
 </table>
14
+<!-- INDENTATION -->
15
+<table width="100%" border=0 rules="none" frame="void"
16
+       cols="2" cellspacing="0" cellpadding="0">
17
+<tr valign="top" align="left">
18
+<td width="11%"></td>
19
+<td width="89%">
20
+<p><b>Rebuild Bayes Every</b></p></td>
21
+</table>
22
+<!-- INDENTATION -->
23
+<table width="100%" border=0 rules="none" frame="void"
24
+       cols="2" cellspacing="0" cellpadding="0">
25
+<tr valign="top" align="left">
26
+<td width="22%"></td>
27
+<td width="78%">
28
+<p>Default: 0</p>
29
+<!-- INDENTATION -->
30
+<p>If you are using the Bayesian statistics engine on a busy
31
+server, you may well need to force a Bayesian database
32
+rebuild and expiry at regular intervals. This is measures in
33
+seconds. 24 hours = 86400 seconds. To disable this feature
34
+set this to 0.</p>
35
+</td>
36
+</table>
37
+<!-- INDENTATION -->
38
+<table width="100%" border=0 rules="none" frame="void"
39
+       cols="2" cellspacing="0" cellpadding="0">
40
+<tr valign="top" align="left">
41
+<td width="11%"></td>
42
+<td width="89%">
43
+<p><b>Wait During Bayes Rebuild</b></p></td>
44
+</table>
45
+<!-- INDENTATION -->
46
+<table width="100%" border=0 rules="none" frame="void"
47
+       cols="2" cellspacing="0" cellpadding="0">
48
+<tr valign="top" align="left">
49
+<td width="22%"></td>
50
+<td width="78%">
51
+<p>Default: no</p>
52
+<!-- INDENTATION -->
53
+<p># The Bayesian database rebuild and expiry may take a 2
54
+or 3 minutes # to complete. During this time you can either
55
+wait, or simply # disable SpamAssassin checks until it has
56
+completed. WaitDuringBayesRebuild = no</p>
57
+</td>
58
+</table>
59
 <a name="What to do with spam"></a>
60
 <h2>What to do with spam</h2>
61
 <!-- INDENTATION -->
62
@@ -3810,12 +3855,14 @@
63
 <p>&quot;store&quot; &minus; the message is stored in the
64
 quarantine</p>
65
 <!-- INDENTATION -->
66
-<p>&quot;bounce&quot; &minus; a rejection message is sent
67
-back to the sender</p>
68
-<!-- INDENTATION -->
69
 <p>&quot;forward&quot; &minus; an email address is supplied,
70
 to which the message is forwarded</p>
71
 <!-- INDENTATION -->
72
+<p>&quot;notify&quot; &minus; Send the recipients a short
73
+notification that spam addressed to them was not delivered.
74
+They can then take action to request retrieval of the
75
+orginal message if they think it was not spam.</p>
76
+<!-- INDENTATION -->
77
 <p>&quot;striphtml&quot; &minus; convert all in&minus;line
78
 HTML content in the message to be stripped to plain text,
79
 which removes all images and scripts and so can be used to
80
@@ -3888,14 +3935,9 @@
81
 <tr valign="top" align="left">
82
 <td width="22%"></td>
83
 <td width="78%">
84
-<p>Default:
85
-/opt/MailScanner/etc/reports/en/sender.spam.report.txt<br>
86
-Default Linux:
87
-/etc/MailScanner/reports/en/sender.spam.report.txt<br>
88
-Default FreeBSD:
89
-/usr/local/share/MailScanner/reports/en/sender.spam.report.txt</p>
90
+<p>Default: %reports&minus;dir%/sender.spam.report.txt</p>
91
 <!-- INDENTATION -->
92
-<p>hen the &quot;bounce&quot; spam action is applied to a
93
+<p>When the &quot;bounce&quot; spam action is applied to a
94
 message that triggered both a &quot;Spam List&quot; check
95
 and SpamAssassin, this file gives the text to put in that
96
 message.</p>
97
@@ -3916,11 +3958,7 @@
98
 <td width="22%"></td>
99
 <td width="78%">
100
 <p>Default:
101
-/opt/MailScanner/etc/reports/en/sender.spam.rbl.report.txt<br>
102
-Default Linux:
103
-/etc/MailScanner/reports/en/sender.spam.rbl.report.txt<br>
104
-Default FreeBSD:
105
-/usr/local/share/MailScanner/reports/en/sender.spam.rbl.report.txt</p>
106
+%reports&minus;dir%/sender.spam.rbl.report.txt</p>
107
 <!-- INDENTATION -->
108
 <p>When the &quot;bounce&quot; spam action is applied to a
109
 message that triggered a &quot;Spam List&quot; check, this
110
@@ -3942,11 +3980,7 @@
111
 <td width="22%"></td>
112
 <td width="78%">
113
 <p>Default:
114
-/opt/MailScanner/etc/reports/en/sender.spam.sa.report.txt<br>
115
-Default Linux:
116
-/etc/MailScanner/reports/en/sender.spam.sa.report.txt<br>
117
-Default FreeBSD:
118
-/usr/local/share/MailScanner/reports/en/sender.spam.sa.report.txt</p>
119
+%reports&minus;dir%/sender.spam.sa.report.txt</p>
120
 <!-- INDENTATION -->
121
 <p>When the &quot;bounce&quot; spam action is applied to a
122
 message that triggered SpamAssassin, this file gives the
123
@@ -3967,18 +4001,36 @@
124
 <tr valign="top" align="left">
125
 <td width="22%"></td>
126
 <td width="78%">
127
-<p>Default:
128
-/opt/MailScanner/etc/reports/en/inline.spam.warning.txt<br>
129
-Default Linux:
130
-/etc/MailScanner/reports/en/inline.spam.warning.txt<br>
131
-Default FreeBSD:
132
-/usr/local/share/MailScanner/reports/en/inline.spam.warning.txt</p>
133
+<p>Default: %reports&minus;dir%/inline.spam.warning.txt</p>
134
 <!-- INDENTATION -->
135
 <p>If you use the &rsquo;attachment&rsquo; Spam Action or
136
 High Scoring Spam Action then this is the location of inline
137
 spam report that is inserted at the top of the message.</p>
138
 </td>
139
 </table>
140
+<!-- INDENTATION -->
141
+<table width="100%" border=0 rules="none" frame="void"
142
+       cols="2" cellspacing="0" cellpadding="0">
143
+<tr valign="top" align="left">
144
+<td width="11%"></td>
145
+<td width="89%">
146
+<p><b>Recipient Spam Report</b></p></td>
147
+</table>
148
+<!-- INDENTATION -->
149
+<table width="100%" border=0 rules="none" frame="void"
150
+       cols="2" cellspacing="0" cellpadding="0">
151
+<tr valign="top" align="left">
152
+<td width="22%"></td>
153
+<td width="78%">
154
+<p>Default:
155
+%reports&minus;dir%/recipient.spam.report.txt</p>
156
+<!-- INDENTATION -->
157
+<p>If you use the &rsquo;notify&rsquo; Spam Action or High
158
+Scoring Spam Action then this is the location of the
159
+notification message that is sent to the original recipients
160
+of the message.</p>
161
+</td>
162
+</table>
163
 <a name="System logging"></a>
164
 <h2>System logging</h2>
165
 <!-- INDENTATION -->
166
@@ -4047,6 +4099,28 @@
167
 off. But if you are having trouble with spam detection,
168
 setting this to &quot;yes&quot; temporarily can provide
169
 useful debugging output.</p>
170
+</td>
171
+</table>
172
+<!-- INDENTATION -->
173
+<table width="100%" border=0 rules="none" frame="void"
174
+       cols="2" cellspacing="0" cellpadding="0">
175
+<tr valign="top" align="left">
176
+<td width="11%"></td>
177
+<td width="89%">
178
+<p><b>Log Non Spam</b></p></td>
179
+</table>
180
+<!-- INDENTATION -->
181
+<table width="100%" border=0 rules="none" frame="void"
182
+       cols="2" cellspacing="0" cellpadding="0">
183
+<tr valign="top" align="left">
184
+<td width="22%"></td>
185
+<td width="78%">
186
+<p>Default: no</p>
187
+<!-- INDENTATION -->
188
+<p>Do you want all non&minus;spam to be logged? Useful if
189
+you want to see all the SpamAssassin reports of mail that
190
+was marked as non&minus;spam. Note: It will generate a lot
191
+of log traffic.</p>
192
 </td>
193
 </table>
194
 <!-- INDENTATION -->
(-)/server-root/ports/mail/mailscanner-devel/pkg-plist (+28 lines)
Lines 96-101 Link Here
96
%%DATADIR%%/reports/cy+en/stored.content.message.txt.sample
96
%%DATADIR%%/reports/cy+en/stored.content.message.txt.sample
97
%%DATADIR%%/reports/cy+en/stored.filename.message.txt.sample
97
%%DATADIR%%/reports/cy+en/stored.filename.message.txt.sample
98
%%DATADIR%%/reports/cy+en/stored.virus.message.txt.sample
98
%%DATADIR%%/reports/cy+en/stored.virus.message.txt.sample
99
%%DATADIR%%/reports/cy+en/recipient.mcp.report.txt.sample
100
%%DATADIR%%/reports/cy+en/recipient.spam.report.txt.sample
99
%%DATADIR%%/reports/cz/deleted.content.message.txt.sample
101
%%DATADIR%%/reports/cz/deleted.content.message.txt.sample
100
%%DATADIR%%/reports/cz/deleted.filename.message.txt.sample
102
%%DATADIR%%/reports/cz/deleted.filename.message.txt.sample
101
%%DATADIR%%/reports/cz/deleted.virus.message.txt.sample
103
%%DATADIR%%/reports/cz/deleted.virus.message.txt.sample
Lines 117-122 Link Here
117
%%DATADIR%%/reports/cz/stored.content.message.txt.sample
119
%%DATADIR%%/reports/cz/stored.content.message.txt.sample
118
%%DATADIR%%/reports/cz/stored.filename.message.txt.sample
120
%%DATADIR%%/reports/cz/stored.filename.message.txt.sample
119
%%DATADIR%%/reports/cz/stored.virus.message.txt.sample
121
%%DATADIR%%/reports/cz/stored.virus.message.txt.sample
122
%%DATADIR%%/reports/cz/recipient.mcp.report.txt.sample
123
%%DATADIR%%/reports/cz/recipient.spam.report.txt.sample
120
%%DATADIR%%/reports/de/README.1ST.sample
124
%%DATADIR%%/reports/de/README.1ST.sample
121
%%DATADIR%%/reports/de/deleted.content.message.txt.sample
125
%%DATADIR%%/reports/de/deleted.content.message.txt.sample
122
%%DATADIR%%/reports/de/deleted.filename.message.txt.sample
126
%%DATADIR%%/reports/de/deleted.filename.message.txt.sample
Lines 139-144 Link Here
139
%%DATADIR%%/reports/de/stored.content.message.txt.sample
143
%%DATADIR%%/reports/de/stored.content.message.txt.sample
140
%%DATADIR%%/reports/de/stored.filename.message.txt.sample
144
%%DATADIR%%/reports/de/stored.filename.message.txt.sample
141
%%DATADIR%%/reports/de/stored.virus.message.txt.sample
145
%%DATADIR%%/reports/de/stored.virus.message.txt.sample
146
%%DATADIR%%/reports/de/recipient.spam.report.txt.sample
147
%%DATADIR%%/reports/de/recipient.mcp.report.txt.sample
142
%%DATADIR%%/reports/dk/deleted.content.message.txt.sample
148
%%DATADIR%%/reports/dk/deleted.content.message.txt.sample
143
%%DATADIR%%/reports/dk/deleted.filename.message.txt.sample
149
%%DATADIR%%/reports/dk/deleted.filename.message.txt.sample
144
%%DATADIR%%/reports/dk/deleted.virus.message.txt.sample
150
%%DATADIR%%/reports/dk/deleted.virus.message.txt.sample
Lines 160-165 Link Here
160
%%DATADIR%%/reports/dk/stored.content.message.txt.sample
166
%%DATADIR%%/reports/dk/stored.content.message.txt.sample
161
%%DATADIR%%/reports/dk/stored.filename.message.txt.sample
167
%%DATADIR%%/reports/dk/stored.filename.message.txt.sample
162
%%DATADIR%%/reports/dk/stored.virus.message.txt.sample
168
%%DATADIR%%/reports/dk/stored.virus.message.txt.sample
169
%%DATADIR%%/reports/dk/recipient.spam.report.txt.sample
170
%%DATADIR%%/reports/dk/recipient.mcp.report.txt.sample
163
%%DATADIR%%/reports/en/deleted.content.message.txt.sample
171
%%DATADIR%%/reports/en/deleted.content.message.txt.sample
164
%%DATADIR%%/reports/en/deleted.filename.message.txt.sample
172
%%DATADIR%%/reports/en/deleted.filename.message.txt.sample
165
%%DATADIR%%/reports/en/deleted.virus.message.txt.sample
173
%%DATADIR%%/reports/en/deleted.virus.message.txt.sample
Lines 181-186 Link Here
181
%%DATADIR%%/reports/en/stored.content.message.txt.sample
189
%%DATADIR%%/reports/en/stored.content.message.txt.sample
182
%%DATADIR%%/reports/en/stored.filename.message.txt.sample
190
%%DATADIR%%/reports/en/stored.filename.message.txt.sample
183
%%DATADIR%%/reports/en/stored.virus.message.txt.sample
191
%%DATADIR%%/reports/en/stored.virus.message.txt.sample
192
%%DATADIR%%/reports/en/recipient.mcp.report.txt.sample
193
%%DATADIR%%/reports/en/recipient.spam.report.txt.sample
184
%%DATADIR%%/reports/es/deleted.content.message.txt.sample
194
%%DATADIR%%/reports/es/deleted.content.message.txt.sample
185
%%DATADIR%%/reports/es/deleted.filename.message.txt.sample
195
%%DATADIR%%/reports/es/deleted.filename.message.txt.sample
186
%%DATADIR%%/reports/es/deleted.virus.message.txt.sample
196
%%DATADIR%%/reports/es/deleted.virus.message.txt.sample
Lines 202-207 Link Here
202
%%DATADIR%%/reports/es/stored.content.message.txt.sample
212
%%DATADIR%%/reports/es/stored.content.message.txt.sample
203
%%DATADIR%%/reports/es/stored.filename.message.txt.sample
213
%%DATADIR%%/reports/es/stored.filename.message.txt.sample
204
%%DATADIR%%/reports/es/stored.virus.message.txt.sample
214
%%DATADIR%%/reports/es/stored.virus.message.txt.sample
215
%%DATADIR%%/reports/es/recipient.mcp.report.txt.sample
216
%%DATADIR%%/reports/es/recipient.spam.report.txt.sample
205
%%DATADIR%%/reports/fr/deleted.content.message.txt.sample
217
%%DATADIR%%/reports/fr/deleted.content.message.txt.sample
206
%%DATADIR%%/reports/fr/deleted.filename.message.txt.sample
218
%%DATADIR%%/reports/fr/deleted.filename.message.txt.sample
207
%%DATADIR%%/reports/fr/deleted.virus.message.txt.sample
219
%%DATADIR%%/reports/fr/deleted.virus.message.txt.sample
Lines 223-228 Link Here
223
%%DATADIR%%/reports/fr/stored.content.message.txt.sample
235
%%DATADIR%%/reports/fr/stored.content.message.txt.sample
224
%%DATADIR%%/reports/fr/stored.filename.message.txt.sample
236
%%DATADIR%%/reports/fr/stored.filename.message.txt.sample
225
%%DATADIR%%/reports/fr/stored.virus.message.txt.sample
237
%%DATADIR%%/reports/fr/stored.virus.message.txt.sample
238
%%DATADIR%%/reports/fr/recipient.mcp.report.txt.sample
239
%%DATADIR%%/reports/fr/recipient.spam.report.txt.sample
226
%%DATADIR%%/reports/hu/deleted.content.message.txt.sample
240
%%DATADIR%%/reports/hu/deleted.content.message.txt.sample
227
%%DATADIR%%/reports/hu/deleted.filename.message.txt.sample
241
%%DATADIR%%/reports/hu/deleted.filename.message.txt.sample
228
%%DATADIR%%/reports/hu/deleted.virus.message.txt.sample
242
%%DATADIR%%/reports/hu/deleted.virus.message.txt.sample
Lines 244-249 Link Here
244
%%DATADIR%%/reports/hu/stored.content.message.txt.sample
258
%%DATADIR%%/reports/hu/stored.content.message.txt.sample
245
%%DATADIR%%/reports/hu/stored.filename.message.txt.sample
259
%%DATADIR%%/reports/hu/stored.filename.message.txt.sample
246
%%DATADIR%%/reports/hu/stored.virus.message.txt.sample
260
%%DATADIR%%/reports/hu/stored.virus.message.txt.sample
261
%%DATADIR%%/reports/hu/recipient.mcp.report.txt.sample
262
%%DATADIR%%/reports/hu/recipient.spam.report.txt.sample
247
%%DATADIR%%/reports/it/deleted.content.message.txt.sample
263
%%DATADIR%%/reports/it/deleted.content.message.txt.sample
248
%%DATADIR%%/reports/it/deleted.filename.message.txt.sample
264
%%DATADIR%%/reports/it/deleted.filename.message.txt.sample
249
%%DATADIR%%/reports/it/deleted.virus.message.txt.sample
265
%%DATADIR%%/reports/it/deleted.virus.message.txt.sample
Lines 265-270 Link Here
265
%%DATADIR%%/reports/it/stored.content.message.txt.sample
281
%%DATADIR%%/reports/it/stored.content.message.txt.sample
266
%%DATADIR%%/reports/it/stored.filename.message.txt.sample
282
%%DATADIR%%/reports/it/stored.filename.message.txt.sample
267
%%DATADIR%%/reports/it/stored.virus.message.txt.sample
283
%%DATADIR%%/reports/it/stored.virus.message.txt.sample
284
%%DATADIR%%/reports/it/recipient.mcp.report.txt.sample
285
%%DATADIR%%/reports/it/recipient.spam.report.txt.sample
268
%%DATADIR%%/reports/nl/deleted.content.message.txt.sample
286
%%DATADIR%%/reports/nl/deleted.content.message.txt.sample
269
%%DATADIR%%/reports/nl/deleted.filename.message.txt.sample
287
%%DATADIR%%/reports/nl/deleted.filename.message.txt.sample
270
%%DATADIR%%/reports/nl/deleted.virus.message.txt.sample
288
%%DATADIR%%/reports/nl/deleted.virus.message.txt.sample
Lines 286-291 Link Here
286
%%DATADIR%%/reports/nl/stored.content.message.txt.sample
304
%%DATADIR%%/reports/nl/stored.content.message.txt.sample
287
%%DATADIR%%/reports/nl/stored.filename.message.txt.sample
305
%%DATADIR%%/reports/nl/stored.filename.message.txt.sample
288
%%DATADIR%%/reports/nl/stored.virus.message.txt.sample
306
%%DATADIR%%/reports/nl/stored.virus.message.txt.sample
307
%%DATADIR%%/reports/nl/recipient.mcp.report.txt.sample
308
%%DATADIR%%/reports/nl/recipient.spam.report.txt.sample
289
%%DATADIR%%/reports/pt_br/deleted.content.message.txt.sample
309
%%DATADIR%%/reports/pt_br/deleted.content.message.txt.sample
290
%%DATADIR%%/reports/pt_br/deleted.filename.message.txt.sample
310
%%DATADIR%%/reports/pt_br/deleted.filename.message.txt.sample
291
%%DATADIR%%/reports/pt_br/deleted.virus.message.txt.sample
311
%%DATADIR%%/reports/pt_br/deleted.virus.message.txt.sample
Lines 307-312 Link Here
307
%%DATADIR%%/reports/pt_br/stored.content.message.txt.sample
327
%%DATADIR%%/reports/pt_br/stored.content.message.txt.sample
308
%%DATADIR%%/reports/pt_br/stored.filename.message.txt.sample
328
%%DATADIR%%/reports/pt_br/stored.filename.message.txt.sample
309
%%DATADIR%%/reports/pt_br/stored.virus.message.txt.sample
329
%%DATADIR%%/reports/pt_br/stored.virus.message.txt.sample
330
%%DATADIR%%/reports/pt_br/recipient.mcp.report.txt.sample
331
%%DATADIR%%/reports/pt_br/recipient.spam.report.txt.sample
310
%%DATADIR%%/reports/ro/deleted.content.message.txt.sample
332
%%DATADIR%%/reports/ro/deleted.content.message.txt.sample
311
%%DATADIR%%/reports/ro/deleted.filename.message.txt.sample
333
%%DATADIR%%/reports/ro/deleted.filename.message.txt.sample
312
%%DATADIR%%/reports/ro/deleted.virus.message.txt.sample
334
%%DATADIR%%/reports/ro/deleted.virus.message.txt.sample
Lines 328-333 Link Here
328
%%DATADIR%%/reports/ro/stored.content.message.txt.sample
350
%%DATADIR%%/reports/ro/stored.content.message.txt.sample
329
%%DATADIR%%/reports/ro/stored.filename.message.txt.sample
351
%%DATADIR%%/reports/ro/stored.filename.message.txt.sample
330
%%DATADIR%%/reports/ro/stored.virus.message.txt.sample
352
%%DATADIR%%/reports/ro/stored.virus.message.txt.sample
353
%%DATADIR%%/reports/ro/recipient.mcp.report.txt.sample
354
%%DATADIR%%/reports/ro/recipient.spam.report.txt.sample
331
%%DATADIR%%/reports/se/README.sample
355
%%DATADIR%%/reports/se/README.sample
332
%%DATADIR%%/reports/se/deleted.content.message.txt.sample
356
%%DATADIR%%/reports/se/deleted.content.message.txt.sample
333
%%DATADIR%%/reports/se/deleted.filename.message.txt.sample
357
%%DATADIR%%/reports/se/deleted.filename.message.txt.sample
Lines 350-355 Link Here
350
%%DATADIR%%/reports/se/stored.content.message.txt.sample
374
%%DATADIR%%/reports/se/stored.content.message.txt.sample
351
%%DATADIR%%/reports/se/stored.filename.message.txt.sample
375
%%DATADIR%%/reports/se/stored.filename.message.txt.sample
352
%%DATADIR%%/reports/se/stored.virus.message.txt.sample
376
%%DATADIR%%/reports/se/stored.virus.message.txt.sample
377
%%DATADIR%%/reports/se/recipient.mcp.report.txt.sample
378
%%DATADIR%%/reports/se/recipient.spam.report.txt.sample
353
%%DATADIR%%/reports/sk/deleted.content.message.txt.sample
379
%%DATADIR%%/reports/sk/deleted.content.message.txt.sample
354
%%DATADIR%%/reports/sk/deleted.filename.message.txt.sample
380
%%DATADIR%%/reports/sk/deleted.filename.message.txt.sample
355
%%DATADIR%%/reports/sk/deleted.virus.message.txt.sample
381
%%DATADIR%%/reports/sk/deleted.virus.message.txt.sample
Lines 371-376 Link Here
371
%%DATADIR%%/reports/sk/stored.content.message.txt.sample
397
%%DATADIR%%/reports/sk/stored.content.message.txt.sample
372
%%DATADIR%%/reports/sk/stored.filename.message.txt.sample
398
%%DATADIR%%/reports/sk/stored.filename.message.txt.sample
373
%%DATADIR%%/reports/sk/stored.virus.message.txt.sample
399
%%DATADIR%%/reports/sk/stored.virus.message.txt.sample
400
%%DATADIR%%/reports/sk/recipient.mcp.report.txt.sample
401
%%DATADIR%%/reports/sk/recipient.spam.report.txt.sample
374
%%PORTDOCS%%%%DOCSDIR%%/COPYING
402
%%PORTDOCS%%%%DOCSDIR%%/COPYING
375
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
403
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
376
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
404
%%PORTDOCS%%%%DOCSDIR%%/INSTALL

Return to bug 61967