[logwatch/f14/master] Second round of patches from Bugzilla

[Karel Klíč]

commit cfe0a1731d887bf7a4b80243736eef68214d4aa5
Author: Karel Klic <kklic at redhat.com>
Date:   Tue Jan 18 17:02:36 2011 +0100

    Second round of patches from Bugzilla

 logwatch-7.3.6-automount.patch |   11 +++++++++++
 logwatch-7.3.6-pam_unix5.patch |   11 +++++++++++
 logwatch-7.3.6-xntpd2.patch    |    3 +--
 logwatch.spec                  |    6 ++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/logwatch-7.3.6-automount.patch b/logwatch-7.3.6-automount.patch
new file mode 100644
index 0000000..e28f21d
--- /dev/null
+++ b/logwatch-7.3.6-automount.patch
@@ -0,0 +1,11 @@
+--- logwatch/scripts/services/automount	2010-10-10 04:06:00.000000000 +1100
++++ logwatch/scripts/services/automount	2011-01-01 13:48:22.000000000 +1100
+@@ -19,7 +19,7 @@
+          ($ThisLine =~ /^expired .*$/) or
+          ($ThisLine =~ /^lookup\(ldap\): got answer, but no first entry for /) or
+          ($ThisLine =~ /^>>.*mount: .*$/) or
+-         ($ThisLine =~ /lookup_read_master: lookup\(nisplus\): couldn't locat nis\+ table auto.master/) or
++         ($ThisLine =~ /lookup_read_master: lookup\(nisplus\): couldn't locate? nis\+ table auto.master/) or
+          ($ThisLine =~ /create_(tcp|udp)_client: hostname lookup failed: (No such process|Operation not permitted)/) or 
+          ($ThisLine =~ /lookup_mount: exports lookup failed for .*directory/) or
+          ($ThisLine =~ /master_do_mount: failed to startup mount/)
diff --git a/logwatch-7.3.6-pam_unix5.patch b/logwatch-7.3.6-pam_unix5.patch
new file mode 100644
index 0000000..a358c00
--- /dev/null
+++ b/logwatch-7.3.6-pam_unix5.patch
@@ -0,0 +1,11 @@
+--- logwatch/scripts/services/pam_unix	2010-10-10 04:06:00.000000000 +1100
++++ logwatch/scripts/services/pam_unix	2011-01-01 15:55:18.000000000 +1100
+@@ -178,7 +178,7 @@
+       if ($line =~ s/^password changed for (.+)/$1/) {
+          ($Detail >= 5) && $data{$service}{'Password changed'}{$line}++;
+       }
+-   } elsif ($service eq 'gdm') {
++   } elsif (($service eq 'gdm') || ($service eq 'gdm-password')) {
+       if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) {
+          ($Detail >= 5) && $data{$service}{'Sessions Opened'}{$line}++;
+       } elsif ($line =~ s/auth could not identify password for \[(.*)\]/$1/) {
diff --git a/logwatch-7.3.6-xntpd2.patch b/logwatch-7.3.6-xntpd2.patch
index 540150d..980673c 100644
--- a/logwatch-7.3.6-xntpd2.patch
+++ b/logwatch-7.3.6-xntpd2.patch
@@ -1,6 +1,6 @@
 --- logwatch/scripts/services/xntpd	2010-10-10 04:06:00.000000000 +1100
 +++ logwatch/scripts/services/xntpd	2010-12-31 17:11:33.000000000 +1100
-@@ -108,12 +108,15 @@ 
+@@ -108,12 +108,14 @@ 
          ($ThisLine =~ m/kernel time sync (dis|en)abled /) or # startup
          ($ThisLine =~ m/frequency initialized/) or # startup
          ($ThisLine =~ m/using kernel phase-lock loop/) or # startup
@@ -11,7 +11,6 @@
          ($ThisLine =~ /Invalid argument/) or
          ($ThisLine =~ /Listening on interface .* Disabled/) or
 -        ($ThisLine =~ /Listening on interface .* Enabled/)
-+        ($ThisLine =~ /Listening on interface .* Enabled/) or
 +        ($ThisLine =~ /Listen and drop on /) or
 +        ($ThisLine =~ /Listening on routing socket on/)
      ) {
diff --git a/logwatch.spec b/logwatch.spec
index 07192d5..33c467d 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -152,6 +152,8 @@ Patch78: logwatch-7.3.6-dovecot4.patch
 Patch79: logwatch-7.3.6-smartd2.patch
 Patch80: logwatch-7.3.6-dhcpd3.patch
 Patch81: logwatch-7.3.6-xntpd2.patch
+Patch82: logwatch-7.3.6-pam_unix5.patch
+Patch83: logwatch-7.3.6-automount.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildArchitectures: noarch
@@ -234,6 +236,8 @@ of the package on many systems.
 %patch79 -p1
 %patch80 -p1
 %patch81 -p1
+%patch82 -p1
+%patch83 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -358,6 +362,8 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
 - Added -smartd2 patch (#666382)
 - Added -dhcpd3 patch (#666393)
 - Added -xntpd2 patch (#666498)
+- Added -pam_unix5.patch (#666586)
+- Added -automount.patch (#666582)
 
 * Sat Oct  9 2010 Richard Fearn <richardfearn at gmail.com> 7.3.6-58
 - named: match "DNS format error", and variants of existing messages