rpms/logwatch/F-9 logwatch-7.3.6-postfix2.patch, NONE, 1.1 logwatch.spec, 1.91, 1.92
Ivana Varekova
varekova at fedoraproject.org
Mon Sep 15 12:02:56 UTC 2008
Author: varekova
Update of /cvs/pkgs/rpms/logwatch/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5763
Modified Files:
logwatch.spec
Added Files:
logwatch-7.3.6-postfix2.patch
Log Message:
- fix postfix script problem
(#462174)
logwatch-7.3.6-postfix2.patch:
--- NEW FILE logwatch-7.3.6-postfix2.patch ---
diff -up logwatch-7.3.6/scripts/services/postfix.pom logwatch-7.3.6/scripts/services/postfix
--- logwatch-7.3.6/scripts/services/postfix.pom 2008-09-15 12:15:12.000000000 +0200
+++ logwatch-7.3.6/scripts/services/postfix 2008-09-15 13:26:55.000000000 +0200
@@ -1530,8 +1530,9 @@ while ( <> ) {
# end of $re_QID section
# see also ConnectionLost in $re_QID section
- elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) from ([^[]*)\[($re_IP|unknown)\]$/o )) {
+ elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP|unknown)\]$/o )) {
unless ($hostip =~ /unknown/) {
+ #TD lost connection after DATA (0 bytes) from mail.example.com[192.168.0.1]
#TD lost connection after CONNECT from mail.example.com[192.168.0.1]
$Totals{'ConnectionLost'}++;
$Counts{'ConnectionLost'}{"\u$reason"}{formathost($hostip,$host)}++;
@@ -1570,7 +1571,8 @@ while ( <> ) {
}
# see also TimeoutInbound in $re_QID section
- elsif ( ($reason,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) from ([^[]*)\[($re_IP)\]$/o)) {
+ elsif ( ($reason,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP)\]$/o)) {
+ #TD timeout after DATA (0 bytes) from unknown[85.102.182.31]
#TD timeout after RSET from example.com[192.168.0.1]
$Totals{'TimeoutInbound'}++;
$Counts{'TimeoutInbound'}{"\u$reason"}{formathost($hostip,$host)}++;
@@ -1593,7 +1595,8 @@ while ( <> ) {
### smtpd_tls_loglevel >= 1
# Server TLS messages
- elsif ( ($status,$host,$hostip,$type) = ($p1 =~ /^(?:(Trusted|Untrusted) )?TLS connection established from ([^[]+)\[($re_IP)\]: (.*)$/o )) {
+ elsif ( ($status,$host,$hostip,$type) = ($p1 =~ /^(?:(Trusted|Untrusted|Anonymous) )?TLS connection established from ([^[]+)\[($re_IP)\]: (.*)$/o )) {
+ #DT Anonymous TLS connection established from fractal.kaosol.net[216.150.215.72]: TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)
#TD TLS connection established from example.com[192.168.0.1]: TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)
# Postfix 2.5+: status: Untrusted or Trusted
#TD Untrusted TLS connection established from example.com[192.168.0.1]: TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)
@@ -1625,6 +1628,11 @@ while ( <> ) {
$Totals{'TlsUnverified'}++;
$Counts{'TlsUnverified'}{$cert}++;
+ } elsif ( ($cert) = ($p1 =~ /: Untrusted: (subject_CN=.*)/)) {
+ #TD Untrusted: subject_CN=EXAMPLE-MAIL, issuer=EXAMPLE-MAIL,
+ $Totals{'TlsUnverified'}++;
+ $Counts{'TlsUnverified'}{$cert}++;
+
} elsif ( ($p1 =~ m/(lookup )?table ([^ ]+ )?has changed -- (restarting|exiting)$/)) {
#TD table hash:/etc/postfix/helo_checks has changed -- restarting
$Totals{'TableChanged'}++;
Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-9/logwatch.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- logwatch.spec 10 Jun 2008 12:19:38 -0000 1.91
+++ logwatch.spec 15 Sep 2008 12:02:22 -0000 1.92
@@ -1,7 +1,7 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.3.6
-Release: 22%{?dist}
+Release: 23%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
@@ -39,6 +39,7 @@
Patch34: logwatch-7.3.6-dovecot_back.patch
Patch35: logwatch-7.3.6-audit2.patch
Patch36: logwatch-7.3.6-openvpn2.patch
+Patch37: logwatch-7.3.6-postfix2.patch
Requires: textutils sh-utils grep mailx
Requires: perl(Date::Manip)
@@ -86,6 +87,7 @@
%patch34 -p1
%patch35 -p1
%patch36 -p1
+%patch37 -p1
rm -f scripts/services/*.orig
%build
@@ -199,6 +201,10 @@
%doc License project/CHANGES
%changelog
+* Mon Sep 15 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-23
+- fix postfix script problem
+ (#462174)
+
* Tue Jun 10 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-22
- Resolves: #450494
MailTo configuration parameter is ignored
More information about the fedora-extras-commits
mailing list