OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Jun-2003 08:50:58
Branch: HEAD Handle: 2003063007505800
Modified files:
openpkg-src/postfix pflogsumm.patch
Log:
backout and simplify regex, we just match syslog(3) level not
ident/facility
Summary:
Revision Changes Path
1.5 +2 -2 openpkg-src/postfix/pflogsumm.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postfix/pflogsumm.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 pflogsumm.patch
--- openpkg-src/postfix/pflogsumm.patch 28 Jun 2003 13:44:06 -0000 1.4
+++ openpkg-src/postfix/pflogsumm.patch 30 Jun 2003 06:50:58 -0000 1.5
@@ -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#^<[^>]+>\s+(?:vmailer|postfix|$syslogName)/([^\[:]*).*?: ([^:\s]+)#o) == 2 ||
-+ (($cmd, $qid) = $logRmdr =~
m#^<[^>]+>\s+((?: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;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
