浏览代码

fix postfix.sum generation

Ralf S. Engelschall 23 年之前
父节点
当前提交
477adf4f53
共有 2 个文件被更改,包括 17 次插入5 次删除
  1. 16 4
      postfix/pflogsumm.patch
  2. 1 1
      postfix/postfix.spec

+ 16 - 4
postfix/pflogsumm.patch

@@ -1,6 +1,18 @@
---- pflogsumm.pl.orig	Tue 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.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);
+     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)
+     {
+ 	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];
  

+ 1 - 1
postfix/postfix.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [BASE]
 Group:        Mail
 License:      IPL
 Version:      %{V_postfix}
-Release:      20030304
+Release:      20030305
 
 #   package options
 %option       with_tls       no