cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support long queue IDs. From Liviu Daia.

Browse Source
This commit is contained in:
sthen 2012-12-20 14:24:58 +00:00
parent a8c96a3c44
commit ea2b13b849
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mail/mailgraph/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2010/11/19 07:23:07 espie Exp $
# $OpenBSD: Makefile,v 1.10 2012/12/20 14:24:58 sthen Exp $
COMMENT= RRDtool frontend for Postfix statistics
DISTNAME= mailgraph-1.14
REVISION= 0
CATEGORIES= net mail
MASTER_SITES= ${HOMEPAGE}/pub/ \

42
mail/mailgraph/patches/patch-mailgraph_pl Normal file
View File

@ -0,0 +1,42 @@
$OpenBSD: patch-mailgraph_pl,v 1.1 2012/12/20 14:24:58 sthen Exp $
--- mailgraph.pl.orig Wed Aug 29 12:06:01 2007
+++ mailgraph.pl Thu Dec 20 14:41:13 2012
@@ -596,7 +596,7 @@ sub process_line($)
}
}
elsif($prog eq 'smtpd') {
- if($text =~ /^[0-9A-Z]+: client=(\S+)/) {
+ if($text =~ /^[0-9a-zA-Z]+: client=(\S+)/) {
my $client = $1;
return if $opt{'ignore-localhost'} and
$client =~ /\[127\.0\.0\.1\]$/;
@@ -604,16 +604,16 @@ sub process_line($)
$client =~ /$opt{'ignore-host'}/oi;
event($time, 'received');
}
- elsif($opt{'virbl-is-virus'} and $text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using virbl.dnsbl.bit.nl/) {
+ elsif($opt{'virbl-is-virus'} and $text =~ /^(?:[0-9a-zA-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using virbl.dnsbl.bit.nl/) {
event($time, 'virus');
}
- elsif($opt{'rbl-is-spam'} and $text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using/) {
+ elsif($opt{'rbl-is-spam'} and $text =~ /^(?:[0-9a-zA-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using/) {
event($time, 'spam');
}
- elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: /) {
+ elsif($text =~ /^(?:[0-9a-zA-Z]+: |NOQUEUE: )?reject: /) {
event($time, 'rejected');
}
- elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?milter-reject: /) {
+ elsif($text =~ /^(?:[0-9a-zA-Z]+: |NOQUEUE: )?milter-reject: /) {
if($text =~ /Blocked by SpamAssassin/) {
event($time, 'spam');
}
@@ -628,7 +628,7 @@ sub process_line($)
}
}
elsif($prog eq 'cleanup') {
- if($text =~ /^[0-9A-Z]+: (?:reject|discard): /) {
+ if($text =~ /^[0-9a-zA-Z]+: (?:reject|discard): /) {
event($time, 'rejected');
}
}