From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 29 18:40:19 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 734E416A41C for ; Wed, 29 Jun 2005 18:40:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D99143D53 for ; Wed, 29 Jun 2005 18:40:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5TIeJUS082425 for ; Wed, 29 Jun 2005 18:40:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5TIeJdG082421; Wed, 29 Jun 2005 18:40:19 GMT (envelope-from gnats) Resent-Date: Wed, 29 Jun 2005 18:40:19 GMT Resent-Message-Id: <200506291840.j5TIeJdG082421@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "J.R. Oldroyd" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C85DC16A41C for ; Wed, 29 Jun 2005 18:37:06 +0000 (GMT) (envelope-from jr@opal.com) Received: from smtp.vzavenue.net (smtp.vzavenue.net [66.171.59.140]) by mx1.FreeBSD.org (Postfix) with ESMTP id 633EB43D53 for ; Wed, 29 Jun 2005 18:37:06 +0000 (GMT) (envelope-from jr@opal.com) Received: from linwhf.opal.com (112.79.171.66.subscriber.vzavenue.net [66.171.79.112]) by smtp.vzavenue.net (MOS 3.4.8-GR) with ESMTP id CLY15396; Wed, 29 Jun 2005 14:32:31 -0400 (EDT) Received: from ASSP-nospam (localhost [127.0.0.1]) (authenticated bits=0) by linwhf.opal.com (8.13.3/8.13.3) with ESMTP id j5TIWShP079951 for ; Wed, 29 Jun 2005 14:32:30 -0400 (EDT) (envelope-from jr@opal.com) Received: from 24.91.206.234 ([24.91.206.234] helo=vougeot.opal.com) by ASSP-nospam ; 29 Jun 05 18:32:28 -0000 Received: from vougeot.opal.com (localhost [127.0.0.1]) by vougeot.opal.com (8.13.3/8.13.3) with ESMTP id j5TIdUjt006144 for ; Wed, 29 Jun 2005 14:39:31 -0400 (EDT) (envelope-from jr@opal.com) Received: (from jr@localhost) by vougeot.opal.com (8.13.3/8.13.3/Submit) id j5TIdU8q006143; Wed, 29 Jun 2005 14:39:30 -0400 (EDT) (envelope-from jr) Message-Id: <200506291839.j5TIdU8q006143@vougeot.opal.com> Date: Wed, 29 Jun 2005 14:39:30 -0400 (EDT) From: "J.R. Oldroyd" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/82789: update port: mail/assp - update to 1.1.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "J.R. Oldroyd" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2005 18:40:19 -0000 >Number: 82789 >Category: ports >Synopsis: update port: mail/assp - update to 1.1.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jun 29 18:40:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: J.R. Oldroyd >Release: FreeBSD 6.0-CURRENT i386 >Organization: >Environment: System: FreeBSD vougeot.opal.com 6.0-CURRENT FreeBSD 6.0-CURRENT #6: Thu Apr 14 19:28:40 EDT 2005 xxx:/home/opal/+usr/src/sys/i386/compile/VOUGEOT i386 >Description: Update of the port to code release 1.1.1. >How-To-Repeat: >Fix: diff -ruN /usr/ports/mail/assp/Makefile mail/assp/Makefile --- /usr/ports/mail/assp/Makefile Fri Jun 24 02:24:48 2005 +++ mail/assp/Makefile Wed Jun 29 14:28:13 2005 @@ -6,15 +6,15 @@ # PORTNAME= assp -PORTVERSION= 1.1.1.b13 +PORTVERSION= 1.1.1 CATEGORIES= mail -MASTER_SITES= http://opal.com/freebsd/ports/mail/assp/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= assp MAINTAINER= fbsd@opal.com COMMENT= Anti-Spam SMTP Proxy USE_ZIP= yes -NO_WRKSUBDIR= yes NO_BUILD= yes USE_REINPLACE= yes USE_PERL5_RUN= yes @@ -64,6 +64,8 @@ .else PLIST_SUB+= ASSP_CLAMAV="@comment " .endif + +EXTRACT_AFTER_ARGS= -d ${PORTNAME}-${PORTVERSION} post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/*.pl diff -ruN /usr/ports/mail/assp/distinfo mail/assp/distinfo --- /usr/ports/mail/assp/distinfo Fri Jun 24 02:24:48 2005 +++ mail/assp/distinfo Wed Jun 29 14:02:27 2005 @@ -1,2 +1,2 @@ -MD5 (assp-1.1.1.b13.zip) = 00e820bbfccde6e9159e25a07804a0d3 -SIZE (assp-1.1.1.b13.zip) = 183364 +MD5 (assp-1.1.1.zip) = 0a00de00329b21b29746ff7961e552d8 +SIZE (assp-1.1.1.zip) = 183775 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 Wed Jun 29 14:25:49 2005 @@ -1,176 +1,176 @@ --- stats.sh.orig Fri Aug 6 20:26:26 2004 +++ stats.sh Thu May 26 22:24:20 2005 @@ -4,12 +4,12 @@ - # copy of your standard Unix shell, the 'tail' utility and a working 'awk' - # interpreter. - --# I use the default location for ASSP's maillog file, and the 'maillog.log' -+# I use the default location for ASSP's maillog file, and the 'maillog.txt' - # name (in assp.cfg) to keep ASSP from changing it on me. - --# This script attempts to go back at least 300 lines in your maillog.log -+# This script attempts to go back at least 300 lines in your maillog.txt - # file to give you a nice screenful of goodies to review when it --# first starts. If your maillog.log is nearly empty, then just -+# first starts. If your maillog.txt is nearly empty, then just - # be patient. As things happen - the logger will reveal it in COLOR! - # ------------------------------------ KRL ------------------------- - + # copy of your standard Unix shell, the 'tail' utility and a working 'awk' + # interpreter. + +-# I use the default location for ASSP's maillog file, and the 'maillog.log' ++# I use the default location for ASSP's maillog file, and the 'maillog.txt' + # name (in assp.cfg) to keep ASSP from changing it on me. + +-# This script attempts to go back at least 300 lines in your maillog.log ++# This script attempts to go back at least 300 lines in your maillog.txt + # file to give you a nice screenful of goodies to review when it +-# first starts. If your maillog.log is nearly empty, then just ++# first starts. If your maillog.txt is nearly empty, then just + # be patient. As things happen - the logger will reveal it in COLOR! + # ------------------------------------ KRL ------------------------- + @@ -30,8 +30,11 @@ - # BS (in Red) lines are those caught by the Bayesian filter !! - # LW (in White .. mostly) are those Local or Whitelisted eMails - # Ok (in Green) are eMail that fully pass alltests without exceptions. --# RB (in Cyan) .. Blocked Relay attempt --# WL+ Whitelist ADDITION by an authorized local user -+# RB (in Magenta) .. Blocked Relay attempt -+# HL (in Magenta) .. Blocked due to spam HELO -+# SP (in Magenta) .. Blocked by failed SPF lookup -+# WA+ Whitelist ADDITION by an authorized local user -+# WL+ Whitelist ADDITION of address CC'd in whitelisted email - # BA (in Cyan) .. Bad ATTACHEMENT rejected - # SR (in Cyan) .. spam@ report submission - # NS (in Cyan) .. notspam@ report submission + # BS (in Red) lines are those caught by the Bayesian filter !! + # LW (in White .. mostly) are those Local or Whitelisted eMails + # Ok (in Green) are eMail that fully pass alltests without exceptions. +-# RB (in Cyan) .. Blocked Relay attempt +-# WL+ Whitelist ADDITION by an authorized local user ++# RB (in Magenta) .. Blocked Relay attempt ++# HL (in Magenta) .. Blocked due to spam HELO ++# SP (in Magenta) .. Blocked by failed SPF lookup ++# WA+ Whitelist ADDITION by an authorized local user ++# WL+ Whitelist ADDITION of address CC'd in whitelisted email + # BA (in Cyan) .. Bad ATTACHEMENT rejected + # SR (in Cyan) .. spam@ report submission + # NS (in Cyan) .. notspam@ report submission @@ -46,32 +49,32 @@ - # 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 ... --# I assume the naming convention of 'maillog.log' so ASSP won't munge -+# I assume the naming convention of 'maillog.txt' so ASSP won't munge - # each current log into some difficult-to-grok name. You should try - # to use this feature - and perhaps roll the log periodically with - # your system's 'newsyslog' functionality. You can send a SIGHUP to - # ASSP when you roll the log so it starts afresh..KRL - --tail -300 -f /usr/local/assp/maillog.log | \ -+tail -300 -f /var/db/assp/maillog.txt | \ - awk ' \ - /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)) )\ - } \ -- /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($6,1,length($6)) )\ -+ "-adds-", \ -+ substr($7,1,length($7)) )\ - } \ - /whitelist addition/ && !/email/ { \ -- printf("%s %s \033[1;32m%-15s W\033[0mL+ %s \033[1;32m %s %s\033[0m\n", \ -+ 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)), \ + # 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 ... +-# I assume the naming convention of 'maillog.log' so ASSP won't munge ++# I assume the naming convention of 'maillog.txt' so ASSP won't munge + # each current log into some difficult-to-grok name. You should try + # to use this feature - and perhaps roll the log periodically with + # your system's 'newsyslog' functionality. You can send a SIGHUP to + # ASSP when you roll the log so it starts afresh..KRL + +-tail -300 -f /usr/local/assp/maillog.log | \ ++tail -300 -f /var/db/assp/maillog.txt | \ + awk ' \ + /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)) )\ + } \ +- /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($6,1,length($6)) )\ ++ "-adds-", \ ++ substr($7,1,length($7)) )\ + } \ + /whitelist addition/ && !/email/ { \ +- printf("%s %s \033[1;32m%-15s W\033[0mL+ %s \033[1;32m %s %s\033[0m\n", \ ++ 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 @@ - "-adds-", \ - substr($9,1,length($9)) )\ - } \ -- /Bayesian spam/ { \ -+ /Bayesian Spam/ { \ - 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($4,1,40), \ - substr($6,1,length($6)) )\ - } \ - /message ok/ { \ + "-adds-", \ + substr($9,1,length($9)) )\ + } \ +- /Bayesian spam/ { \ ++ /Bayesian Spam/ { \ + 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($4,1,40), \ + substr($6,1,length($6)) )\ + } \ + /message ok/ { \ @@ -95,7 +98,7 @@ - substr($4,1,40), \ - substr($6,1,length($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)), \ + substr($4,1,40), \ + substr($6,1,length($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)) )\ - } \ - /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($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($4,1,40), \ - substr($9,1,length($9)) )\ - } \ -+ /Invalid 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)), \ -+ substr($4,1,40), \ -+ substr($NF,1,length($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)), \ -+ substr($4,1,40), \ -+ substr($7,1,length($7)) )\ -+ } \ -+ /failed RBL checks/ { \ -+ 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)), \ -+ substr($4,1,40), \ -+ substr($6,1,length($6)) )\ -+ } \ -+ /failed SPF checks/ { \ -+ 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)), \ -+ substr($4,1,40), \ -+ substr($6,1,length($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)), \ -+ substr($4,1,40), \ -+ substr($6,1,length($6)), \ -+ substr($10,1,length($10)) )\ -+ } \ - /Admin update:/ { \ -- printf("\033[1;33m%s %s %s %s %s %s \033[0m\n", $1, $2, $3, $4, $5, $6) \ -+ 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", \ -+ 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", \ -+ 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)), \ + substr($6,1,length($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($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($4,1,40), \ + substr($9,1,length($9)) )\ + } \ ++ /Invalid 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)), \ ++ substr($4,1,40), \ ++ substr($NF,1,length($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)), \ ++ substr($4,1,40), \ ++ substr($7,1,length($7)) )\ ++ } \ ++ /failed RBL checks/ { \ ++ 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)), \ ++ substr($4,1,40), \ ++ substr($6,1,length($6)) )\ ++ } \ ++ /failed SPF checks/ { \ ++ 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)), \ ++ substr($4,1,40), \ ++ substr($6,1,length($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)), \ ++ substr($4,1,40), \ ++ substr($6,1,length($6)), \ ++ substr($10,1,length($10)) )\ ++ } \ + /Admin update:/ { \ +- printf("\033[1;33m%s %s %s %s %s %s \033[0m\n", $1, $2, $3, $4, $5, $6) \ ++ 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", \ ++ 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", \ ++ 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)), \ >Release-Note: >Audit-Trail: >Unformatted: