rpms/logwatch/devel logwatch-7.3.4-sshd.patch, NONE, 1.1 logwatch-7.3.4-xntpd2.patch, NONE, 1.1 logwatch.spec, 1.66, 1.67

[fedora-cvs-commits at redhat.com]

Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.4-sshd.patch logwatch-7.3.4-xntpd2.patch 
Log Message:
- remove another xntpd service logs
- add sshd logs with two spaces after the date tag


logwatch-7.3.4-sshd.patch:
 onlyservice |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.4-sshd.patch ---
--- logwatch-7.3.4/scripts/shared/onlyservice.pom	2005-12-01 00:52:27.000000000 +0100
+++ logwatch-7.3.4/scripts/shared/onlyservice	2007-04-13 15:15:15.000000000 +0200
@@ -20,7 +20,7 @@
 }
 
 while (defined($ThisLine = <STDIN>)) {
-    if ($ThisLine =~ m/^... .. ..:..:.. [^ ]* $ServiceName\[[0123456789]*\]: /io) {
+    if ($ThisLine =~ m/^... .. ..:..:..[ ]*[^ ]* $ServiceName\[[0123456789]*\]: /io) {
       print $ThisLine;
     }
     elsif ($ThisLine =~ m/^... .. ..:..:.. [^ ]* [^ ]*\[[0123456789]*\]: \[ID [0-9]+ $ServiceName/io) {

logwatch-7.3.4-xntpd2.patch:
 xntpd |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.4-xntpd2.patch ---
--- logwatch-7.3.4/scripts/services/xntpd.pom	2007-04-13 15:22:15.000000000 +0200
+++ logwatch-7.3.4/scripts/services/xntpd	2007-04-13 15:38:30.000000000 +0200
@@ -106,7 +106,7 @@
         ($ThisLine =~ m/signal_no_reset: signal \d+ had flags \d+/) or
         ($ThisLine =~ /Deleting interface \#[0-9] [^,]*, [^,]*, interface stats: received=.*, sent=.*, dropped=.*, active_time=.* secs/) or
         ($ThisLine =~ /Invalid argument/) or 
-        ($ThisLine =~ /Listening on interface #[0-9]* (vmnet[0-9]|eth[0-9]|lo), [0-9a-z:.]+\#[0-9]* Enabled/) or
+        ($ThisLine =~ /Listening on interface #[0-9]* (vmnet[0-9]|eth[0-9]|lo|tun[0-9]), [0-9a-z:.]+\#[a-z0-9]* Enabled/) or
         ($ThisLine =~ /Listening on interface #[0-9]* wildcard, [0-9a-z:.]+\#[0-9]* Disabled/)
     ) {
        # Ignore these


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- logwatch.spec	10 Apr 2007 10:49:04 -0000	1.66
+++ logwatch.spec	13 Apr 2007 13:48:56 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -11,6 +11,8 @@
 Patch3: logwatch-7.3.4-pam_unix.patch
 Patch4: logwatch-7.3.4-secure.patch
 Patch5: logwatch-7.3.4-xntpd.patch
+Patch6: logwatch-7.3.4-sshd.patch
+Patch7: logwatch-7.3.4-xntpd2.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +31,8 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 
@@ -142,6 +146,10 @@
 %doc License project/CHANGES 
 
 %changelog
+* Fri Apr 13 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-6
+- remove another xntpd service logs
+- add sshd logs with two spaces after the date tag
+
 * Tue Apr 10 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-5
 - logwatch will ignore more useless secure logs