On Sat, Jun 28, 2003, Ralf S. Engelschall 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. This had been run-time tested on a live machine. Using the new patch the output was slightly different than the one in previous releases but it actually looked more complete. So i think we can safely back-out this change and should consider patching existing releases equally well.
-- [EMAIL PROTECTED] Development Team, Operations Northern Europe, Cable & Wireless ______________________________________________________________________ The OpenPKG Project www.openpkg.org Developer Communication List [EMAIL PROTECTED]
