rpms/logwatch/FC-4 logwatch-7.0-man_page.patch, NONE, 1.1 logwatch-7.0-named.patch, NONE, 1.1 logwatch-7.0-smartd2.patch, NONE, 1.1 logwatch.spec, 1.20, 1.21

Fri Jan 20 09:56:39 UTC 2006

Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.0-man_page.patch logwatch-7.0-named.patch 
	logwatch-7.0-smartd2.patch 
Log Message:
- fix bug 172073 (man page problem)
- fix bug 171631 (named service problem)
- fix smartd service


logwatch-7.0-man_page.patch:
 logwatch.8 |  106 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 53 insertions(+), 53 deletions(-)

--- NEW FILE logwatch-7.0-man_page.patch ---
--- logwatch-7.0/logwatch.8.pom	2005-05-04 21:21:37.000000000 +0200
+++ logwatch-7.0/logwatch.8	2005-11-12 19:35:49.000000000 +0100
@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH LOGWATCH 8 "MARCH 1998" Linux "User Manuals"
+.TH LOGWATCH 8 "October 2005" Linux "User Manuals"
 .SH NAME
 logwatch \- system log analyzer and reporter
 .SH SYNOPSIS
@@ -23,26 +23,29 @@
 .I directory
 .B ] [--hostname
 .I hostname
-.B ] [--numeric] [--help|--usage]
+.B ] [--splithosts] [--multiemail] [--output
+.I output-type
+.B ] [--numeric] [--version] [--help|--usage]
 .SH DESCRIPTION
 .B LogWatch
 is a customizable, pluggable log-monitoring system.  It will go
 through your logs for a given period of time and make a report in the areas
-that you wish with the detail that you wish.  Easy to use - works right out
-of the package on almost all systems.
+that you wish with the detail that you wish.  Logwatch is being used for
+Linux and many types of UNIX.
 .SH OPTIONS
-.IP "--detail level"
+.IP "\fB--detail\fR level"
 This is the detail level of the report.
 .I level
-can be high, med, low.
-.IP "--logfile log-file-group"
+can be a positive integer, or high, med, low, which correspond to the
+integers 10, 5, and 0, repectively.
+.IP "\fB--logfile\fR log-file-group"
 This will force LogWatch to process only the set of logfiles
 defined by
 .I log-file-group
 (i.e. messages, xferlog, ...).  LogWatch will therefore process
 all services that use those logfiles.  This option can be specified
 more than once to specify multiple logfile-groups.
-.IP "--service service-name"
+.IP "\fB--service\fR service-name"
 This will force LogWatch to process only the service specified in
 .I service-name
 (i.e. login, pam, identd, ...).  LogWatch will therefore also process
@@ -54,12 +57,12 @@
 .I All
 which will process all services (and logfile-groups) for which you have
 filters installed.
-.IP --print
+.IP "\fB--print\fR"
 Print the results to stdout (i.e. the screen).
-.IP "--mailto address"
+.IP "\fB--mailto\fR address"
 Mail the results to the email address or user specified in
 .I address.
-.IP "--range range"
+.IP "\fB--range\fR range"
 You can specify a date-range to process. Common ranges are  
 .I Yesterday, Today, All,
 and
@@ -67,70 +70,50 @@
 Additional options are listed when invoked with the
 .I Help
 parameter.
-.IP --archives
+.IP "\fB--archives\fR"
 Each log-file-group has basic logfiles (i.e. /var/log/messages) as
 well as archives (i.e. /var/log/messages.? or /var/log/messages.?.gz).
 When used with "--range all", this option will make LogWatch search
 through the archives in addition to the regular logfiles.  For other
 values of --range, LogWatch will search the appropriate archived logs.
-.IP "--debug level"
+.IP "\fB--debug\fR level"
 For debugging purposes.
 .I level
 can range from 0 to 100.  This will
 .I really
 clutter up your output.  You probably don't want to use this.
-.IP "--save file-name"
+.IP "\fB--save\fR file-name"
 Save the output to
 .I file-name
 instead of displaying or mailing it.
-.IP "--logdir directory"
+.IP "\fB--logdir\fR directory"
 Look in
 .I directory
 for log files instead of the default directory.
-.IP "--hostname hostname"
+.IP "\fB--hostname\fR hostname"
 Use
 .I hostname
 for the reports instead of this system's hostname.  In addition,
