rpms/logwatch/devel logwatch-7.3.1-named.patch, NONE, 1.1 logwatch-7.3.1-sendmail2.patch, NONE, 1.1 logwatch.spec, 1.46, 1.47

[fedora-cvs-commits at redhat.com]

Author: varekova

Update of /cvs/dist/rpms/logwatch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6344

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.1-named.patch logwatch-7.3.1-sendmail2.patch 
Log Message:
- fix #209405 - another sendmail service problem
- fix #212812 - add service script patch
    patch created by Russell Coker



logwatch-7.3.1-named.patch:
 named |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.1-named.patch ---
--- logwatch-7.3.1/scripts/services/named.pom	2006-09-15 17:40:58.000000000 +0200
+++ logwatch-7.3.1/scripts/services/named	2006-10-30 13:28:34.000000000 +0100
@@ -137,7 +137,9 @@
       # file syntax error get reported twice and are already caught below
       ($ThisLine =~ /loading master file/) or
       ($ThisLine =~ /^ succeeded$/) or
-      ($ThisLine =~ /\*\*\* POKED TIMER \*\*\*/)
+      ($ThisLine =~ /\*\*\* POKED TIMER \*\*\*/) or
+      # The message about the end of transfer is the interesting one
+      ($ThisLine =~ /: Transfer started./) or
    ) {
       # Don't care about these...
    } elsif (

logwatch-7.3.1-sendmail2.patch:
 sendmail |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE logwatch-7.3.1-sendmail2.patch ---
--- logwatch-7.3.1/scripts/services/sendmail.pom	2006-10-30 12:33:16.000000000 +0100
+++ logwatch-7.3.1/scripts/services/sendmail	2006-10-30 13:22:56.000000000 +0100
@@ -394,6 +394,7 @@
       ( $ThisLine =~ /^--- 550 5(\.[0-9]){2} .*\.\.\. User unknown/ ) or
       ( $ThisLine =~ /to=([^,]*), relay=([^,]*), delay=([^,]*), delays=([^,]*), dsn=([^,]*), status=undeliverable \(unknown user: "([^.]*)"\)/) or
       ( $ThisLine =~ /to=([^,]*), orig_to=([^,]*), relay=([^,]*), delay=([^,]*), delays=([^,]*), dsn=([^,]*), status=undeliverable \(Host or domain name not found./) or
+      ( $ThisLine =~ /to=[^,]*, relay=[^,]*, delay=[^,]*, delays=[^,]*, dsn=[^,]*, status=deliverable \(aliased to [^.]*\)/) or
       # Relaying denied detected later by ruleset=check_rcpt
       ( $ThisLine =~ /^--- 550 5(\.[0-9]){2} .*\.\.\. Relaying denied/ ) or
       # Access denied detected later by ruleset=check_relay


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- logwatch.spec	23 Oct 2006 13:51:41 -0000	1.46
+++ logwatch.spec	30 Oct 2006 13:15:58 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 7.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -11,6 +11,8 @@
 Patch9: logwatch-7.3.1-yum.patch
 Patch10: logwatch-7.3.1-automount.patch
 Patch11: logwatch-7.3.1-sendmail.patch
+Patch12: logwatch-7.3.1-sendmail2.patch
+Patch13: logwatch-7.3.1-named.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -29,6 +31,8 @@
 %patch9 -p1 
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %install
 
@@ -133,6 +137,11 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Mon Oct 30 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-4
+- fix #209405 - another sendmail service problem
+- fix #212812 - add service script patch 
+    patch created by Russell Coker
+
 * Mon Oct 23 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-3
 - fix #209405 - sendmail service problems