Index: head/mail/amavis-logwatch/Makefile =================================================================== --- head/mail/amavis-logwatch/Makefile (revision 473005) +++ head/mail/amavis-logwatch/Makefile (revision 473006) @@ -1,44 +1,45 @@ # Created by: Masaki TAGAWA # $FreeBSD$ PORTNAME= amavis-logwatch PORTVERSION= 1.51.03 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF/logreporters/${PORTNAME}/release/${PORTVERSION} MAINTAINER= danilo@FreeBSD.org COMMENT= Amavisd-new log parser LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE PORTDOCS= Bugs Changes README PORTEXAMPLES= ${PORTNAME}.conf USES= perl5 shebangfix tar:tgz USE_PERL5= run NO_BUILD= yes SHEBANG_FILES= amavis-logwatch OPTIONS_DEFINE= EXAMPLES DOCS post-patch: @cd ${WRKSRC} && ${REINPLACE_CMD} -e '\ s!/usr/local/etc!${ETCDIR}! \ ' ${PORTNAME} ${PORTNAME}.1 README do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @${CP} ${WRKSRC}/${PORTNAME}.conf ${WRKSRC}/${PORTNAME}.conf.sample @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${STAGEDIR}${ETCDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .include Index: head/mail/amavis-logwatch/files/patch-amavis-logwatch =================================================================== --- head/mail/amavis-logwatch/files/patch-amavis-logwatch (nonexistent) +++ head/mail/amavis-logwatch/files/patch-amavis-logwatch (revision 473006) @@ -0,0 +1,22 @@ +--- amavis-logwatch.orig 2018-05-01 11:57:52 UTC ++++ amavis-logwatch +@@ -1333,6 +1333,10 @@ sub print_summary_report (\@) { + sprintf "$fmt %-42s %6.2f%%\n", $total, $desc, + $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor; + } ++ elsif ($extra eq '') { ++ push @{$lines[$cur_level]}, ++ sprintf "$fmt %-23s\n", $total, $desc; ++ } + else { + push @{$lines[$cur_level]}, + sprintf "$fmt %-23s $extra\n", $total, $desc, commify ($Totals{$keyname}); +@@ -2283,7 +2287,7 @@ while (<>) { + #XXX elsif (($action, $key, $ip, $from, $to) = ( $p1 =~ /^(?:Virus found - quarantined|(?:(Passed|Blocked) )?INFECTED) \(([^\)]+)\),[A-Z .]*(?: \[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)] -> [(<]([^(<]+)[(>]/o )) + + # the first IP is the envelope sender. +- if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: {[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) { ++ if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) { + inc_unmatched('passblock'); + next; + } Property changes on: head/mail/amavis-logwatch/files/patch-amavis-logwatch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property