Attachment #82459 for bug #117940

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

Lines 2-12 Link Here

(-)mail/assp/Makefile (-4 / +7 lines)
2	# Date created: 16 May 2005	2	# Date created: 16 May 2005
3	# Whom: J.R. Oldroyd <fbsd@opal.com>	3	# Whom: J.R. Oldroyd <fbsd@opal.com>
4	#	4	#
5	# $FreeBSD: ports/mail/assp/Makefile,v 1.12 2007/10/12 00:32:21 tabthorpe Exp $	5	# $FreeBSD: ports/mail/assp/Makefile,v 1.11 2007/01/31 16:45:06 rafan Exp $
6	#	6	#
7		7
8	PORTNAME= assp	8	PORTNAME= assp
9	PORTVERSION= 1.3.3.1	9	PORTVERSION= 1.3.3.8
10	CATEGORIES= mail	10	CATEGORIES= mail
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 19-27 Link Here
19	NO_BUILD= yes	19	NO_BUILD= yes
20	USE_PERL5_RUN= yes	20	USE_PERL5_RUN= yes
21		21
22	USE_DOS2UNIX= addservice.pl \	22	USE_DOS2UNIX= \
		23	../Install.txt \
		24	../changelog.txt \
		25	addservice.pl \
23	assp.pl \	26	assp.pl \
24	changelog.txt \
25	files/URIBLCCTLDS.txt \	27	files/URIBLCCTLDS.txt \
26	files/blackdomains.txt \	28	files/blackdomains.txt \
27	files/bombre.txt \	29	files/bombre.txt \
Lines 33-38 Link Here
33	files/redre.txt \	35	files/redre.txt \
34	files/whitedomains.txt \	36	files/whitedomains.txt \
35	move2num.pl \	37	move2num.pl \
		38	rc/readme.txt \
36	rebuildspamdb.pl \	39	rebuildspamdb.pl \
37	repair.pl \	40	repair.pl \
38	reports/helpreport.txt \	41	reports/helpreport.txt \

Lines 1-3 Link Here

(-)mail/assp/distinfo (-3 / +3 lines)
1	MD5 (ASSP_1.3.3.1-Install.zip) = 9ce0cc17ee9c8d8cb03d258b69812a11	1	MD5 (ASSP_1.3.3.8-Install.zip) = fad56889a74acc10769789bdc887f620
2	SHA256 (ASSP_1.3.3.1-Install.zip) = 810bebed2f48a480c7e7458fb9b6e2fbe3f39c441d74aa8471b458aa0e33e47b	2	SHA256 (ASSP_1.3.3.8-Install.zip) = 48a84aa63cbcff99833710c7ccbef69933558e98368982456f5ec8d201fad3ba
3	SIZE (ASSP_1.3.3.1-Install.zip) = 362975	3	SIZE (ASSP_1.3.3.8-Install.zip) = 332926




--- assp.pl.orig	Thu Nov  1 16:37:53 2007
+++ assp.pl	Thu Nov  1 16:40:38 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 
 use File::Copy;
 use Encode;
@@ -844,8 +844,8 @@
 [ScanWL,'Scan Whitelisted Senders',0,checkbox,0,'([01]?)',undef,''],
 [ScanNP,'Scan No Processing Senders',0,checkbox,0,'([01]?)',undef,''],
 [ScanLocal,'Scan Local Senders',0,checkbox,0,'([01]?)',undef,''],
-[AvClamdPort,'Port or file socket for ClamAV',20,textinput,'/tmp/clamd','(\S+)',undef,
-  'A socket specified in the clamav.conf file - LocalSocket. For example /tmp/clamd. If the socket has been setup as a TCP/IP socket (see the TCPSocket option in the clamav.conf file), then specify the TCP socket. For example 3310 '],
+[AvClamdPort,'Port or file socket for ClamAV',20,textinput,'/var/run/clamav/clamd','(\S+)',undef,

 [AvError,'Reply Message to Refuse Infected E<!--get rid of google autofill-->mail',80,textinput,'554 5.7.1 Mail appears infected with \'$infection\'.','(5\d\d .*)',undef,
   'Reply message to refuse infected mail. The string $infection is replaced with the name of the detected virus.<br />
   For example: 554 5.7.1 Mail appears infected with \'$infection\' -- disinfect and resend.'],
@@ -1003,7 +1003,7 @@
   '<span class="negative"> 0 = no report, 1 = to SENDER, 2 = to TO address (below), 3 = BOTH</span>'],
 [EmailRedlistTo,'To Address for Redlist-Reports',40,textinput,'','(.+)',undef,
   'Email sent from ASSP acknowledging your submissions will be sent to this address. For example: admin@domain.com'],
