rpms/logwatch/FC-6 logwatch-7.3-postfix.patch, NONE, 1.1 logwatch-7.3.1-postfix2.patch, NONE, 1.1 logwatch-7.3.1-vsftpd.patch, NONE, 1.1 logwatch.spec, 1.44, 1.45
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Dec 20 08:31:00 UTC 2006
- Previous message (by thread): rpms/tomboy/devel tomboy-0.5.2-wrapper.patch, NONE, 1.1 tomboy.spec, 1.30, 1.31
- Next message (by thread): rpms/logwatch/devel logwatch-7.3.1-amavis.patch, NONE, 1.1 logwatch-7.3.1-dovecot.patch, NONE, 1.1 logwatch-7.3.1-init.patch, NONE, 1.1 logwatch.spec, 1.50, 1.51
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: varekova
Update of /cvs/dist/rpms/logwatch/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv13610
Modified Files:
logwatch.spec
Added Files:
logwatch-7.3-postfix.patch logwatch-7.3.1-postfix2.patch
logwatch-7.3.1-vsftpd.patch
Log Message:
- added postfix patch - fixes #217411
- added postfix2 patch - fixes #208909
- added vsftpd patch - fixes #217226
logwatch-7.3-postfix.patch:
postfix | 104 ++++++++++++++++++++++++++++++++--------------------------------
1 files changed, 52 insertions(+), 52 deletions(-)
--- NEW FILE logwatch-7.3-postfix.patch ---
--- logwatch-7.3/scripts/services/postfix.pom 2006-03-22 18:43:46.000000000 +0100
+++ logwatch-7.3/scripts/services/postfix 2006-08-13 23:25:55.000000000 +0200
@@ -1,8 +1,12 @@
##########################################################################
-# $Id: postfix,v 1.24 2006/03/22 17:43:46 bjorn Exp $
+# $Id: postfix,v 1.25 2006/08/13 21:25:55 bjorn Exp $
##########################################################################
# $Log: postfix,v $
+# Revision 1.25 2006/08/13 21:25:55 bjorn
+# Updates to work with the Postfix 2.3.x series (due to log format changes),
+# by Mike Cappella.
+#
# Revision 1.24 2006/03/22 17:43:46 bjorn
# Changes by Harald Geiger:
# - ignore additional statistics: messages (Postfix 2.2)
@@ -142,6 +146,9 @@
my $Detail = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0;
my $Debug = $ENV{'LOGWATCH_DEBUG'} || 0;
+my $re_DSN = '(?:\d{3}(?: \d\.\d\.\d)?)';
+my $re_MsgID = '[a-zA-Z\d]+';
+
$MsgsSent = 0;
$BytesTransferred = 0;
$FourHourReturns = 0;
@@ -161,12 +168,12 @@
while (defined($ThisLine = <STDIN>)) {
if (
- ( $ThisLine =~ m/^[a-zA-Z0-9]+: client=([^ ]*\[[^ ]*\])\s*$/ ) or
- ( $ThisLine =~ m/^[a-zA-Z0-9]+: message-id/ ) or
- ( $ThisLine =~ m/^[a-zA-Z0-9]+: skipped, still being delivered/ ) or
- ( $ThisLine =~ m/^[a-zA-Z0-9]+: to=\<.*>, relay=.*, delay=[0-9]+, status=(sent|deferred)/ ) or
- ( $ThisLine =~ m/^[a-zA-Z0-9]+: host [^ ]*\[[^ ]*\] said: 4[0-9][0-9]/ ) or
- ( $ThisLine =~ m/^[a-zA-Z0-9]+: host [^ ]*\[[^ ]*\] refused to talk to me: 4[0-9][0-9]/ ) or
+ ( $ThisLine =~ m/^$re_MsgID: client=([^ ]*\[[^ ]*\])\s*$/ ) or
+ ( $ThisLine =~ m/^$re_MsgID: message-id/ ) or
+ ( $ThisLine =~ m/^$re_MsgID: skipped, still being delivered/ ) or
+ ( $ThisLine =~ m/^$re_MsgID: to=\<.*>, relay=.*, delay=[\d.]+,(?: delays=[\d\/.]+, dsn=[\d.]+,)? status=(?:sent|deferred)/ ) or
+ ( $ThisLine =~ m/^$re_MsgID: host [^ ]*\[[^ ]*\] said: 4[0-9][0-9]/ ) or
+ ( $ThisLine =~ m/^$re_MsgID: host [^ ]*\[[^ ]*\] refused to talk to me: 4[0-9][0-9]/ ) or
( $ThisLine =~ m/^Deleted: \d message$/ ) or
( $ThisLine =~ m/^Peer certficate could not be verified$/ ) or #postfix typo
( $ThisLine =~ m/^Peer certificate could not be verified$/ ) or
@@ -185,7 +192,7 @@
( $ThisLine =~ m/^setting up TLS connection (from|to)/ ) or
( $ThisLine =~ m/^starting TLS engine$/ ) or
( $ThisLine =~ m/^terminating on signal 15$/ ) or
- ( $ThisLine =~ m/^warning: [a-zA-Z0-9]+: skipping further client input$/ ) or
+ ( $ThisLine =~ m/^warning: $re_MsgID: skipping further client input$/ ) or
( $ThisLine =~ m/^warning: (?:smtpd_peer_init: )?[\.0-9]+: address not listed for hostname/ ) or
( $ThisLine =~ m/^warning: (?:smtpd_peer_init: )?[\.0-9]+: hostname .* verification failed: Host not found/ ) or
( $ThisLine =~ m/^warning: (?:smtpd_peer_init: )?[\.0-9]+: hostname .* verification failed: Name or service not known/ ) or
@@ -209,96 +216,89 @@
or ( $ThisLine =~ m/certificate peer name verification failed/o ) # Perhaps a candidate for extended statistics
) {
# We don't care about these
- } elsif ( ($Bytes) = ($ThisLine =~ /^[a-zA-Z0-9]+: from=.*size=([0-9]+).*$/) ) {
+ } elsif ( ($Bytes) = ($ThisLine =~ /^$re_MsgID: from=.*size=(\d+).*$/) ) {
$MsgsSent++;
$BytesTransferred += $Bytes;
- } elsif (($User) = ($ThisLine =~ /^[a-zA-Z0-9]+: to=\<([^ ]*)>,(?: orig_to=\<(?:[^ ]*)>,)? relay=local, delay=-?[0-9]+, status=bounced \((?:unknown user|user unknown)/)) {
+ } elsif (($User) = ($ThisLine =~ /^$re_MsgID: to=\<([^ ]*)>,(?: orig_to=\<(?:[^ ]*)>,)? relay=local, delay=-?\d+, status=bounced \((?:unknown user|user unknown)/)) {
# unknown user
$UnknownUsers{$User}++;
- } elsif (($User) = ($ThisLine =~ /^[a-zA-Z0-9]+: reject: RCPT from (?:[^ ]*): [0-9]+ <([^ ]*)>:(?:[^:]+: )?User unknown in(?: \w+)+ table/)) {
+ } elsif (($User) = ($ThisLine =~ /^$re_MsgID: reject: RCPT from (?:[^ ]*): $re_DSN <([^ ]*)>:(?:[^:]+: )?User unknown in(?: \w+)+ table/)) {
# unknown local mailbox, alias, virtual user
$UnknownUsers{$User}++;
- } elsif (($User) = ($ThisLine =~ /^[a-zA-Z0-9]+: to=\<([^ ]*)>,(?: orig_to=\<(?:[^ ]*)>,)? .*, status=bounced .*: User unknown in virtual (alias|mailbox) table/)) {
+ } elsif (($User) = ($ThisLine =~ /^$re_MsgID: to=\<([^ ]*)>,(?: orig_to=\<(?:[^ ]*)>,)? .*, status=bounced .*: User unknown in virtual (alias|mailbox) table/)) {
# another unknown user probably could combine with local unknown but again my perl is weak
$UnknownUsers{$User}++;
- } elsif (($Dest, $Relay, $Msg) = ($ThisLine =~ /^[a-zA-Z0-9]+: to=\<([^ ]*)>,(?: orig_to=\<(?:[^ ]*)>,)? relay=([^ ]*).*, delay=-?[0-9]+, status=bounced \(([^)]*)/ )) {
+ } elsif (($Dest, $Relay, $Msg) = ($ThisLine =~ /^$re_MsgID: to=\<([^ ]*)>,(?: orig_to=\<(?:[^ ]*)>,)? relay=([^ ]*).*, delay=-?[\d.]+(?:, delays=[\d\/.]+, dsn=[\d.]+)?, status=bounced \(([^)]*)/ )) {
# unknown user
# $Msg = " hello "
# print "bounce message from " . $Dest . " msg : " . $Relay . "\n";
- if ($Relay =~ m/^(none|local|avcheck)/) {
+ if ($Relay =~ m/^(none|local|avcheck|127\.0\.0\.1)/) {
$Temp = "To " . $Dest . " Msg=\"" . $Msg . "\"";
$LocalBounce{$Temp}++;
} else {
$Temp = "To " . $Dest . " Msg=\"" . $Msg . "\"";
$ForeignBounce{$Temp}++;
}
- } elsif ( ($Relay,$Dest) = ($ThisLine =~ m/reject: RCPT from ([^ ]*): [0-9]+ <([^ ]*)>.* Relay access denied.* to=([^ ]*)/) ) {
+ } elsif ( ($Relay,$Dest) = ($ThisLine =~ m/reject: RCPT from ([^ ]*): $re_DSN <([^ ]*)>.* Relay access denied.* to=([^ ]*)/) ) {
# print "reject: " . $ThisLine . "\n";
# print "Relay :" . $Relay . " to " . $Dest . "\n";
$Temp = "From " . $Relay . " to " . $Dest;
$RelayDenied{$Temp}++;
- } elsif ( ($User,$From) = ($ThisLine =~ /^[a-zA-Z0-9]+: uid=([^ ]*) from=\<([^ ]*)>/)) {
+ } elsif ( ($User,$From) = ($ThisLine =~ /^$re_MsgID: uid=([^ ]*) from=\<([^ ]*)>/)) {
#Messages sent by user
$Temp = $From . " (uid=" . $User . "): ";
$SentBy{$Temp}++;
- } elsif ( ($From) = ($ThisLine =~ /^[a-zA-Z0-9]+: from=<([^ ]*)>, status=expired, returned to sender$/)) {
+ } elsif ( ($From) = ($ThisLine =~ /^$re_MsgID: from=<([^ ]*)>, status=expired, returned to sender$/)) {
$ReturnedToSender++;
- } elsif ( (undef) = ($ThisLine =~ /^[a-zA-Z0-9]+: resent-message-id=<([^ ]*)>$/)) {
+ } elsif ( (undef) = ($ThisLine =~ /^$re_MsgID: resent-message-id=<([^ ]*)>$/)) {
$ResentMessages++;
} elsif (
($Command,$Host) = ($ThisLine =~ /lost connection after ([^ ]*) from ([^ ]*)$/) or
- ($Host,$Command) = ($ThisLine =~ /^[a-zA-Z0-9]+: lost connection with ([^ ]*) while (.*)$/)
+ ($Host,$Command) = ($ThisLine =~ /^$re_MsgID: lost connection with ([^ ]*) while (.*)$/)
) {
# Make some better summary with hosts
$ConnectionLost{$Command}++;
} elsif (
($Command,$Host) = ($ThisLine =~ /timeout after ([^ ]*) from ([^ ]*)$/) or
- ($Host,$Command) = ($ThisLine =~ /^[a-zA-Z0-9]+: conversation with ([^ ]*) timed out while (.*)$/)
+ ($Host,$Command) = ($ThisLine =~ /^$re_MsgID: conversation with ([^ ]*) timed out while (.*)$/)
) {
# Make some better summary with hosts
$ConnectionLost{$Command}++;
- } elsif ( ($Rejected,undef,undef,undef,$Reason) = ($ThisLine =~ /^[a-zA-Z0-9]+: reject: header (.*); from=<([^ ]*)> to=<([^ ]*)>( proto=[^ ]* helo=<[^ ]*>)?: (.*)$/)) {
+ } elsif ( ($Rejected,undef,undef,undef,$Reason) = ($ThisLine =~ /^$re_MsgID: reject: header (.*); from=<([^ ]*)> to=<([^ ]*)>( proto=[^ ]* helo=<[^ ]*>)?: (.*)$/)) {
$HeaderReject{$Reason}{$Rejected}++;
- } elsif ( ($Warning,undef,undef,undef,$Reason) = ($ThisLine =~ /^[a-zA-Z0-9]+: warning: header (.*); from=<([^ ]*)> to=<([^ ]*)>( proto=[^ ]* helo=<[^ ]*>)?: (.*)$/)) {
+ } elsif ( ($Warning,undef,undef,undef,$Reason) = ($ThisLine =~ /^$re_MsgID: warning: header (.*); from=<([^ ]*)> to=<([^ ]*)>( proto=[^ ]* helo=<[^ ]*>)?: (.*)$/)) {
$HeaderWarning{$Reason}{$Warning}++;
- } elsif ( ($Warning,undef,undef,undef) = ($ThisLine =~ /^[a-zA-Z0-9]+: warning: header (.*); from=<([^ ]*)> to=<([^ ]*)>( proto=[^ ]* helo=<[^ ]*>)?$/)) {
+ } elsif ( ($Warning,undef,undef,undef) = ($ThisLine =~ /^$re_MsgID: warning: header (.*); from=<([^ ]*)> to=<([^ ]*)>( proto=[^ ]* helo=<[^ ]*>)?$/)) {
$HeaderWarning{"Unknown Reason"}{$Warning}++;
- } elsif ( ($Rejected,undef,undef,undef,$Reason) = ($ThisLine =~ /^[a-zA-Z0-9]+: reject: body (.*); from=<([^ ]*)> to=<([^ ]*)>( proto=[^ ]* helo=<[^ ]*>)?: (.*)$/)) {
+ } elsif ( ($Rejected,undef,undef,undef,$Reason) = ($ThisLine =~ /^$re_MsgID: reject: body (.*); from=<([^ ]*)> to=<([^ ]*)>( proto=[^ ]* helo=<[^ ]*>)?: (.*)$/)) {
$BodyReject{$Reason}{$Rejected}++;
- } elsif ( (undef,undef,undef,$Reason) = ($ThisLine =~ /^[a-zA-Z0-9]+: to=<([^ ]*)>,( orig_to=<[^ ]*>,)? relay=([^ ]*), delay=\d+, status=undeliverable \((.*)\)$/)) {
+ } elsif ( (undef,undef,undef,$Reason) = ($ThisLine =~ /^$re_MsgID: to=<([^ ]*)>,( orig_to=<[^ ]*>,)? relay=([^ ]*), delay=\d+, status=undeliverable \((.*)\)$/)) {
$Undeliverable++;
$UndeliverableMsg{$Reason}++;
- } elsif ( (undef,undef,undef,undef) = ($ThisLine =~ /^[a-zA-Z0-9]+: to=<([^ ]*)>,( orig_to=<[^ ]*>,)? relay=([^ ]*), delay=\d+, status=deliverable \((.*)\)$/)) {
+ } elsif ( (undef,undef,undef,undef) = ($ThisLine =~ /^$re_MsgID: to=<([^ ]*)>,( orig_to=<[^ ]*>,)? relay=([^ ]*), delay=\d+, status=deliverable \((.*)\)$/)) {
$Deliverable++;
- #} elsif ( ($Host,undef) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): [0-9]+ <([^ ]*)>: Sender address rejected: Domain not found;/)) {
- # $RejectDomain{$Host}++;
- # above two lines included in generic reject sender on next condition
- } elsif ( ($Host,$Sender,$Reason) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): [0-9]+ <(.*)>: Sender address rejected: (.*);/)) {
+ } elsif ( ($Host,$Sender,$Reason) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): $re_DSN <(.*)>: Sender address rejected: (.*);/)) {
$RejectSender{$Reason}{$Host}{$Sender}++;
$RejectSenderHost{$Reason}{$Host}++;
$RejectSenderReason{$Reason}++;
- #} elsif ( ($Host) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): [0-9]+ <[^ ]*\[[^ ]*\]>: Client host rejected: Access denied;/)) {
- # $RejectClientHost{$Host}++;
- # $RejectClients++;
- # above three lines included in generic reject client on next condition
- } elsif ( ($Host,$Reason,$Sender,$Recip) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): [0-9]+ <[^ ]*\[[^ ]*\]>: Client host rejected: (.*); from=<(.*)> to=<(.*)> proto=/)) {
+ } elsif ( ($Host,$Reason,$Sender,$Recip) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): $re_DSN <[^ ]*\[[^ ]*\]>: Client host rejected: (.*); from=<(.*)> to=<(.*)> proto=/)) {
$RejectClient{$Reason}{$Host}{$Sender}{$Recip}++;
$RejectClientHost{$Reason}{$Host}++;
$RejectClientReason{$Reason}++;
- } elsif ( ($Host,$Sender,$Recip,$Helo) = ($ThisLine =~ /reject: RCPT from [^ ]*\[([^ ]*)\]: [0-9]+ Client host rejected: cannot find your hostname, \[\d+\.\d+\.\d+\.\d+\]; from=<(.*?)> to=<(.*?)> proto=\S+ helo=<(.*)>/)) {
+ } elsif ( ($Host,$Sender,$Recip,$Helo) = ($ThisLine =~ /reject: RCPT from [^ ]*\[([^ ]*)\]: $re_DSN Client host rejected: cannot find your hostname, \[\d+\.\d+\.\d+\.\d+\]; from=<(.*?)> to=<(.*?)> proto=\S+ helo=<(.*)>/)) {
$RejectUnknownClient{$Host}{$Helo}{$Sender}{$Recip}++;
$RejectUnknownClientHost{"$Host helo=<$Helo>"}++;
$RejectUnknownClients++;
- } elsif ( ($Host,$Recip,$Reason) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): [0-9]+ <(.*)>: Recipient address rejected: (.*);/)) {
+ } elsif ( ($Host,$Recip,$Reason) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): $re_DSN <(.*)>: Recipient address rejected: (.*);/)) {
$Temp = "$Host : $Reason";
$RejectRecip{$Recip}{$Temp}++;
- } elsif ( ($Host,undef) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): [0-9]+ <(.*)>: Sender address rejected: Access denied;/)) {
+ } elsif ( ($Host,undef) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): $re_DSN <(.*)>: Sender address rejected: Access denied;/)) {
$RejectAddress{$Host}++;
- } elsif ( ($Host,$Site,$Reason) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): [0-9]+ Service unavailable; (?:Client host )?\[[^ ]*\] blocked using ([^ ]*), reason: (.*);/)) {
+ } elsif ( ($Host,$Site,$Reason) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): $re_DSN Service unavailable; (?:Client host )?\[[^ ]*\] blocked using ([^ ]*), reason: (.*);/)) {
$Temp = "$Host : $Reason";
$RejectRBL{$Site}{$Temp}++;
$RejectedRBL++;
- } elsif ( ($Host,$Site) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): [0-9]+ Service unavailable; (?:Sender address |Client host )?\[[^ ]*\] blocked using ([^ ]*);/)) {
+ } elsif ( ($Host,$Site) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): $re_DSN Service unavailable; (?:Sender address |Client host )?\[[^ ]*\] blocked using ([^ ]*);/)) {
$RejectRBL{$Site}{$Host}++;
$RejectedRBL++;
} elsif ( ($Host,$Site,$Reason) = ($ThisLine =~ /warning: ([^ ]*): RBL lookup error: Name service error for \d+\.\d+\.\d+\.\d+\.([^ ]*): (.*)$/)) {
@@ -309,9 +309,9 @@
$Discarded{$Site}{$Reason}++;
} elsif ( (undef,undef,$Error) = ($ThisLine =~ /warning: ([^ ]*): hostname ([^ ]*) verification failed: (.*)$/)) {
$HostnameVerification{$Error}++;
- } elsif ( $ThisLine =~ /^[a-zA-Z0-9]+: removed\s*$/) {
+ } elsif ( $ThisLine =~ /^$re_MsgID: removed\s*$/) {
$RemovedFromQueue++;
- } elsif ( ($Host) = ($ThisLine =~ /^[a-zA-Z0-9]+: enabling PIX <CRLF>.<CRLF> workaround for ([^ ]*\[[^ ]*\])$/)) {
+ } elsif ( ($Host) = ($ThisLine =~ /^$re_MsgID: enabling PIX <CRLF>.<CRLF> workaround for ([^ ]*\[[^ ]*\])$/)) {
$PixWorkaround{$Host}++;
} elsif ( ($Message) = ($ThisLine =~ /warning: valid_hostname: (.*)$/)) {
$ValidHostname{$Message}++;
@@ -319,7 +319,7 @@
$HeloError{$Error}{$Host}++;
} elsif ( ($Host,$Error) = ($ThisLine =~ /warning: host ([^ ]*\[[^ ]*\]) (replied to HELO\/EHLO with my own hostname [^ ]*)$/)) {
$HeloError{$Error}{$Host}++;
- } elsif ( ($Host,$Error) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): \d+ <.*>: (Helo command rejected: .*);/)) {
+ } elsif ( ($Host,$Error) = ($ThisLine =~ /reject: RCPT from ([^ ]*\[[^ ]*\]): $re_DSN <.*>: (Helo command rejected: .*);/)) {
$HeloError{$Error}{$Host}++;
} elsif ( ($Error,$Host) = ($ThisLine =~ /(bad size limit "\([^ ]*\)" in EHLO reply) from ([^ ]*\[[^ ]*\])$/)) {
$HeloError{$Error}{$Host}++;
@@ -330,8 +330,8 @@
} elsif ( ($Host) = ($ThisLine =~ /warning: ([^ ]*\[[^ ]*\]): SASL .* authentication failed/)) {
$SaslAuthenticationFail{$Host}++;
} elsif (
- ($Host,$User) = ($ThisLine =~ /^[a-zA-Z0-9]+: client=([^ ]*\[[^ ]*\]), .* sasl_username=([^ ]*)$/) or
- ($Host,$User) = ($ThisLine =~ /^[a-zA-Z0-9]+: client=([^ ]*\[[^ ]*\]), sasl_sender=([^ ]*)$/)
+ ($Host,$User) = ($ThisLine =~ /^$re_MsgID: client=([^ ]*\[[^ ]*\]), .* sasl_username=([^ ]*)$/) or
+ ($Host,$User) = ($ThisLine =~ /^$re_MsgID: client=([^ ]*\[[^ ]*\]), sasl_sender=([^ ]*)$/)
) {
chomp($User);
$SaslAuth{$Host}{$User}++;
@@ -358,7 +358,7 @@
$TableChanged++;
} elsif (
($ThisLine =~ m/^fatal: [^ ]*\(\d+\): Message file too big$/) or
- ($ThisLine =~ m/^warning: [a-zA-Z0-9]+: queue file size limit exceeded$/) or
+ ($ThisLine =~ m/^warning: $re_MsgID: queue file size limit exceeded$/) or
($ThisLine =~ m/^warning: uid=\d+: File too large$/)
) {
$QueueSizeExceeded++;
@@ -370,15 +370,15 @@
$SizeLimit{"MAIL from $Server"}++;
} elsif ( (undef,$Source) = ($ThisLine =~ /^warning: database ([^ ]*) is older than source file ([a-zA-Z0-9\/]+)$/)) {
$DatabaseGeneration{$Source}++;
- } elsif ( ($Reason) = ($ThisLine =~ /^warning: [a-zA-Z0-9]+: write queue file: (.*)$/)) {
+ } elsif ( ($Reason) = ($ThisLine =~ /^warning: $re_MsgID: write queue file: (.*)$/)) {
$QueueWriteError{$Reason}++;
- } elsif ( ($Reason) = ($ThisLine =~ /^warning: open active [a-zA-Z0-9]+: (.*)$/)) {
+ } elsif ( ($Reason) = ($ThisLine =~ /^warning: open active $re_MsgID: (.*)$/)) {
$QueueWriteError{"open active: $Reason"}++;
- } elsif ( ($Reason) = ($ThisLine =~ /^warning: qmgr_active_corrupt: save corrupt file queue active id [a-zA-Z0-9]+: (.*)$/)) {
+ } elsif ( ($Reason) = ($ThisLine =~ /^warning: qmgr_active_corrupt: save corrupt file queue active id $re_MsgID: (.*)$/)) {
$QueueWriteError{"active corrupt: $Reason"}++;
- } elsif ( ($Reason) = ($ThisLine =~ /^warning: qmgr_active_done_3_generic: remove [a-zA-Z0-9]+ from active: (.*)$/)) {
+ } elsif ( ($Reason) = ($ThisLine =~ /^warning: qmgr_active_done_3_generic: remove $re_MsgID: (.*)$/)) {
$QueueWriteError{"remove active: $Reason"}++;
- } elsif ( ($Reason) = ($ThisLine =~ /^warning: [^ ]*\/[a-zA-Z0-9]+: (Error writing message file)$/)) {
+ } elsif ( ($Reason) = ($ThisLine =~ /^warning: [^ ]*\/$re_MsgID: (Error writing message file)$/)) {
$MessageWriteError{$Reason}++;
} elsif ( $ThisLine =~ /reject: RCPT from [^ ]*\[[^ ]*\]: \d+ Insufficient system storage; from=<.*> to=<.*>/) {
$NoFreeSpace++;
@@ -520,7 +520,7 @@
}
if (($Detail >=5) and (keys %SentBy)) {
- print "\n\nTop ten senders:\n";
+ print "\n\nTop ten local senders:\n";
foreach $ThisSender (sort {$a cmp $b} keys %SentBy) {
$ThisNumber = $SentBy{$ThisSender};
push(@{$ThisIsNumber{$ThisNumber}}, $ThisSender);
logwatch-7.3.1-postfix2.patch:
postfix | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE logwatch-7.3.1-postfix2.patch ---
--- logwatch-7.3.1/scripts/services/postfix.pom 2006-08-13 23:25:55.000000000 +0200
+++ logwatch-7.3.1/scripts/services/postfix 2006-11-29 10:48:38.000000000 +0100
@@ -214,6 +214,7 @@
or ( $ThisLine =~ m/certificate verification failed for/o ) # Perhaps a candidate for extended statistics
or ( $ThisLine =~ m/Server certificate could not be verified/o ) # Perhaps a candidate for extended statistics
or ( $ThisLine =~ m/certificate peer name verification failed/o ) # Perhaps a candidate for extended statistics
+ or ( $ThisLine =~ m/sender non-delivery notification:/o ) # Perhaps a candidate for extended statistics
) {
# We don't care about these
} elsif ( ($Bytes) = ($ThisLine =~ /^$re_MsgID: from=.*size=(\d+).*$/) ) {
logwatch-7.3.1-vsftpd.patch:
logwatch.pl | 7 ++++++-
shared/applyvsftpddate | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
--- NEW FILE logwatch-7.3.1-vsftpd.patch ---
--- logwatch-7.3.1/scripts/logwatch.pl.pom 2006-09-16 06:04:14.000000000 +0200
+++ logwatch-7.3.1/scripts/logwatch.pl 2006-11-29 13:16:22.000000000 +0100
@@ -917,11 +917,16 @@
my $FilterText = " ";
foreach (sort keys %{$LogFileData{$LogFile}}) {
my $cmd = $_;
+
if ($cmd =~ s/^\d+-\*//) {
if (-f "$ConfigDir/scripts/shared/$cmd") {
$FilterText .= ("| $PerlVersion $ConfigDir/scripts/shared/$cmd '$LogFileData{$LogFile}{$_}'" );
} elsif (-f "$BaseDir/scripts/shared/$cmd") {
- $FilterText .= ("| $PerlVersion $BaseDir/scripts/shared/$cmd '$LogFileData{$LogFile}{$_}'" );
+ if ($LogFile =~ /^vsftpd$/ ) {
+ $FilterText .= ("| $PerlVersion $BaseDir/scripts/shared/applyvsftpddate '$LogFileData{$LogFile}{$_}'" );
+ } else {
+ $FilterText .= ("| $PerlVersion $BaseDir/scripts/shared/$cmd '$LogFileData{$LogFile}{$_}'" );
+ }
} else {
die "Cannot find shared script $cmd\n";
}
--- logwatch-7.3.1/scripts/shared/applyvsftpddate.pom 2006-11-29 13:13:28.000000000 +0100
+++ logwatch-7.3.1/scripts/shared/applyvsftpddate 2006-11-29 13:10:26.000000000 +0100
@@ -0,0 +1,34 @@
+##########################################################################
+# $Id: applystddate,v 1.18 2005/10/22 00:19:56 bjorn Exp $
+##########################################################################
+
+########################################################
+# This was written and is maintained by:
+# Kirk Bauer <kirk at kaybee.org>
+#
+# Please send all comments, suggestions, bug reports,
+# etc, to logwatch-devel at logwatch.org
+########################################################
+
+use Logwatch ':dates';
+
+my $Debug = $ENV{'LOGWATCH_DEBUG'} || 0;
+
+$SearchDate = TimeFilter('%b %e %H:%M:%S 20%y');
+
+# The date might be "Dec 09", but it needs to be "Dec 9"...
+#$SearchDate =~ s/ 0/ /;
+# The format of Fri Nov 29 20:59:09 2005
+
+if ( $Debug > 5 ) {
+ print STDERR "DEBUG: Inside ApplyStdDate...\n";
+ print STDERR "DEBUG: Looking For: " . $SearchDate . "\n";
+}
+
+while (defined($ThisLine = <STDIN>)) {
+ if ($ThisLine =~ m/(Mon|Tue|Wed|Thu|Fri|Sat|Sun) $SearchDate/o) {
+ print "$ThisLine";
+ }
+}
+
+# vi: shiftwidth=3 syntax=perl tabstop=3 et
Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/FC-6/logwatch.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- logwatch.spec 16 Nov 2006 08:51:59 -0000 1.44
+++ logwatch.spec 20 Dec 2006 08:30:57 -0000 1.45
@@ -1,7 +1,7 @@
Summary: A log file analysis program.
Name: logwatch
Version: 7.3
-Release: 6%{?dist}
+Release: 7%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
@@ -24,6 +24,9 @@
Patch17: logwatch-7.3-named2.patch
Patch18: logwatch-7.3-init.patch
Patch19: logwatch-7.3-sshd2.patch
+Patch20: logwatch-7.3-postfix.patch
+Patch21: logwatch-7.3.1-postfix2.patch
+Patch22: logwatch-7.3.1-vsftpd.patch
Requires: textutils sh-utils grep mailx
@@ -56,6 +59,9 @@
%patch17 -p1
%patch18 -p1
%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
%install
@@ -157,6 +163,11 @@
%doc License project/CHANGES project/TODO
%changelog
+* Wed Dec 20 2006 Ivana Varekova <varekova at redhat.com> 7.3-7
+- added postfix patch - fixes #217411
+- added postfix2 patch - fixes #208909
+- added vsftpd patch - fixes #217226
+
* Thu Nov 16 2006 Ivana Varekova <varekova at redhat.com> 7.3-6
- added named, pam_unix, secure, smart, automount,
audit, init and sshd patches
- Previous message (by thread): rpms/tomboy/devel tomboy-0.5.2-wrapper.patch, NONE, 1.1 tomboy.spec, 1.30, 1.31
- Next message (by thread): rpms/logwatch/devel logwatch-7.3.1-amavis.patch, NONE, 1.1 logwatch-7.3.1-dovecot.patch, NONE, 1.1 logwatch-7.3.1-init.patch, NONE, 1.1 logwatch.spec, 1.50, 1.51
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list