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

(-)/server-root/ports/mail/mailscanner/Makefile (-5 / +12 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	MailScanner
8
PORTNAME=	MailScanner
9
PORTVERSION=	4.36.4
9
PORTVERSION=	4.37.7
10
PORTREVISION=	1
11
CATEGORIES=	mail
10
CATEGORIES=	mail
12
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/
13
DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
12
DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
Lines 210-215 Link Here
210
	   ${ECHO} "Changes in MailScanner.conf found. Please look at \
209
	   ${ECHO} "Changes in MailScanner.conf found. Please look at \
211
		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION}" ; \
210
		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION}" ; \
212
	fi
211
	fi
212
.endif
213
	# Languages.conf update
213
	@for LANG_DIR in ${DATADIR}/reports/*; do \
214
	@for LANG_DIR in ${DATADIR}/reports/*; do \
214
		if [ -f $${LANG_DIR}/languages.conf ]; then \
215
		if [ -f $${LANG_DIR}/languages.conf ]; then \
215
			${ECHO} -n Upgrading $${LANG_DIR}/languages.conf... Please wait...; \
216
			${ECHO} -n Upgrading $${LANG_DIR}/languages.conf... Please wait...; \
Lines 220-233 Link Here
220
				2> /dev/null ; \
221
				2> /dev/null ; \
221
			if diff -b -B -q $${LANG_DIR}/languages.conf \
222
			if diff -b -B -q $${LANG_DIR}/languages.conf \
222
				$${LANG_DIR}/languages.conf.new.${PORTVERSION} ; \
223
				$${LANG_DIR}/languages.conf.new.${PORTVERSION} ; \
223
			  then  ${ECHO} " no changes"; \
224
			  then	${ECHO} " no changes"; \
224
				${RM} $${LANG_DIR}/languages.conf.new.${PORTVERSION} ; \
225
				${RM} $${LANG_DIR}/languages.conf.new.${PORTVERSION} ; \
225
			  else  ${ECHO} " done"; \
226
			  else	${ECHO} " done"; \
226
				${CP} $${LANG_DIR}/languages.conf.new.${PORTVERSION} $${LANG_DIR}/languages.conf ; \
227
				${CP} $${LANG_DIR}/languages.conf.new.${PORTVERSION} $${LANG_DIR}/languages.conf ; \
227
			fi; \
228
			fi; \
228
		fi; \
229
		fi; \
229
	done
230
	done
230
.endif
231
	@${SED} -e 's,%%PREFIX%%,${PREFIX},' pkg-message > ${PKGMESSAGE}
231
	@${SED} -e 's,%%PREFIX%%,${PREFIX},' pkg-message > ${PKGMESSAGE}
232
	@${CAT} ${PKGMESSAGE}
232
	@${CAT} ${PKGMESSAGE}
233
233
Lines 249-253 Link Here
249
		${PREFIX}/etc/MailScanner
249
		${PREFIX}/etc/MailScanner
250
	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
250
	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
251
		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules
251
		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules
252
	@${ECHO} "******************************************************************************"
253
	@${ECHO} "The provided default configuration requires several directories to be created:"
254
	@${ECHO} "/var/spool/MailScanner/incoming"
255
	@${ECHO} "/var/spool/MailScanner/quarantine"
256
	@${ECHO} "/var/spool/mqueue"
257
	@${ECHO} "Either create those directories or change the configuration."
258
	@${ECHO} "******************************************************************************"
252
259
253
.include <bsd.port.post.mk>
260
.include <bsd.port.post.mk>
(-)/server-root/ports/mail/mailscanner/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (MailScanner-install-4.36.4-1.tar.gz) = 322f1b5d8f7e5f0f0bbf53046f1d2a20
1
MD5 (MailScanner-install-4.37.7-1.tar.gz) = 07a12541361ec9a38e58e090dc6fb184
2
SIZE (MailScanner-install-4.36.4-1.tar.gz) = 5622620
2
SIZE (MailScanner-install-4.37.7-1.tar.gz) = 5616070
(-)/server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8 (-3 / +3 lines)
Lines 1-8 Link Here
1
--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.8	Wed Dec 15 20:31:43 2004
1
--- ../MailScanner-install-4.37.7.orig/docs/man/MailScanner.8	Mon Jan 17 12:58:50 2005
2
+++ docs/man/MailScanner.8	Wed Dec 15 20:32:20 2004
2
+++ docs/man/MailScanner.8	Mon Jan 17 13:00:43 2005
3
@@ -1,4 +1,4 @@
3
@@ -1,4 +1,4 @@
4
-.TH "MailScanner" "8" "4.34.8" "Julian Field" "Mail"
4
-.TH "MailScanner" "8" "4.34.8" "Julian Field" "Mail"
5
+.TH "MailScanner" "8" "4.36.4" "Julian Field" "Mail"
5
+.TH "MailScanner" "8" "4.37.7" "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
(-)/server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8.html (-3 / +3 lines)
Lines 1-9 Link Here
1
--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.8.html	Wed Dec 15 20:31:43 2004
1
--- ../MailScanner-install-4.37.7.orig/docs/man/MailScanner.8.html	Mon Jan 17 12:58:50 2005
2
+++ docs/man/MailScanner.8.html	Wed Dec 15 20:32:06 2004
2
+++ docs/man/MailScanner.8.html	Mon Jan 17 13:00:45 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: Fri Oct 15 15:13:21 2004 -->
5
-<!-- CreationDate: Fri Oct 15 15:13:21 2004 -->
6
+<!-- CreationDate: Mon Nov  1 18:00:16 2004 -->
6
+<!-- CreationDate: Wed Dec 15 21:29:27 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>
(-)/server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5 (-6 / +55 lines)
Lines 1-8 Link Here
1
--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.conf.5	Wed Dec 15 20:31:43 2004
1
--- ../MailScanner-install-4.37.7.orig/docs/man/MailScanner.conf.5	Mon Jan 17 13:18:55 2005
2
+++ docs/man/MailScanner.conf.5	Wed Dec 15 20:32:29 2004
2
+++ docs/man/MailScanner.conf.5	Mon Jan 17 13:19:08 2005
3
@@ -1,4 +1,4 @@
3
@@ -1,4 +1,4 @@
4
-.TH "MailScanner.conf" "5" "4.34.8" "Julian Field" "Mail"
4
-.TH "MailScanner.conf" "5" "4.34.8" "Julian Field" "Mail"
5
+.TH "MailScanner.conf" "5" "4.36.4" "Julian Field" "Mail"
5
+.TH "MailScanner.conf" "5" "4.37.7" "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
Lines 15-21 Link Here
15
 .br 
15
 .br 
16
 
16
 
17
 .br 
17
 .br 
18
@@ -1266,12 +1266,11 @@
18
@@ -781,6 +781,15 @@
19
 When an entire message is saved in the quarantine for any reason, do you want to save it as the raw data files out of the mail queue (which can be processed with the df2mbox script, and which is easier to send to its original recipients), or do you want a conventional message file consisting of the header followed by the body of the message. If the previous option is switched off, then this will only affect archived mail and quarantined spam. If the previous option is on, then this also affects quarantined infections. 
20
 
21
 .TP 
22
+\fBKeep Spam And MCP Archive Clean\fR
23
+Default: no
24
+.br 
25
+
26
+.br 
27
+Do you want to stop any virus\-infected spam getting into the spam or MCP archives? If you have a system where users can release messages from the spam or MCP archives, then you probably want to stop them being able to release any infected messages, so set this to yes. It is set to no by default as it causes a small hit in performance, and many people don't allow users to access the spam quarantine, so don't need it. This can also be the filename of a ruleset.
28
+
29
+
30
+.TP 
31
 \fBLanguage Strings\fR
32
 Default: %reports\-dir%/languages.conf
33
 .br 
34
@@ -1266,12 +1275,11 @@
19
 
35
 
20
 .TP 
36
 .TP 
21
 \fBAttachment Encoding Charset\fR
37
 \fBAttachment Encoding Charset\fR
Lines 30-36 Link Here
30
 .SH "Mail archiving and monitoring"
46
 .SH "Mail archiving and monitoring"
31
 .TP 
47
 .TP 
32
 \fBArchive Mail\fR
48
 \fBArchive Mail\fR
33
@@ -1725,8 +1724,16 @@
49
@@ -1595,22 +1603,24 @@
50
 .br 
51
 .RS 7
52
 .IP  \(bu 4
53
-"deliver" \- the message is delivered to the recipient as normal 
54
+deliver \- the message is delivered to the recipient as normal 
55
 .IP  \(bu 4
56
-"delete" \- the message is deleted 
57
+delete \- the message is deleted 
58
 .IP  \(bu 4
59
-"store" \- the message is stored in the quarantine 
60
+store \- the message is stored in the quarantine 
61
 
62
 .IP  \(bu 4
63
-"forward" \- an email address is supplied, to which the message is forwarded 
64
+forward \- an email address is supplied, to which the message is forwarded 
65
 .IP  \(bu 4
66
-"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.
67
+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.
68
 .IP  \(bu 4
69
-"striphtml" \- convert all in\-line HTML content in the message to be stripped to plain text, which removes all images and scripts and so can be used to protect your users from offensive spam. Note that using this action on its own does not imply that the message will be delivered, you will need to specify "deliver" or "forward" to actually deliver the message. 
70
+striphtml \- convert all in\-line HTML content in the message to be stripped to plain text, which removes all images and scripts and so can be used to protect your users from offensive spam. Note that using this action on its own does not imply that the message will be delivered, you will need to specify "deliver" or "forward" to actually deliver the message. 
71
 .IP  \(bu 4
72
-"attachment" \- Convert the original message into an attachment of the message. This means the user has to take an extra step to open the spam, and stops "web bugs" very effectively.
73
+attachment \- Convert the original message into an attachment of the message. This means the user has to take an extra step to open the spam, and stops "web bugs" very effectively.
74
 .IP  \(bu 4
75
-"bounce" \- bounce the spam message. This option should not be used and must be enabled with the "Enable Spam Bounce" option first.
76
+bounce \- bounce the spam message. This option should not be used and must be enabled with the "Enable Spam Bounce" option first.
77
+.IP  \(bu 4
78
+header "name: value" \- Add the header "name: value" to the message. name must not contain any spaces.
79
 .RE
80
 
81
 .TP 
82
@@ -1725,8 +1735,16 @@
34
 
83
 
35
 .br 
84
 .br 
36
 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.
85
 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.
Lines 48-54 Link Here
48
 
97
 
49
 .TP 
98
 .TP 
50
 \fBSpamAssassin User State Dir\fR
99
 \fBSpamAssassin User State Dir\fR
51
@@ -1734,7 +1741,7 @@
100
@@ -1734,7 +1752,7 @@
52
 .br 
101
 .br 
53
 
102
 
54
 .br 
103
 .br 
(-)/server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html (-27 / +67 lines)
Lines 1-13 Link Here
1
--- ../MailScanner-install-4.36.4.orig/docs/man/MailScanner.conf.5.html	Wed Dec 15 20:31:43 2004
1
--- ../MailScanner-install-4.37.7.orig/docs/man/MailScanner.conf.5.html	Mon Jan 17 13:18:55 2005
2
+++ docs/man/MailScanner.conf.5.html	Wed Dec 15 20:32:12 2004
2
+++ docs/man/MailScanner.conf.5.html	Mon Jan 17 13:19:11 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: Fri Oct 22 08:13:20 2004 -->
5
-<!-- CreationDate: Fri Oct 22 08:13:20 2004 -->
6
+<!-- CreationDate: Mon Nov  1 18:00:15 2004 -->
6
+<!-- CreationDate: Mon Jan 17 13:18:36 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>
10
@@ -397,4 +397,5740 @@
10
@@ -397,4 +397,5780 @@
11
 <td width="3%"></td>
11
 <td width="3%"></td>
12
 <td width="72%">
12
 <td width="72%">
13
 
13
 
Lines 1953-1958 Link Here
1953
+<tr valign="top" align="left">
1953
+<tr valign="top" align="left">
1954
+<td width="11%"></td>
1954
+<td width="11%"></td>
1955
+<td width="89%">
1955
+<td width="89%">
1956
+<p><b>Keep Spam And MCP Archive Clean</b></p></td>
1957
+</table>
1958
+<!-- INDENTATION -->
1959
+<table width="100%" border=0 rules="none" frame="void"
1960
+       cols="2" cellspacing="0" cellpadding="0">
1961
+<tr valign="top" align="left">
1962
+<td width="22%"></td>
1963
+<td width="78%">
1964
+<p>Default: no</p>
1965
+<!-- INDENTATION -->
1966
+<p>Do you want to stop any virus&minus;infected spam getting
1967
+into the spam or MCP archives? If you have a system where
1968
+users can release messages from the spam or MCP archives,
1969
+then you probably want to stop them being able to release
1970
+any infected messages, so set this to yes. It is set to no
1971
+by default as it causes a small hit in performance, and many
1972
+people don&rsquo;t allow users to access the spam
1973
+quarantine, so don&rsquo;t need it. This can also be the
1974
+filename of a ruleset.</p>
1975
+</td>
1976
+</table>
1977
+<!-- INDENTATION -->
1978
+<table width="100%" border=0 rules="none" frame="void"
1979
+       cols="2" cellspacing="0" cellpadding="0">
1980
+<tr valign="top" align="left">
1981
+<td width="11%"></td>
1982
+<td width="89%">
1956
+<p><b>Language Strings</b></p></td>
1983
+<p><b>Language Strings</b></p></td>
1957
+</table>
1984
+</table>
1958
+<!-- INDENTATION -->
1985
+<!-- INDENTATION -->
Lines 4226-4233 Link Here
4226
+<td width="5%"></td>
4253
+<td width="5%"></td>
4227
+<td width="72%">
4254
+<td width="72%">
4228
+
4255
+
4229
+<p>&quot;deliver&quot; &minus; the message is delivered to
4256
+<p>deliver &minus; the message is delivered to the
4230
+the recipient as normal</p>
4257
+recipient as normal</p>
4231
+</td>
4258
+</td>
4232
+<tr valign="top" align="left">
4259
+<tr valign="top" align="left">
4233
+<td width="22%"></td>
4260
+<td width="22%"></td>
Lines 4238-4244 Link Here
4238
+<td width="5%"></td>
4265
+<td width="5%"></td>
4239
+<td width="72%">
4266
+<td width="72%">
4240
+
4267
+
4241
+<p>&quot;delete&quot; &minus; the message is deleted</p>
4268
+<p>delete &minus; the message is deleted</p>
4242
+</td>
4269
+</td>
4243
+<tr valign="top" align="left">
4270
+<tr valign="top" align="left">
4244
+<td width="22%"></td>
4271
+<td width="22%"></td>
Lines 4249-4255 Link Here
4249
+<td width="5%"></td>
4276
+<td width="5%"></td>
4250
+<td width="72%">
4277
+<td width="72%">
4251
+
4278
+
4252
+<p>&quot;store&quot; &minus; the message is stored in the
4279
+<p>store &minus; the message is stored in the
4253
+quarantine</p>
4280
+quarantine</p>
4254
+</td>
4281
+</td>
4255
+<tr valign="top" align="left">
4282
+<tr valign="top" align="left">
Lines 4261-4268 Link Here
4261
+<td width="5%"></td>
4288
+<td width="5%"></td>
4262
+<td width="72%">
4289
+<td width="72%">
4263
+
4290
+
4264
+<p>&quot;forward&quot; &minus; an email address is
4291
+<p>forward &minus; an email address is supplied, to which
4265
+supplied, to which the message is forwarded</p>
4292
+the message is forwarded</p>
4266
+</td>
4293
+</td>
4267
+<tr valign="top" align="left">
4294
+<tr valign="top" align="left">
4268
+<td width="22%"></td>
4295
+<td width="22%"></td>
Lines 4273-4282 Link Here
4273
+<td width="5%"></td>
4300
+<td width="5%"></td>
4274
+<td width="72%">
4301
+<td width="72%">
4275
+
4302
+
4276
+<p>&quot;notify&quot; &minus; Send the recipients a short
4303
+<p>notify &minus; Send the recipients a short notification
4277
+notification that spam addressed to them was not delivered.
4304
+that spam addressed to them was not delivered. They can then
4278
+They can then take action to request retrieval of the
4305
+take action to request retrieval of the orginal message if
4279
+orginal message if they think it was not spam.</p>
4306
+they think it was not spam.</p>
4280
+</td>
4307
+</td>
4281
+<tr valign="top" align="left">
4308
+<tr valign="top" align="left">
4282
+<td width="22%"></td>
4309
+<td width="22%"></td>
Lines 4287-4298 Link Here
4287
+<td width="5%"></td>
4314
+<td width="5%"></td>
4288
+<td width="72%">
4315
+<td width="72%">
4289
+
4316
+
4290
+<p>&quot;striphtml&quot; &minus; convert all in&minus;line
4317
+<p>striphtml &minus; convert all in&minus;line HTML content
4291
+HTML content in the message to be stripped to plain text,
4318
+in the message to be stripped to plain text, which removes
4292
+which removes all images and scripts and so can be used to
4319
+all images and scripts and so can be used to protect your
4293
+protect your users from offensive spam. Note that using this
4320
+users from offensive spam. Note that using this action on
4294
+action on its own does not imply that the message will be
4321
+its own does not imply that the message will be delivered,
4295
+delivered, you will need to specify &quot;deliver&quot; or
4322
+you will need to specify &quot;deliver&quot; or
4296
+&quot;forward&quot; to actually deliver the message.</p>
4323
+&quot;forward&quot; to actually deliver the message.</p>
4297
+</td>
4324
+</td>
4298
+<tr valign="top" align="left">
4325
+<tr valign="top" align="left">
Lines 4304-4313 Link Here
4304
+<td width="5%"></td>
4331
+<td width="5%"></td>
4305
+<td width="72%">
4332
+<td width="72%">
4306
+
4333
+
4307
+<p>&quot;attachment&quot; &minus; Convert the original
4334
+<p>attachment &minus; Convert the original message into an
4308
+message into an attachment of the message. This means the
4335
+attachment of the message. This means the user has to take
4309
+user has to take an extra step to open the spam, and stops
4336
+an extra step to open the spam, and stops &quot;web
4310
+&quot;web bugs&quot; very effectively.</p>
4337
+bugs&quot; very effectively.</p>
4338
+</td>
4339
+<tr valign="top" align="left">
4340
+<td width="22%"></td>
4341
+<td width="1%">
4342
+
4343
+<p>&bull;</p>
4344
+</td>
4345
+<td width="5%"></td>
4346
+<td width="72%">
4347
+
4348
+<p>bounce &minus; bounce the spam message. This option
4349
+should not be used and must be enabled with the &quot;Enable
4350
+Spam Bounce&quot; option first.</p>
4311
+</td>
4351
+</td>
4312
+<tr valign="top" align="left">
4352
+<tr valign="top" align="left">
4313
+<td width="22%"></td>
4353
+<td width="22%"></td>
Lines 4318-4326 Link Here
4318
+<td width="5%"></td>
4358
+<td width="5%"></td>
4319
+<td width="72%">
4359
+<td width="72%">
4320
+
4360
+
4321
+<p>&quot;bounce&quot; &minus; bounce the spam message. This
4361
+<p>header &quot;name: value&quot; &minus; Add the header
4322
+option should not be used and must be enabled with the
4362
+&quot;name: value&quot; to the message. name must not
4323
+&quot;Enable Spam Bounce&quot; option first.</p>
4363
+contain any spaces.</p>
4324
+</td>
4364
+</td>
4325
+</table>
4365
+</table>
4326
+<!-- INDENTATION -->
4366
+<!-- INDENTATION -->
(-)/server-root/ports/mail/mailscanner/pkg-plist (+1 lines)
Lines 452-457 Link Here
452
%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
452
%%PORTDOCS%%%%DOCSDIR%%/Sophos.install.freebsd
453
%%PORTDOCS%%%%DOCSDIR%%/book.cover.gif
453
%%PORTDOCS%%%%DOCSDIR%%/book.cover.gif
454
%%PORTDOCS%%%%DOCSDIR%%/building.txt
454
%%PORTDOCS%%%%DOCSDIR%%/building.txt
455
%%PORTDOCS%%%%DOCSDIR%%/docs.html
455
%%PORTDOCS%%%%DOCSDIR%%/donations.shtml
456
%%PORTDOCS%%%%DOCSDIR%%/donations.shtml
456
%%PORTDOCS%%%%DOCSDIR%%/downloadgraphs.shtml
457
%%PORTDOCS%%%%DOCSDIR%%/downloadgraphs.shtml
457
%%PORTDOCS%%%%DOCSDIR%%/downloads.shtml
458
%%PORTDOCS%%%%DOCSDIR%%/downloads.shtml

Return to bug 76354