Re: [CVS] OpenPKG: openpkg-src/postfix/ pflogsumm.patch postfix.spec openp...

2003-06-29 Thread Ralf S. Engelschall 
On Sun, Jun 29, 2003, Thomas Lotterer wrote:

  On Tue, Jun 24, 2003, Thomas Lotterer wrote:
 
   [...]
   modifying package: postfix-2.0.12 20030623 - 20030624
   [...]
 - 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)
   [...]
 
  This is not quite right, because [a-z]+ does not match Postfix'
  postfix/smtpd. Better to use something like [^]+ here instead.
  I've fixed it this way now.
 
 The data to be matched at the point in question are syslog(3) levels
 not ident/facility as you assume. The strings look like info, debug
 etc. so the patch was correct.

Ops, good catch. I'm wrong, you're right.
Then we can backout this, yes. Feel free.

   Ralf S. Engelschall
   [EMAIL PROTECTED]
   www.engelschall.com

__
The OpenPKG Projectwww.openpkg.org
Developer Communication List   [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/postfix/ pflogsumm.patch postfix.spec openp...

2003-06-28 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   28-Jun-2003 15:44:06
  Branch: HEAD Handle: 2003062814440501

  Modified files:
openpkg-src/postfix pflogsumm.patch postfix.spec
openpkg-web news.txt

  Log:
Postfix uses syslog ids like 'postfix/smtpd', hence we need a less
restrictive regex here

  Summary:
RevisionChanges Path
1.4 +2  -2  openpkg-src/postfix/pflogsumm.patch
1.139   +1  -1  openpkg-src/postfix/postfix.spec
1.5046  +1  -0  openpkg-web/news.txt
  

  patch -p0 '@@ .'
  Index: openpkg-src/postfix/pflogsumm.patch
  
  $ cvs diff -u -r1.3 -r1.4 pflogsumm.patch
  --- openpkg-src/postfix/pflogsumm.patch   24 Jun 2003 09:47:27 -  1.3
  +++ openpkg-src/postfix/pflogsumm.patch   28 Jun 2003 13:44:06 -  1.4
  @@ -10,8 +10,8 @@
($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((($cmd, $qid) = $logRmdr =~ 
m#^[^]+\s+(?:vmailer|postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
  ++   (($cmd, $qid) = $logRmdr =~ 
m#^[^]+\s+((?:vmailer|postfix)(?:-script)?)(?:\[\d+\])?: ([^:\s]+)#o) == 2)
{
#print UNPROCD $_;
next;
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/postfix/postfix.spec
  
  $ cvs diff -u -r1.138 -r1.139 postfix.spec
  --- openpkg-src/postfix/postfix.spec  24 Jun 2003 17:51:02 -  1.138
  +++ openpkg-src/postfix/postfix.spec  28 Jun 2003 13:44:06 -  1.139
  @@ -39,7 +39,7 @@
   Group:Mail
   License:  IPL
   Version:  %{V_postfix}
  -Release:  20030624
  +Release:  20030628
   
   #   package options
   %option   with_fsl   yes
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.5045 -r1.5046 news.txt
  --- openpkg-web/news.txt  28 Jun 2003 13:20:33 -  1.5045
  +++ openpkg-web/news.txt  28 Jun 2003 13:44:05 -  1.5046
  @@ -1,3 +1,4 @@
  +28-Jun-2003: Upgraded package: Ppostfix-2.0.12-20030628
   28-Jun-2003: Upgraded package: Paica-0.81-20030628
   28-Jun-2003: Upgraded package: Psquirrelmail-1.4.0-20030628
   28-Jun-2003: Upgraded package: Popenjade-1.3.2-20030628
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

Re: [CVS] OpenPKG: openpkg-src/postfix/ pflogsumm.patch postfix.spec openp...

2003-06-28 Thread Ralf S. Engelschall 
On Tue, Jun 24, 2003, Thomas Lotterer wrote:

 [...]
 modifying package: postfix-2.0.12 20030623 - 20030624
 [...]
   - 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)
 [...]

This is not quite right, because [a-z]+ does not match Postfix'
postfix/smtpd. Better to use something like [^]+ here instead.
I've fixed it this way now.
   Ralf S. Engelschall
   [EMAIL PROTECTED]
   www.engelschall.com

__
The OpenPKG Projectwww.openpkg.org
Developer Communication List   [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/postfix/ pflogsumm.patch postfix.spec openp...

2003-06-24 Thread Thomas Lotterer 
  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:
RevisionChanges 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 -   1.2
  +++ openpkg-src/postfix/pflogsumm.patch   24 Jun 2003 09:47:27 -  1.3
  @@ -1,27 +1,21 @@
   This patch makes Pflogsumm working with the particular format
   of the OSSP fsl based Postfix logfile.
   
   pflogsumm.pl.origWed 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.origTue 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 nn 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 -  1.136
  +++ openpkg-src/postfix/postfix.spec  24 Jun 2003 09:47:27 -  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 -  1.4980
  +++ openpkg-web/news.txt  24 Jun 2003 09:47:26 -  1.4981
  @@ -1,3 +1,4 @@
  +24-Jun-2003: Upgraded package: Ppostfix-2.0.12-20030624
   24-Jun-2003: Upgraded package: Pautogen-5.5.5-20030624
   24-Jun-2003: Upgraded package: Plibiconv-1.9.1-20030624
   24-Jun-2003: Upgraded package: Ptinyca-0.4.6-20030624
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/postfix/ pflogsumm.patch postfix.spec openp...

2003-03-05 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   05-Mar-2003 10:36:50
  Branch: HEAD Handle: 2003030509364602

  Modified files:
openpkg-src/postfix pflogsumm.patch postfix.spec
openpkg-web news.txt

  Log:
fix postfix.sum generation

  Summary:
RevisionChanges Path
1.2 +16 -4  openpkg-src/postfix/pflogsumm.patch
1.118   +1  -1  openpkg-src/postfix/postfix.spec
1.3544  +1  -0  openpkg-web/news.txt
  

  patch -p0 '@@ .'
  Index: openpkg-src/postfix/pflogsumm.patch
  
  $ cvs diff -u -r1.1 -r1.2 pflogsumm.patch
  --- openpkg-src/postfix/pflogsumm.patch   10 Jan 2003 12:11:14 -  1.1
  +++ openpkg-src/postfix/pflogsumm.patch   5 Mar 2003 09:36:48 -   1.2
  @@ -1,6 +1,18 @@
   pflogsumm.pl.origTue Dec 31 19:30:43 2002
  -+++ pflogsumm.pl Fri Jan 10 13:07:39 2003
  -@@ -557,7 +557,7 @@
  +This patch makes Pflogsumm working with the particular format
  +of the OSSP fsl based Postfix logfile.
  +
  +--- pflogsumm.pl.origWed 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);
  + s/: \[ID \d+\s+[^\]]+\] /: /o;  # lose [ID nn 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)
  + {
  + 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) {
  @@ -9,7 +21,7 @@
if(exists($connTime{$pid})) {
$hostID = gimme_domain($hostID);
my($d, $h, $m, $s) = Delta_DHMS(@{$connTime{$pid}},
  -@@ -1267,7 +1267,7 @@
  +@@ -1299,7 +1299,7 @@
}
my ($t_mday, $t_mon) = (localtime($time))[3,4];

  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/postfix/postfix.spec
  
  $ cvs diff -u -r1.117 -r1.118 postfix.spec
  --- openpkg-src/postfix/postfix.spec  4 Mar 2003 08:35:00 -   1.117
  +++ openpkg-src/postfix/postfix.spec  5 Mar 2003 09:36:48 -   1.118
  @@ -38,7 +38,7 @@
   Group:Mail
   License:  IPL
   Version:  %{V_postfix}
  -Release:  20030304
  +Release:  20030305
   
   #   package options
   %option   with_tls   no
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.3543 -r1.3544 news.txt
  --- openpkg-web/news.txt  5 Mar 2003 09:24:55 -   1.3543
  +++ openpkg-web/news.txt  5 Mar 2003 09:36:46 -   1.3544
  @@ -1,3 +1,4 @@
  +05-Mar-2003: Upgraded package: Ppostfix-2.0.5-20030305
   05-Mar-2003: Upgraded package: Pproftpd-1.2.8-20030305
   05-Mar-2003: Upgraded package: Plinkchecker-1.8.9-20030305
   05-Mar-2003: Upgraded package: Pgeoip-1.1.8-20030305
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]

[CVS] OpenPKG: openpkg-src/postfix/ pflogsumm.patch postfix.spec openp...

2003-01-10 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web  Date:   10-Jan-2003 13:11:15
  Branch: HEAD Handle: 2003011012111301

  Added files:
openpkg-src/postfix pflogsumm.patch
  Modified files:
openpkg-src/postfix postfix.spec
openpkg-web news.txt

  Log:
fix pflogsumm under OSSP fsl world order

  Summary:
RevisionChanges Path
1.1 +20 -0  openpkg-src/postfix/pflogsumm.patch
1.104   +5  -1  openpkg-src/postfix/postfix.spec
1.2635  +1  -0  openpkg-web/news.txt
  

  patch -p0 '@@ .'
  Index: openpkg-src/postfix/pflogsumm.patch
  
  $ cvs diff -u -r0 -r1.1 pflogsumm.patch
  --- /dev/null 2003-01-10 13:11:15.0 +0100
  +++ pflogsumm.patch   2003-01-10 13:11:15.0 +0100
  @@ -0,0 +1,20 @@
  +--- pflogsumm.pl.origTue Dec 31 19:30:43 2002
   pflogsumm.pl Fri Jan 10 13:07:39 2003
  +@@ -557,7 +557,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}},
  +@@ -1267,7 +1267,7 @@
  + }
  + my ($t_mday, $t_mon) = (localtime($time))[3,4];
  + 
  +-return sprintf(%s %2d, $monthNames[$t_mon], $t_mday);
  ++return sprintf(%s %02d, $monthNames[$t_mon], $t_mday);
  + }
  + 
  + # if there's a real domain: uses that.  Otherwise uses the first
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-src/postfix/postfix.spec
  
  $ cvs diff -u -r1.103 -r1.104 postfix.spec
  --- openpkg-src/postfix/postfix.spec  3 Jan 2003 11:34:14 -   1.103
  +++ openpkg-src/postfix/postfix.spec  10 Jan 2003 12:11:14 -  1.104
  @@ -38,7 +38,7 @@
   Group:Mail
   License:  IPL
   Version:  %{V_postfix}
  -Release:  20030103
  +Release:  20030110
   
   #   package options
   %option   with_tls   no
  @@ -52,6 +52,7 @@
   Source3:  etc.tar
   Source4:  fsl.postfix
   Source5:  rc.postfix
  +Patch0:   pflogsumm.patch
   
   #   build information
   Prefix:   %{l_prefix}
  @@ -101,6 +102,9 @@
   %if %{with_tls} == yes
   %{l_patch} -p1 pfixtls-%{V_tls}/pfixtls.diff
   %endif
  +
  +#   apply pflogsumm patch
  +( cd pflogsumm-%{V_pflogsumm}; %{l_patch} -p0 %{SOURCE pflogsumm.patch} )
   
   %build
   #   configure Postfix (hard-core part I)
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.2634 -r1.2635 news.txt
  --- openpkg-web/news.txt  10 Jan 2003 10:49:39 -  1.2634
  +++ openpkg-web/news.txt  10 Jan 2003 12:11:13 -  1.2635
  @@ -1,3 +1,4 @@
  +10-Jan-2003: Upgraded package: Ppostfix-2.0.0.2-20030110
   10-Jan-2003: Upgraded package: Pncurses-5.3.20030105-20030110
   10-Jan-2003: Upgraded package: Pgdb-5.3-20030110
   10-Jan-2003: Upgraded package: Pvim-6.1.287-20030110
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]