-[EmailFrom,'From Address for Reports',40,textinput,'<spammaster@yourdomain.com>','(.+)',undef,
+[EmailFrom,'From Address for Reports',40,textinput,'<postmaster@yourdomain.com>','(.+)',undef,
   'Email sent from ASSP acknowledging your submissions will be sent from this address.'],
 
 
@@ -1214,7 +1214,7 @@
 [0,0,0,'heading','Server Setup'],
 [AsAService,'Run ASSP as a Windows Service**',0,checkbox,0,'([01]?)',undef,
   'In Windows NT/2000/XP/2003 ASSP can be installed as a service. This setting tells ASSP that this has been done -- it does not install the Windows service for you. Installing ASSP as a service requires several steps which are detailed in the <a href="http://www.asspsmtp.org/wiki/Quick_Start_for_Win32">Quick Start for Win32</a> wiki page.'],
-[AsADaemon,'Run ASSP as a Daemon**',0,checkbox,0,'([01]?)',undef,
+[AsADaemon,'Run ASSP as a Daemon**',0,checkbox,1,'([01]?)',undef,
  'In Linux/BSD/Unix/OSX fork and close file handles. Similar to the command "perl assp.pl &amp;", but better.'],
 [runAsUser,'Run as UID**',20,textinput,'','(\S*)',undef,
   'The *nix user name to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p>'],




--- stats.sh.orig	Thu Nov  8 10:30:36 2007
+++ stats.sh	Thu Nov  8 10:43:14 2007
@@ -1,15 +1,23 @@
 #!/bin/sh
 

 #
 # I got the idea for this script from Mark Constable. He submitted
 #  a similar script to follow the Courier-MTA /var/log/maillog
@@ -46,91 +47,283 @@
 # Some fields are truncated (with a hard-coded length value, usually 40)
 #   to keep each line more or less intact on your screen as things scroll by
 # Colors are coded with ANSI Color coding, your mileage may vary ...

+        $(p+8) )
+    next
+  }
+  /Unknown Sender (with|from) Local Domain/ {
+    printf("%s %s \033[1;34m%-15s IS  %s\033[0m\n",
+        $1,
+        $2,

+    # suppress
+    next
+  }
+  /((DNS|URI)BL )?Received-(R|DNS|URI)BL: (pass|neutral|fail)|URIBL fail|Bayesian Check URIBL/ {
+    # suppress
+    next
+  }
+  /failed (DNS|URI)BL|failed (R|URI)BL checks|Received-RBL: fail|\[DNSBL].* rejected by / {
+    printf("%s %s \033[1;35m%-15s BL  %s -> %s\033[0m\n",
+        $1,
+        $2,

+        $(p+7) )
+    next
+  }
+  /Received-SPF: (pass|neutral)| SPF: (soft)?fail|SPFstrict/ {
+    # suppress
+    next
+  }

+	$(p+4),
+	$(p+8), $(p+9), $(p+10), $(p+11),
+	substr($(p+12),8,40) )
+    next
+  }
+  /PBextreme:monitoring|([ValidHelo]|[InvalidHelo]|[PTRmissing])[scoring]/ {
+    # suppress
+    next
+  }
+  /Message Limit/ {

Lines 13-18 Link Here

(-)mail/assp/pkg-plist (-1 / +1 lines)
13	lib/assp/files/rbl-service.txt	13	lib/assp/files/rbl-service.txt
14	lib/assp/files/redre.txt	14	lib/assp/files/redre.txt
15	lib/assp/files/whitedomains.txt	15	lib/assp/files/whitedomains.txt
		16	lib/assp/images/Thumbs.db
16	lib/assp/images/assp.css	17	lib/assp/images/assp.css
17	lib/assp/images/dropShadow.gif	18	lib/assp/images/dropShadow.gif
18	lib/assp/images/editor.css	19	lib/assp/images/editor.css
Lines 28-34 Link Here
28	lib/assp/images/valid-xhtml10.gif	29	lib/assp/images/valid-xhtml10.gif
29	lib/assp/images/village.gif	30	lib/assp/images/village.gif
30	lib/assp/images/xml-pill.gif	31	lib/assp/images/xml-pill.gif
31	lib/assp/images/Thumbs.db
32	lib/assp/move2num.pl	32	lib/assp/move2num.pl
33	lib/assp/rebuildspamdb.pl	33	lib/assp/rebuildspamdb.pl
34	lib/assp/repair.pl	34	lib/assp/repair.pl

Return to bug 117940

Lines 1-15 Link Here

(-)mail/assp/files/patch-assp.pl (-13 / +13 lines)
1	--- assp.pl.orig Fri Aug 3 14:10:49 2007	1	--- assp.pl.orig Thu Nov 1 16:37:53 2007
2	+++ assp.pl Fri Aug 3 14:12:21 2007	2	+++ assp.pl Thu Nov 1 16:40:38 2007
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#!/usr/bin/perl	4	-#!/usr/bin/perl
5	+#!/usr/local/bin/perl	5	+#!/usr/local/bin/perl
6		6
7	use File::Copy;	7	use File::Copy;
8	use Encode;	8	use Encode;
9	@@ -803,8 +803,8 @@	9	@@ -844,8 +844,8 @@
10	[ScanWL,'Scan Whitelisted Senders',0,checkbox,'1','(.*)',undef,''],	10	[ScanWL,'Scan Whitelisted Senders',0,checkbox,0,'([01]?)',undef,''],
11	[ScanNP,'Scan No Processing Senders',0,checkbox,'','(.*)',undef,''],	11	[ScanNP,'Scan No Processing Senders',0,checkbox,0,'([01]?)',undef,''],
12	[ScanLocal,'Scan Local Senders',0,checkbox,'','(.*)',undef,''],	12	[ScanLocal,'Scan Local Senders',0,checkbox,0,'([01]?)',undef,''],
13	-[AvClamdPort,'Port or file socket for ClamAV',20,textinput,'/tmp/clamd','(\S+)',undef,	13	-[AvClamdPort,'Port or file socket for ClamAV',20,textinput,'/tmp/clamd','(\S+)',undef,
14	- 'A socket specified in the clamav.conf file - LocalSocket. For example /tmp/clamd. If the socket has been setup as a TCP/IP socket (see the TCPSocket option in the clamav.conf file), then specify the TCP socket. For example 3310 '],	14	- 'A socket specified in the clamav.conf file - LocalSocket. For example /tmp/clamd. If the socket has been setup as a TCP/IP socket (see the TCPSocket option in the clamav.conf file), then specify the TCP socket. For example 3310 '],
15	+[AvClamdPort,'Port or file socket for ClamAV',20,textinput,'/var/run/clamav/clamd','(\S+)',undef,	15	+[AvClamdPort,'Port or file socket for ClamAV',20,textinput,'/var/run/clamav/clamd','(\S+)',undef,
Lines 17-37 Link Here
17	[AvError,'Reply Message to Refuse Infected E<!--get rid of google autofill-->mail',80,textinput,'554 5.7.1 Mail appears infected with \'$infection\'.','(5\d\d .*)',undef,	17	[AvError,'Reply Message to Refuse Infected E<!--get rid of google autofill-->mail',80,textinput,'554 5.7.1 Mail appears infected with \'$infection\'.','(5\d\d .*)',undef,
18	'Reply message to refuse infected mail. The string $infection is replaced with the name of the detected virus.<br />	18	'Reply message to refuse infected mail. The string $infection is replaced with the name of the detected virus.<br />
19	For example: 554 5.7.1 Mail appears infected with \'$infection\' -- disinfect and resend.'],	19	For example: 554 5.7.1 Mail appears infected with \'$infection\' -- disinfect and resend.'],
20	@@ -959,7 +959,7 @@	20	@@ -1003,7 +1003,7 @@
21	'<span class="negative"> 0 = no report, 1 = to SENDER, 2 = to TO address (below), 3 = BOTH</span>'],	21	'<span class="negative"> 0 = no report, 1 = to SENDER, 2 = to TO address (below), 3 = BOTH</span>'],
22	[EmailRedlistTo,'To Address for Redlist-Reports',40,textinput,'','(.+)',undef,	22	[EmailRedlistTo,'To Address for Redlist-Reports',40,textinput,'','(.+)',undef,
23	'Email sent from ASSP acknowledging your submissions will be sent to this address. For example: admin@domain.com'],	23	'Email sent from ASSP acknowledging your submissions will be sent to this address. For example: admin@domain.com'],
24	-[EmailFrom,'From Address for Reports',40,textinput,'<spammaster@yourdomain.com>','(.+)',undef,	24	-[EmailFrom,'From Address for Reports',40,textinput,'<spammaster@yourdomain.com>','(.+)',undef,
25	+[EmailFrom,'From Address for Reports',40,textinput,'<postmaster@yourdomain.com>','(.+)',undef,	25	+[EmailFrom,'From Address for Reports',40,textinput,'<postmaster@yourdomain.com>','(.+)',undef,
26	'Email sent from ASSP acknowledging your submissions will be sent from this address.'],	26	'Email sent from ASSP acknowledging your submissions will be sent from this address.'],
27	[NoHaiku,'Legacy: Don\'t reply to messages to the Email Interface',0,checkbox,0,'([01]?)',undef,	27
28	'Check this option to suppress email reports for spam and not-spam reports, whitelist and redlist additions/deletions via the email interface.<br /><hr />	28
29	@@ -1168,7 +1168,7 @@	29	@@ -1214,7 +1214,7 @@
30	[0,0,0,'heading','Server Setup'],	30	[0,0,0,'heading','Server Setup'],
31	[AsAService,'Run ASSP as a Windows Service**',0,checkbox,0,'([01]?)',undef,	31	[AsAService,'Run ASSP as a Windows Service**',0,checkbox,0,'([01]?)',undef,
32	'In Windows NT/2000/XP/2003 ASSP can be installed as a service. This setting tells ASSP that this has been done -- it does not install the Windows service for you. Installing ASSP as a service requires several steps which are detailed in the <a href="http://www.asspsmtp.org/wiki/Quick_Start_for_Win32">Quick Start for Win32</a> wiki page.','Basic'],	32	'In Windows NT/2000/XP/2003 ASSP can be installed as a service. This setting tells ASSP that this has been done -- it does not install the Windows service for you. Installing ASSP as a service requires several steps which are detailed in the <a href="http://www.asspsmtp.org/wiki/Quick_Start_for_Win32">Quick Start for Win32</a> wiki page.'],
33	-[AsADaemon,'Run ASSP as a Daemon**',0,checkbox,0,'([01]?)',undef,	33	-[AsADaemon,'Run ASSP as a Daemon**',0,checkbox,0,'([01]?)',undef,
34	+[AsADaemon,'Run ASSP as a Daemon**',0,checkbox,1,'([01]?)',undef,	34	+[AsADaemon,'Run ASSP as a Daemon**',0,checkbox,1,'([01]?)',undef,
35	'In Linux/BSD/Unix/OSX fork and close file handles. Similar to the command "perl assp.pl &", but better.','Basic'],	35	'In Linux/BSD/Unix/OSX fork and close file handles. Similar to the command "perl assp.pl &", but better.'],
36	[runAsUser,'Run as UID*',20,textinput,'','(\S)',undef,	36	[runAsUser,'Run as UID*',20,textinput,'','(\S)',undef,
37	'The nix user name to assume after startup (nix only).<p><small><i>Examples:</i> assp, nobody</small>','Basic'],	37	'The nix user name to assume after startup (nix only).<p><small><i>Examples:</i> assp, nobody</small></p>'],

Lines 1-5 Link Here

(-)mail/assp/files/patch-stats.sh (-7 / +11 lines)
1	--- stats.sh.orig Fri Aug 3 23:48:56 2007	1	--- stats.sh.orig Thu Nov 8 10:30:36 2007
2	+++ stats.sh Fri Aug 3 23:49:15 2007	2	+++ stats.sh Thu Nov 8 10:43:14 2007
3	@@ -1,15 +1,23 @@	3	@@ -1,15 +1,23 @@
4	#!/bin/sh	4	#!/bin/sh
5		5
Lines 43-49 Link Here
43	#	43	#
44	# I got the idea for this script from Mark Constable. He submitted	44	# I got the idea for this script from Mark Constable. He submitted
45	# a similar script to follow the Courier-MTA /var/log/maillog	45	# a similar script to follow the Courier-MTA /var/log/maillog
46	@@ -46,91 +47,279 @@	46	@@ -46,91 +47,283 @@
47	# Some fields are truncated (with a hard-coded length value, usually 40)	47	# Some fields are truncated (with a hard-coded length value, usually 40)
48	# to keep each line more or less intact on your screen as things scroll by	48	# to keep each line more or less intact on your screen as things scroll by
49	# Colors are coded with ANSI Color coding, your mileage may vary ...	49	# Colors are coded with ANSI Color coding, your mileage may vary ...
Lines 241-247 Link Here
241	+ $(p+8) )	241	+ $(p+8) )
242	+ next	242	+ next
243	+ }	243	+ }
244	+ /Unknown Sender with Local Domain/ {	244	+ /Unknown Sender (with\|from) Local Domain/ {
245	+ printf("%s %s \033[1;34m%-15s IS %s\033[0m\n",	245	+ printf("%s %s \033[1;34m%-15s IS %s\033[0m\n",
246	+ $1,	246	+ $1,
247	+ $2,	247	+ $2,
Lines 253-263 Link Here
253	+ # suppress	253	+ # suppress
254	+ next	254	+ next
255	+ }	255	+ }
256	+ /((DNS\|URI)BL )?Received-(R\|DNS\|URI)BL: (pass\|neutral\|fail)/ {	256	+ /((DNS\|URI)BL )?Received-(R\|DNS\|URI)BL: (pass\|neutral\|fail)\|URIBL fail\|Bayesian Check URIBL/ {
257	+ # suppress	257	+ # suppress
258	+ next	258	+ next
259	+ }	259	+ }
260	+ /failed DNSBL\|failed (R\|URI)BL checks\|Received-RBL: fail\|\[DNSBL].* rejected by / {	260	+ /failed (DNS\|URI)BL\|failed (R\|URI)BL checks\|Received-RBL: fail\|\[DNSBL].* rejected by / {
261	+ printf("%s %s \033[1;35m%-15s BL %s -> %s\033[0m\n",	261	+ printf("%s %s \033[1;35m%-15s BL %s -> %s\033[0m\n",
262	+ $1,	262	+ $1,
263	+ $2,	263	+ $2,
Lines 266-272 Link Here
266	+ $(p+7) )	266	+ $(p+7) )
267	+ next	267	+ next
268	+ }	268	+ }
269	+ /Received-SPF: (pass\|neutral)\| SPF: fail/ {	269	+ /Received-SPF: (pass\|neutral)\| SPF: (soft)?fail\|SPFstrict/ {
270	+ # suppress	270	+ # suppress
271	+ next	271	+ next
272	+ }	272	+ }
Lines 376-381 Link Here
376	+ $(p+4),	376	+ $(p+4),
377	+ $(p+8), $(p+9), $(p+10), $(p+11),	377	+ $(p+8), $(p+9), $(p+10), $(p+11),
378	+ substr($(p+12),8,40) )	378	+ substr($(p+12),8,40) )
		379	+ next
		380	+ }
		381	+ /PBextreme:monitoring\|([ValidHelo]\|[InvalidHelo]\|[PTRmissing])[scoring]/ {
		382	+ # suppress
379	+ next	383	+ next
380	+ }	384	+ }
381	+ /Message Limit/ {	385	+ /Message Limit/ {