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: 06-Apr-2007 17:41:19
Branch: HEAD Handle: 2007040616411800
Modified files:
openpkg-src/postfix postfix.patch.pfls postfix.spec
Log:
modifying package: postfix-2.4.0 20070329 -> 20070406
Summary:
Revision Changes Path
1.4 +18 -18 openpkg-src/postfix/postfix.patch.pfls
1.256 +2 -2 openpkg-src/postfix/postfix.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.patch.pfls
============================================================================
$ cvs diff -u -r1.3 -r1.4 postfix.patch.pfls
--- openpkg-src/postfix/postfix.patch.pfls 26 Aug 2006 07:43:24 -0000
1.3
+++ openpkg-src/postfix/postfix.patch.pfls 6 Apr 2007 15:41:18 -0000
1.4
@@ -3,20 +3,20 @@
one to specify a more flexible data format.
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 @@
+--- pflogsumm.1.orig 2007-04-06 16:11:28 +0200
++++ pflogsumm.1 2007-04-06 17:35:12 +0200
+@@ -172,6 +172,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
+ .PP
.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
+--- pflogsumm.pl.orig 2007-04-06 16:06:37 +0200
++++ pflogsumm.pl 2007-04-06 17:37:09 +0200
@@ -10,7 +10,7 @@
=head1 SYNOPSIS
@@ -36,26 +36,26 @@
-e extended (extreme? excessive?) detail
-@@ -361,6 +364,7 @@
- # ---Begin: SMTPD_STATS_SUPPORT---
- use Date::Calc qw(Delta_DHMS);
- # ---End: SMTPD_STATS_SUPPORT---
+@@ -359,6 +362,7 @@
+ use strict;
+ use locale;
+ use Getopt::Long;
+use Date::Parse;
+ eval { require Date::Calc };
+ my $hasDateCalc = $@ ? 0 : 1;
- my $mailqCmd = "mailq";
- my $release = "1.1.0";
-@@ -516,8 +520,8 @@
+@@ -542,8 +546,8 @@
my $logRmdr;
next unless((($msgMonStr, $msgDay, $msgHr, $msgMin, $msgSec, $logRmdr) =
/^(...) +(\d+) (..):(..):(..) \S+ (.+)$/o) == 6);
-- unless((($cmd, $qid) = $logRmdr =~
m#^(?:vmailer|postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
-- (($cmd, $qid) = $logRmdr =~
m#^((?:vmailer|postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
-+ unless((($cmd, $qid) = $logRmdr =~
m#^<[a-z]+>\s+(?:vmailer|postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
-+ (($cmd, $qid) = $logRmdr =~
m#^<[a-z]+>\s+((?:vmailer|postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
+- unless((($cmd, $qid) = $logRmdr =~
m#^(?:postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
+- (($cmd, $qid) = $logRmdr =~
m#^((?:postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
++ unless((($cmd, $qid) = $logRmdr =~
m#^<[a-z]+>\s+(?:postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
++ (($cmd, $qid) = $logRmdr =~
m#^<[a-z]+>\s+((?:postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
{
#print UNPROCD "$_";
next;
-@@ -1374,11 +1378,11 @@
+@@ -1394,11 +1398,11 @@
if($dateOpt eq "yesterday") {
$time -= $aDay;
} elsif($dateOpt ne "today") {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.255 -r1.256 postfix.spec
--- openpkg-src/postfix/postfix.spec 29 Mar 2007 09:56:12 -0000 1.255
+++ openpkg-src/postfix/postfix.spec 6 Apr 2007 15:41:18 -0000 1.256
@@ -24,7 +24,7 @@
# package versions
%define V_postfix 2.4.0
-%define V_pflogsumm 1.1.0
+%define V_pflogsumm 1.1.1
%define V_whoson 2.4.0
# package information
@@ -38,7 +38,7 @@
Group: Mail
License: IPL
Version: %{V_postfix}
-Release: 20070329
+Release: 20070406
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
