Attachment #54028 for bug #81755

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

Lines 6-12 Link Here

(-)/server-root/ports/mail/mailscanner/Makefile (-2 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= MailScanner	8	PORTNAME= MailScanner
9	PORTVERSION= 4.41.3	9	PORTVERSION= 4.42.9
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 31-37 Link Here
31	${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef \	31	${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef \
32	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \	32	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
33	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \	33	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
34	${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar	34	${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \
		35	${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo \
		36	${LOCALBASE}/bin/unarj:${PORTSDIR}/archivers/unarj \
		37	${LOCALBASE}/bin/unace:${PORTSDIR}/archivers/unace \
		38	${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha
35		39
36	CONFLICTS= MailScanner-devel-[0-9]*	40	CONFLICTS= MailScanner-devel-[0-9]*
37		41

Lines 1-2 Link Here

(-)/server-root/ports/mail/mailscanner/distinfo (-2 / +2 lines)
1	MD5 (MailScanner-install-4.41.3-1.tar.gz) = 6df068ec74fb07bd1d166c1ad5e69cd6	1	MD5 (MailScanner-install-4.42.9-1.tar.gz) = 893eda4833586b61b5b78af95d0f2f0d
2	SIZE (MailScanner-install-4.41.3-1.tar.gz) = 4925560	2	SIZE (MailScanner-install-4.42.9-1.tar.gz) = 4775108

Lines 1-8 Link Here

(-)/server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8 (-3 / +3 lines)
1	--- ../MailScanner-install-4.40.10.old/docs/man/MailScanner.8 Fri Apr 1 16:10:19 2005	1	--- ../MailScanner-install-4.42.9.orig/docs/man/MailScanner.8 Wed Jun 1 11:24:25 2005
2	+++ docs/man/MailScanner.8 Fri Apr 1 16:10:33 2005	2	+++ docs/man/MailScanner.8 Wed Jun 1 11:30:08 2005
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-.TH "MailScanner" "8" "4.38.2" "Julian Field" "Mail"	4	-.TH "MailScanner" "8" "4.38.2" "Julian Field" "Mail"
5	+.TH "MailScanner" "8" "4.41.3" "Julian Field" "Mail"	5	+.TH "MailScanner" "8" "4.42.9" "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

Lines 1-9 Link Here

(-)/server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.8.html (-3 / +3 lines)
1	--- ../MailScanner-install-4.40.10.old/docs/man/MailScanner.8.html Fri Apr 1 16:10:19 2005	1	--- ../MailScanner-install-4.42.9.orig/docs/man/MailScanner.8.html Wed Jun 1 11:24:25 2005
2	+++ docs/man/MailScanner.8.html Fri Apr 1 16:10:35 2005	2	+++ docs/man/MailScanner.8.html Wed Jun 1 11:30:10 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: Mon Jan 17 15:53:41 2005 -->	5	-<!-- CreationDate: Mon Jan 17 15:53:41 2005 -->
6	+<!-- CreationDate: Fri Apr 1 16:08:30 2005 -->	6	+<!-- CreationDate: Wed Jun 1 11:29:47 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>




--- ../MailScanner-install-4.42.9.orig/docs/man/MailScanner.conf.5	Wed Jun  1 11:24:25 2005
+++ docs/man/MailScanner.conf.5	Wed Jun  1 11:30:13 2005
@@ -1,4 +1,4 @@
-.TH "MailScanner.conf" "5" "4.38.2" "Julian Field" "Mail"
+.TH "MailScanner.conf" "5" "4.42.9" "Julian Field" "Mail"
 .SH "NAME"
 .LP 
 MailScanner.conf \- Main configuration for MailScanner

 \fBAllow IFrame Tags\fR
 Default: no
 .br 
@@ -1233,6 +1312,23 @@
 .br 
 This is the text inserted at the start of the "Subject:" line if the "Content Modify Subject" option is set. 
 
+.TP 
+\fBDisarmed Modify Subject\fR
+Default: yes
+.br 
+
+.br 
+If HTML tags in the message were "disarmed" by using the HTML "Allow" options above with the "disarm" settings, do you want to modify the subject line? This can also be the filename of a ruleset.
+
+
+.TP 
+\fBDisarmed Subject Text\fR
+Default: {Disarmed}
+.br 
+
+.br 
+This is the text to add to the start of the subject if the "Disarmed Modify Subject" option is set. This can also be the filename of a ruleset.
+
 
 .TP 
 \fBSpam Modify Subject\fR
@@ -1415,6 +1511,15 @@
 This provides a space\-separated list of "Spam Lists" (or RBL's or DNSBL's) which are checked for each message. These lists are based on the domain name of the sender address of each message. Every list used here must be defined in the "Spam List Definitions" file mentioned above. 
 
 .TP 
+\fBSpam Lists To Be Spam\fR
+Default: 1
+.br 
+
+.br 
+If a message appears in at least this number of "Spam Lists" (as defined above), then the message will be treated as spam and so the "Spam Actions" will happen, unless the message reaches the levels for "High Scoring Spam". By default this is set to 1 to mimic the previous behaviour, which means that appearing in any "Spam Lists" will cause the message to be treated as spam. This can also be the filename of a ruleset.
+
+
+.TP 
 \fBSpam Lists To Reach High Score\fR
 Default: 5
 .br 
@@ -1753,6 +1858,12 @@
 
 .br 
 Log all occurrences of "Silent Viruses" as defined above? This can only be a simple yes/no value, not a ruleset.




--- ../MailScanner-install-4.42.9.orig/docs/man/MailScanner.conf.5.html	Wed Jun  1 11:24:25 2005
+++ docs/man/MailScanner.conf.5.html	Wed Jun  1 11:30:17 2005
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.19 -->
-<!-- CreationDate: Mon Jan 17 15:53:41 2005 -->
+<!-- CreationDate: Wed Jun  1 11:29:47 2005 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>

 <p><b>Allow IFrame Tags</b></p></td>
 </table>
 <!-- INDENTATION -->
@@ -3617,6 +3826,50 @@
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="89%">
+<p><b>Disarmed Modify Subject</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="22%"></td>
+<td width="78%">
+<p>Default: yes</p>
+<!-- INDENTATION -->
+<p>If HTML tags in the message were &quot;disarmed&quot; by
+using the HTML &quot;Allow&quot; options above with the
+&quot;disarm&quot; settings, do you want to modify the
+subject line? This can also be the filename of a
+ruleset.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="11%"></td>
+<td width="89%">
+<p><b>Disarmed Subject Text</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="22%"></td>
+<td width="78%">
+<p>Default: {Disarmed}</p>
+<!-- INDENTATION -->
+<p>This is the text to add to the start of the subject if
+the &quot;Disarmed Modify Subject&quot; option is set. This
+can also be the filename of a ruleset.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="11%"></td>
+<td width="89%">
 <p><b>Spam Modify Subject</b></p></td>
 </table>
 <!-- INDENTATION -->
@@ -4118,6 +4371,33 @@
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="89%">
+<p><b>Spam Lists To Be Spam</b></p></td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="22%"></td>
+<td width="78%">
+<p>Default: 1</p>
+<!-- INDENTATION -->
+<p>If a message appears in at least this number of
+&quot;Spam Lists&quot; (as defined above), then the message
+will be treated as spam and so the &quot;Spam Actions&quot;
+will happen, unless the message reaches the levels for
+&quot;High Scoring Spam&quot;. By default this is set to 1
+to mimic the previous behaviour, which means that appearing
+in any &quot;Spam Lists&quot; will cause the message to be
+treated as spam. This can also be the filename of a
+ruleset.</p>
+</td>
+</table>
+<!-- INDENTATION -->
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="11%"></td>
+<td width="89%">
 <p><b>Spam Lists To Reach High Score</b></p></td>
 </table>
 <!-- INDENTATION -->
@@ -5122,6 +5402,28 @@
 <p>Log all occurrences of &quot;Silent Viruses&quot; as
 defined above? This can only be a simple yes/no value, not a
 ruleset.</p>




--- ../MailScanner-install-4.42.9.orig/lib/clamav-wrapper	Wed Jun  1 11:24:25 2005
+++ lib/clamav-wrapper	Wed Jun  1 11:31:57 2005
--- ../MailScanner-4.27.5.orig/lib/clamav-wrapper	Thu Feb 26 15:25:51 2004
+++ lib/clamav-wrapper	Thu Feb 26 15:26:23 2004
@@ -51,6 +51,9 @@
 
 # You may want to check this script for bash-isms

 TempDir="/tmp/clamav.$$"
 ClamUser="clamav"
 ClamGroup="clamav"
@@ -98,23 +101,23 @@
 # LESS COMMON unpackers, which probably aren't installed by default
 # (hence disabled)
 # Uncomment ONE of the following lines if you have unrar installed
-#ExtraScanOptions="$ExtraScanOptions --unrar"  
+ExtraScanOptions="$ExtraScanOptions --unrar"  
 #ExtraScanOptions="$ExtraScanOptions --unrar=/path/to/unrar" 
 
 # Uncomment ONE of the following lines if you have unarj installed
-#ExtraScanOptions="$ExtraScanOptions --unarj"  
+ExtraScanOptions="$ExtraScanOptions --unarj"  
 #ExtraScanOptions="$ExtraScanOptions --unarj=/path/to/unarj" 
 
 # Uncomment ONE of the following lines if you have unace installed
-#ExtraScanOptions="$ExtraScanOptions --unace"  
+ExtraScanOptions="$ExtraScanOptions --unace"  
 #ExtraScanOptions="$ExtraScanOptions --unace=/path/to/unace" 
 
 # Uncomment ONE of the following lines if you have lha installed
-#ExtraScanOptions="$ExtraScanOptions --lha"  
+ExtraScanOptions="$ExtraScanOptions --lha"  
 #ExtraScanOptions="$ExtraScanOptions --lha=/path/to/lha" 
 
 # Uncomment ONE of the following lines if you have zoo installed
-#ExtraScanOptions="$ExtraScanOptions --zoo"  
+ExtraScanOptions="$ExtraScanOptions --zoo"  
 #ExtraScanOptions="$ExtraScanOptions --zoo=/path/to/unzoo" 
 
 # Uncomment next line if you need to disable Clam's DoS protection

Return to bug 81755

Lines 1-9 Link Here

(-)/server-root/ports/mail/mailscanner/files/patch-docs:man:MailScanner.conf.5.html (-4 / +89 lines)
1	--- ../MailScanner-install-4.40.10.old/docs/man/MailScanner.conf.5.html Fri Apr 1 16:10:19 2005	1	--- ../MailScanner-install-4.42.9.orig/docs/man/MailScanner.conf.5.html Wed Jun 1 11:24:25 2005
2	+++ docs/man/MailScanner.conf.5.html Fri Apr 1 16:10:40 2005	2	+++ docs/man/MailScanner.conf.5.html Wed Jun 1 11:30:17 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: Mon Jan 17 15:53:41 2005 -->	5	-<!-- CreationDate: Mon Jan 17 15:53:41 2005 -->
6	+<!-- CreationDate: Fri Apr 1 16:08:30 2005 -->	6	+<!-- CreationDate: Wed Jun 1 11:29:47 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 265-271 Link Here
265	<p><b>Allow IFrame Tags</b></p></td>	265	<p><b>Allow IFrame Tags</b></p></td>
266	</table>	266	</table>
267	<!-- INDENTATION -->	267	<!-- INDENTATION -->
268	@@ -5122,6 +5331,28 @@	268	@@ -3617,6 +3826,50 @@
		269	<tr valign="top" align="left">
		270	<td width="11%"></td>
		271	<td width="89%">
		272	+<p><b>Disarmed Modify Subject</b></p></td>
		273	+</table>
		274	+<!-- INDENTATION -->
		275	+<table width="100%" border=0 rules="none" frame="void"
		276	+ cols="2" cellspacing="0" cellpadding="0">
		277	+<tr valign="top" align="left">
		278	+<td width="22%"></td>
		279	+<td width="78%">
		280	+<p>Default: yes</p>
		281	+<!-- INDENTATION -->
		282	+<p>If HTML tags in the message were "disarmed" by
		283	+using the HTML "Allow" options above with the
		284	+"disarm" settings, do you want to modify the
		285	+subject line? This can also be the filename of a
		286	+ruleset.</p>
		287	+</td>
		288	+</table>
		289	+<!-- INDENTATION -->
		290	+<table width="100%" border=0 rules="none" frame="void"
		291	+ cols="2" cellspacing="0" cellpadding="0">
		292	+<tr valign="top" align="left">
		293	+<td width="11%"></td>
		294	+<td width="89%">
		295	+<p><b>Disarmed Subject Text</b></p></td>
		296	+</table>
		297	+<!-- INDENTATION -->
		298	+<table width="100%" border=0 rules="none" frame="void"
		299	+ cols="2" cellspacing="0" cellpadding="0">
		300	+<tr valign="top" align="left">
		301	+<td width="22%"></td>
		302	+<td width="78%">
		303	+<p>Default: {Disarmed}</p>
		304	+<!-- INDENTATION -->
		305	+<p>This is the text to add to the start of the subject if
		306	+the "Disarmed Modify Subject" option is set. This
		307	+can also be the filename of a ruleset.</p>
		308	+</td>
		309	+</table>
		310	+<!-- INDENTATION -->
		311	+<table width="100%" border=0 rules="none" frame="void"
		312	+ cols="2" cellspacing="0" cellpadding="0">
		313	+<tr valign="top" align="left">
		314	+<td width="11%"></td>
		315	+<td width="89%">
		316	<p><b>Spam Modify Subject</b></p></td>
		317	</table>
		318	<!-- INDENTATION -->
		319	@@ -4118,6 +4371,33 @@
		320	<tr valign="top" align="left">
		321	<td width="11%"></td>
		322	<td width="89%">
		323	+<p><b>Spam Lists To Be Spam</b></p></td>
		324	+</table>
		325	+<!-- INDENTATION -->
		326	+<table width="100%" border=0 rules="none" frame="void"
		327	+ cols="2" cellspacing="0" cellpadding="0">
		328	+<tr valign="top" align="left">
		329	+<td width="22%"></td>
		330	+<td width="78%">
		331	+<p>Default: 1</p>
		332	+<!-- INDENTATION -->
333	+<p>If a message appears in at least this number of
334	+"Spam Lists" (as defined above), then the message
335	+will be treated as spam and so the "Spam Actions"
336	+will happen, unless the message reaches the levels for
337	+"High Scoring Spam". By default this is set to 1
338	+to mimic the previous behaviour, which means that appearing
339	+in any "Spam Lists" will cause the message to be
340	+treated as spam. This can also be the filename of a
341	+ruleset.</p>
342	+</td>
343	+</table>
344	+<!-- INDENTATION -->
345	+<table width="100%" border=0 rules="none" frame="void"
346	+ cols="2" cellspacing="0" cellpadding="0">
347	+<tr valign="top" align="left">
348	+<td width="11%"></td>
349	+<td width="89%">
350	<p><b>Spam Lists To Reach High Score</b></p></td>
351	</table>
352	<!-- INDENTATION -->
353	@@ -5122,6 +5402,28 @@
269	<p>Log all occurrences of "Silent Viruses" as	354	<p>Log all occurrences of "Silent Viruses" as
270	defined above? This can only be a simple yes/no value, not a	355	defined above? This can only be a simple yes/no value, not a
271	ruleset.</p>	356	ruleset.</p>

Lines 1-7 Link Here

(-)/server-root/ports/mail/mailscanner/files/patch-lib:clamav-wrapper (-4 / +31 lines)
1	$FreeBSD: ports/mail/mailscanner/files/patch-lib:clamav-wrapper,v 1.4 2004/08/08 17:16:18 sem Exp $	1	--- ../MailScanner-install-4.42.9.orig/lib/clamav-wrapper Wed Jun 1 11:24:25 2005
2		2	+++ lib/clamav-wrapper Wed Jun 1 11:31:57 2005
3	--- ../MailScanner-4.27.5.orig/lib/clamav-wrapper Thu Feb 26 15:25:51 2004
4	+++ lib/clamav-wrapper Thu Feb 26 15:26:23 2004
5	@@ -51,6 +51,9 @@	3	@@ -51,6 +51,9 @@
6		4
7	# You may want to check this script for bash-isms	5	# You may want to check this script for bash-isms
Lines 12-14 Link Here
12	TempDir="/tmp/clamav.$$"	10	TempDir="/tmp/clamav.$$"
13	ClamUser="clamav"	11	ClamUser="clamav"
14	ClamGroup="clamav"	12	ClamGroup="clamav"
		13	@@ -98,23 +101,23 @@
		14	# LESS COMMON unpackers, which probably aren't installed by default
		15	# (hence disabled)
		16	# Uncomment ONE of the following lines if you have unrar installed
		17	-#ExtraScanOptions="$ExtraScanOptions --unrar"
		18	+ExtraScanOptions="$ExtraScanOptions --unrar"
		19	#ExtraScanOptions="$ExtraScanOptions --unrar=/path/to/unrar"
		20
		21	# Uncomment ONE of the following lines if you have unarj installed
		22	-#ExtraScanOptions="$ExtraScanOptions --unarj"
		23	+ExtraScanOptions="$ExtraScanOptions --unarj"
		24	#ExtraScanOptions="$ExtraScanOptions --unarj=/path/to/unarj"
		25
		26	# Uncomment ONE of the following lines if you have unace installed
		27	-#ExtraScanOptions="$ExtraScanOptions --unace"
		28	+ExtraScanOptions="$ExtraScanOptions --unace"
		29	#ExtraScanOptions="$ExtraScanOptions --unace=/path/to/unace"
		30
		31	# Uncomment ONE of the following lines if you have lha installed
		32	-#ExtraScanOptions="$ExtraScanOptions --lha"
		33	+ExtraScanOptions="$ExtraScanOptions --lha"
		34	#ExtraScanOptions="$ExtraScanOptions --lha=/path/to/lha"
		35
		36	# Uncomment ONE of the following lines if you have zoo installed
		37	-#ExtraScanOptions="$ExtraScanOptions --zoo"
		38	+ExtraScanOptions="$ExtraScanOptions --zoo"
		39	#ExtraScanOptions="$ExtraScanOptions --zoo=/path/to/unzoo"
		40
		41	# Uncomment next line if you need to disable Clam's DoS protection