OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 24-Jun-2003 11:47:28
Branch: HEAD Handle: 2003062410472601
Modified files:
openpkg-src/postfix pflogsumm.patch postfix.spec
openpkg-web news.txt
Log:
modifying package: postfix-2.0.12 20030623 -> 20030624
Summary:
Revision Changes Path
1.3 +13 -19 openpkg-src/postfix/pflogsumm.patch
1.137 +1 -1 openpkg-src/postfix/postfix.spec
1.4981 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/pflogsumm.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 pflogsumm.patch
--- openpkg-src/postfix/pflogsumm.patch 5 Mar 2003 09:36:48 -0000 1.2
+++ openpkg-src/postfix/pflogsumm.patch 24 Jun 2003 09:47:27 -0000 1.3
@@ -1,27 +1,21 @@
This patch makes Pflogsumm working with the particular format
of the OSSP fsl based Postfix logfile.
---- pflogsumm.pl.orig Wed Feb 19 23:36:07 2003
-+++ pflogsumm.pl Wed Mar 5 10:34:11 2003
-@@ -470,7 +470,7 @@
- next if(defined($dateStr) && ! /^$dateStr/o);
+--- pflogsumm.pl.orig Tue Jun 17 17:59:57 2003
++++ pflogsumm.pl Tue Jun 24 11:41:59 2003
+
+@@ -498,8 +498,8 @@
s/: \[ID \d+\s+[^\]]+\] /: /o; # lose "[ID nnnnnn some.thing]" stuff
- unless((($msgMonStr, $msgDay, $msgTimeStr, $cmd, $qid) =
-- m#^(...)\s+(\d+)\s(..:..:..)\s\S+\s(?:vmailer|$syslogName)[-/]([^\[:]*).*?:
([^:]+)#o) == 5)
-+
m#^(...)\s+(\d+)\s(..:..:..)\s\S+\s+\S+\s(?:vmailer|$syslogName)[-/]([^\[:]*).*?:
([^:]+)#o) == 5)
+ my $logRmdr;
+ ($msgMonStr, $msgDay, $msgTimeStr, $logRmdr) =
/^(...)\s+(\d+)\s(..:..:..)\s\S+\s(.+)$/o;
+- 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((($msgMonStr, $msgDay, $msgTimeStr, $cmd, $qid) =
- m#^(...)\s+(\d+)\s(..:..:..)\s\S+\s(vmailer|$syslogName[^\[:]*).*?:
([^:]+)#o) == 5)
-@@ -581,7 +581,7 @@
- @{$connTime{$1}} =
- ($msgYr, $msgMon + 1, $msgDay, $msgHr, $msgMin, $msgSec);
- } elsif(/: disconnect from /o) {
-- my ($pid, $hostID) = /\/smtpd\[(\d+)\]: disconnect from (.+)$/o;
-+ my ($pid, $hostID) = /\/smtpd\[(\d+)\]: disconnect from (.+)$/o ||
next;
- if(exists($connTime{$pid})) {
- $hostID = gimme_domain($hostID);
- my($d, $h, $m, $s) = Delta_DHMS(@{$connTime{$pid}},
-@@ -1299,7 +1299,7 @@
+ #print UNPROCD "$_";
+ next;
+@@ -1324,7 +1324,7 @@
}
my ($t_mday, $t_mon) = (localtime($time))[3,4];
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/postfix.spec
============================================================================
$ cvs diff -u -r1.136 -r1.137 postfix.spec
--- openpkg-src/postfix/postfix.spec 23 Jun 2003 20:51:30 -0000 1.136
+++ openpkg-src/postfix/postfix.spec 24 Jun 2003 09:47:27 -0000 1.137
@@ -39,7 +39,7 @@
Group: Mail
License: IPL
Version: %{V_postfix}
-Release: 20030623
+Release: 20030624
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4980 -r1.4981 news.txt
--- openpkg-web/news.txt 24 Jun 2003 09:00:21 -0000 1.4980
+++ openpkg-web/news.txt 24 Jun 2003 09:47:26 -0000 1.4981
@@ -1,3 +1,4 @@
+24-Jun-2003: Upgraded package: P<postfix-2.0.12-20030624>
24-Jun-2003: Upgraded package: P<autogen-5.5.5-20030624>
24-Jun-2003: Upgraded package: P<libiconv-1.9.1-20030624>
24-Jun-2003: Upgraded package: P<tinyca-0.4.6-20030624>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
