+++ /dev/null
-Starting with 1.1.3-2 the pflogsumm package no longer ships the
-'.pl' compatibility symlinks. Thus for consistency we've to do some
-s/pflogsumm.pl/pflogsumm/ all over the place.
-Index: pflogsumm/pflogsumm-faq.txt
-===================================================================
---- pflogsumm.orig/pflogsumm-faq.txt 2012-02-06 10:09:17.000000000 +0100
-+++ pflogsumm/pflogsumm-faq.txt 2012-02-06 10:18:17.679364712 +0100
-@@ -1,5 +1,5 @@
-
--FAQ for Pflogsumm.pl - A Log Summarizer/Analyzer for the Postfix MTA
-+FAQ for pflogsumm - A Log Summarizer/Analyzer for the Postfix MTA
-
- Introduction
-
-@@ -7,13 +7,13 @@
- hearted exercise in improving my facility with Perl--with the hope
- that something useful would come out of it as well--has turned out to
- be a somewhat popular utility. And as more Admins find out about
-- postfix, and more end up trying pflogsumm.pl, many of the questions,
-+ postfix, and more end up trying pflogsumm, many of the questions,
- suggestions, and enhancement requests are becoming "frequently
- asked". So odd as it seems (to me, at any rate), it looks like it's
- time for a FAQ.
-
-
--Index of pflogsumm.pl Frequently Asked Questions (in no particular order)
-+Index of pflogsumm Frequently Asked Questions (in no particular order)
-
- 1. Project Status
- 2. "Could You Make" or "Here's A Patch To Make" Pflogsumm Do ...
-@@ -137,11 +137,11 @@
- "creeping over-feature-itis" if I can. My position is *not* set in
- stone on this issue. In the mean-time:
-
-- zcat /var/log/maillog.0.gz |pflogsumm.pl <args...>
-+ zcat /var/log/maillog.0.gz |pflogsumm <args...>
-
- or
-
-- gunzip </var/log/maillog.0.gz |pflogsumm.pl <args...>
-+ gunzip </var/log/maillog.0.gz |pflogsumm <args...>
-
- should do the trick quite nicely for you.
-
-@@ -149,7 +149,7 @@
- exactly at midnight, you might try something like:
-
- (zcat /var/log/maillog.0.gz; cat /var/log/maillog) \
-- |pflogsumm.pl -d yesterday
-+ |pflogsumm -d yesterday
-
- See Also: 5. Processing Multiple Log Files
- 17. How Do I Get Pflogsumm To Email Reports To Me
-@@ -175,7 +175,7 @@
- A more complex example, where compressed logs are involved:
-
- (zcat `ls -rt /var/log/maillog.*.gz`; cat /var/log/maillog) \
-- |pflogsumm.pl
-+ |pflogsumm
-
- Obviously, this depends on the file modification times for your logs
- being reflective of their chronological order. If that can't be
-@@ -185,12 +185,12 @@
- (for each in 3 2 1 0; do
- zcat "/var/log/maillog.$each.gz"
- done
-- cat /var/log/maillog) |pflogsumm.pl
-+ cat /var/log/maillog) |pflogsumm
-
- or (somewhat more efficiently--by running zcat only once):
-
- (zcat `for ea in 3 2 1 0; do echo "/var/log/maillog.$ea.gz";
-- done`; cat /var/log/maillog) |pflogsumm.pl
-+ done`; cat /var/log/maillog) |pflogsumm
-
- [Note: I didn't actually run these. So you would be well-advised
- to double-check them.]
-@@ -305,7 +305,7 @@
- Message size is reported only by the queue manager. The message
- may be delivered long-enough after the (last) qmgr log entry that
- the information is not in the log(s) processed by a particular run
-- of pflogsumm.pl.
-+ of pflogsumm.
-
- The Result:
-
-@@ -337,7 +337,7 @@
-
- 10. Pflogsumm misses/mis-diagnoses/mis-reports, etc. <whatever>
-
-- Are you using a real old version of VMailer? As of pflogsumm.pl
-+ Are you using a real old version of VMailer? As of pflogsumm
- version 19990220-06, versions of VMailer prior to 19981023 are no
- longer supported. Sorry. Pflogsumm-19990121-01.pl will be made
- permanently available from now on for those with out-of-date versions
-@@ -346,7 +346,7 @@
- Are you processing your log files in chronological order? See item
- "5: "Processing Multiple Log Files".
-
-- Pflogsumm.pl is being developed by me on my rather small-scale server
-+ pflogsumm is being developed by me on my rather small-scale server
- at home. There are only two users on the system. And I do no
- mail-forwarding. So the log samples I have to work with are
- commensurately limited.
-@@ -366,13 +366,13 @@
- 11. Pflogsumm is generating lots of "uninitialized value" warnings
-
- Are you using a version of Perl lower than 5.004_04? Perhaps with a
-- "beta" version of pflogsumm.pl? If so, try turning off the "-w"
-+ "beta" version of pflogsumm? If so, try turning off the "-w"
- switch. Pflogsumm as of 19990413-02beta appeared to work correctly
- with Perl 5.003 in spite of the warnings. (Those warnings didn't
- appear with Perl 5.004.)
-
- I don't guarantee that I'll remember to test future versions of
-- pflogsumm.pl against 5.003, but I'll try to :-).
-+ pflogsumm against 5.003, but I'll try to :-).
-
- You really should consider upgrading your Perl to 5.004 or later.
-
-Index: pflogsumm/pflogsumm.1
-===================================================================
---- pflogsumm.orig/pflogsumm.1 2012-02-06 10:11:16.000000000 +0100
-+++ pflogsumm/pflogsumm.1 2012-02-06 10:19:18.695363861 +0100
-@@ -130,13 +130,13 @@
- .if n .ad l
- .nh
- .SH "NAME"
--pflogsumm.pl \- Produce Postfix MTA logfile summary
-+pflogsumm \- Produce Postfix MTA logfile summary
- .PP
- Copyright (C) 1998\-2010 by James S. Seymour, Release 1.1.5
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
- .Vb 8
--\& pflogsumm.pl \-[eq] [\-d <today|yesterday>] [\-\-detail <cnt>]
-+\& pflogsumm \-[eq] [\-d <today|yesterday>] [\-\-detail <cnt>]
- \& [\-\-bounce\-detail <cnt>] [\-\-deferral\-detail <cnt>]
- \& [\-h <cnt>] [\-i|\-\-ignore\-case] [\-\-iso\-date\-time] [\-\-mailq]
- \& [\-m|\-\-uucp\-mung] [\-\-no\-no\-msg\-size] [\-\-problems\-first]
-@@ -145,7 +145,7 @@
- \& [\-\-syslog\-name=string] [\-u <cnt>] [\-\-verbose\-msg\-detail]
- \& [\-\-verp\-mung[=<n>]] [\-\-zero\-fill] [file1 [filen]]
- \&
--\& pflogsumm.pl \-[help|version]
-+\& pflogsumm \-[help|version]
- \&
- \& If no file(s) specified, reads from stdin. Output is to stdout.
- .Ve
-@@ -268,7 +268,7 @@
- \& The message may be delivered long\-enough after the
- \& (last) qmgr log entry that the information is not in
- \& the log(s) processed by a particular run of
--\& pflogsumm.pl. This throws off "Recipients by message
-+\& pflogsumm. This throws off "Recipients by message
- \& size" and the total for "bytes delivered." These are
- \& normally reported by pflogsumm as "Messages with no
- \& size data."
-@@ -386,15 +386,15 @@
- .Vb 1
- \& Produce a report of previous day\*(Aqs activities:
- \&
--\& pflogsumm.pl \-d yesterday /var/log/maillog
-+\& pflogsumm \-d yesterday /var/log/maillog
- \&
- \& A report of prior week\*(Aqs activities (after logs rotated):
- \&
--\& pflogsumm.pl /var/log/maillog.0
-+\& pflogsumm /var/log/maillog.0
- \&
- \& What\*(Aqs happened so far today:
- \&
--\& pflogsumm.pl \-d today /var/log/maillog
-+\& pflogsumm \-d today /var/log/maillog
- \&
- \& Crontab entry to generate a report of the previous day\*(Aqs activity
- \& at 10 minutes after midnight.
-Index: pflogsumm/pflogsumm.pl
-===================================================================
---- pflogsumm.orig/pflogsumm.pl 2012-02-06 10:11:16.000000000 +0100
-+++ pflogsumm/pflogsumm.pl 2012-02-06 10:19:00.459363575 +0100
-@@ -4,13 +4,13 @@
-
- =head1 NAME
-
--pflogsumm.pl - Produce Postfix MTA logfile summary
-+pflogsumm - Produce Postfix MTA logfile summary
-
- Copyright (C) 1998-2010 by James S. Seymour, Release 1.1.5
-
- =head1 SYNOPSIS
-
-- pflogsumm.pl -[eq] [-d <today|yesterday>] [--detail <cnt>]
-+ pflogsumm -[eq] [-d <today|yesterday>] [--detail <cnt>]
- [--bounce-detail <cnt>] [--deferral-detail <cnt>]
- [-h <cnt>] [-i|--ignore-case] [--iso-date-time] [--mailq]
- [-m|--uucp-mung] [--no-no-msg-size] [--problems-first]
-@@ -19,7 +19,7 @@
- [--syslog-name=string] [-u <cnt>] [--verbose-msg-detail]
- [--verp-mung[=<n>]] [--zero-fill] [file1 [filen]]
-
-- pflogsumm.pl -[help|version]
-+ pflogsumm -[help|version]
-
- If no file(s) specified, reads from stdin. Output is to stdout.
-
-@@ -140,7 +140,7 @@
- The message may be delivered long-enough after the
- (last) qmgr log entry that the information is not in
- the log(s) processed by a particular run of
-- pflogsumm.pl. This throws off "Recipients by message
-+ pflogsumm. This throws off "Recipients by message
- size" and the total for "bytes delivered." These are
- normally reported by pflogsumm as "Messages with no
- size data."
-@@ -255,15 +255,15 @@
-
- Produce a report of previous day's activities:
-
-- pflogsumm.pl -d yesterday /var/log/maillog
-+ pflogsumm -d yesterday /var/log/maillog
-
- A report of prior week's activities (after logs rotated):
-
-- pflogsumm.pl /var/log/maillog.0
-+ pflogsumm /var/log/maillog.0
-
- What's happened so far today:
-
-- pflogsumm.pl -d today /var/log/maillog
-+ pflogsumm -d today /var/log/maillog
-
- Crontab entry to generate a report of the previous day's activity
- at 10 minutes after midnight.
+++ /dev/null
-Index: pflogsumm/pflogsumm.pl
-===================================================================
---- pflogsumm.orig/pflogsumm.pl
-+++ pflogsumm/pflogsumm.pl
-@@ -713,7 +713,7 @@ while(<>) {
- \${$msgsPerDay{$revMsgDateStr}}[4]);
- } elsif($cmd eq 'master') {
- ++$masterMsgs{(split(/^.*master.*: /, $logRmdr))[1]};
-- } elsif($cmd eq 'smtpd') {
-+ } elsif($cmd eq 'smtpd' || $cmd eq 'postscreen') {
- if($logRmdr =~ /\[\d+\]: \w+: client=(.+?)(,|$)/) {
- #
- # Warning: this code in two places!
-@@ -1536,14 +1536,14 @@ sub gimme_domain {
- # split domain/ipaddr into separates
- # newer versions of Postfix have them "dom.ain[i.p.add.ress]"
- # older versions of Postfix have them "dom.ain/i.p.add.ress"
-- unless((($domain, $ipAddr) = /^([^\[]+)\[((?:\d{1,3}\.){3}\d{1,3})\]/) == 2 ||
-- (($domain, $ipAddr) = /^([^\/]+)\/([0-9a-f.:]+)/i) == 2) {
-+ unless((($domain, $ipAddr) = /^([^\[]*)\[((?:\d{1,3}\.){3}\d{1,3})\]/) == 2||
-+ (($domain, $ipAddr) = /^([^\/]*)\/([0-9a-f.:]+)/i) == 2) {
- # more exhaustive method
-- ($domain, $ipAddr) = /^([^\[\(\/]+)[\[\(\/]([^\]\)]+)[\]\)]?:?\s*$/;
-+ ($domain, $ipAddr) = /^([^\[\(\/]*)[\[\(\/]([^\]\)]+)[\]\)]:?\d*$/;
- }
-
- # "mach.host.dom"/"mach.host.do.co" to "host.dom"/"host.do.co"
-- if($domain eq 'unknown') {
-+ if($domain eq "" || $domain eq 'unknown') {
- $domain = $ipAddr;
- # For identifying the host part on a Class C network (commonly
- # seen with dial-ups) the following is handy.
-@@ -1656,9 +1656,10 @@ sub proc_smtpd_reject {
- # those--incl. stuff that'll screw up subsequent parsing. So just
- # get rid of it right off.
- $rejReas =~ s/^(\d{3} <).*?(>:)/$1$2/;
-+ $rejReas =~ s/^(?:\d{3} \d\.\d\.\d )(Protocol error);.*$/$1/;
- $rejReas =~ s/^(?:.*?[:;] )(?:\[[^\]]+\] )?([^;,]+)[;,].*$/$1/;
- $rejReas =~ s/^((?:Sender|Recipient) address rejected: [^:]+):.*$/$1/;
-- $rejReas =~ s/(Client host|Sender address) .+? blocked/blocked/;
-+ $rejReas =~ s/(client|Client host|Sender address) .+? blocked/blocked/;
- } elsif($rejTyp eq "MAIL") { # *more* special treatment :-( grrrr...
- $rejReas =~ s/^\d{3} (?:<.+>: )?([^;:]+)[;:]?.*$/$1/;
- } else {
projects / sven / pflogsumm.git / commitdiff