rpms/logwatch/devel logwatch-7.3.6-clamav-milter.patch, NONE, 1.1 logwatch.spec, 1.79, 1.80

[Ivana Varekova (varekova)]

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19367

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-clamav-milter.patch 
Log Message:
- Resolves: #361921 - fix clamav-milter service


logwatch-7.3.6-clamav-milter.patch:

--- NEW FILE logwatch-7.3.6-clamav-milter.patch ---
diff -up logwatch-7.3.6/scripts/services/clamav-milter.pom logwatch-7.3.6/scripts/services/clamav-milter
--- logwatch-7.3.6/scripts/services/clamav-milter.pom	2006-12-15 05:58:30.000000000 +0100
+++ logwatch-7.3.6/scripts/services/clamav-milter	2007-11-06 15:02:42.000000000 +0100
@@ -16,7 +16,9 @@ while (defined($ThisLine = <STDIN>)) {
        ( $ThisLine =~ /^clamav-milter (startup|shutdown) succeeded$/ ) or
        ( $ThisLine =~ /^Quarantined infected mail as/ ) or 
        ( $ThisLine =~ /^File quarantined as/ ) or
-       ( $ThisLine =~ /^ClamAv: mi_stop/ )) {
+       ( $ThisLine =~ /^ClamAv: mi_stop/ ) or
+       ( $ThisLine =~ m#^\/tmp\/clamav-.* .* FOUND# )) {
+       
        # We do not care about these.
    } elsif (($ThisLine =~ /clean message from/)) {
       $CleanMessage++;


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- logwatch.spec	30 Oct 2007 13:18:14 -0000	1.79
+++ logwatch.spec	6 Nov 2007 14:18:57 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -26,6 +26,7 @@
 Patch20: logwatch-7.3.6-secure1.patch
 Patch21: logwatch-7.3.6-sudo.patch
 Patch22: logwatch-7.3.6-sshd1.patch
+Patch23: logwatch-7.3.6-clamav-milter.patch
 
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@@ -60,6 +61,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %build
 
@@ -172,6 +174,10 @@
 %doc License project/CHANGES 
 
 %changelog
+* Tue Nov  6 2007 Ivana Varekova <varekova at redhat.com> 7.3.6-11
+- Resolves: #361921
+  fix clamav-milter service
+
 * Tue Oct 30 2007 Ivana Varekova <varekova at redhat.com> 7.3.6-10
 - add perl requirement (#356481)