Update to revision 198
This commit is contained in:
Jan Synacek
parent
10caee079e
commit
9eba0c43fa
@ -1,37 +0,0 @@
|
||||
Add --hostlimit and --html_wrap to the logwatch.8 manpage.
|
||||
|
||||
Author: Jan Synacek <jsynacek@redhat.com>
|
||||
|
||||
--- logwatch-svn140/logwatch.8 2013-05-22 15:29:09.779339911 +0200
|
||||
+++ logwatch-svn140-dist/logwatch.8 2013-05-22 15:48:03.248311264 +0200
|
||||
@@ -21,8 +21,12 @@ logwatch \- system log analyzer and repo
|
||||
.I file-name
|
||||
.B ] [--logdir
|
||||
.I directory
|
||||
+.B ] [--hostlimit
|
||||
+.I hosts
|
||||
.B ] [--hostname
|
||||
.I hostname
|
||||
+.B ] [--html_wrap
|
||||
+.I number of characters
|
||||
.B ] [--hostformat
|
||||
.I host based options
|
||||
.B ] [--output
|
||||
@@ -94,6 +98,8 @@ instead of displaying or mailing it.
|
||||
Look in
|
||||
.I directory
|
||||
for log subdirectories or log files instead of the default directory.
|
||||
+.IP "\fB--hostlimit\fR host1,host2"
|
||||
+Limit report to hostname - host1, host2.
|
||||
.IP "\fB--hostname\fR hostname"
|
||||
Use
|
||||
.I hostname
|
||||
@@ -101,6 +107,8 @@ for the reports instead of this system's
|
||||
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 "\fB--html_wrap\fR num-characters"
|
||||
+Number of characters that html output should be wrapped to. Default is 80.
|
||||
.IP "\fB--numeric\fR"
|
||||
Inhibits additional name lookups, displaying IP addresses numerically.
|
||||
.IP "\fB--no-oldfiles-log\fR"
|
||||
@ -2,11 +2,11 @@ Handle DNSSEC messages in named.
|
||||
|
||||
Author: Frank Crawford <frank@crawford.emu.id.au>
|
||||
RH-Bugzilla: #666394
|
||||
Backported-By: Jan Synacek <jsynacek@redhat.com>
|
||||
|
||||
diff -up logwatch-svn46/scripts/services/named.dnssec logwatch-svn46/scripts/services/named
|
||||
--- logwatch-svn46/scripts/services/named.dnssec 2011-03-28 13:54:24.212725223 +0200
|
||||
+++ logwatch-svn46/scripts/services/named 2011-03-28 14:08:21.044509429 +0200
|
||||
@@ -228,6 +228,7 @@ while (defined($ThisLine = <STDIN>)) {
|
||||
--- logwatch-svn198/scripts/services/named 2014-06-24 23:27:49.000000000 +0200
|
||||
+++ logwatch-svn198-new/scripts/services/named 2014-07-04 10:13:12.216468271 +0200
|
||||
@@ -228,6 +228,7 @@
|
||||
($ThisLine =~ /too many timeouts resolving '.*' .*: disabling EDNS/) or
|
||||
($ThisLine =~ /too many timeouts resolving '.*' .*: reducing the advertised EDNS UDP packet size to .* octets/) or
|
||||
($ThisLine =~ /reloading zones succeeded/) or
|
||||
@ -14,7 +14,7 @@ diff -up logwatch-svn46/scripts/services/named.dnssec logwatch-svn46/scripts/ser
|
||||
($ThisLine =~ /success resolving '.*' \(in '.*'?\) after disabling EDNS/) or
|
||||
($ThisLine =~ /success resolving '.*' \(in '.*'?\) after reducing the advertised EDNS UDP packet size to 512 octets/) or
|
||||
($ThisLine =~ /the working directory is not writable/) or
|
||||
@@ -250,6 +250,11 @@ while (defined($ThisLine = <STDIN>)) {
|
||||
@@ -249,6 +250,11 @@
|
||||
($ThisLine =~ /refresh in progress, refresh check queued/) or
|
||||
($ThisLine =~ /refresh: NODATA response from master/) or
|
||||
($ThisLine =~ /update with no effect/) or
|
||||
@ -24,9 +24,9 @@ diff -up logwatch-svn46/scripts/services/named.dnssec logwatch-svn46/scripts/ser
|
||||
+ # the following seems okay since it says "success"
|
||||
+ ($ThisLine =~ /managed-keys-zone .*: No DNSKEY RRSIGs found for '.*': success/) or
|
||||
($ThisLine =~ /validating \@0x[[:xdigit:]]+: .* no valid signature found/) or
|
||||
# ignore this line because the following line describes the error
|
||||
($ThisLine =~ /unexpected error/)
|
||||
@@ -269,7 +275,8 @@ while (defined($ThisLine = <STDIN>)) {
|
||||
($ThisLine =~ /^sizing zone task pool based on \d+ zones/) or
|
||||
($ThisLine =~ /^BIND \d+ is maintained by Internet Systems Consortium/) or
|
||||
@@ -276,7 +282,8 @@
|
||||
$ShutdownNamed++;
|
||||
} elsif ( $ThisLine =~ /named shutdown failed/ ) {
|
||||
$ShutdownNamedFail++;
|
||||
@ -36,7 +36,7 @@ diff -up logwatch-svn46/scripts/services/named.dnssec logwatch-svn46/scripts/ser
|
||||
$DeniedZoneTransfers{$Host}{$Zone}++;
|
||||
} elsif ( ($Zone) = ( $ThisLine =~ /zone (.+) zone transfer deferred due to quota/ ) ) {
|
||||
$DeferredZoneTransfers{$Zone}++;
|
||||
@@ -291,14 +298,13 @@ while (defined($ThisLine = <STDIN>)) {
|
||||
@@ -300,14 +307,13 @@
|
||||
$ZoneLoaded{$Zone}++;
|
||||
} elsif ( (undef,$Addr,undef,$Server) = ( $ThisLine =~ /ame server (on|resolving) '(.+)' \(in .+\):\s+(\[.+\]\.\d+)?\s*'?(.+)'?:?/ ) ) {
|
||||
$LameServer{"$Addr ($Server)"}++;
|
||||
@ -53,7 +53,7 @@ diff -up logwatch-svn46/scripts/services/named.dnssec logwatch-svn46/scripts/ser
|
||||
} elsif ( ($Zone) = ( $ThisLine =~ /zone (.+)\/IN: refused notify from non-master/ ) ) {
|
||||
$ZoneRefusedNotify{$Zone}++;
|
||||
# } elsif ( ($Rhost,$Ldom,$Reason) = ( $ThisLine =~ /client ([\d\.a-fA-F:]+) bad zone transfer request: '(.+)': (.+)$/ ) ) {
|
||||
@@ -321,13 +327,13 @@ while (defined($ThisLine = <STDIN>)) {
|
||||
@@ -330,13 +336,13 @@
|
||||
} elsif ( ($Client) = ( $ThisLine =~ /warning: client (.*) no more TCP clients/ ) ) {
|
||||
$FullClient = LookupIP ($Client);
|
||||
$DeniedTCPClient{$FullClient}++;
|
||||
@ -69,7 +69,7 @@ diff -up logwatch-svn46/scripts/services/named.dnssec logwatch-svn46/scripts/ser
|
||||
$ViewName = ($ViewName ? "/$ViewName" : "");
|
||||
$UpdateDenied{"$Rhost ($Ldom$ViewName)"}++;
|
||||
} elsif ( ($Rhost, $Ldom) = ($ThisLine =~ /client ([\d\.]+)#\d+: update forwarding '(.*)' denied/)) {
|
||||
@@ -384,6 +390,18 @@ while (defined($ThisLine = <STDIN>)) {
|
||||
@@ -393,6 +399,18 @@
|
||||
$NoSOA{$Client}++;
|
||||
} elsif (($Hint) = ($ThisLine =~ /checkhints: (.*)/) ) {
|
||||
$Hints{$Hint}++;
|
||||
@ -88,7 +88,7 @@ diff -up logwatch-svn46/scripts/services/named.dnssec logwatch-svn46/scripts/ser
|
||||
} else {
|
||||
# Report any unmatched entries...
|
||||
# remove PID from named messages
|
||||
@@ -713,6 +731,51 @@ if (keys %Hints) {
|
||||
@@ -735,6 +753,51 @@
|
||||
}
|
||||
}
|
||||
|
||||
@ -140,3 +140,4 @@ diff -up logwatch-svn46/scripts/services/named.dnssec logwatch-svn46/scripts/ser
|
||||
if (keys %OtherList) {
|
||||
print "\n**Unmatched Entries**\n";
|
||||
foreach $line (sort {$a cmp $b} keys %OtherList) {
|
||||
|
||||
|
||||
@ -3,10 +3,11 @@ logwatch temporary directory.
|
||||
|
||||
Author: Ivana Varekova <varekova@redhat.com>
|
||||
RH-Bugzilla: #230974
|
||||
Backported-By: Jan Synacek <jsynacek@redhat.com>
|
||||
|
||||
--- logwatch-20110113/logwatch.8.orig 2010-05-01 04:32:20.000000000 +0200
|
||||
+++ logwatch-20110113/logwatch.8 2011-01-13 11:49:28.631589520 +0100
|
||||
@@ -31,7 +31,7 @@
|
||||
--- logwatch-svn198/logwatch.8 2014-01-26 13:46:02.000000000 +0100
|
||||
+++ logwatch-svn198/logwatch.8 2014-07-04 10:03:26.870415276 +0200
|
||||
@@ -35,7 +35,7 @@
|
||||
.I report format
|
||||
.B ] [--encode
|
||||
.I encoding to use
|
||||
@ -15,8 +16,8 @@ RH-Bugzilla: #230974
|
||||
.SH DESCRIPTION
|
||||
.B Logwatch
|
||||
is a customizable, pluggable log-monitoring system. It will go
|
||||
@@ -104,6 +104,9 @@
|
||||
then only logs from this hostname will be processed (where appropriate).
|
||||
@@ -111,6 +111,9 @@
|
||||
Number of characters that html output should be wrapped to. Default is 80.
|
||||
.IP "\fB--numeric\fR"
|
||||
Inhibits additional name lookups, displaying IP addresses numerically.
|
||||
+.IP "\fB--no-oldfiles-log\fR"
|
||||
@ -25,9 +26,9 @@ RH-Bugzilla: #230974
|
||||
.IP "\fB--usage\fR"
|
||||
Displays usage information
|
||||
.IP "\fB--help\fR"
|
||||
--- logwatch-20110113/scripts/logwatch.pl.orig 2011-01-13 11:40:57.083697486 +0100
|
||||
+++ logwatch-20110113/scripts/logwatch.pl 2011-01-13 11:48:07.477874059 +0100
|
||||
@@ -187,6 +187,7 @@ my @TempLogFileList = ();
|
||||
--- logwatch-svn198/scripts/logwatch.pl 2014-07-04 10:02:23.930302006 +0200
|
||||
+++ logwatch-svn198/scripts/logwatch.pl 2014-07-04 10:05:01.588585717 +0200
|
||||
@@ -187,6 +187,7 @@
|
||||
my @TempServiceList = ();
|
||||
my $Help = 0;
|
||||
my $ShowVersion = 0;
|
||||
@ -35,7 +36,7 @@ RH-Bugzilla: #230974
|
||||
my ($tmp_mailto, $tmp_savefile);
|
||||
|
||||
&GetOptions ("d|detail=s" => \$Config{'detail'},
|
||||
@@ -209,6 +210,7 @@ my ($tmp_mailto, $tmp_savefile);
|
||||
@@ -209,6 +210,7 @@
|
||||
"hostformat=s" => \$Config{'hostformat'},
|
||||
"hostlimit=s" => \$Config{'hostlimit'},
|
||||
"html_wrap=s" => \$Config{'html_wrap'},
|
||||
@ -43,16 +44,16 @@ RH-Bugzilla: #230974
|
||||
"subject=s" => \$Config{'subject'}
|
||||
) or &Usage();
|
||||
|
||||
@@ -632,7 +634,7 @@ if ($Config{'debug'} > 7) {
|
||||
@@ -632,7 +634,7 @@
|
||||
opendir(TMPDIR, $Config{'tmpdir'}) or die "$Config{'tmpdir'} $!";
|
||||
my @old_dirs = grep { /^logwatch\.\w{8}$/ && -d "$Config{'tmpdir'}/$_" }
|
||||
readdir(TMPDIR);
|
||||
-if (@old_dirs) {
|
||||
+if ((@old_dirs) && ($NoOldfilesLog==0)) {
|
||||
+if (@old_dirs && ($NoOldfilesLog==0)) {
|
||||
print "You have old files in your logwatch tmpdir ($Config{'tmpdir'}):\n\t";
|
||||
print join("\n\t", @old_dirs);
|
||||
print "\nThe directories listed above were most likely created by a\n";
|
||||
@@ -1077,7 +1079,7 @@ sub ReadConfigFile {
|
||||
@@ -1085,7 +1087,7 @@
|
||||
sub Usage () {
|
||||
# Show usage for this program
|
||||
print "\nUsage: $0 [--detail <level>] [--logfile <name>] [--output <output_type>]\n" .
|
||||
@ -61,12 +62,13 @@ RH-Bugzilla: #230974
|
||||
" [--mailto <addr>] [--archives] [--range <range>] [--debug <level>]\n" .
|
||||
" [--filename <filename>] [--help|--usage] [--version] [--service <name>]\n" .
|
||||
" [--hostformat <host_format type>] [--hostlimit <host1,host2>] [--html_wrap <num_characters>]\n\n";
|
||||
@@ -1088,6 +1090,8 @@ sub Usage () {
|
||||
@@ -1096,6 +1098,8 @@
|
||||
print "--output <output type>: Report Output - stdout [default], mail, file.\n"; #8.0
|
||||
print "--format <formatting>: Report Format - text [default], html.\n"; #8.0
|
||||
print "--encode <encoding>: Enconding to use - none [default], base64.\n"; #8.0
|
||||
+ print "--no-oldfiles-log: Suppress the logwatch log, which informs about the\n";
|
||||
+ print " old files in logwatch tmpdir.\n";
|
||||
+ print "--no-oldfiles-log: Suppress the logwatch log, which informs about the\n";
|
||||
+ print " old files in logwatch tmpdir.\n";
|
||||
print "--mailto <addr>: Mail report to <addr>.\n";
|
||||
print "--archives: Use archived log files too.\n";
|
||||
print "--filename <filename>: Used to specify they filename to save to. --filename <filename> [Forces output to file].\n";
|
||||
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
%global revision 198
|
||||
Summary: A log file analysis program
|
||||
Name: logwatch
|
||||
Version: 7.4.0
|
||||
Release: 31.20130522svn140%{?dist}
|
||||
Release: 32.20140704svn%{revision}%{?dist}
|
||||
License: MIT
|
||||
Group: Applications/System
|
||||
URL: http://www.logwatch.org/
|
||||
# The source for this package was pulled from upstream's vcs. Use the
|
||||
# following commands to generate the tarball:
|
||||
# svn export -r 140 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-svn140
|
||||
# tar cJvf logwatch-svn140.tar.xz logwatch-svn140
|
||||
Source0: logwatch-svn140.tar.xz
|
||||
# svn export -r 198 https://svn.code.sf.net/p/logwatch/code/ logwatch-svn198
|
||||
# tar cJvf logwatch-svn198.tar.xz logwatch-svn198
|
||||
Source0: logwatch-svn%{revision}.tar.xz
|
||||
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
# Needs proper fix. Not applied by the upstream.
|
||||
Patch0: logwatch-vsftpd.patch
|
||||
@ -24,7 +25,6 @@ Patch9: logwatch-rkhunter.patch
|
||||
# Not yet upstreamed
|
||||
Patch16: logwatch-secure-userhelper.patch
|
||||
Patch18: logwatch-secure-username.patch
|
||||
Patch19: logwatch-man.patch
|
||||
Requires: textutils sh-utils grep mailx
|
||||
Requires: perl(Date::Manip)
|
||||
Requires: perl(Sys::CPU)
|
||||
@ -39,7 +39,7 @@ that you wish with the detail that you wish. Easy to use - works right out
|
||||
of the package on many systems.
|
||||
|
||||
%prep
|
||||
%setup -q -n logwatch-svn140
|
||||
%setup -q -n logwatch-svn%{revision}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
@ -48,7 +48,6 @@ of the package on many systems.
|
||||
%patch9 -p0
|
||||
%patch16 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
rm -f scripts/services/*.orig
|
||||
|
||||
%build
|
||||
@ -148,6 +147,9 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
|
||||
%{_mandir}/man*/*
|
||||
|
||||
%changelog
|
||||
* Fri Jul 4 2014 Jan Synáček <jsynacek@redhat.com> - 7.4.0-32.20140704svn198
|
||||
- Update to revision 198
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.4.0-31.20130522svn140
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user