head	1.6;
access;
symbols
	OPENPKG_2_STABLE_MP:1.6
	OPENPKG_E1_MP_HEAD:1.6
	OPENPKG_E1_MP:1.6
	OPENPKG_E1_MP_2_STABLE:1.6
	OPENPKG_E1_FP:1.6
	OPENPKG_2_STABLE_20061018:1.6
	OPENPKG_2_STABLE:1.6.0.14
	OPENPKG_2_STABLE_BP:1.6
	OPENPKG_2_5_SOLID:1.6.0.12
	OPENPKG_2_5_SOLID_BP:1.6
	OPENPKG_2_4_RELEASE:1.6
	OPENPKG_2_4_SOLID:1.6.0.10
	OPENPKG_2_4_SOLID_BP:1.6
	OPENPKG_2_3_RELEASE:1.6
	OPENPKG_2_3_SOLID:1.6.0.8
	OPENPKG_2_3_SOLID_BP:1.6
	OPENPKG_2_2_RELEASE:1.6
	OPENPKG_2_2_SOLID:1.6.0.6
	OPENPKG_2_2_SOLID_BP:1.6
	OPENPKG_2_1_RELEASE:1.6
	OPENPKG_2_1_SOLID:1.6.0.4
	OPENPKG_2_1_SOLID_BP:1.6
	OPENPKG_2_0_RELEASE:1.6
	OPENPKG_2_0_SOLID:1.6.0.2
	OPENPKG_2_0_SOLID_BP:1.6
	OPENPKG_1_3_RELEASE:1.1.2.1
	OPENPKG_1_3_SOLID:1.1.2.1.0.2
	OPENPKG_1_3_SOLID_BP:1.1.2.1
	OPENPKG_1_2_RELEASE:1.1
	OPENPKG_1_2_SOLID:1.1.0.4
	OPENPKG_1_2_SOLID_BP:1.1
	OPENPKG_1_STABLE:1.1.0.2
	OPENPKG_1_STABLE_BP:1.1;
locks; strict;
comment	@# @;


1.6
date	2003.07.22.14.19.09;	author rse;	state dead;
branches;
next	1.5;

1.5
date	2003.06.30.06.50.58;	author thl;	state Exp;
branches;
next	1.4;

1.4
date	2003.06.28.13.44.06;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2003.06.24.09.47.27;	author thl;	state Exp;
branches;
next	1.2;

1.2
date	2003.03.05.09.36.48;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2003.01.10.12.11.14;	author rse;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2003.07.24.20.45.04;	author rse;	state dead;
branches;
next	;


desc
@@


1.6
log
@cleanup packaging
@
text
@This patch makes Pflogsumm working with the particular format
of the OSSP fsl based Postfix logfile.

--- 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
     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)
     {
 	#print UNPROCD "$_";
 	next;
@@@@ -1324,7 +1324,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
@


1.5
log
@backout and simplify regex, we just match syslog(3) level not ident/facility
@
text
@@


1.4
log
@Postfix uses syslog ids like 'postfix/smtpd', hence we need a less restrictive regex here
@
text
@d13 2
a14 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)
@


1.3
log
@modifying package: postfix-2.0.12 20030623 -> 20030624
@
text
@d13 2
a14 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)
@


1.2
log
@fix postfix.sum generation
@
text
@d4 4
a7 4
--- 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);
d9 6
a14 3
     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)
d16 3
a18 12
 	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 @@@@
@


1.1
log
@fix pflogsumm under OSSP fsl world order
@
text
@d1 15
a15 3
--- pflogsumm.pl.orig	Tue Dec 31 19:30:43 2002
+++ pflogsumm.pl	Fri Jan 10 13:07:39 2003
@@@@ -557,7 +557,7 @@@@
d24 1
a24 1
@@@@ -1267,7 +1267,7 @@@@
@


1.1.2.1
log
@mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class BASE only]
@
text
@@