From 11079669c974ec8581ea370e7212de88506b5c4e Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Fri, 13 Apr 2007 13:48:56 +0000
Subject: [PATCH] - remove another xntpd service logs - add sshd logs with two
 spaces after the date tag

---
 logwatch-7.3.4-sshd.patch   | 11 +++++++++++
 logwatch-7.3.4-xntpd2.patch | 11 +++++++++++
 logwatch.spec               | 10 +++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 logwatch-7.3.4-sshd.patch
 create mode 100644 logwatch-7.3.4-xntpd2.patch

diff --git a/logwatch-7.3.4-sshd.patch b/logwatch-7.3.4-sshd.patch
new file mode 100644
index 0000000..4b2b740
--- /dev/null
+++ b/logwatch-7.3.4-sshd.patch
@@ -0,0 +1,11 @@
+--- 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) {
diff --git a/logwatch-7.3.4-xntpd2.patch b/logwatch-7.3.4-xntpd2.patch
new file mode 100644
index 0000000..409f65e
--- /dev/null
+++ b/logwatch-7.3.4-xntpd2.patch
@@ -0,0 +1,11 @@
+--- 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
diff --git a/logwatch.spec b/logwatch.spec
index 653d49c..0c84920 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -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 @@ Patch2: logwatch-7.3.1-vsftpd.patch
 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 @@ of the package on many systems.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 
@@ -142,6 +146,10 @@ rm -rf %{buildroot}
 %doc License project/CHANGES 
 
 %changelog
+* Fri Apr 13 2007 Ivana Varekova <varekova@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@redhat.com> 7.3.4-5
 - logwatch will ignore more useless secure logs