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

(-)Makefile (-1 / +16 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	MailScanner
8
PORTNAME=	MailScanner
9
PORTVERSION=	4.46.2
9
PORTVERSION=	4.48.4
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
DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
12
DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
Lines 232-237 Link Here
232
		fi; \
232
		fi; \
233
	done
233
	done
234
	@${CAT} ${PKGMESSAGE}
234
	@${CAT} ${PKGMESSAGE}
235
236
.if !defined(NO_SPAMASSASSIN_SYMLINK)
237
post-install:
238
	@if [ -d ${PREFIX}/etc/mail/spamassassin ]; then \
239
		if [ ! -r ${PREFIX}/etc/mail/spamassassin/mailscanner.cf ]; then \
240
			if [ ! -r ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf ]; then \
241
				${CP} ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf.sample ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf; \
242
			fi; \
243
			${ECHO} ${LN} -s ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf ${PREFIX}/etc/mail/spamassassin/mailscanner.cf; \
244
			${LN} -s ${PREFIX}/etc/MailScanner/spam.assassin.prefs.conf ${PREFIX}/etc/mail/spamassassin/mailscanner.cf; \
245
		else \
246
			${ECHO} "File ${PREFIX}/etc/mail/spamassassin/mailscanner.cf already exists!"; \
247
		fi; \
248
	fi
249
.endif
235
250
236
renew-wrapper: install
251
renew-wrapper: install
237
	# Renew virus wrapper scripts
252
	# Renew virus wrapper scripts
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (MailScanner-install-4.46.2-2.tar.gz) = 71cc984d0b8588fbe8d10936bd240333
1
MD5 (MailScanner-install-4.48.4-2.tar.gz) = d787daabb0a75f369bd1037256307909
2
SIZE (MailScanner-install-4.46.2-2.tar.gz) = 5428009
2
SIZE (MailScanner-install-4.48.4-2.tar.gz) = 5434134
(-)pkg-plist (+15 lines)
Lines 97-102 Link Here
97
libexec/MailScanner/update_virus_scanners
97
libexec/MailScanner/update_virus_scanners
98
libexec/MailScanner/vexira-autoupdate.sample
98
libexec/MailScanner/vexira-autoupdate.sample
99
libexec/MailScanner/vexira-wrapper.sample
99
libexec/MailScanner/vexira-wrapper.sample
100
%%DATADIR%%/reports/ca/rejection.report.txt.sample
100
%%DATADIR%%/reports/ca/deleted.content.message.txt.sample
101
%%DATADIR%%/reports/ca/deleted.content.message.txt.sample
101
%%DATADIR%%/reports/ca/deleted.filename.message.txt.sample
102
%%DATADIR%%/reports/ca/deleted.filename.message.txt.sample
102
%%DATADIR%%/reports/ca/deleted.virus.message.txt.sample
103
%%DATADIR%%/reports/ca/deleted.virus.message.txt.sample
Lines 134-139 Link Here
134
%%DATADIR%%/reports/cy+en/recipient.mcp.report.txt.sample
135
%%DATADIR%%/reports/cy+en/recipient.mcp.report.txt.sample
135
%%DATADIR%%/reports/cy+en/recipient.spam.report.txt.sample
136
%%DATADIR%%/reports/cy+en/recipient.spam.report.txt.sample
136
%%DATADIR%%/reports/cy+en/sender.content.report.txt.sample
137
%%DATADIR%%/reports/cy+en/sender.content.report.txt.sample
138
%%DATADIR%%/reports/cy+en/rejection.report.txt.sample
137
%%DATADIR%%/reports/cy+en/sender.error.report.txt.sample
139
%%DATADIR%%/reports/cy+en/sender.error.report.txt.sample
138
%%DATADIR%%/reports/cy+en/sender.filename.report.txt.sample
140
%%DATADIR%%/reports/cy+en/sender.filename.report.txt.sample
139
%%DATADIR%%/reports/cy+en/sender.mcp.report.txt.sample
141
%%DATADIR%%/reports/cy+en/sender.mcp.report.txt.sample
Lines 159-164 Link Here
159
%%DATADIR%%/reports/cz/recipient.mcp.report.txt.sample
161
%%DATADIR%%/reports/cz/recipient.mcp.report.txt.sample
160
%%DATADIR%%/reports/cz/recipient.spam.report.txt.sample
162
%%DATADIR%%/reports/cz/recipient.spam.report.txt.sample
161
%%DATADIR%%/reports/cz/sender.content.report.txt.sample
163
%%DATADIR%%/reports/cz/sender.content.report.txt.sample
164
%%DATADIR%%/reports/cz/rejection.report.txt.sample
162
%%DATADIR%%/reports/cz/sender.error.report.txt.sample
165
%%DATADIR%%/reports/cz/sender.error.report.txt.sample
163
%%DATADIR%%/reports/cz/sender.filename.report.txt.sample
166
%%DATADIR%%/reports/cz/sender.filename.report.txt.sample
164
%%DATADIR%%/reports/cz/sender.mcp.report.txt.sample
167
%%DATADIR%%/reports/cz/sender.mcp.report.txt.sample
Lines 183-188 Link Here
183
%%DATADIR%%/reports/de/recipient.mcp.report.txt.sample
186
%%DATADIR%%/reports/de/recipient.mcp.report.txt.sample
184
%%DATADIR%%/reports/de/recipient.spam.report.txt.sample
187
%%DATADIR%%/reports/de/recipient.spam.report.txt.sample
185
%%DATADIR%%/reports/de/sender.content.report.txt.sample
188
%%DATADIR%%/reports/de/sender.content.report.txt.sample
189
%%DATADIR%%/reports/de/rejection.report.txt.sample
186
%%DATADIR%%/reports/de/sender.error.report.txt.sample
190
%%DATADIR%%/reports/de/sender.error.report.txt.sample
187
%%DATADIR%%/reports/de/sender.filename.report.txt.sample
191
%%DATADIR%%/reports/de/sender.filename.report.txt.sample
188
%%DATADIR%%/reports/de/sender.mcp.report.txt.sample
192
%%DATADIR%%/reports/de/sender.mcp.report.txt.sample
Lines 206-211 Link Here
206
%%DATADIR%%/reports/dk/recipient.mcp.report.txt.sample
210
%%DATADIR%%/reports/dk/recipient.mcp.report.txt.sample
207
%%DATADIR%%/reports/dk/recipient.spam.report.txt.sample
211
%%DATADIR%%/reports/dk/recipient.spam.report.txt.sample
208
%%DATADIR%%/reports/dk/sender.content.report.txt.sample
212
%%DATADIR%%/reports/dk/sender.content.report.txt.sample
213
%%DATADIR%%/reports/dk/rejection.report.txt.sample
209
%%DATADIR%%/reports/dk/sender.error.report.txt.sample
214
%%DATADIR%%/reports/dk/sender.error.report.txt.sample
210
%%DATADIR%%/reports/dk/sender.filename.report.txt.sample
215
%%DATADIR%%/reports/dk/sender.filename.report.txt.sample
211
%%DATADIR%%/reports/dk/sender.mcp.report.txt.sample
216
%%DATADIR%%/reports/dk/sender.mcp.report.txt.sample
Lines 229-234 Link Here
229
%%DATADIR%%/reports/en/recipient.mcp.report.txt.sample
234
%%DATADIR%%/reports/en/recipient.mcp.report.txt.sample
230
%%DATADIR%%/reports/en/recipient.spam.report.txt.sample
235
%%DATADIR%%/reports/en/recipient.spam.report.txt.sample
231
%%DATADIR%%/reports/en/sender.content.report.txt.sample
236
%%DATADIR%%/reports/en/sender.content.report.txt.sample
237
%%DATADIR%%/reports/en/rejection.report.txt.sample
232
%%DATADIR%%/reports/en/sender.error.report.txt.sample
238
%%DATADIR%%/reports/en/sender.error.report.txt.sample
233
%%DATADIR%%/reports/en/sender.filename.report.txt.sample
239
%%DATADIR%%/reports/en/sender.filename.report.txt.sample
234
%%DATADIR%%/reports/en/sender.mcp.report.txt.sample
240
%%DATADIR%%/reports/en/sender.mcp.report.txt.sample
Lines 251-256 Link Here
251
%%DATADIR%%/reports/es/languages.conf.sample
257
%%DATADIR%%/reports/es/languages.conf.sample
252
%%DATADIR%%/reports/es/recipient.mcp.report.txt.sample
258
%%DATADIR%%/reports/es/recipient.mcp.report.txt.sample
253
%%DATADIR%%/reports/es/recipient.spam.report.txt.sample
259
%%DATADIR%%/reports/es/recipient.spam.report.txt.sample
260
%%DATADIR%%/reports/es/rejection.report.txt.sample
254
%%DATADIR%%/reports/es/sender.content.report.txt.sample
261
%%DATADIR%%/reports/es/sender.content.report.txt.sample
255
%%DATADIR%%/reports/es/sender.error.report.txt.sample
262
%%DATADIR%%/reports/es/sender.error.report.txt.sample
256
%%DATADIR%%/reports/es/sender.filename.report.txt.sample
263
%%DATADIR%%/reports/es/sender.filename.report.txt.sample
Lines 274-279 Link Here
274
%%DATADIR%%/reports/fr/languages.conf.sample
281
%%DATADIR%%/reports/fr/languages.conf.sample
275
%%DATADIR%%/reports/fr/recipient.mcp.report.txt.sample
282
%%DATADIR%%/reports/fr/recipient.mcp.report.txt.sample
276
%%DATADIR%%/reports/fr/recipient.spam.report.txt.sample
283
%%DATADIR%%/reports/fr/recipient.spam.report.txt.sample
284
%%DATADIR%%/reports/fr/rejection.report.txt.sample
277
%%DATADIR%%/reports/fr/sender.content.report.txt.sample
285
%%DATADIR%%/reports/fr/sender.content.report.txt.sample
278
%%DATADIR%%/reports/fr/sender.error.report.txt.sample
286
%%DATADIR%%/reports/fr/sender.error.report.txt.sample
279
%%DATADIR%%/reports/fr/sender.filename.report.txt.sample
287
%%DATADIR%%/reports/fr/sender.filename.report.txt.sample
Lines 297-302 Link Here
297
%%DATADIR%%/reports/hu/languages.conf.sample
305
%%DATADIR%%/reports/hu/languages.conf.sample
298
%%DATADIR%%/reports/hu/recipient.mcp.report.txt.sample
306
%%DATADIR%%/reports/hu/recipient.mcp.report.txt.sample
299
%%DATADIR%%/reports/hu/recipient.spam.report.txt.sample
307
%%DATADIR%%/reports/hu/recipient.spam.report.txt.sample
308
%%DATADIR%%/reports/hu/rejection.report.txt.sample
300
%%DATADIR%%/reports/hu/sender.content.report.txt.sample
309
%%DATADIR%%/reports/hu/sender.content.report.txt.sample
301
%%DATADIR%%/reports/hu/sender.error.report.txt.sample
310
%%DATADIR%%/reports/hu/sender.error.report.txt.sample
302
%%DATADIR%%/reports/hu/sender.filename.report.txt.sample
311
%%DATADIR%%/reports/hu/sender.filename.report.txt.sample
Lines 320-325 Link Here
320
%%DATADIR%%/reports/it/languages.conf.sample
329
%%DATADIR%%/reports/it/languages.conf.sample
321
%%DATADIR%%/reports/it/recipient.mcp.report.txt.sample
330
%%DATADIR%%/reports/it/recipient.mcp.report.txt.sample
322
%%DATADIR%%/reports/it/recipient.spam.report.txt.sample
331
%%DATADIR%%/reports/it/recipient.spam.report.txt.sample
332
%%DATADIR%%/reports/it/rejection.report.txt.sample
323
%%DATADIR%%/reports/it/sender.content.report.txt.sample
333
%%DATADIR%%/reports/it/sender.content.report.txt.sample
324
%%DATADIR%%/reports/it/sender.error.report.txt.sample
334
%%DATADIR%%/reports/it/sender.error.report.txt.sample
325
%%DATADIR%%/reports/it/sender.filename.report.txt.sample
335
%%DATADIR%%/reports/it/sender.filename.report.txt.sample
Lines 343-348 Link Here
343
%%DATADIR%%/reports/nl/languages.conf.sample
353
%%DATADIR%%/reports/nl/languages.conf.sample
344
%%DATADIR%%/reports/nl/recipient.mcp.report.txt.sample
354
%%DATADIR%%/reports/nl/recipient.mcp.report.txt.sample
345
%%DATADIR%%/reports/nl/recipient.spam.report.txt.sample
355
%%DATADIR%%/reports/nl/recipient.spam.report.txt.sample
356
%%DATADIR%%/reports/nl/rejection.report.txt.sample
346
%%DATADIR%%/reports/nl/sender.content.report.txt.sample
357
%%DATADIR%%/reports/nl/sender.content.report.txt.sample
347
%%DATADIR%%/reports/nl/sender.error.report.txt.sample
358
%%DATADIR%%/reports/nl/sender.error.report.txt.sample
348
%%DATADIR%%/reports/nl/sender.filename.report.txt.sample
359
%%DATADIR%%/reports/nl/sender.filename.report.txt.sample
Lines 366-371 Link Here
366
%%DATADIR%%/reports/pt_br/languages.conf.sample
377
%%DATADIR%%/reports/pt_br/languages.conf.sample
367
%%DATADIR%%/reports/pt_br/recipient.mcp.report.txt.sample
378
%%DATADIR%%/reports/pt_br/recipient.mcp.report.txt.sample
368
%%DATADIR%%/reports/pt_br/recipient.spam.report.txt.sample
379
%%DATADIR%%/reports/pt_br/recipient.spam.report.txt.sample
380
%%DATADIR%%/reports/pt_br/rejection.report.txt.sample
369
%%DATADIR%%/reports/pt_br/sender.content.report.txt.sample
381
%%DATADIR%%/reports/pt_br/sender.content.report.txt.sample
370
%%DATADIR%%/reports/pt_br/sender.error.report.txt.sample
382
%%DATADIR%%/reports/pt_br/sender.error.report.txt.sample
371
%%DATADIR%%/reports/pt_br/sender.filename.report.txt.sample
383
%%DATADIR%%/reports/pt_br/sender.filename.report.txt.sample
Lines 389-394 Link Here
389
%%DATADIR%%/reports/ro/languages.conf.sample
401
%%DATADIR%%/reports/ro/languages.conf.sample
390
%%DATADIR%%/reports/ro/recipient.mcp.report.txt.sample
402
%%DATADIR%%/reports/ro/recipient.mcp.report.txt.sample
391
%%DATADIR%%/reports/ro/recipient.spam.report.txt.sample
403
%%DATADIR%%/reports/ro/recipient.spam.report.txt.sample
404
%%DATADIR%%/reports/ro/rejection.report.txt.sample
392
%%DATADIR%%/reports/ro/sender.content.report.txt.sample
405
%%DATADIR%%/reports/ro/sender.content.report.txt.sample
393
%%DATADIR%%/reports/ro/sender.error.report.txt.sample
406
%%DATADIR%%/reports/ro/sender.error.report.txt.sample
394
%%DATADIR%%/reports/ro/sender.filename.report.txt.sample
407
%%DATADIR%%/reports/ro/sender.filename.report.txt.sample
Lines 413-418 Link Here
413
%%DATADIR%%/reports/se/languages.conf.sample
426
%%DATADIR%%/reports/se/languages.conf.sample
414
%%DATADIR%%/reports/se/recipient.mcp.report.txt.sample
427
%%DATADIR%%/reports/se/recipient.mcp.report.txt.sample
415
%%DATADIR%%/reports/se/recipient.spam.report.txt.sample
428
%%DATADIR%%/reports/se/recipient.spam.report.txt.sample
429
%%DATADIR%%/reports/se/rejection.report.txt.sample
416
%%DATADIR%%/reports/se/sender.content.report.txt.sample
430
%%DATADIR%%/reports/se/sender.content.report.txt.sample
417
%%DATADIR%%/reports/se/sender.error.report.txt.sample
431
%%DATADIR%%/reports/se/sender.error.report.txt.sample
418
%%DATADIR%%/reports/se/sender.filename.report.txt.sample
432
%%DATADIR%%/reports/se/sender.filename.report.txt.sample
Lines 436-441 Link Here
436
%%DATADIR%%/reports/sk/languages.conf.sample
450
%%DATADIR%%/reports/sk/languages.conf.sample
437
%%DATADIR%%/reports/sk/recipient.mcp.report.txt.sample
451
%%DATADIR%%/reports/sk/recipient.mcp.report.txt.sample
438
%%DATADIR%%/reports/sk/recipient.spam.report.txt.sample
452
%%DATADIR%%/reports/sk/recipient.spam.report.txt.sample
453
%%DATADIR%%/reports/sk/rejection.report.txt.sample
439
%%DATADIR%%/reports/sk/sender.content.report.txt.sample
454
%%DATADIR%%/reports/sk/sender.content.report.txt.sample
440
%%DATADIR%%/reports/sk/sender.error.report.txt.sample
455
%%DATADIR%%/reports/sk/sender.error.report.txt.sample
441
%%DATADIR%%/reports/sk/sender.filename.report.txt.sample
456
%%DATADIR%%/reports/sk/sender.filename.report.txt.sample
(-)files/patch-docs:man:MailScanner.8 (-3 / +3 lines)
Lines 1-8 Link Here
1
--- ../MailScanner-install-4.44.6.orig/docs/man/MailScanner.8	Mon Aug 22 16:18:05 2005
1
--- ../MailScanner-install-4.48.4.orig/docs/man/MailScanner.8	Wed Dec  7 18:33:04 2005
2
+++ docs/man/MailScanner.8	Mon Aug 22 16:18:20 2005
2
+++ docs/man/MailScanner.8	Wed Dec  7 18:33:48 2005
3
@@ -1,4 +1,4 @@
3
@@ -1,4 +1,4 @@
4
-.TH "MailScanner" "8" "4.42.9" "Julian Field" "Mail"
4
-.TH "MailScanner" "8" "4.42.9" "Julian Field" "Mail"
5
+.TH "MailScanner" "8" "4.44.6" "Julian Field" "Mail"
5
+.TH "MailScanner" "8" "4.45.1" "Julian Field" "Mail"
6
 .SH "NAME"
6
 .SH "NAME"
7
 .LP 
7
 .LP 
8
 MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
8
 MailScanner \- Virus/Spam Scanner for Sendmail, Exim and Postfix
(-)files/patch-docs:man:MailScanner.8.html (-3 / +3 lines)
Lines 1-9 Link Here
1
--- ../MailScanner-install-4.44.6.orig/docs/man/MailScanner.8.html	Mon Aug 22 16:18:05 2005
1
--- ../MailScanner-install-4.48.4.orig/docs/man/MailScanner.8.html	Wed Dec  7 18:33:04 2005
2
+++ docs/man/MailScanner.8.html	Mon Aug 22 16:18:23 2005
2
+++ docs/man/MailScanner.8.html	Wed Dec  7 18:33:51 2005
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 Jun  1 11:29:47 2005 -->
5
-<!-- CreationDate: Wed Jun  1 11:29:47 2005 -->
6
+<!-- CreationDate: Thu Aug 18 11:23:58 2005 -->
6
+<!-- CreationDate: Tue Dec  6 20:28:14 2005 -->
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>
(-)files/patch-docs:man:MailScanner.conf.5 (-9 / +49 lines)
Lines 1-12 Link Here
1
--- ../MailScanner-install-4.44.6.orig/docs/man/MailScanner.conf.5	Mon Aug 22 16:18:05 2005
1
--- ../MailScanner-install-4.48.4.orig/docs/man/MailScanner.conf.5	Wed Dec  7 18:33:04 2005
2
+++ docs/man/MailScanner.conf.5	Mon Aug 22 16:18:27 2005
2
+++ docs/man/MailScanner.conf.5	Wed Dec  7 18:33:54 2005
3
@@ -1,4 +1,4 @@
3
@@ -1,4 +1,4 @@
4
-.TH "MailScanner.conf" "5" "4.42.9" "Julian Field" "Mail"
4
-.TH "MailScanner.conf" "5" "4.42.9" "Julian Field" "Mail"
5
+.TH "MailScanner.conf" "5" "4.44.6" "Julian Field" "Mail"
5
+.TH "MailScanner.conf" "5" "4.48.4" "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
@@ -326,6 +326,16 @@
9
@@ -326,6 +326,23 @@
10
 .br 
10
 .br 
11
 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".
11
 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".
12
 
12
 
Lines 19-29 Link Here
19
+.br 
19
+.br 
20
+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.
20
+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.
21
+
21
+
22
+.TP 
23
+\fBReject Messages\fR
24
+Default: no
25
+.br 
26
+
27
+.br 
28
+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.
22
+
29
+
23
 .TP 
30
 .TP 
24
 \fBMaximum Attachments Per Message\fR
31
 \fBMaximum Attachments Per Message\fR
25
 Default: 200
32
 Default: 200
26
@@ -1701,12 +1711,64 @@
33
@@ -853,6 +870,15 @@
34
 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.
35
 
36
 .TP 
37
+\fBQuarantine Modified Body\fR
38
+Default: no
39
+.br 
40
+
41
+.br 
42
+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.
43
+
44
+
45
+.TP 
46
 \fBQuarantine Whole Message\fR
47
 Default: no
48
 .br 
49
@@ -885,6 +911,16 @@
50
 .br 
51
 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.
52
 
53
+
54
+.TP 
55
+\fBRejection Report\fR
56
+Default: %reports\-dir%/rejection.report.txt
57
+.br 
58
+
59
+.br 
60
+Set where to find the message text sent to users who triggered the ruleset you are using with the "Reject Message" option.
61
+
62
+
63
 .TP 
64
 \fBDeleted Bad Filename Message Report\fR
65
 Default: %reports\-dir%/deleted.filename.message.txt
66
@@ -1701,12 +1737,64 @@
27
 .br 
67
 .br 
28
 
68
 
29
 .br 
69
 .br 
Lines 55-70 Link Here
55
+$Message	\- a perl reference to the list of line of the message
95
+$Message	\- a perl reference to the list of line of the message
56
+.RE
96
+.RE
57
+.br 
97
+.br 
58
 
98
+
59
 
99
+
60
+.TP 
100
+.TP 
61
+\fBMax Custom Spam Scanner Size\fR
101
+\fBMax Custom Spam Scanner Size\fR
62
+Default: 20000
102
+Default: 20000
63
+.br 
103
+.br 
64
+
104
 
65
+.br 
105
+.br 
66
+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.
106
+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.
67
+
107
 
68
+.TP 
108
+.TP 
69
+\fBCustom Spam Scanner Timeout\fR
109
+\fBCustom Spam Scanner Timeout\fR
70
+Default: 20
110
+Default: 20
(-)files/patch-docs:man:MailScanner.conf.5.html (-5 / +92 lines)
Lines 1-9 Link Here
1
--- ../MailScanner-install-4.44.6.orig/docs/man/MailScanner.conf.5.html	Mon Aug 22 16:18:05 2005
1
--- ../MailScanner-install-4.48.4.orig/docs/man/MailScanner.conf.5.html	Wed Dec  7 18:33:07 2005
2
+++ docs/man/MailScanner.conf.5.html	Mon Aug 22 16:18:30 2005
2
+++ docs/man/MailScanner.conf.5.html	Wed Dec  7 18:34:00 2005
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 Jun  1 11:29:47 2005 -->
5
-<!-- CreationDate: Wed Jun  1 11:29:47 2005 -->
6
+<!-- CreationDate: Thu Aug 18 11:23:58 2005 -->
6
+<!-- CreationDate: Tue Dec  6 20:28:14 2005 -->
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>
Lines 15-21 Link Here
15
 <a href="#What to do with spam">What to do with spam</a><br>
15
 <a href="#What to do with spam">What to do with spam</a><br>
16
 <a href="#System logging">System logging</a><br>
16
 <a href="#System logging">System logging</a><br>
17
 <a href="#Advanced SpamAssassin Settings">Advanced SpamAssassin Settings</a><br>
17
 <a href="#Advanced SpamAssassin Settings">Advanced SpamAssassin Settings</a><br>
18
@@ -953,6 +954,30 @@
18
@@ -953,6 +954,61 @@
19
 <tr valign="top" align="left">
19
 <tr valign="top" align="left">
20
 <td width="11%"></td>
20
 <td width="11%"></td>
21
 <td width="89%">
21
 <td width="89%">
Lines 43-52 Link Here
43
+<tr valign="top" align="left">
43
+<tr valign="top" align="left">
44
+<td width="11%"></td>
44
+<td width="11%"></td>
45
+<td width="89%">
45
+<td width="89%">
46
+<p><b>Reject Messages</b></p></td>
47
+</table>
48
+<!-- INDENTATION -->
49
+<table width="100%" border=0 rules="none" frame="void"
50
+       cols="2" cellspacing="0" cellpadding="0">
51
+<tr valign="top" align="left">
52
+<td width="22%"></td>
53
+<td width="78%">
54
+<p>Default: no</p>
55
+<!-- INDENTATION -->
56
+<p>You may not want to receive mail from certain addresses
57
+and/or to certain addresses. If so, you can do this with
58
+your email transport (sendmail, Postfix, etc) but that will
59
+just send a one&minus;line message which is not helpful to
60
+the user sending the message. If this is set to yes, then
61
+the message set by the &quot;Rejection Report&quot; will be
62
+sent instead, and the incoming message will be deleted. If
63
+you want to store a copy of the original incoming message
64
+then use the &quot;Archive Mail&quot; setting to archive a
65
+copy of it. The purpose of this option is to set it to be a
66
+ruleset, so that you can reject messages from a few
67
+offending addresses where you need to send a polite reply
68
+instead of just a brief 1&minus;line rejection message.</p>
69
+</td>
70
+</table>
71
+<!-- INDENTATION -->
72
+<table width="100%" border=0 rules="none" frame="void"
73
+       cols="2" cellspacing="0" cellpadding="0">
74
+<tr valign="top" align="left">
75
+<td width="11%"></td>
76
+<td width="89%">
46
 <p><b>Maximum Attachments Per Message</b></p></td>
77
 <p><b>Maximum Attachments Per Message</b></p></td>
47
 </table>
78
 </table>
48
 <!-- INDENTATION -->
79
 <!-- INDENTATION -->
49
@@ -4909,10 +4934,239 @@
80
@@ -2523,6 +2579,27 @@
81
 <tr valign="top" align="left">
82
 <td width="11%"></td>
83
 <td width="89%">
84
+<p><b>Quarantine Modified Body</b></p></td>
85
+</table>
86
+<!-- INDENTATION -->
87
+<table width="100%" border=0 rules="none" frame="void"
88
+       cols="2" cellspacing="0" cellpadding="0">
89
+<tr valign="top" align="left">
90
+<td width="22%"></td>
91
+<td width="78%">
92
+<p>Default: no</p>
93
+<!-- INDENTATION -->
94
+<p>Do you want to store copies of messages which have been
95
+disarmed by having their HTML modified at all? This can also
96
+be the filename of a ruleset.</p>
97
+</td>
98
+</table>
99
+<!-- INDENTATION -->
100
+<table width="100%" border=0 rules="none" frame="void"
101
+       cols="2" cellspacing="0" cellpadding="0">
102
+<tr valign="top" align="left">
103
+<td width="11%"></td>
104
+<td width="89%">
105
 <p><b>Quarantine Whole Message</b></p></td>
106
 </table>
107
 <!-- INDENTATION -->
108
@@ -2621,6 +2698,27 @@
109
 <tr valign="top" align="left">
110
 <td width="11%"></td>
111
 <td width="89%">
112
+<p><b>Rejection Report</b></p></td>
113
+</table>
114
+<!-- INDENTATION -->
115
+<table width="100%" border=0 rules="none" frame="void"
116
+       cols="2" cellspacing="0" cellpadding="0">
117
+<tr valign="top" align="left">
118
+<td width="22%"></td>
119
+<td width="78%">
120
+<p>Default: %reports&minus;dir%/rejection.report.txt</p>
121
+<!-- INDENTATION -->
122
+<p>Set where to find the message text sent to users who
123
+triggered the ruleset you are using with the &quot;Reject
124
+Message&quot; option.</p>
125
+</td>
126
+</table>
127
+<!-- INDENTATION -->
128
+<table width="100%" border=0 rules="none" frame="void"
129
+       cols="2" cellspacing="0" cellpadding="0">
130
+<tr valign="top" align="left">
131
+<td width="11%"></td>
132
+<td width="89%">
133
 <p><b>Deleted Bad Filename Message Report</b></p></td>
134
 </table>
135
 <!-- INDENTATION -->
136
@@ -4909,10 +5007,239 @@
50
 <td width="78%">
137
 <td width="78%">
51
 <p>Default: no</p>
138
 <p>Default: no</p>
52
 <!-- INDENTATION -->
139
 <!-- INDENTATION -->

Return to bug 90296