Date: Thu, 13 Jul 2006 14:16:44 -0400 (EDT) From: "J.R. Oldroyd" <fbsd@opal.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/100233: update port mail/assp to 1.2.2 Message-ID: <200607131816.k6DIGiBl001359@linwhf.opal.com> Resent-Message-ID: <200607131820.k6DIKiwD099508@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 100233
>Category: ports
>Synopsis: update port mail/assp to 1.2.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 13 18:20:44 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: J.R. Oldroyd
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD linwhf.opal.com 6.1-STABLE FreeBSD 6.1-STABLE #1: Thu May 18 16:03:24 EDT 2006 xxx@linwhf.opal.com:/usr/obj/usr/src/sys/LINWHF i386
>Description:
Update of ASSP to version 1.2.2.
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/mail/assp/Makefile mail/assp/Makefile
--- /usr/ports/mail/assp/Makefile Wed May 10 18:36:46 2006
+++ mail/assp/Makefile Thu Jun 29 16:42:43 2006
@@ -6,11 +6,11 @@
#
PORTNAME= assp
-PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTVERSION= 1.2.2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= assp
+DISTNAME= ASSP_${PORTVERSION}-install
MAINTAINER= fbsd@opal.com
COMMENT= Anti-Spam SMTP Proxy
@@ -19,6 +19,24 @@
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
@@ -27,18 +45,23 @@
PLIST_SUB= ASSP_HOME="${ASSP_HOME}"
-SUB_FILES= assp.8 assplog.8 assp.sh periodic-assp.sh pkg-install
+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.sh
+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)
@@ -54,8 +77,16 @@
RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF/Query.pm:${PORTSDIR}/mail/p5-Mail-SPF-Query
.endif
-.if !defined(WITHOUT_DNSBL)
-RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+.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)
@@ -65,10 +96,11 @@
PLIST_SUB+= ASSP_CLAMAV="@comment "
.endif
-EXTRACT_AFTER_ARGS= -d ${PORTNAME}-${PORTVERSION}
+.if !defined(WITHOUT_DNSBL)
+RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+.endif
-pre-patch:
- @${REINPLACE_CMD} -e 's|.$$||' ${WRKSRC}/stats.sh
+EXTRACT_AFTER_ARGS= -d ${PORTNAME}-${PORTVERSION}
post-patch:
@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/*.pl
@@ -81,6 +113,11 @@
${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
diff -ruN /usr/ports/mail/assp/distinfo mail/assp/distinfo
--- /usr/ports/mail/assp/distinfo Sun Jan 22 07:50:13 2006
+++ mail/assp/distinfo Sun Jun 25 15:02:32 2006
@@ -1,3 +1,3 @@
-MD5 (assp-1.1.1.zip) = 0a00de00329b21b29746ff7961e552d8
-SHA256 (assp-1.1.1.zip) = c47a45e5bb3ebae7dc3f4c94ecfdf87e0dbfb372a0d70d64d98232a37895ab58
-SIZE (assp-1.1.1.zip) = 183775
+MD5 (ASSP_1.2.2-install.zip) = 0f9f44ce02c68a69063390ad1b8fe872
+SHA256 (ASSP_1.2.2-install.zip) = 967ca2cde4474fd9dd5d775e139434497a3c9ff58bab606db9e8edf1d077d334
+SIZE (ASSP_1.2.2-install.zip) = 244053
diff -ruN /usr/ports/mail/assp/files/assp.8.in mail/assp/files/assp.8.in
--- /usr/ports/mail/assp/files/assp.8.in Fri Dec 9 04:04:29 2005
+++ mail/assp/files/assp.8.in Wed Jun 28 12:06:01 2006
@@ -4,7 +4,7 @@
.SH SYNOPSIS
assp [ base_dir [ admin_port ] ]
.PP
-%%PREFIX%%/etc/rc.d/assp.sh start|stop|restart|status
+%%PREFIX%%/etc/rc.d/assp start|stop|restart|status
.SH DESCRIPTION
.I "Anti-Spam SMTP Proxy"
is a spam filter that sits on port 25 in front
@@ -43,6 +43,8 @@
.IP -
DNSBL (DNS Block List) checking using many block list services
.IP -
+delaying of messages from unknown senders
+.IP -
Virus detection
.RE
.PP
@@ -197,6 +199,7 @@
.IR ASSP 's
other filtering options (local user validation, RFC822
conformance, client HELO validation, SPF validation,
+the Delay List,
the use of DNSBLs and the ClamAV virus checker)
can be enabled by examining and adjusting their
configuration options as needed and then unchecking the
@@ -227,7 +230,7 @@
website and documentation.
.SH "STARTING ASSP AT BOOT TIME"
The
-.I /usr/local/etc/rc.d/assp.sh
+.I /usr/local/etc/rc.d/assp
script is run automatically at system boot time.
Several variables can be set in
.I /etc/rc.conf
diff -ruN /usr/ports/mail/assp/files/assp.in mail/assp/files/assp.in
--- /usr/ports/mail/assp/files/assp.in Wed Dec 31 19:00:00 1969
+++ mail/assp/files/assp.in Sun Jun 25 14:58:08 2006
@@ -0,0 +1,23 @@
+#!/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"
diff -ruN /usr/ports/mail/assp/files/assp.sh.in mail/assp/files/assp.sh.in
--- /usr/ports/mail/assp/files/assp.sh.in Mon Feb 20 15:47:06 2006
+++ mail/assp/files/assp.sh.in Wed Dec 31 19:00:00 1969
@@ -1,23 +0,0 @@
-#!/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"
diff -ruN /usr/ports/mail/assp/files/assplog.8.in mail/assp/files/assplog.8.in
--- /usr/ports/mail/assp/files/assplog.8.in Sat May 28 05:56:27 2005
+++ mail/assp/files/assplog.8.in Thu Jun 29 16:47:50 2006
@@ -57,6 +57,9 @@
BS
Bayesian spam check failed
.TP
+DL
+Message from unknown sender delayed, sender requested to retry later
+.TP
HL
Bad HELO greeting
.TP
@@ -90,8 +93,9 @@
SR
assp-spam@ report submission
.SH BUGS
+Note that
.I assplog
-does not display all log messages; for a complete view of
+does not display anywhere near all the log messages; for a complete view of
the log, use
.B "tail -f"
directly on the log file.
diff -ruN /usr/ports/mail/assp/files/patch-assp.pl mail/assp/files/patch-assp.pl
--- /usr/ports/mail/assp/files/patch-assp.pl Fri Dec 9 04:04:29 2005
+++ mail/assp/files/patch-assp.pl Sun Jun 25 15:43:44 2006
@@ -1,56 +1,55 @@
---- assp.pl.orig Tue Mar 15 06:41:24 2005
-+++ assp.pl Wed May 18 11:33:35 2005
-@@ -39,7 +39,7 @@
+--- assp.pl.orig Sun Jun 25 15:35:15 2006
++++ assp.pl Sun Jun 25 15:43:20 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/local/bin/perl
+ #use strict;
+ #use warnings;
+@@ -67,7 +67,7 @@
loadConfig();
+
sub loadConfig {
- print "loading config -- base='$base'\n";
+ # print "loading config -- base='$base'\n";
@Config=(
- [0,0,0,heading,'Network Setup'],
+ [0,0,0,'heading','Network Setup'],
# except for the heading lines, all config lines have the following:
-@@ -58,7 +58,7 @@
+@@ -86,7 +86,7 @@
'The address:port of your message handling system\'s smtp server. For example: 127.0.0.1:125'],
- [AsAService,'As a Service',0,checkbox,'','(\S*)',undef,
+ [AsAService,'As a Service',0,checkbox,0,'(.*)',undef,
'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.'],
-- [AsADaemon,'As a Daemon',0,checkbox,'','(\S*)',undef,
-+ [AsADaemon,'As a Daemon',0,checkbox,1,'(\S*)',undef,
+- [AsADaemon,'As a Daemon',0,checkbox,0,'(.*)',undef,
++ [AsADaemon,'As a Daemon',0,checkbox,1,'(.*)',undef,
'In Linux/BSD/Unix/OSX fork and close file handles, kinda like "perl assp.pl &" but better. Requires restart.'],
- [myName,'My Name',20,textinput,'ASSP-nospam','(\S+)',undef,
- 'What the program calls itself in the email "received by" header. Usually ASSP-nospam.'],
-@@ -355,7 +355,7 @@
- No mail is delivered! For example: assp-notspam'],
- [EmailWhitelist,'Add to Whitelist Address',20,textinput,'assp-white','(.*)',undef,
- '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'],
-- [EmailFrom,'From Address for Email',20,textinput,'ASSP <>','(.+)',undef,
-+ [EmailFrom,'From Address for Email',20,textinput,'ASSP <postmaster@yourdomain.com>','(.+)',undef,
+ [myName,'My Name',40,textinput,'ASSP.nospam','(\S+)',undef,
+ 'What the program calls itself in the email "received by" header. Usually ASSP.nospam.'],
+@@ -811,7 +811,7 @@
+ '<span class="negative"> 0 = no report, 1 = to user, 2 = to TO address, 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,'<>','(.+)',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.<br />
Some mailers don\'t like the default setting. For example: ASSP <> or Mail Administrator
- <mailadmin@mydomain.com>'],
-@@ -423,9 +423,9 @@
- 'ASSP closes and renames the log file after this number of days. Decimals are ok. For example: 14 or 0.5'],
+ <mailadmin@mydomain.com>
+@@ -913,9 +913,9 @@
+ '],
- [0,0,0,heading,'Security'],
+ [0,0,0,'heading','Security'],
- [runAsUser,'Run as UID',20,textinput,'','(\S*)',undef,
+ [runAsUser,'Run as UID',20,textinput,'nobody','(\S*)',undef,
'The *nix user name to assume after startup: assp or nobody -- requires ASSP restart.'],
- [runAsGroup,'Run as GID',20,textinput,'','(\S*)',undef,
+ [runAsGroup,'Run as GID',20,textinput,'nobody','(\S*)',undef,
'The *nix group to assume after startup: assp or nogroup -- requires ASSP restart.'],
- [ChangeRoot,'Change Root',60,textinput,'','(.*)',undef,
+ [ChangeRoot,'Change Root',40,textinput,'','(.*)',undef,
'Non-blank means to run in chroot jail in *nix. You need an etc/protocols file to make this work<br />
-@@ -3631,6 +3631,7 @@
- @PossibleOptionFiles=();
- for (@Config) {
+@@ -7865,6 +7865,7 @@
+ @PossibleOptionFiles2=();
+ foreach (@Config) {
if($_->[6] eq 'ConfigMakeRe') {
+ $silent=1 if($AsADaemon);
${$_->[0]}=optionList(${$_->[0]},$_->[0]);
push(@PossibleOptionFiles,$_->[0]);
} elsif($_->[6] eq 'ConfigCompileRe') {
-@@ -4462,4 +4462,4 @@
- dynablock.njabl.org
- );
- }
--1;
-\ No newline at end of file
-+1;
diff -ruN /usr/ports/mail/assp/files/patch-stats.sh mail/assp/files/patch-stats.sh
--- /usr/ports/mail/assp/files/patch-stats.sh Sat May 28 05:56:27 2005
+++ mail/assp/files/patch-stats.sh Thu Jul 13 11:56:02 2006
@@ -1,5 +1,5 @@
---- stats.sh.orig Fri Aug 6 20:26:26 2004
-+++ stats.sh Thu May 26 22:24:20 2005
+--- stats.sh.orig Thu Jul 13 11:50:02 2006
++++ stats.sh Thu Jul 13 11:55:05 2006
@@ -4,12 +4,12 @@
# copy of your standard Unix shell, the 'tail' utility and a working 'awk'
# interpreter.
@@ -30,7 +30,7 @@
# BA (in Cyan) .. Bad ATTACHEMENT rejected
# SR (in Cyan) .. spam@ report submission
# NS (in Cyan) .. notspam@ report submission
-@@ -46,32 +49,32 @@
+@@ -46,91 +49,144 @@
# 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 ...
@@ -44,133 +44,198 @@
-tail -300 -f /usr/local/assp/maillog.log | \
+tail -300 -f /var/db/assp/maillog.txt | \
awk ' \
- /whitelisted/ { \
+- /whitelisted/ { \
- printf("%s %s \033[1;32m%-15s L\033[0mW %s \033[1;32m->\033[0m %s\n", \
-+ 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", \
- substr($1,1,length($1)), \
- substr($2,1,length($2)), \
- substr($3,1,length($3)), \
- substr($4,1,40), \
- substr($6,1,length($6)) )\
- } \
+- substr($1,1,length($1)), \
+- substr($2,1,length($2)), \
+- substr($3,1,length($3)), \
+- substr($4,1,40), \
+- substr($6,1,length($6)) )\
+- } \
- /email/ && /whitelist addition/ { \
- printf("%s %s \033[1;32m%-15s W\033[0mA+ %s \033[1;32m->\033[0m %s\n", \
-+ /whitelist addition/ && /email new/ { \
-+ printf("%s %s \033[1;36m%-15s WA+ %s\033[0m \033[1;37m%s\033[0m\n", \
- substr($1,1,length($1)), \
- substr($2,1,length($2)), \
- "+email address+", \
-- substr($4,1,40), \
+- substr($1,1,length($1)), \
+- substr($2,1,length($2)), \
+- "+email address+", \
++ /local or whitelisted/ { \
++ 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", \
++ $1, \
++ $2, \
++ $3, \
+ substr($4,1,40), \
- substr($6,1,length($6)) )\
++ $6 )\
++ } \
++ /Email whitelist addition/ { \
++ printf("%s %s \033[1;36m%-15s WA+ %s\033[0m \033[1;37m%s\033[0m\n", \
++ $1, \
++ $2, \
++ "+email address+", \
+ "-adds-", \
-+ substr($7,1,length($7)) )\
++ $6 )\
} \
- /whitelist addition/ && !/email/ { \
+- /whitelist addition/ && !/email/ { \
- printf("%s %s \033[1;32m%-15s W\033[0mL+ %s \033[1;32m %s %s\033[0m\n", \
+- substr($1,1,length($1)), \
+- substr($2,1,length($2)), \
+- substr($3,1,length($3)), \
++ /whitelist addition:/ && !/[Ee]mail/ { \
+ 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", \
- substr($1,1,length($1)), \
- substr($2,1,length($2)), \
- substr($3,1,length($3)), \
-@@ -79,12 +82,12 @@
++ $1, \
++ $2, \
++ $3, \
+ substr($4,1,40), \
"-adds-", \
- substr($9,1,length($9)) )\
+- substr($9,1,length($9)) )\
++ $9 )\
} \
- /Bayesian spam/ { \
-+ /Bayesian Spam/ { \
++ /Bayesian [Ss]pam/ { \
printf("%s %s \033[1;31m%-15s BS %s -> %s\033[0m\n", \
- substr($1,1,length($1)), \
- substr($2,1,length($2)), \
- substr($3,1,length($3)), \
- substr($4,1,40), \
-+ substr($1,1,length($1)), \
-+ substr($2,1,length($2)), \
-+ substr($3,1,length($3)), \
+- substr($6,1,length($6)) )\
++ $1, \
++ $2, \
++ $3, \
+ substr($4,1,40), \
- substr($6,1,length($6)) )\
++ $6 )\
} \
/message ok/ { \
-@@ -95,7 +98,7 @@
+ printf("%s %s \033[1;32m%-15s Ok %s -> %s\033[0m\n", \
+- substr($1,1,length($1)), \
+- substr($2,1,length($2)), \
+- substr($3,1,length($3)), \
++ $1, \
++ $2, \
++ $3, \
substr($4,1,40), \
- substr($6,1,length($6)) )\
+- substr($6,1,length($6)) )\
++ $6 )\
} \
- /bad attachment/ { \
+ /bad attachment/ && !/no bad/ { \
printf("%s %s \033[1;35m%-15s BA %s -> %s\033[0m\n", \
- substr($1,1,length($1)), \
- substr($2,1,length($2)), \
-@@ -104,29 +107,66 @@
- substr($6,1,length($6)) )\
+- substr($1,1,length($1)), \
+- substr($2,1,length($2)), \
+- substr($3,1,length($3)), \
++ $1, \
++ $2, \
++ $3, \
+ substr($4,1,40), \
+- substr($6,1,length($6)) )\
++ $6 )\
} \
/relay attempt blocked/ { \
- printf("%s %s \033[1;35m%-15s RB %s -> %s %s %s %s %s\033[0m\n", \
-+ printf("%s %s \033[1;35m%-15s RB %s -> %s\033[0m\n", \
- substr($1,1,length($1)), \
- substr($2,1,length($2)), \
- substr($3,1,length($3)), \
+- substr($1,1,length($1)), \
+- substr($2,1,length($2)), \
+- substr($3,1,length($3)), \
- substr($4,1,length($4)), \
- substr($5,1,length($5)), \
- substr($6,1,length($6)), \
- substr($7,1,length($7)), \
- substr($8,1,length($8)), \
+- substr($9,1,length($9)) )\
+- } \
+- /Admin update:/ { \
+- printf("\033[1;33m%s %s %s %s %s %s \033[0m\n", $1, $2, $3, $4, $5, $6) \
+- } \
+- /Email spamreport/ { \
+- printf("%s %s\033[0;36m %-15s SR %s Email SPAM Submission\033[0m\n", \
+- substr($1,1,length($1)), \
+- substr($2,1,length($2)), \
+- substr($3,1,length($3)), \
+- substr($4,1,length($4)) ) \
+- } \
+- /Email hamreport/ { \
+- printf("%s %s\033[0;36m %-15s NS %s Email NOTSPAM Submission\033[0m\n", \
+- substr($1,1,length($1)), \
+- substr($2,1,length($2)), \
+- substr($3,1,length($3)), \
+- substr($4,1,length($4)) ) \
++ printf("%s %s \033[1;35m%-15s RB %s -> %s\033[0m\n", \
++ $1, \
++ $2, \
++ $3, \
+ substr($4,1,40), \
- substr($9,1,length($9)) )\
- } \
-+ /Invalid address rejected/ { \
++ ($9 ~ /^(.*):$/) ? $10 : $9 )\
++ } \
++ /[Ii]nvalid address rejected/ { \
+ printf("%s %s \033[1;34m%-15s IR %s -> %s\033[0m\n", \
-+ substr($1,1,length($1)), \
-+ substr($2,1,length($2)), \
-+ substr($3,1,length($3)), \
++ $1, \
++ $2, \
++ $3, \
+ substr($4,1,40), \
-+ substr($NF,1,length($NF)) )\
++ $NF )\
+ } \
+ /malformed address/ { \
+ printf("%s %s \033[1;35m%-15s MA %s -> %s\033[0m\n", \
-+ substr($1,1,length($1)), \
-+ substr($2,1,length($2)), \
-+ substr($3,1,length($3)), \
++ $1, \
++ $2, \
++ $3, \
+ substr($4,1,40), \
-+ substr($7,1,length($7)) )\
++ $7 )\
+ } \
-+ /failed RBL checks/ { \
++ /failed RBL checks|Received-RBL: fail/ { \
+ printf("%s %s \033[1;35m%-15s BL %s -> %s\033[0m\n", \
-+ substr($1,1,length($1)), \
-+ substr($2,1,length($2)), \
-+ substr($3,1,length($3)), \
++ $1, \
++ $2, \
++ $3, \
+ substr($4,1,40), \
-+ substr($6,1,length($6)) )\
++ $6 )\
+ } \
-+ /failed SPF checks/ { \
++ /failed SPF checks|Received-SPF: fail/ { \
+ printf("%s %s \033[1;35m%-15s SP %s -> %s\033[0m\n", \
-+ substr($1,1,length($1)), \
-+ substr($2,1,length($2)), \
-+ substr($3,1,length($3)), \
++ $1, \
++ $2, \
++ $3, \
+ substr($4,1,40), \
-+ substr($6,1,length($6)) )\
++ $6 )\
+ } \
+ /has spam helo/ { \
+ printf("%s %s \033[1;35m%-15s HL %s -> %s %s\033[0m\n", \
-+ substr($1,1,length($1)), \
-+ substr($2,1,length($2)), \
-+ substr($3,1,length($3)), \
++ $1, \
++ $2, \
++ $3, \
+ substr($4,1,40), \
-+ substr($6,1,length($6)), \
-+ substr($10,1,length($10)) )\
++ $6, \
++ $10 )\
+ } \
- /Admin update:/ { \
-- printf("\033[1;33m%s %s %s %s %s %s \033[0m\n", $1, $2, $3, $4, $5, $6) \
++ /Sender Validation:blocked:/ { \
++ printf("%s %s \033[1;35m%-15s HL %s %s\033[0m\n", \
++ $1, \
++ $2, \
++ $3, \
++ substr($4,1,40), \
++ $9 )\
++ } \
++ /recipient delayed/ { \
++ printf("%s %s \033[1;35m%-15s DL %s -> %s\033[0m\n", \
++ $1, \
++ $2, \
++ $3, \
++ substr($4,1,40), \
++ $7 ) \
++ } \
++ /Admin (update:|connection from )/ { \
+ printf("\033[1;33m%s\033[0m\n", $0) \
- } \
- /Email spamreport/ { \
-- printf("%s %s\033[0;36m %-15s SR %s Email SPAM Submission\033[0m\n", \
++ } \
++ /[Ee]mail spamreport/ { \
+ printf("%s %s\033[1;36m %-15s SR %s\033[0m\n", \
- substr($1,1,length($1)), \
- substr($2,1,length($2)), \
- substr($3,1,length($3)), \
- substr($4,1,length($4)) ) \
- } \
- /Email hamreport/ { \
-- printf("%s %s\033[0;36m %-15s NS %s Email NOTSPAM Submission\033[0m\n", \
++ $1, \
++ $2, \
++ $3, \
++ $4 ) \
++ } \
++ /[Ee]mail hamreport/ { \
+ printf("%s %s\033[1;36m %-15s NS %s\033[0m\n", \
- substr($1,1,length($1)), \
- substr($2,1,length($2)), \
- substr($3,1,length($3)), \
++ $1, \
++ $2, \
++ $3, \
++ $4 ) \
+ }'
+ # end of script
+
diff -ruN /usr/ports/mail/assp/files/pkg-install.in mail/assp/files/pkg-install.in
--- /usr/ports/mail/assp/files/pkg-install.in Sat May 28 05:56:27 2005
+++ mail/assp/files/pkg-install.in Sun Jun 25 16:55:25 2006
@@ -2,5 +2,9 @@
if [ "$2" = "POST-INSTALL" ]; then
install -d -m 0700 -o %%ASSP_USER%% -g %%ASSP_GROUP%% %%ASSP_HOME%%
- ln -s $PKG_PREFIX/lib/assp/*.txt %%ASSP_HOME%%
+ [ ! -f %%ASSP_HOME%%/denysmtp.txt ] && touch %%ASSP_HOME%%/denysmtp.txt && chown %%ASSP_USER%%:%%ASSP_GROUP%% %%ASSP_HOME%%/denysmtp.txt
+ ln -s $PKG_PREFIX/lib/assp/*report.txt %%ASSP_HOME%%
+ ln -s $PKG_PREFIX/lib/assp/nodelay.txt %%ASSP_HOME%%
+ ln -s $PKG_PREFIX/lib/assp/redre.txt %%ASSP_HOME%%
+ ln -s $PKG_PREFIX/lib/assp/images %%ASSP_HOME%%
fi
diff -ruN /usr/ports/mail/assp/pkg-plist mail/assp/pkg-plist
--- /usr/ports/mail/assp/pkg-plist Sat Jan 21 21:19:47 2006
+++ mail/assp/pkg-plist Sun Jun 25 16:13:22 2006
@@ -3,23 +3,48 @@
@dirrmtry etc/periodic
lib/assp/addservice.pl
lib/assp/assp.pl
+lib/assp/images/assp.css
+lib/assp/images/dropShadow.gif
+lib/assp/images/editor.css
+lib/assp/images/favicon.ico
+lib/assp/images/logo.jpg
+lib/assp/images/minusIcon.png
+lib/assp/images/noIcon.png
+lib/assp/images/plusIcon.png
+lib/assp/images/shutdown.css
+lib/assp/images/sourceforge-logo.gif
+lib/assp/images/valid-xhtml10.gif
+lib/assp/images/village.gif
+lib/assp/images/xml-pill.gif
lib/assp/move2num.pl
+lib/assp/nodelay.txt
lib/assp/notspamreport.txt
lib/assp/rebuildspamdb.pl
+lib/assp/redremovereport.txt
+lib/assp/redre.txt
+lib/assp/redreport.txt
lib/assp/repair.pl
lib/assp/spamreport.txt
lib/assp/stat.pl
lib/assp/stats.sh
+lib/assp/whiteremovereport.txt
lib/assp/whitereport.txt
%%ASSP_CLAMAV%%lib/assp/freshclam.sh
+@dirrm lib/assp/images
@dirrm lib/assp
sbin/assp
sbin/assplog
%%PORTDOCS%%%%DOCSDIR%%/ASSP Documentation.htm
%%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rm -f %%ASSP_HOME%%/images 2>/dev/null || true
+@unexec rm -f %%ASSP_HOME%%/nodelay.txt 2>/dev/null || true
@unexec rm -f %%ASSP_HOME%%/notspamreport.txt 2>/dev/null || true
+@unexec rm -f %%ASSP_HOME%%/redremovereport.txt 2>/dev/null || true
+@unexec rm -f %%ASSP_HOME%%/redre.txt 2>/dev/null || true
+@unexec rm -f %%ASSP_HOME%%/redreport.txt 2>/dev/null || true
@unexec rm -f %%ASSP_HOME%%/spamreport.txt 2>/dev/null || true
+@unexec rm -f %%ASSP_HOME%%/whiteremovereport.txt 2>/dev/null || true
@unexec rm -f %%ASSP_HOME%%/whitereport.txt 2>/dev/null || true
@unexec rmdir %%ASSP_HOME%% 2>/dev/null || true
@unexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607131816.k6DIGiBl001359>