-if HostLimit is set in 
-.I /etc/log.d/logwatch.conf,
+if HostLimit is set in the logwatch.conf configuration file (see
+\fBMORE INFORMATION\fR, below),
 then only logs from this hostname will be processed (where appropriate).
-.IP "--numeric"
+.IP "\fB--numeric\fR"
 Inhibits additional name lookups, displaying IP addresses numerically.
-.IP --usage
+.IP "\fB--usage\fR"
 Displays usage information
-.IP --help
+.IP "\fB--help\fR"
 same as --usage.
 .SH FILES
-.I /etc/log.d/logwatch.conf
+.IP /usr/share/logwatch/
 .RS
-Really a symlink to /etc/log.d/conf/logwatch.conf.
-This file sets the default values of all the above 
-options.  These defaults are used when LogWatch is
-called without any parameters (i.e. from cron.daily).
-The file is well-documented, but the explanations above
-also apply to this config file.
+This directory contains all the perl executables and
+configuration files shipped with the logwatch distribution.
 .RE
-.I /etc/log.d/conf/services/*
+.IP /etc/logwatch
 .RS
-Configuration files for the various services whose log
-entries LogWatch can process.
-.RE
-.I /etc/log.d/conf/logfiles/*
-.RS
-Configuration files for the various logfiles that the
-above service's log entries are stored in.
-.RE
-.I /etc/log.d/scripts/shared/*
-.RS
-Filters common to many services and/or logfiles.
-.RE
-.I /etc/log.d/scripts/logfiles/*
-.RS
-Filters specific to just particular logfiles.
-.RE
-.I /etc/log.d/scripts/services/*
-.RS
-Actual filter programs for the various services.
+This directory contains local configuration files that override
+the default configuration.  See \fBMORE INFORMATION\fR below for more
+information.
 .RE
 .SH EXAMPLES
 .B logwatch --service ftpd-xferlog --range all --detail high --print --archives
@@ -143,12 +126,29 @@
 This will print out login information for the previous day...
 .RE
 .SH MORE INFORMATION
-For information on adding your own filter, please see the file HOWTO-Make-Filter
-which should have been included with Logwatch.  If you installed from an RPM,
-it is probably under /usr/share/doc/logwatch-XXX.
+The directory /usr/share/doc/logwatch-* contains several files with additional
+documentation:
+.RE
+.I HOWTO-Customize-Configuration
+.I HOWTO-Make-Filter
+.RS 
+Documents the directory structure of LogWatch configuration and executable
+files, and describes how to customize LogWatch by overriding these default
+files.
+.RE
+.I License
+.RS
+Describes the License under which LogWatch is distributed.  Additional
+clauses may be specified in individual files.
+.RE
+.I README
+.RS
+Describes how to install, where to find it, mailing lists, and
+other useful information.
 .SH AUTHOR
+.RE
 Kirk Bauer <kirk at kaybee.org>
-
+.RE
 http://www.kaybee.org/~kirk
-
+.RE
 ftp://ftp.kaybee.org/pub/redhat/RPMS

logwatch-7.0-named.patch:
 named |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+)

--- NEW FILE logwatch-7.0-named.patch ---
--- logwatch-7.1/scripts/services/named.pom	2005-09-29 17:02:52.000000000 +0200
+++ logwatch-7.1/scripts/services/named	2005-11-23 14:29:41.640084088 +0100
@@ -195,6 +195,15 @@
       $MasterFailure{"$Zone from $Host"}{$Reason}++;
    } elsif ( ($Zone) = ($ThisLine =~ /zone ([^\/]+)\/.+: refresh: non-authoritative answer from master/)) {
       $NonAuthoritative{$Zone}++;
+   } elsif ( ($ThisLine =~ /unexpected RCODE ([^ ]+) resolving '[^ ]+': [0-9.#]+/) ){
+      chomp($ThisLine);
+      $DisallClient{$ThisLine}++;
+   } elsif ( ($ThisLine =~ /FORMERR resolving '[^ ]+: [0-9.#]+/) ) {
+      chomp($ThisLine);
+      $FormErr{$ThisLine}++;
+   } elsif ( ($ThisLine =~ /found 1 CPU, using 1 worker thread/) ) {
+      chomp($ThisLine);
+      $StartLog{$ThisLine}++;
    } else {
       # Report any unmatched entries...
       # remove PID from named messages
@@ -366,6 +375,28 @@
    }
 }
 
+if (($Detail >= 5) and (keys %DisallClient)) {
+   print "\n Query form disallowed client:\n";
+   foreach $ThisOne (keys %DisallClient) {
+      print "   " . $ThisOne . ": " . $DisallClient{$ThisOne} . " Time(s)\n";
+   }
+}
+
+if (($Detail >= 5) and (keys %FormErr)) {
+   print "\n Incorrect response format:\n";
+   foreach $ThisOne (keys %FormErr) {
+      print "   " . $ThisOne . ": " . $FormErr{$ThisOne} . " Time(s)\n";
+   }
+}
+
+if (($Detail >= 10) and (keys %StartLog)) {
+   print "\n Named startup logs:\n";
+   foreach $ThisOne (keys %StartLog) {
+      print "   " . $ThisOne . ": " . $StartLog{$ThisOne} . " Time(s)\n";
+   }
+}
+
+
 if (keys %OtherList) {
    print "\n**Unmatched Entries**\n";
    foreach $line (sort {$a cmp $b} keys %OtherList) {

logwatch-7.0-smartd2.patch:
 smartd |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.0-smartd2.patch ---
--- logwatch-7.0/scripts/services/smartd.ppp	2006-01-20 09:59:35.000000000 +0100
+++ logwatch-7.0/scripts/services/smartd	2006-01-20 10:23:13.411151344 +0100
@@ -19,7 +19,16 @@
        # ignore
    } elsif ( ($ThisLine =~ /^smartd version/) || ($ThisLine =~ /^Home page/) || ($ThisLine =~ /configuration file/i) || ($ThisLine =~ /^Monitoring/) || ($ThisLine =~ /smartd has fork/) || ($ThisLine =~ /smartd startup succeeded/)  ) {
        # ignore
-
+   } elsif ( ($ThisLine =~ /^smartd version/)
+        || ($ThisLine =~ /^Home page/)
+        || ($ThisLine =~ /configuration file/i)
+        || ($ThisLine =~ /\[trip Temperature is \d+ Celsius\]/)
+        || ($ThisLine =~ /^Monitoring/)
+        || ($ThisLine =~ /smartd received signal 15: Terminated/)
+        || ($ThisLine =~ /smartd is exiting \(exit status 0\)/)
+        || ($ThisLine =~ /smartd has fork/)
+        || ($ThisLine =~ /smartd startup succeeded/)  ) {						        # ignore
+											
 #   } elsif ( ($Device,$Msg) = ($ThisLine =~ /^Device: ([^,]+), (.*)$/)) {
 #      $ParamChanges{$Device}{$Msg}++;
    } elsif ( ($Device,$AttribType,$Code,$Name,undef,undef,$NewVal) = ($ThisLine =~ /^Device: ([^,]+), SMART ([A-Za-z]+) Attribute: ([0-9]+) ([A-Za-z_]+) changed from ([0-9]+) (\[Raw [0-9]+\] )?to ([0-9]+)/)) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/FC-4/logwatch.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- logwatch.spec	24 Oct 2005 10:06:03 -0000	1.20
+++ logwatch.spec	20 Jan 2006 09:56:30 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 7.0
-Release: 1.fc4
+Release: 2.fc4
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -12,6 +12,9 @@
 Patch4: logwatch-7.0-smartd.patch
 Patch5: logwatch-7.0-zz-disk_space.patch
 Patch6: logwatch-7.0-secure.patch
+Patch7: logwatch-7.0-man_page.patch
+Patch8: logwatch-7.0-named.patch
+Patch9: logwatch-7.0-smartd2.patch
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
 BuildArchitectures: noarch
@@ -32,6 +35,9 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 
 %install
@@ -130,6 +136,11 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Fri Jan 20 2006 Ivana Varekova <varekova at redhat.com> 7.0-2.fc4
+- fix bug 172073 (man page problem)
+- fix bug 171631 (named service problem)
+- fix smartd service 
+
 * Mon Oct 24 2005 Ivana Varekova <varekova at redhat.com> 7.0-1.fc4
 - Update to 7.0
 - add smart, zz-disk_space patch, secure and audit2 patches


