OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Aug-2006 09:43:24
Branch: HEAD Handle: 2006082608432400
Modified files:
openpkg-src/postfix postfix.patch.pfls postfix.spec
Log:
allow pflogsumm to accept a more flexible data format
Summary:
Revision Changes Path
1.3 +51 -5 openpkg-src/postfix/postfix.patch.pfls
1.242 +1 -1 openpkg-src/postfix/postfix.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.patch.pfls
============================================================================
$ cvs diff -u -r1.2 -r1.3 postfix.patch.pfls
--- openpkg-src/postfix/postfix.patch.pfls 28 Nov 2003 19:07:28 -0000
1.2
+++ openpkg-src/postfix/postfix.patch.pfls 26 Aug 2006 07:43:24 -0000
1.3
@@ -1,9 +1,50 @@
This patch makes Pflogsumm working with the particular format
-of the OSSP fsl based Postfix logfile.
+of the OSSP fsl based Postfix logfile and additionally allows
+one to specify a more flexible data format.
---- pflogsumm.pl.orig 2003-11-28 20:01:19.000000000 +0100
-+++ pflogsumm.pl 2003-11-28 20:02:28.000000000 +0100
-@@ -516,8 +516,8 @@
+Index: pflogsumm.1
+--- pflogsumm.1.orig 2003-12-12 15:41:55 +0100
++++ pflogsumm.1 2006-08-26 09:36:50 +0200
+@@ -225,6 +225,8 @@
+ .Vb 2
+ \& -d today generate report for just today
+ \& -d yesterday generate report for just "yesterday"
++\& -d YYYY-MM-DD generate report for just "YYYY-MM-DD"
++\& (Really takes string Date::Parse will handle)
+ .Ve
+ .Vb 1
+ \& -e extended (extreme? excessive?) detail
+Index: pflogsumm.pl
+--- pflogsumm.pl.orig 2003-12-12 15:40:19 +0100
++++ pflogsumm.pl 2006-08-26 09:37:43 +0200
+@@ -10,7 +10,7 @@
+
+ =head1 SYNOPSIS
+
+- pflogsumm.pl -[eq] [-d <today|yesterday>] [-h <cnt>] [-u <cnt>]
++ pflogsumm.pl -[eq] [-d <today|yesterday|YYYY-MM-DD>] [-h <cnt>] [-u
<cnt>]
+ [--verp_mung[=<n>]] [--verbose_msg_detail] [--iso_date_time]
+ [-m|--uucp_mung] [-i|--ignore_case] [--smtpd_stats] [--mailq]
+ [--problems_first] [--rej_add_from] [--no_bounce_detail]
+@@ -37,6 +37,9 @@
+
+ -d today generate report for just today
+ -d yesterday generate report for just "yesterday"
++ -d YYYY-MM-DD generate report for just "YYYY-MM-DD"
++ (Actually this will take any date string
++ parsable by the perl Date::Parse module)
+
+ -e extended (extreme? excessive?) detail
+
+@@ -361,6 +364,7 @@
+ # ---Begin: SMTPD_STATS_SUPPORT---
+ use Date::Calc qw(Delta_DHMS);
+ # ---End: SMTPD_STATS_SUPPORT---
++use Date::Parse;
+
+ my $mailqCmd = "mailq";
+ my $release = "1.1.0";
+@@ -516,8 +520,8 @@
my $logRmdr;
next unless((($msgMonStr, $msgDay, $msgHr, $msgMin, $msgSec, $logRmdr) =
/^(...) +(\d+) (..):(..):(..) \S+ (.+)$/o) == 6);
@@ -14,7 +55,12 @@
{
#print UNPROCD "$_";
next;
-@@ -1378,7 +1378,7 @@
+@@ -1374,11 +1378,11 @@
+ if($dateOpt eq "yesterday") {
+ $time -= $aDay;
+ } elsif($dateOpt ne "today") {
+- die "$usageMsg\n";
++ $time = str2time($dateOpt);
}
my ($t_mday, $t_mon) = (localtime($time))[3,4];
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.241 -r1.242 postfix.spec
--- openpkg-src/postfix/postfix.spec 26 Aug 2006 07:30:51 -0000 1.241
+++ openpkg-src/postfix/postfix.spec 26 Aug 2006 07:43:24 -0000 1.242
@@ -142,7 +142,7 @@
# apply OpenPKG patches
%patch -p0
- ( cd pflogsumm-%{V_pflogsumm} && %{l_patch} -p0 <%{PATCH1} ) || exit $?
+ ( cd pflogsumm-%{V_pflogsumm} && %{l_patch} -p0 -b <%{PATCH1} ) || exit
$?
# apply vendor WHOSON patch
%if "%{with_whoson}" == "yes"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
