rpms/logwatch/F-10 logwatch-7.3.6-removeservice.patch, NONE, 1.1 logwatch.spec, 1.104, 1.105

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6489

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-removeservice.patch 
Log Message:
- fix removeservice script - to decrease the number of 
  perl instances running simultaneously


logwatch-7.3.6-removeservice.patch:

--- NEW FILE logwatch-7.3.6-removeservice.patch ---
diff -up logwatch-7.3.6/conf/logfiles/messages.conf.pom logwatch-7.3.6/conf/logfiles/messages.conf
--- logwatch-7.3.6/conf/logfiles/messages.conf.pom	2009-06-15 10:59:52.000000000 +0200
+++ logwatch-7.3.6/conf/logfiles/messages.conf	2009-06-15 11:03:48.000000000 +0200
@@ -25,13 +25,7 @@ Archive = archiv/messages-*
 *ExpandRepeats
 
 # Now, lets remove the services we don't care about at all...
-*RemoveService = talkd
-*RemoveService = telnetd
-*RemoveService = inetd
-*RemoveService = nfsd
-*RemoveService = /sbin/mingetty
-*RemoveService = netscreen
-*RemoveService = NetScreen
+*RemoveService = talkd,telnetd,inetd,nfsd,/sbin/mingetty,netscreen,NetScreen
 
 # Keep only the lines in the proper date range...
 *OnlyHost
diff -up logwatch-7.3.6/conf/logfiles/syslog.conf.pom logwatch-7.3.6/conf/logfiles/syslog.conf
--- logwatch-7.3.6/conf/logfiles/syslog.conf.pom	2009-06-15 10:59:52.000000000 +0200
+++ logwatch-7.3.6/conf/logfiles/syslog.conf	2009-06-15 11:04:23.000000000 +0200
@@ -16,11 +16,7 @@ LogFile = syslog.0
 Archive = syslog.*.gz
 Archive = syslog-*.gz
 *ExpandRepeats
-*RemoveService = talkd
-*RemoveService = telnetd
-*RemoveService = inetd
-*RemoveService = nfsd
-*RemoveService = /sbin/mingetty
+*RemoveService = talkd,telnetd,inetd,nfsd,/sbin/mingetty
 *OnlyHost
 *ApplyStdDate
 
diff -up logwatch-7.3.6/scripts/shared/removeservice.pom logwatch-7.3.6/scripts/shared/removeservice
--- logwatch-7.3.6/scripts/shared/removeservice.pom	2005-02-24 18:08:05.000000000 +0100
+++ logwatch-7.3.6/scripts/shared/removeservice	2009-06-15 11:02:51.000000000 +0200
@@ -24,10 +24,13 @@ if ( $ENV{'LOGWATCH_DEBUG'} > 5 ) {
 
 $ServiceName = $ARGV[0];
 
+#Change commas to pipes -mgt
+$ServiceName =~ s/,/|/g;
+
 while (defined($ThisLine = <STDIN>)) {
    $linesin++;
-   unless ( ($ThisLine =~ m/^... .. ..:..:.. [^ ]* $ServiceName\[[0123456789]*\]: /oi) or
-         ($ThisLine =~ m/^... .. ..:..:.. [^ ]* $ServiceName: /oi) ) {
+   unless ( ($ThisLine =~ m/^... .. ..:..:.. [^ ]* ($ServiceName)\[[0123456789]*\]: /oi) or
+            ($ThisLine =~ m/^... .. ..:..:.. [^ ]* (:\s*)?($ServiceName)\s*: /oi) ) {
       $linesout++;
       print $ThisLine;
    }


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-10/logwatch.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- logwatch.spec	16 Mar 2009 08:37:23 -0000	1.104
+++ logwatch.spec	15 Jun 2009 09:23:39 -0000	1.105
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 35%{?dist}
+Release: 36%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -51,6 +51,7 @@ Patch47: logwatch-7.3.6-dovecot.patch
 Patch48: logwatch-7.3.6-named4.patch
 Patch49: logwatch-7.3.6-openvpn3.patch
 Patch50: logwatch-7.3.6-zz-disk_space2.patch
+Patch51: logwatch-7.3.6-removeservice.patch
 
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@@ -110,6 +111,7 @@ of the package on many systems.
 %patch48 -p1
 %patch49 -p1
 %patch50 -p1
+%patch51 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -221,6 +223,10 @@ rm -rf %{buildroot}
 %doc License project/CHANGES 
 
 %changelog
+* Mon Jun 15 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-36
+- fix removeservice script - to decrease the number of
+  perl instances running simultaneously
+
 * Mon Mar 16 2009 Ivana Varekova <varekova at redhat.com> 7.3.6-35
 - fix zz-disk_space script (#486407)