Attachment #68126 for bug #100233

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




#

PORTNAME=	assp
PORTVERSION=	1.2.2
PORTREVISION=	1
CATEGORIES=	mail
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	assp
DISTNAME=	ASSP_${PORTVERSION}-install

MAINTAINER=	fbsd@opal.com
COMMENT=	Anti-Spam SMTP Proxy

NO_BUILD=	yes
USE_PERL5_RUN=	yes

USE_DOS2UNIX=	addservice.pl \
		assp.pl \
		changelog.txt \
		freshclam.sh \
		move2num.pl \
		nodelay.txt \
		notspamreport.txt \
		rebuildspamdb.pl \
		redre.txt \
		redremovereport.txt \
		redreport.txt \
		repair.pl \
		spamreport.txt \
		stat.pl \
		stats.sh \
		whiteremovereport.txt \
		whitereport.txt

MAN8=		assp.8 assplog.8

ASSP_USER=	nobody


PLIST_SUB=	ASSP_HOME="${ASSP_HOME}"

SUB_FILES=	assp.8 assplog.8 assp periodic-assp.sh pkg-install
SUB_LIST=	ASSP_HOME="${ASSP_HOME}" ASSP_USER="${ASSP_USER}" \
		ASSP_GROUP="${ASSP_GROUP}" PERL="${PERL}"

USE_RC_SUBR=	assp

OPTIONS=	EMVALID	"RFC822 recipient address validator" on \
		LDAP	"LDAP validation of recipient addresses" on \
		SPF	"SPF validation of client IP" on \
		SRS	"Sender Rewriting Scheme" on \
		FBACKW	"File Reading Backwards" on \
		ZLIB	"HTTP Header Compression on Admin Interface" on \
		CLAMAV	"ClamAV virus scanner" on \
		DNSBL	"DNS block list checking" on

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP

.include <bsd.port.pre.mk>

.if !defined(WITHOUT_EMVALID)

RUN_DEPENDS+=	${SITE_PERL}/Mail/SPF/Query.pm:${PORTSDIR}/mail/p5-Mail-SPF-Query
.endif

.if !defined(WITHOUT_SRS)
RUN_DEPENDS+=	${SITE_PERL}/Mail/SRS.pm:${PORTSDIR}/mail/p5-Mail-SRS
.endif

.if !defined(WITHOUT_FBACKW)
RUN_DEPENDS+=	${SITE_PERL}/File/ReadBackwards.pm:${PORTSDIR}/devel/p5-File-ReadBackwards
.endif

.if !defined(WITHOUT_ZLIB)
RUN_DEPENDS+=	${SITE_PERL}/mach/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress/Zlib
.endif

.if !defined(WITHOUT_CLAMAV)

PLIST_SUB+=	ASSP_CLAMAV="@comment "
.endif

.if !defined(WITHOUT_DNSBL)
RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
.endif

EXTRACT_AFTER_ARGS=	-d ${PORTNAME}-${PORTVERSION}
	@${REINPLACE_CMD} -e 's|.$$||' ${WRKSRC}/stats.sh

post-patch:
	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/*.pl

	${INSTALL_SCRIPT} ${WRKSRC}/freshclam.sh ${PREFIX}/lib/assp
.endif
	${INSTALL_DATA} ${WRKSRC}/*report.txt ${PREFIX}/lib/assp
	${INSTALL_DATA} ${WRKSRC}/nodelay.txt ${PREFIX}/lib/assp
	${INSTALL_DATA} ${WRKSRC}/redre.txt ${PREFIX}/lib/assp

	${MKDIR} ${PREFIX}/lib/assp/images
	${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/lib/assp/images

	${LN} -s ${PREFIX}/lib/assp/assp.pl ${PREFIX}/sbin/assp
	${LN} -s ${PREFIX}/lib/assp/stats.sh ${PREFIX}/sbin/assplog

Lines 1-3 Link Here

(-)mail/assp/distinfo (-3 / +3 lines)
1	MD5 (assp-1.1.1.zip) = 0a00de00329b21b29746ff7961e552d8	1	MD5 (ASSP_1.2.2-install.zip) = 0f9f44ce02c68a69063390ad1b8fe872
2	SHA256 (assp-1.1.1.zip) = c47a45e5bb3ebae7dc3f4c94ecfdf87e0dbfb372a0d70d64d98232a37895ab58	2	SHA256 (ASSP_1.2.2-install.zip) = 967ca2cde4474fd9dd5d775e139434497a3c9ff58bab606db9e8edf1d077d334
3	SIZE (assp-1.1.1.zip) = 183775	3	SIZE (ASSP_1.2.2-install.zip) = 244053

Lines 4-10 Link Here

(-)mail/assp/files/assp.8.in (-2 / +5 lines)
4	.SH SYNOPSIS	4	.SH SYNOPSIS
5	assp [ base_dir [ admin_port ] ]	5	assp [ base_dir [ admin_port ] ]
6	.PP	6	.PP
7	%%PREFIX%%/etc/rc.d/assp.sh start\|stop\|restart\|status	7	%%PREFIX%%/etc/rc.d/assp start\|stop\|restart\|status
8	.SH DESCRIPTION	8	.SH DESCRIPTION
9	.I "Anti-Spam SMTP Proxy"	9	.I "Anti-Spam SMTP Proxy"
10	is a spam filter that sits on port 25 in front	10	is a spam filter that sits on port 25 in front
Lines 43-48 Link Here
43	.IP -	43	.IP -
44	DNSBL (DNS Block List) checking using many block list services	44	DNSBL (DNS Block List) checking using many block list services
45	.IP -	45	.IP -
		46	delaying of messages from unknown senders
		47	.IP -
46	Virus detection	48	Virus detection
47	.RE	49	.RE
48	.PP	50	.PP
Lines 197-202 Link Here
197	.IR ASSP 's	199	.IR ASSP 's
198	other filtering options (local user validation, RFC822	200	other filtering options (local user validation, RFC822
199	conformance, client HELO validation, SPF validation,	201	conformance, client HELO validation, SPF validation,
		202	the Delay List,
200	the use of DNSBLs and the ClamAV virus checker)	203	the use of DNSBLs and the ClamAV virus checker)
201	can be enabled by examining and adjusting their	204	can be enabled by examining and adjusting their
202	configuration options as needed and then unchecking the	205	configuration options as needed and then unchecking the
Lines 227-233 Link Here
227	website and documentation.	230	website and documentation.
228	.SH "STARTING ASSP AT BOOT TIME"	231	.SH "STARTING ASSP AT BOOT TIME"
229	The	232	The
230	.I /usr/local/etc/rc.d/assp.sh	233	.I /usr/local/etc/rc.d/assp
231	script is run automatically at system boot time.	234	script is run automatically at system boot time.
232	Several variables can be set in	235	Several variables can be set in
233	.I /etc/rc.conf	236	.I /etc/rc.conf




#!/bin/sh
#
# $FreeBSD: ports/mail/assp/files/assp.sh.in,v 1.3 2006/02/20 20:47:06 dougb Exp $
#

# PROVIDE: assp
# REQUIRE: LOGIN
# KEYWORD: shutdown

. %%RC_SUBR%%

name=assp
rcvar=`set_rcvar`

command=%%PREFIX%%/sbin/assp
command_interpreter=%%PERL%%
pidfile=%%ASSP_HOME%%/pid

load_rc_config $name
: ${assp_enable="NO"}
: ${assp_flags="%%ASSP_HOME%%"}

run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD: ports/mail/assp/files/assp.sh.in,v 1.3 2006/02/20 20:47:06 dougb Exp $
#

# PROVIDE: assp
# REQUIRE: LOGIN
# KEYWORD: shutdown

. %%RC_SUBR%%

name=assp
rcvar=`set_rcvar`

command=%%PREFIX%%/sbin/assp
command_interpreter=%%PERL%%
pidfile=%%ASSP_HOME%%/pid

load_rc_config $name
: ${assp_enable="NO"}
: ${assp_flags="%%ASSP_HOME%%"}

run_rc_command "$1"

Lines 57-62 Link Here

(-)mail/assp/files/assplog.8.in (-1 / +5 lines)
57	BS	57	BS
58	Bayesian spam check failed	58	Bayesian spam check failed
59	.TP	59	.TP
		60	DL
		61	Message from unknown sender delayed, sender requested to retry later
		62	.TP
60	HL	63	HL
61	Bad HELO greeting	64	Bad HELO greeting
62	.TP	65	.TP
Lines 90-97 Link Here
90	SR	93	SR
91	assp-spam@ report submission	94	assp-spam@ report submission
92	.SH BUGS	95	.SH BUGS
		96	Note that
93	.I assplog	97	.I assplog
94	does not display all log messages; for a complete view of	98	does not display anywhere near all the log messages; for a complete view of
95	the log, use	99	the log, use
96	.B "tail -f"	100	.B "tail -f"
97	directly on the log file.	101	directly on the log file.

Lines 1-56 Link Here

(-)mail/assp/files/patch-assp.pl (-31 / +30 lines)
1	--- assp.pl.orig Tue Mar 15 06:41:24 2005	1	--- assp.pl.orig Sun Jun 25 15:35:15 2006
2	+++ assp.pl Wed May 18 11:33:35 2005	2	+++ assp.pl Sun Jun 25 15:43:20 2006
3	@@ -39,7 +39,7 @@	3	@@ -1,4 +1,4 @@
		4	-#!/usr/bin/perl
		5	+#!/usr/local/bin/perl
4		6
		7	#use strict;
		8	#use warnings;
		9	@@ -67,7 +67,7 @@
5	loadConfig();	10	loadConfig();
		11
6	sub loadConfig {	12	sub loadConfig {
7	- print "loading config -- base='$base'\n";	13	- print "loading config -- base='$base'\n";
8	+ # print "loading config -- base='$base'\n";	14	+ # print "loading config -- base='$base'\n";
9	@Config=(	15	@Config=(
10	[0,0,0,heading,'Network Setup'],	16	[0,0,0,'heading','Network Setup'],
11	# except for the heading lines, all config lines have the following:	17	# except for the heading lines, all config lines have the following:
12	@@ -58,7 +58,7 @@	18	@@ -86,7 +86,7 @@
13	'The address:port of your message handling system\'s smtp server. For example: 127.0.0.1:125'],	19	'The address:port of your message handling system\'s smtp server. For example: 127.0.0.1:125'],
14	[AsAService,'As a Service',0,checkbox,'','(\S*)',undef,	20	[AsAService,'As a Service',0,checkbox,0,'(.*)',undef,
15	'In Windows 2000 / NT you can run it as a service; requires <a href="http://www.roth.net/perl/Daemon/" rel="external">win32::daemon</a>. Requires start from the service control panel.'],	21	'In Windows 2000 / NT you can run it as a service; requires <a href="http://www.roth.net/perl/Daemon/" rel="external">win32::daemon</a>. Requires start from the service control panel.'],
16	- [AsADaemon,'As a Daemon',0,checkbox,'','(\S*)',undef,	22	- [AsADaemon,'As a Daemon',0,checkbox,0,'(.*)',undef,
17	+ [AsADaemon,'As a Daemon',0,checkbox,1,'(\S*)',undef,	23	+ [AsADaemon,'As a Daemon',0,checkbox,1,'(.*)',undef,
18	'In Linux/BSD/Unix/OSX fork and close file handles, kinda like "perl assp.pl &" but better. Requires restart.'],	24	'In Linux/BSD/Unix/OSX fork and close file handles, kinda like "perl assp.pl &" but better. Requires restart.'],
19	[myName,'My Name',20,textinput,'ASSP-nospam','(\S+)',undef,	25	[myName,'My Name',40,textinput,'ASSP.nospam','(\S+)',undef,
20	'What the program calls itself in the email "received by" header. Usually ASSP-nospam.'],	26	'What the program calls itself in the email "received by" header. Usually ASSP.nospam.'],
21	@@ -355,7 +355,7 @@	27	@@ -811,7 +811,7 @@
22	No mail is delivered! For example: assp-notspam'],	28	'<span class="negative"> 0 = no report, 1 = to user, 2 = to TO address, 3 = both</span>'],
23	[EmailWhitelist,'Add to Whitelist Address',20,textinput,'assp-white','(.*)',undef,	29	[EmailRedlistTo,'To Address for Redlist-Reports',40,textinput,'','(.+)',undef,
24	'Any mail sent by local/authenticated users to this username will be interpreted as a request to add addresses to the whitelist.<br /> No mail is delivered! For example: assp-white'],	30	'Email sent from ASSP acknowledging your submissions will be sent to this address. For example: admin@domain.com'],
25	- [EmailFrom,'From Address for Email',20,textinput,'ASSP <>','(.+)',undef,	31	- [EmailFrom,'From Address for Reports',40,textinput,'<>','(.+)',undef,
26	+ [EmailFrom,'From Address for Email',20,textinput,'ASSP <postmaster@yourdomain.com>','(.+)',undef,	32	+ [EmailFrom,'From Address for Reports',40,textinput,'<postmaster@yourdomain.com>','(.+)',undef,
27	'Email sent from ASSP acknowledging your submissions will be sent from this address.<br />	33	'Email sent from ASSP acknowledging your submissions will be sent from this address.<br />
28	Some mailers don\'t like the default setting. For example: ASSP <> or Mail Administrator	34	Some mailers don\'t like the default setting. For example: ASSP <> or Mail Administrator
29	<mailadmin@mydomain.com>'],	35	<mailadmin@mydomain.com>
30	@@ -423,9 +423,9 @@	36	@@ -913,9 +913,9 @@
31	'ASSP closes and renames the log file after this number of days. Decimals are ok. For example: 14 or 0.5'],	37	'],
32		38
33	[0,0,0,heading,'Security'],	39	[0,0,0,'heading','Security'],
34	- [runAsUser,'Run as UID',20,textinput,'','(\S*)',undef,	40	- [runAsUser,'Run as UID',20,textinput,'','(\S*)',undef,
35	+ [runAsUser,'Run as UID',20,textinput,'nobody','(\S*)',undef,	41	+ [runAsUser,'Run as UID',20,textinput,'nobody','(\S*)',undef,
36	'The *nix user name to assume after startup: assp or nobody -- requires ASSP restart.'],	42	'The *nix user name to assume after startup: assp or nobody -- requires ASSP restart.'],
37	- [runAsGroup,'Run as GID',20,textinput,'','(\S*)',undef,	43	- [runAsGroup,'Run as GID',20,textinput,'','(\S*)',undef,
38	+ [runAsGroup,'Run as GID',20,textinput,'nobody','(\S*)',undef,	44	+ [runAsGroup,'Run as GID',20,textinput,'nobody','(\S*)',undef,
39	'The *nix group to assume after startup: assp or nogroup -- requires ASSP restart.'],	45	'The *nix group to assume after startup: assp or nogroup -- requires ASSP restart.'],
40	[ChangeRoot,'Change Root',60,textinput,'','(.*)',undef,	46	[ChangeRoot,'Change Root',40,textinput,'','(.*)',undef,
41	'Non-blank means to run in chroot jail in *nix. You need an etc/protocols file to make this work<br />	47	'Non-blank means to run in chroot jail in *nix. You need an etc/protocols file to make this work<br />
42	@@ -3631,6 +3631,7 @@	48	@@ -7865,6 +7865,7 @@
43	@PossibleOptionFiles=();	49	@PossibleOptionFiles2=();
44	for (@Config) {	50	foreach (@Config) {
45	if($_->[6] eq 'ConfigMakeRe') {	51	if($_->[6] eq 'ConfigMakeRe') {
46	+ $silent=1 if($AsADaemon);	52	+ $silent=1 if($AsADaemon);
47	${$_->[0]}=optionList(${$_->[0]},$_->[0]);	53	${$_->[0]}=optionList(${$_->[0]},$_->[0]);
48	push(@PossibleOptionFiles,$_->[0]);	54	push(@PossibleOptionFiles,$_->[0]);
49	} elsif($_->[6] eq 'ConfigCompileRe') {	55	} elsif($_->[6] eq 'ConfigCompileRe') {
50	@@ -4462,4 +4462,4 @@
51	dynablock.njabl.org
52	);
53	}
54	-1;
55	\ No newline at end of file
56	+1;

Lines 1-5 Link Here

(-)mail/assp/files/patch-stats.sh (-80 / +145 lines)
1	--- stats.sh.orig Fri Aug 6 20:26:26 2004	1	--- stats.sh.orig Thu Jul 13 11:50:02 2006
2	+++ stats.sh Thu May 26 22:24:20 2005	2	+++ stats.sh Thu Jul 13 11:55:05 2006
3	@@ -4,12 +4,12 @@	3	@@ -4,12 +4,12 @@
4	# copy of your standard Unix shell, the 'tail' utility and a working 'awk'	4	# copy of your standard Unix shell, the 'tail' utility and a working 'awk'
5	# interpreter.	5	# interpreter.
Lines 30-36 Link Here
30	# BA (in Cyan) .. Bad ATTACHEMENT rejected	30	# BA (in Cyan) .. Bad ATTACHEMENT rejected
31	# SR (in Cyan) .. spam@ report submission	31	# SR (in Cyan) .. spam@ report submission
32	# NS (in Cyan) .. notspam@ report submission	32	# NS (in Cyan) .. notspam@ report submission
33	@@ -46,32 +49,32 @@	33	@@ -46,91 +49,144 @@
34	# Some fields are truncated (with a hard-coded length value, usually 40)	34	# Some fields are truncated (with a hard-coded length value, usually 40)
35	# to keep each line more or less intact on your screen as things scroll by	35	# to keep each line more or less intact on your screen as things scroll by
36	# Colors are coded with ANSI Color coding, your mileage may vary ...	36	# Colors are coded with ANSI Color coding, your mileage may vary ...
Lines 44-176 Link Here
44	-tail -300 -f /usr/local/assp/maillog.log \| \	44	-tail -300 -f /usr/local/assp/maillog.log \| \
45	+tail -300 -f /var/db/assp/maillog.txt \| \	45	+tail -300 -f /var/db/assp/maillog.txt \| \
46	awk ' \	46	awk ' \
47	/whitelisted/ { \	47	- /whitelisted/ { \
48	- printf("%s %s \033[1;32m%-15s L\033[0mW %s \033[1;32m->\033[0m %s\n", \	48	- printf("%s %s \033[1;32m%-15s L\033[0mW %s \033[1;32m->\033[0m %s\n", \
49	+ printf("%s %s \033[1;32m%-15s\033[0m \033[1;37mLW %s\033[0m \033[1;32m->\033[0m \033[1;37m%s\033[0m\n", \	49	- substr($1,1,length($1)), \
50	substr($1,1,length($1)), \	50	- substr($2,1,length($2)), \
51	substr($2,1,length($2)), \	51	- substr($3,1,length($3)), \
52	substr($3,1,length($3)), \	52	- substr($4,1,40), \
53	substr($4,1,40), \	53	- substr($6,1,length($6)) )\
54	substr($6,1,length($6)) )\	54	- } \
55	} \
56	- /email/ && /whitelist addition/ { \	55	- /email/ && /whitelist addition/ { \
57	- printf("%s %s \033[1;32m%-15s W\033[0mA+ %s \033[1;32m->\033[0m %s\n", \	56	- printf("%s %s \033[1;32m%-15s W\033[0mA+ %s \033[1;32m->\033[0m %s\n", \
58	+ /whitelist addition/ && /email new/ { \	57	- substr($1,1,length($1)), \
59	+ printf("%s %s \033[1;36m%-15s WA+ %s\033[0m \033[1;37m%s\033[0m\n", \	58	- substr($2,1,length($2)), \
60	substr($1,1,length($1)), \	59	- "+email address+", \
61	substr($2,1,length($2)), \	60	+ /local or whitelisted/ { \
62	"+email address+", \	61	+ printf("%s %s \033[1;32m%-15s\033[0m \033[1;37mLW %s\033[0m \033[1;32m->\033[0m \033[1;37m%s\033[0m\n", \
63	- substr($4,1,40), \	62	+ $1, \
		63	+ $2, \
		64	+ $3, \
		65	substr($4,1,40), \
64	- substr($6,1,length($6)) )\	66	- substr($6,1,length($6)) )\
		67	+ $6 )\
		68	+ } \
		69	+ /Email whitelist addition/ { \
		70	+ printf("%s %s \033[1;36m%-15s WA+ %s\033[0m \033[1;37m%s\033[0m\n", \
		71	+ $1, \
		72	+ $2, \
		73	+ "+email address+", \
65	+ "-adds-", \	74	+ "-adds-", \
66	+ substr($7,1,length($7)) )\	75	+ $6 )\
67	} \	76	} \
68	/whitelist addition/ && !/email/ { \	77	- /whitelist addition/ && !/email/ { \
69	- printf("%s %s \033[1;32m%-15s W\033[0mL+ %s \033[1;32m %s %s\033[0m\n", \	78	- printf("%s %s \033[1;32m%-15s W\033[0mL+ %s \033[1;32m %s %s\033[0m\n", \
		79	- substr($1,1,length($1)), \
		80	- substr($2,1,length($2)), \
		81	- substr($3,1,length($3)), \
		82	+ /whitelist addition:/ && !/[Ee]mail/ { \
70	+ printf("%s %s \033[1;32m%-15s\033[0m \033[1;37mWL+ %s\033[0m \033[1;32m%s\033[0m \033[1;37m%s\033[0m\n", \	83	+ printf("%s %s \033[1;32m%-15s\033[0m \033[1;37mWL+ %s\033[0m \033[1;32m%s\033[0m \033[1;37m%s\033[0m\n", \
71	substr($1,1,length($1)), \	84	+ $1, \
72	substr($2,1,length($2)), \	85	+ $2, \
73	substr($3,1,length($3)), \	86	+ $3, \
74	@@ -79,12 +82,12 @@	87	substr($4,1,40), \
75	"-adds-", \	88	"-adds-", \
76	substr($9,1,length($9)) )\	89	- substr($9,1,length($9)) )\
		90	+ $9 )\
77	} \	91	} \
78	- /Bayesian spam/ { \	92	- /Bayesian spam/ { \
79	+ /Bayesian Spam/ { \	93	+ /Bayesian [Ss]pam/ { \
80	printf("%s %s \033[1;31m%-15s BS %s -> %s\033[0m\n", \	94	printf("%s %s \033[1;31m%-15s BS %s -> %s\033[0m\n", \
81	- substr($1,1,length($1)), \	95	- substr($1,1,length($1)), \
82	- substr($2,1,length($2)), \	96	- substr($2,1,length($2)), \
83	- substr($3,1,length($3)), \	97	- substr($3,1,length($3)), \
84	- substr($4,1,40), \	98	- substr($4,1,40), \
85	+ substr($1,1,length($1)), \	99	- substr($6,1,length($6)) )\
86	+ substr($2,1,length($2)), \	100	+ $1, \
87	+ substr($3,1,length($3)), \	101	+ $2, \
		102	+ $3, \
88	+ substr($4,1,40), \	103	+ substr($4,1,40), \
89	substr($6,1,length($6)) )\	104	+ $6 )\
90	} \	105	} \
91	/message ok/ { \	106	/message ok/ { \
92	@@ -95,7 +98,7 @@	107	printf("%s %s \033[1;32m%-15s Ok %s -> %s\033[0m\n", \
		108	- substr($1,1,length($1)), \
		109	- substr($2,1,length($2)), \
		110	- substr($3,1,length($3)), \
		111	+ $1, \
		112	+ $2, \
		113	+ $3, \
93	substr($4,1,40), \	114	substr($4,1,40), \
94	substr($6,1,length($6)) )\	115	- substr($6,1,length($6)) )\
		116	+ $6 )\
95	} \	117	} \
96	- /bad attachment/ { \	118	- /bad attachment/ { \
97	+ /bad attachment/ && !/no bad/ { \	119	+ /bad attachment/ && !/no bad/ { \
98	printf("%s %s \033[1;35m%-15s BA %s -> %s\033[0m\n", \	120	printf("%s %s \033[1;35m%-15s BA %s -> %s\033[0m\n", \
99	substr($1,1,length($1)), \	121	- substr($1,1,length($1)), \
100	substr($2,1,length($2)), \	122	- substr($2,1,length($2)), \
101	@@ -104,29 +107,66 @@	123	- substr($3,1,length($3)), \
102	substr($6,1,length($6)) )\	124	+ $1, \
		125	+ $2, \
		126	+ $3, \
		127	substr($4,1,40), \
		128	- substr($6,1,length($6)) )\
		129	+ $6 )\
103	} \	130	} \
104	/relay attempt blocked/ { \	131	/relay attempt blocked/ { \
105	- printf("%s %s \033[1;35m%-15s RB %s -> %s %s %s %s %s\033[0m\n", \	132	- printf("%s %s \033[1;35m%-15s RB %s -> %s %s %s %s %s\033[0m\n", \
106	+ printf("%s %s \033[1;35m%-15s RB %s -> %s\033[0m\n", \	133	- substr($1,1,length($1)), \
107	substr($1,1,length($1)), \	134	- substr($2,1,length($2)), \
108	substr($2,1,length($2)), \	135	- substr($3,1,length($3)), \
109	substr($3,1,length($3)), \
110	- substr($4,1,length($4)), \	136	- substr($4,1,length($4)), \
111	- substr($5,1,length($5)), \	137	- substr($5,1,length($5)), \
112	- substr($6,1,length($6)), \	138	- substr($6,1,length($6)), \
113	- substr($7,1,length($7)), \	139	- substr($7,1,length($7)), \
114	- substr($8,1,length($8)), \	140	- substr($8,1,length($8)), \
		141	- substr($9,1,length($9)) )\
		142	- } \
		143	- /Admin update:/ { \
		144	- printf("\033[1;33m%s %s %s %s %s %s \033[0m\n", $1, $2, $3, $4, $5, $6) \
		145	- } \
		146	- /Email spamreport/ { \
		147	- printf("%s %s\033[0;36m %-15s SR %s Email SPAM Submission\033[0m\n", \
		148	- substr($1,1,length($1)), \
		149	- substr($2,1,length($2)), \
		150	- substr($3,1,length($3)), \
		151	- substr($4,1,length($4)) ) \
		152	- } \
		153	- /Email hamreport/ { \
		154	- printf("%s %s\033[0;36m %-15s NS %s Email NOTSPAM Submission\033[0m\n", \
		155	- substr($1,1,length($1)), \
		156	- substr($2,1,length($2)), \
		157	- substr($3,1,length($3)), \
		158	- substr($4,1,length($4)) ) \
		159	+ printf("%s %s \033[1;35m%-15s RB %s -> %s\033[0m\n", \
		160	+ $1, \
		161	+ $2, \
		162	+ $3, \
115	+ substr($4,1,40), \	163	+ substr($4,1,40), \
116	substr($9,1,length($9)) )\	164	+ ($9 ~ /^(.*):$/) ? $10 : $9 )\
117	} \	165	+ } \
118	+ /Invalid address rejected/ { \	166	+ /[Ii]nvalid address rejected/ { \
119	+ printf("%s %s \033[1;34m%-15s IR %s -> %s\033[0m\n", \	167	+ printf("%s %s \033[1;34m%-15s IR %s -> %s\033[0m\n", \
120	+ substr($1,1,length($1)), \	168	+ $1, \
121	+ substr($2,1,length($2)), \	169	+ $2, \
122	+ substr($3,1,length($3)), \	170	+ $3, \
123	+ substr($4,1,40), \	171	+ substr($4,1,40), \
124	+ substr($NF,1,length($NF)) )\	172	+ $NF )\
125	+ } \	173	+ } \
126	+ /malformed address/ { \	174	+ /malformed address/ { \
127	+ printf("%s %s \033[1;35m%-15s MA %s -> %s\033[0m\n", \	175	+ printf("%s %s \033[1;35m%-15s MA %s -> %s\033[0m\n", \
128	+ substr($1,1,length($1)), \	176	+ $1, \
129	+ substr($2,1,length($2)), \	177	+ $2, \
130	+ substr($3,1,length($3)), \	178	+ $3, \
131	+ substr($4,1,40), \	179	+ substr($4,1,40), \
132	+ substr($7,1,length($7)) )\	180	+ $7 )\
133	+ } \	181	+ } \
134	+ /failed RBL checks/ { \	182	+ /failed RBL checks\|Received-RBL: fail/ { \
135	+ printf("%s %s \033[1;35m%-15s BL %s -> %s\033[0m\n", \	183	+ printf("%s %s \033[1;35m%-15s BL %s -> %s\033[0m\n", \
136	+ substr($1,1,length($1)), \	184	+ $1, \
137	+ substr($2,1,length($2)), \	185	+ $2, \
138	+ substr($3,1,length($3)), \	186	+ $3, \
139	+ substr($4,1,40), \	187	+ substr($4,1,40), \
140	+ substr($6,1,length($6)) )\	188	+ $6 )\
141	+ } \	189	+ } \
142	+ /failed SPF checks/ { \	190	+ /failed SPF checks\|Received-SPF: fail/ { \
143	+ printf("%s %s \033[1;35m%-15s SP %s -> %s\033[0m\n", \	191	+ printf("%s %s \033[1;35m%-15s SP %s -> %s\033[0m\n", \
144	+ substr($1,1,length($1)), \	192	+ $1, \
145	+ substr($2,1,length($2)), \	193	+ $2, \
146	+ substr($3,1,length($3)), \	194	+ $3, \
147	+ substr($4,1,40), \	195	+ substr($4,1,40), \
148	+ substr($6,1,length($6)) )\	196	+ $6 )\
149	+ } \	197	+ } \
150	+ /has spam helo/ { \	198	+ /has spam helo/ { \
151	+ printf("%s %s \033[1;35m%-15s HL %s -> %s %s\033[0m\n", \	199	+ printf("%s %s \033[1;35m%-15s HL %s -> %s %s\033[0m\n", \
152	+ substr($1,1,length($1)), \	200	+ $1, \
153	+ substr($2,1,length($2)), \	201	+ $2, \
154	+ substr($3,1,length($3)), \	202	+ $3, \
155	+ substr($4,1,40), \	203	+ substr($4,1,40), \
156	+ substr($6,1,length($6)), \	204	+ $6, \
157	+ substr($10,1,length($10)) )\	205	+ $10 )\
158	+ } \	206	+ } \
159	/Admin update:/ { \	207	+ /Sender Validation:blocked:/ { \
160	- printf("\033[1;33m%s %s %s %s %s %s \033[0m\n", $1, $2, $3, $4, $5, $6) \	208	+ printf("%s %s \033[1;35m%-15s HL %s %s\033[0m\n", \
		209	+ $1, \
		210	+ $2, \
		211	+ $3, \
		212	+ substr($4,1,40), \
		213	+ $9 )\
		214	+ } \
		215	+ /recipient delayed/ { \
		216	+ printf("%s %s \033[1;35m%-15s DL %s -> %s\033[0m\n", \
		217	+ $1, \
		218	+ $2, \
		219	+ $3, \
		220	+ substr($4,1,40), \
		221	+ $7 ) \
		222	+ } \
		223	+ /Admin (update:\|connection from )/ { \
161	+ printf("\033[1;33m%s\033[0m\n", $0) \	224	+ printf("\033[1;33m%s\033[0m\n", $0) \
162	} \	225	+ } \
163	/Email spamreport/ { \	226	+ /[Ee]mail spamreport/ { \
164	- printf("%s %s\033[0;36m %-15s SR %s Email SPAM Submission\033[0m\n", \
165	+ printf("%s %s\033[1;36m %-15s SR %s\033[0m\n", \	227	+ printf("%s %s\033[1;36m %-15s SR %s\033[0m\n", \
166	substr($1,1,length($1)), \	228	+ $1, \
167	substr($2,1,length($2)), \	229	+ $2, \
168	substr($3,1,length($3)), \	230	+ $3, \
169	substr($4,1,length($4)) ) \	231	+ $4 ) \
170	} \	232	+ } \
171	/Email hamreport/ { \	233	+ /[Ee]mail hamreport/ { \
172	- printf("%s %s\033[0;36m %-15s NS %s Email NOTSPAM Submission\033[0m\n", \
173	+ printf("%s %s\033[1;36m %-15s NS %s\033[0m\n", \	234	+ printf("%s %s\033[1;36m %-15s NS %s\033[0m\n", \
174	substr($1,1,length($1)), \	235	+ $1, \
175	substr($2,1,length($2)), \	236	+ $2, \
176	substr($3,1,length($3)), \	237	+ $3, \
		238	+ $4 ) \
		239	}'
		240	# end of script
		241

Lines 2-6 Link Here

(-)mail/assp/files/pkg-install.in (-1 / +5 lines)
2		2
3	if [ "$2" = "POST-INSTALL" ]; then	3	if [ "$2" = "POST-INSTALL" ]; then
4	install -d -m 0700 -o %%ASSP_USER%% -g %%ASSP_GROUP%% %%ASSP_HOME%%	4	install -d -m 0700 -o %%ASSP_USER%% -g %%ASSP_GROUP%% %%ASSP_HOME%%
5	ln -s $PKG_PREFIX/lib/assp/*.txt %%ASSP_HOME%%	5	[ ! -f %%ASSP_HOME%%/denysmtp.txt ] && touch %%ASSP_HOME%%/denysmtp.txt && chown %%ASSP_USER%%:%%ASSP_GROUP%% %%ASSP_HOME%%/denysmtp.txt
		6	ln -s $PKG_PREFIX/lib/assp/*report.txt %%ASSP_HOME%%
		7	ln -s $PKG_PREFIX/lib/assp/nodelay.txt %%ASSP_HOME%%
		8	ln -s $PKG_PREFIX/lib/assp/redre.txt %%ASSP_HOME%%
		9	ln -s $PKG_PREFIX/lib/assp/images %%ASSP_HOME%%
6	fi	10	fi

Lines 3-25 Link Here

(-)mail/assp/pkg-plist (+25 lines)
3	@dirrmtry etc/periodic	3	@dirrmtry etc/periodic
4	lib/assp/addservice.pl	4	lib/assp/addservice.pl
5	lib/assp/assp.pl	5	lib/assp/assp.pl
		6	lib/assp/images/assp.css
		7	lib/assp/images/dropShadow.gif
		8	lib/assp/images/editor.css
		9	lib/assp/images/favicon.ico
		10	lib/assp/images/logo.jpg
		11	lib/assp/images/minusIcon.png
		12	lib/assp/images/noIcon.png
		13	lib/assp/images/plusIcon.png
		14	lib/assp/images/shutdown.css
		15	lib/assp/images/sourceforge-logo.gif
		16	lib/assp/images/valid-xhtml10.gif
		17	lib/assp/images/village.gif
		18	lib/assp/images/xml-pill.gif
6	lib/assp/move2num.pl	19	lib/assp/move2num.pl
		20	lib/assp/nodelay.txt
7	lib/assp/notspamreport.txt	21	lib/assp/notspamreport.txt
8	lib/assp/rebuildspamdb.pl	22	lib/assp/rebuildspamdb.pl
		23	lib/assp/redremovereport.txt
		24	lib/assp/redre.txt
		25	lib/assp/redreport.txt
9	lib/assp/repair.pl	26	lib/assp/repair.pl
10	lib/assp/spamreport.txt	27	lib/assp/spamreport.txt
11	lib/assp/stat.pl	28	lib/assp/stat.pl
12	lib/assp/stats.sh	29	lib/assp/stats.sh
		30	lib/assp/whiteremovereport.txt
13	lib/assp/whitereport.txt	31	lib/assp/whitereport.txt
14	%%ASSP_CLAMAV%%lib/assp/freshclam.sh	32	%%ASSP_CLAMAV%%lib/assp/freshclam.sh
		33	@dirrm lib/assp/images
15	@dirrm lib/assp	34	@dirrm lib/assp
16	sbin/assp	35	sbin/assp
17	sbin/assplog	36	sbin/assplog
18	%%PORTDOCS%%%%DOCSDIR%%/ASSP Documentation.htm	37	%%PORTDOCS%%%%DOCSDIR%%/ASSP Documentation.htm
19	%%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm	38	%%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm
20	%%PORTDOCS%%@dirrm %%DOCSDIR%%	39	%%PORTDOCS%%@dirrm %%DOCSDIR%%
		40	@unexec rm -f %%ASSP_HOME%%/images 2>/dev/null \|\| true
		41	@unexec rm -f %%ASSP_HOME%%/nodelay.txt 2>/dev/null \|\| true
21	@unexec rm -f %%ASSP_HOME%%/notspamreport.txt 2>/dev/null \|\| true	42	@unexec rm -f %%ASSP_HOME%%/notspamreport.txt 2>/dev/null \|\| true
		43	@unexec rm -f %%ASSP_HOME%%/redremovereport.txt 2>/dev/null \|\| true
		44	@unexec rm -f %%ASSP_HOME%%/redre.txt 2>/dev/null \|\| true
		45	@unexec rm -f %%ASSP_HOME%%/redreport.txt 2>/dev/null \|\| true
22	@unexec rm -f %%ASSP_HOME%%/spamreport.txt 2>/dev/null \|\| true	46	@unexec rm -f %%ASSP_HOME%%/spamreport.txt 2>/dev/null \|\| true
		47	@unexec rm -f %%ASSP_HOME%%/whiteremovereport.txt 2>/dev/null \|\| true
23	@unexec rm -f %%ASSP_HOME%%/whitereport.txt 2>/dev/null \|\| true	48	@unexec rm -f %%ASSP_HOME%%/whitereport.txt 2>/dev/null \|\| true
24	@unexec rmdir %%ASSP_HOME%% 2>/dev/null \|\| true	49	@unexec rmdir %%ASSP_HOME%% 2>/dev/null \|\| true
25	@unexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi	50	@unexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi

Return to bug 100233

Lines 6-16 Link Here

(-)mail/assp/Makefile (-9 / +46 lines)
6	#	6	#
7		7
8	PORTNAME= assp	8	PORTNAME= assp
9	PORTVERSION= 1.1.1	9	PORTVERSION= 1.2.2
10	PORTREVISION= 1
11	CATEGORIES= mail	10	CATEGORIES= mail
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= assp	12	MASTER_SITE_SUBDIR= assp
		13	DISTNAME= ASSP_${PORTVERSION}-install
14		14
15	MAINTAINER= fbsd@opal.com	15	MAINTAINER= fbsd@opal.com
16	COMMENT= Anti-Spam SMTP Proxy	16	COMMENT= Anti-Spam SMTP Proxy
Lines 19-24 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 \
		23	assp.pl \
		24	changelog.txt \
		25	freshclam.sh \
		26	move2num.pl \
		27	nodelay.txt \
		28	notspamreport.txt \
		29	rebuildspamdb.pl \
		30	redre.txt \
		31	redremovereport.txt \
		32	redreport.txt \
		33	repair.pl \
		34	spamreport.txt \
		35	stat.pl \
		36	stats.sh \
		37	whiteremovereport.txt \
		38	whitereport.txt
		39
22	MAN8= assp.8 assplog.8	40	MAN8= assp.8 assplog.8
23		41
24	ASSP_USER= nobody	42	ASSP_USER= nobody
Lines 27-44 Link Here
27		45
28	PLIST_SUB= ASSP_HOME="${ASSP_HOME}"	46	PLIST_SUB= ASSP_HOME="${ASSP_HOME}"
29		47
30	SUB_FILES= assp.8 assplog.8 assp.sh periodic-assp.sh pkg-install	48	SUB_FILES= assp.8 assplog.8 assp periodic-assp.sh pkg-install
31	SUB_LIST= ASSP_HOME="${ASSP_HOME}" ASSP_USER="${ASSP_USER}" \	49	SUB_LIST= ASSP_HOME="${ASSP_HOME}" ASSP_USER="${ASSP_USER}" \
32	ASSP_GROUP="${ASSP_GROUP}" PERL="${PERL}"	50	ASSP_GROUP="${ASSP_GROUP}" PERL="${PERL}"
33		51
34	USE_RC_SUBR= assp.sh	52	USE_RC_SUBR= assp
35		53
36	OPTIONS= EMVALID "RFC822 recipient address validator" on \	54	OPTIONS= EMVALID "RFC822 recipient address validator" on \
37	LDAP "LDAP validation of recipient addresses" on \	55	LDAP "LDAP validation of recipient addresses" on \
38	SPF "SPF validation of client IP" on \	56	SPF "SPF validation of client IP" on \
		57	SRS "Sender Rewriting Scheme" on \
		58	FBACKW "File Reading Backwards" on \
		59	ZLIB "HTTP Header Compression on Admin Interface" on \
39	CLAMAV "ClamAV virus scanner" on \	60	CLAMAV "ClamAV virus scanner" on \
40	DNSBL "DNS block list checking" on	61	DNSBL "DNS block list checking" on
41		62
		63	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP
		64
42	.include <bsd.port.pre.mk>	65	.include <bsd.port.pre.mk>
43		66
44	.if !defined(WITHOUT_EMVALID)	67	.if !defined(WITHOUT_EMVALID)
Lines 54-61 Link Here
54	RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF/Query.pm:${PORTSDIR}/mail/p5-Mail-SPF-Query	77	RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF/Query.pm:${PORTSDIR}/mail/p5-Mail-SPF-Query
55	.endif	78	.endif
56		79
57	.if !defined(WITHOUT_DNSBL)	80	.if !defined(WITHOUT_SRS)
58	RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS	81	RUN_DEPENDS+= ${SITE_PERL}/Mail/SRS.pm:${PORTSDIR}/mail/p5-Mail-SRS
		82	.endif
		83
		84	.if !defined(WITHOUT_FBACKW)
		85	RUN_DEPENDS+= ${SITE_PERL}/File/ReadBackwards.pm:${PORTSDIR}/devel/p5-File-ReadBackwards
		86	.endif
		87
		88	.if !defined(WITHOUT_ZLIB)
		89	RUN_DEPENDS+= ${SITE_PERL}/mach/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress/Zlib
59	.endif	90	.endif
60		91
61	.if !defined(WITHOUT_CLAMAV)	92	.if !defined(WITHOUT_CLAMAV)
Lines 65-74 Link Here
65	PLIST_SUB+= ASSP_CLAMAV="@comment "	96	PLIST_SUB+= ASSP_CLAMAV="@comment "
66	.endif	97	.endif
67		98
68	EXTRACT_AFTER_ARGS= -d ${PORTNAME}-${PORTVERSION}	99	.if !defined(WITHOUT_DNSBL)
		100	RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
		101	.endif
69		102
70	pre-patch:	103	EXTRACT_AFTER_ARGS= -d ${PORTNAME}-${PORTVERSION}
71	@${REINPLACE_CMD} -e 's\|.$$\|\|' ${WRKSRC}/stats.sh
72		104
73	post-patch:	105	post-patch:
74	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL}\|' ${WRKSRC}/*.pl	106	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL}\|' ${WRKSRC}/*.pl
Lines 81-86 Link Here
81	${INSTALL_SCRIPT} ${WRKSRC}/freshclam.sh ${PREFIX}/lib/assp	113	${INSTALL_SCRIPT} ${WRKSRC}/freshclam.sh ${PREFIX}/lib/assp
82	.endif	114	.endif
83	${INSTALL_DATA} ${WRKSRC}/*report.txt ${PREFIX}/lib/assp	115	${INSTALL_DATA} ${WRKSRC}/*report.txt ${PREFIX}/lib/assp
		116	${INSTALL_DATA} ${WRKSRC}/nodelay.txt ${PREFIX}/lib/assp
		117	${INSTALL_DATA} ${WRKSRC}/redre.txt ${PREFIX}/lib/assp
		118
		119	${MKDIR} ${PREFIX}/lib/assp/images
		120	${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/lib/assp/images
84		121
85	${LN} -s ${PREFIX}/lib/assp/assp.pl ${PREFIX}/sbin/assp	122	${LN} -s ${PREFIX}/lib/assp/assp.pl ${PREFIX}/sbin/assp
86	${LN} -s ${PREFIX}/lib/assp/stats.sh ${PREFIX}/sbin/assplog	123	${LN} -s ${PREFIX}/lib/assp/stats.sh ${PREFIX}/sbin/assplog

Line 0 Link Here

(-)mail/assp/files/assp.in (+23 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD: ports/mail/assp/files/assp.sh.in,v 1.3 2006/02/20 20:47:06 dougb Exp $
	4	#
	5
	6	# PROVIDE: assp
	7	# REQUIRE: LOGIN
	8	# KEYWORD: shutdown
	9
	10	. %%RC_SUBR%%
	11
	12	name=assp
	13	rcvar=`set_rcvar`
	14
	15	command=%%PREFIX%%/sbin/assp
	16	command_interpreter=%%PERL%%
	17	pidfile=%%ASSP_HOME%%/pid
	18
	19	load_rc_config $name
	20	: ${assp_enable="NO"}
	21	: ${assp_flags="%%ASSP_HOME%%"}
	22
	23	run_rc_command "$1"

Lines 1-23 Link Here

(-)mail/assp/files/assp.sh.in (-23 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/mail/assp/files/assp.sh.in,v 1.3 2006/02/20 20:47:06 dougb Exp $
4	#
5
6	# PROVIDE: assp
7	# REQUIRE: LOGIN
8	# KEYWORD: shutdown
9
10	. %%RC_SUBR%%
11
12	name=assp
13	rcvar=`set_rcvar`
14
15	command=%%PREFIX%%/sbin/assp
16	command_interpreter=%%PERL%%
17	pidfile=%%ASSP_HOME%%/pid
18
19	load_rc_config $name
20	: ${assp_enable="NO"}
21	: ${assp_flags="%%ASSP_HOME%%"}
22
23	run_rc_command "$1"