[logwatch] Up-to-date SVN version of Logwatch
Karel Klíč
kklic at fedoraproject.org
Thu Jan 13 16:17:52 UTC 2011
commit c74780a7cae82034aa5cb459e514f8154ab0f994
Author: Karel Klic <kklic at redhat.com>
Date: Thu Jan 13 17:17:36 2011 +0100
Up-to-date SVN version of Logwatch
.gitignore | 1 +
logwatch-7.3.4-named.patch | 87 -----
logwatch-7.3.4-sshd.patch | 11 -
logwatch-7.3.4-sshd3.patch | 12 -
logwatch-7.3.6-amavis.patch | 11 -
logwatch-7.3.6-amavis2.patch | 16 -
logwatch-7.3.6-audit.patch | 12 -
logwatch-7.3.6-audit2.patch | 30 --
logwatch-7.3.6-audit3.patch | 12 -
logwatch-7.3.6-audit4.patch | 22 --
logwatch-7.3.6-clamav-milter.patch | 14 -
logwatch-7.3.6-conf.patch | 12 -
logwatch-7.3.6-cron.patch | 98 -----
logwatch-7.3.6-cron2.patch | 28 --
logwatch-7.3.6-cron3.patch | 38 --
logwatch-7.3.6-cron4.patch | 12 -
logwatch-7.3.6-cron5.patch | 57 ---
logwatch-7.3.6-cron_conf.patch | 14 -
logwatch-7.3.6-dhcpd2.patch | 92 -----
logwatch-7.3.6-dovecot.patch | 72 ----
logwatch-7.3.6-dovecot2.patch | 36 --
logwatch-7.3.6-dovecot3.patch | 39 --
logwatch-7.3.6-dovecot_back.patch | 110 ------
logwatch-7.3.6-exim.patch | 22 --
logwatch-7.3.6-exim2.patch | 15 -
logwatch-7.3.6-fetchmail.patch | 154 --------
logwatch-7.3.6-init.patch | 33 --
logwatch-7.3.6-init2.patch | 56 ---
logwatch-7.3.6-iptables.patch | 12 -
logwatch-7.3.6-logrotate.patch | 373 --------------------
logwatch-7.3.6-lost-connection.patch | 12 -
logwatch-7.3.6-maillog.patch | 18 -
logwatch-7.3.6-manpages.patch | 147 --------
logwatch-7.3.6-named10.patch | 42 ---
logwatch-7.3.6-named2.patch | 12 -
logwatch-7.3.6-named3.patch | 48 ---
logwatch-7.3.6-named4.patch | 85 -----
logwatch-7.3.6-named5.patch | 19 -
logwatch-7.3.6-named6.patch | 21 --
logwatch-7.3.6-named7.patch | 47 ---
logwatch-7.3.6-named8.patch | 23 --
logwatch-7.3.6-named9.patch | 12 -
logwatch-7.3.6-oldfiles.patch | 71 ----
logwatch-7.3.6-openvpn.patch | 44 ---
logwatch-7.3.6-openvpn2.patch | 37 --
logwatch-7.3.6-openvpn3.patch | 13 -
logwatch-7.3.6-openvpn4.patch | 24 --
logwatch-7.3.6-pam_unix.patch | 98 -----
logwatch-7.3.6-pam_unix4.patch | 54 ---
logwatch-7.3.6-removeservice.patch | 53 ---
logwatch-7.3.6-secure.patch | 12 -
logwatch-7.3.6-secure1.patch | 13 -
logwatch-7.3.6-secure2.patch | 57 ---
logwatch-7.3.6-secure3.patch | 36 --
logwatch-7.3.6-sendmail.patch | 12 -
logwatch-7.3.6-sendmail2.patch | 11 -
logwatch-7.3.6-smartd.patch | 61 ----
logwatch-7.3.6-sshd1.patch | 48 ---
logwatch-7.3.6-sshd2.patch | 13 -
logwatch-7.3.6-sshd3.patch | 17 -
logwatch-7.3.6-sudo.patch | 16 -
logwatch-7.3.6-usage.patch | 15 -
logwatch-7.3.6-xntpd.patch | 12 -
logwatch-7.3.6-zz-disk_space.patch | 11 -
logwatch-7.3.6-zz-disk_space2.patch | 13 -
logwatch-automount.patch | 11 +
logwatch-dhcpd.patch | 14 +
logwatch-dovecot.patch | 67 ++++
logwatch-dovecot2.patch | 14 +
logwatch-oldfiles.patch | 66 ++++
...h-7.3.6-postfix.patch => logwatch-postfix.patch | 0
logwatch-smartd.patch | 13 +
...tch-7.3.1-vsftpd.patch => logwatch-vsftpd.patch | 0
logwatch-xntpd.patch | 36 ++
logwatch.spec | 324 ++++-------------
sources | 2 +-
76 files changed, 293 insertions(+), 2982 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d76c119..40faa59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
logwatch-7.3.6.tar.gz
+/logwatch-20110113.tar.xz
diff --git a/logwatch-automount.patch b/logwatch-automount.patch
new file mode 100644
index 0000000..9717533
--- /dev/null
+++ b/logwatch-automount.patch
@@ -0,0 +1,11 @@
+--- logwatch-20110113/scripts/services/automount.orig 2010-05-01 04:36:08.000000000 +0200
++++ logwatch-20110113/scripts/services/automount 2011-01-13 15:50:07.613984222 +0100
+@@ -35,7 +35,7 @@ while (defined($ThisLine = <STDIN>)) {
+ ($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-dhcpd.patch b/logwatch-dhcpd.patch
new file mode 100644
index 0000000..9772381
--- /dev/null
+++ b/logwatch-dhcpd.patch
@@ -0,0 +1,14 @@
+--- logwatch-20110113/scripts/services/dhcpd.orig 2010-09-18 17:54:13.000000000 +0200
++++ logwatch-20110113/scripts/services/dhcpd 2011-01-13 15:57:00.131382686 +0100
+@@ -188,9 +188,9 @@ while (my $line = <STDIN>) {
+ if ($Detail >= 3) {
+ $data{'Warnings'}{$line}++;
+ }
+- } elsif ($line =~ s/^uid lease ([\da-fA-F\.:]+) for client ([\da-fA-F\.:]+) is duplicate on ([\da-fA-F\.:\/]+)/Host $2: duplicate $1 (range $3)\n - probably both static and dynamic leases/) {
++ } elsif ($line =~ s/^uid lease ([\da-fA-F\.:]+) for client ([^ ]*) is duplicate on ([^ ]*)/uid lease $1 for client $2 is duplicate/) {
+ if ($Detail >= 3) {
+- $data{'Warnings'}{$line}++;
++ $data{'Duplicate lease'}{$line}++;
+ }
+ } elsif ($line =~ /^DHCPDISCOVER from .* via \S+: (.*): no free leases/) {
+ $data{'No Free Leases'}{$1}++;
diff --git a/logwatch-dovecot.patch b/logwatch-dovecot.patch
new file mode 100644
index 0000000..df76469
--- /dev/null
+++ b/logwatch-dovecot.patch
@@ -0,0 +1,67 @@
+--- logwatch-20110113/scripts/services/dovecot.orig 2011-01-08 21:27:34.000000000 +0100
++++ logwatch-20110113/scripts/services/dovecot 2011-01-13 16:13:56.304183833 +0100
+@@ -104,16 +104,15 @@ while (defined($ThisLine = <STDIN>)) {
+ # remove timestamp. We can't use *RemoveHeaders because we need the
+ # service name
+ $ThisLine =~ s/^\w{3} .\d \d\d:\d\d:\d\d [^ ]* //;
+- if (
+- ($ThisLine =~ /ssl-build-param: SSL parameters regeneration completed/) or
+- ($ThisLine =~ /deliver.*/) or
+- ($ThisLine =~ /auth-worker/) or
+- ($ThisLine =~ /auth:.*: Connected to/) or
+- ($ThisLine =~ /Connection closed/) or
+- ($ThisLine =~ /IMAP.*: Connection closed bytes/) or
+- ($ThisLine =~ /IMAP.* failed with mbox file/)
+-) {
+- # We don't care about these
++ if ( ($ThisLine =~ /(ssl-build-param|ssl-params): SSL parameters regeneration completed/) or
++ ($ThisLine =~ /ssl-params: Generating SSL parameters/) or
++ ($ThisLine =~ /deliver.*/) or
++ ($ThisLine =~ /auth-worker/) or
++ ($ThisLine =~ /auth:.*: Connected to/) or
++ ($ThisLine =~ /Connection closed/) or
++ ($ThisLine =~ /IMAP.*: Connection closed bytes/) or
++ ($ThisLine =~ /IMAP.* failed with mbox file/) ) {
++ # We don't care about these
+ } elsif ( $ThisLine =~ /Killed with signal /) {
+ $End++;
+ } elsif ( $ThisLine =~ /Dovecot (v\d[^ ]* |)starting up$/) {
+@@ -140,7 +139,7 @@ while (defined($ThisLine = <STDIN>)) {
+ $ConnectionSieve{$Host}++;
+ $Connection{$Host}++;
+ }
+- } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^dovecot: deliver\((.*)\): (?:sieve: )?msgid=.*: (?:saved|stored) mail (?:in)to (\S+)/ ) ) {
++ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^dovecot: (?:deliver|lmtp)\((.*)\): (?:sieve: )?msgid=.*: (?:saved|stored) mail (?:in)to (\S+)/ ) ) {
+ $Deliver{$User}{$Mailbox}++;
+
+ #For Dovecot 2.0
+@@ -195,22 +194,22 @@ while (defined($ThisLine = <STDIN>)) {
+ $Disconnected{"no reason"}++;
+ } elsif ( (($Reason) = ($ThisLine =~ /POP3.+: Disconnected: (.+) top/)) or
+ (($Reason) = ($ThisLine =~ /pop3-login: Disconnected \((.+)\): /)) or
+- (($Reason) = ($ThisLine =~ /IMAP.+: Disconnected: (.+) bytes=/)) or
+- (($Reason) = ($ThisLine =~ /IMAP.+: Disconnected: (.+)/)) ) {
++ (($Reason) = ($ThisLine =~ /IMAP.+: Disconnected: (.+) bytes=/i)) or
++ (($Reason) = ($ThisLine =~ /IMAP.+: Disconnected: (.+)/i)) ) {
+ $Disconnected{$Reason}++;
+- } elsif (($Reason) = ($ThisLine =~ /(IMAP|POP3).+: Connection closed (top|bytes)=/)) {
++ } elsif (($Reason) = ($ThisLine =~ /(IMAP|POP3).+: Connection closed (top|bytes)=/i)) {
+ $ConnectionCl{"no reason"}++;
+- } elsif ( (($Reason) = ($ThisLine =~ /IMAP.+: Connection closed: (.*) bytes=/)) or
+- (($Reason) = ($ThisLine =~ /POP3.+: Connection closed: (.*) (top=|bytes=)/)) ) {
++ } elsif ( (($Reason) = ($ThisLine =~ /IMAP.+: Connection closed: (.*) bytes=/i)) or
++ (($Reason) = ($ThisLine =~ /POP3.+: Connection closed: (.*) (top=|bytes=)/i)) ) {
+ $ConnectionCl{$Reason}++;
+ } elsif ($ThisLine =~ /(IMAP|POP3).+: (Connection closed.*)/) {
+ $Disconnected{$2}++;
+- } elsif ($ThisLine =~ /POP3.+: Connection closed top=.* retr=.* del=.* size=.*/) {
++ } elsif ($ThisLine =~ /POP3.+: Connection closed top=.* retr=.* del=.* size=.*/i) {
+ $ConnectionCl{"no reason"}++;
+ } elsif (($Error) = ($ThisLine =~ /child \d* \(login\) returned error (.*)/)) {
+ # dovecot: child 23747 (login) returned error 89
+ $ChildErr{$Error}++;
+- } elsif (($Name) = ($ThisLine =~ /dovecot: IMAP\((.*)\): .*(.*) failed: Disk quota exceeded/)) {
++ } elsif (($Name) = ($ThisLine =~ /dovecot: IMAP\((.*)\): .*(.*) failed: Disk quota exceeded/i)) {
+ # dovecot: IMAP(podracka): mkdir(/home/LF/KLINIKY/podracka/mail/.imap/saved-messages) failed: Disk quota exceeded
+ $DiskQuotaExceed{$Name}++;
+ } else {
diff --git a/logwatch-dovecot2.patch b/logwatch-dovecot2.patch
new file mode 100644
index 0000000..485397d
--- /dev/null
+++ b/logwatch-dovecot2.patch
@@ -0,0 +1,14 @@
+diff -up logwatch-20110113/scripts/services/dovecot.dovecot-child logwatch-20110113/scripts/services/dovecot
+--- logwatch-20110113/scripts/services/dovecot.dovecot-child 2011-01-13 16:55:48.432483241 +0100
++++ logwatch-20110113/scripts/services/dovecot 2011-01-13 16:56:43.056625241 +0100
+@@ -206,8 +206,9 @@ while (defined($ThisLine = <STDIN>)) {
+ $Disconnected{$2}++;
+ } elsif ($ThisLine =~ /POP3.+: Connection closed top=.* retr=.* del=.* size=.*/i) {
+ $ConnectionCl{"no reason"}++;
+- } elsif (($Error) = ($ThisLine =~ /child \d* \(login\) returned error (.*)/)) {
++ } elsif (($Error) = ($ThisLine =~ /child \d* (?:\(login\) )?returned error (.*)/)) {
+ # dovecot: child 23747 (login) returned error 89
++ # dovecot: log: Error: service(auth): child 19654 returned error 89 (Fatal failure)
+ $ChildErr{$Error}++;
+ } elsif (($Name) = ($ThisLine =~ /dovecot: IMAP\((.*)\): .*(.*) failed: Disk quota exceeded/i)) {
+ # dovecot: IMAP(podracka): mkdir(/home/LF/KLINIKY/podracka/mail/.imap/saved-messages) failed: Disk quota exceeded
diff --git a/logwatch-oldfiles.patch b/logwatch-oldfiles.patch
new file mode 100644
index 0000000..3ba993e
--- /dev/null
+++ b/logwatch-oldfiles.patch
@@ -0,0 +1,66 @@
+--- 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 @@
+ .I report format
+ .B ] [--encode
+ .I encoding to use
+-.B ] [--numeric] [--version] [--help|--usage]
++.B ] [--numeric] [--no-oldfiles-log] [--version] [--help|--usage]
+ .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).
+ .IP "\fB--numeric\fR"
+ Inhibits additional name lookups, displaying IP addresses numerically.
++.IP "\fB--no-oldfiles-log\fR"
++Suppress the logwatch log, which informs about the
++old files in logwatch tmpdir.
+ .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 = ();
+ my @TempServiceList = ();
+ my $Help = 0;
+ my $ShowVersion = 0;
++my $NoOldfilesLog = 0;
+ my ($tmp_mailto, $tmp_savefile);
+
+ &GetOptions ("d|detail=s" => \$Config{'detail'},
+@@ -209,6 +210,7 @@ my ($tmp_mailto, $tmp_savefile);
+ "hostformat=s" => \$Config{'hostformat'},
+ "hostlimit=s" => \$Config{'hostlimit'},
+ "html_wrap=s" => \$Config{'html_wrap'},
++ "no-oldfiles-log" => \$NoOldfilesLog,
+ "subject=s" => \$Config{'subject'}
+ ) or &Usage();
+
+@@ -632,7 +634,7 @@ if ($Config{'debug'} > 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)) {
+ 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 {
+ sub Usage () {
+ # Show usage for this program
+ print "\nUsage: $0 [--detail <level>] [--logfile <name>] [--output <output_type>]\n" .
+- " [--format <format_type>] [--encode <enconding>] [--numeric]\n" .
++ " [--format <format_type>] [--encode <enconding>] [--numeric] [--no-oldfiles-log]\n" .
+ " [--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 () {
+ 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 "--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";
diff --git a/logwatch-7.3.6-postfix.patch b/logwatch-postfix.patch
similarity index 100%
rename from logwatch-7.3.6-postfix.patch
rename to logwatch-postfix.patch
diff --git a/logwatch-smartd.patch b/logwatch-smartd.patch
new file mode 100644
index 0000000..f12bca0
--- /dev/null
+++ b/logwatch-smartd.patch
@@ -0,0 +1,13 @@
+--- logwatch-20110113/scripts/services/smartd.orig 2011-01-06 23:16:39.000000000 +0100
++++ logwatch-20110113/scripts/services/smartd 2011-01-13 16:16:44.880504722 +0100
+@@ -102,6 +102,10 @@ while (defined(my $ThisLine = <STDIN>))
+ # ignore
+ } elsif ( ($Device) = ($ThisLine =~ /^Device: ([^,]+), is in STANDBY mode, skipping checks/ )) {
+ # ignore
++ } elsif ( ($Device) = ($ThisLine =~ /^Device: ([^,]+), self-test in progress, [0-9]+% remaining/ )) {
++ # ignore
++ } elsif ( ($Device) = ($ThisLine =~ /^Device: ([^,]+), previous self-test completed without error/ )) {
++ # ignore
+ } elsif ( ($Device) = ($ThisLine =~ /^Device: ([^,]+), type changed from \'\w+\' to \'\w+\'/ )) {
+ # ignore
+ } elsif ( ($Device) = ($ThisLine =~ /^Device: ([^,]+), state (?:read from|written to)/ )) {
diff --git a/logwatch-7.3.1-vsftpd.patch b/logwatch-vsftpd.patch
similarity index 100%
rename from logwatch-7.3.1-vsftpd.patch
rename to logwatch-vsftpd.patch
diff --git a/logwatch-xntpd.patch b/logwatch-xntpd.patch
new file mode 100644
index 0000000..1ba5e51
--- /dev/null
+++ b/logwatch-xntpd.patch
@@ -0,0 +1,36 @@
+--- logwatch-20110113/scripts/services/xntpd.orig 2010-05-10 01:24:57.000000000 +0200
++++ logwatch-20110113/scripts/services/xntpd 2011-01-13 16:30:11.573714329 +0100
+@@ -146,12 +146,15 @@ while (defined(my $ThisLine = <STDIN>))
+ ($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
++ ($ThisLine =~ m/0\.0\.0\.0 [[:xdigit:]]{4} [[:xdigit:]]{2} /) or # startup
+ ($ThisLine =~ m/select([^\)]) error: Interrupted system call/) or
+ ($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 .* Disabled/) or
+ ($ThisLine =~ /Listening on interface .* Enabled/) or
++ ($ThisLine =~ /Listen and drop on /) or
++ ($ThisLine =~ /Listening on routing socket on/) or
+ ($ThisLine =~ /ntp_io: estimated max descriptors: \d*, initial socket boundary: \d*/)
+ ) {
+ # Ignore these
+@@ -174,6 +177,8 @@ while (defined(my $ThisLine = <STDIN>))
+ # MEv end no leadin to line
+ } elsif ( my ($ListenOn) = ($ThisLine =~ /Listening on interface (.*)(?: Enabled)?/ )) {
+ $Interfaces{$ListenOn}++;
++ } elsif ( my ($ListenOn) = ($ThisLine =~ /Listen normally on \d+ (.*)/ )) {
++ $Interfaces{$ListenOn}++;
+ } elsif ( my ($SyncTo,$Stratum) = ($ThisLine =~ /synchronized to ([^ ]+), stratum[ =]([^ ]+)/ )) {
+ my $name = $SyncTo;
+ if ($Detail > 5 && $SyncTo =~ m/^[\d.]+$/) {
+@@ -235,7 +240,7 @@ if (keys %Interfaces) {
+ print "\nListening on interfaces:\n" if ($Detail > 5);
+ foreach my $i (keys %Interfaces) {
+ print " $i - $Interfaces{$i} times\n" if ($Detail > 5);
+- unless ($i =~ m/^(wildcard|lo)/) {
++ unless ($i =~ m/^(wildcard|v[46]wildcard|lo)/) {
+ $lt++;
+ }
+ $t++;
diff --git a/logwatch.spec b/logwatch.spec
index 90a9b32..eea5c8a 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,156 +1,30 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.3.6
-Release: 58%{?dist}
+Release: 59.20100113svn22%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
-Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz
+# The source for this package was pulled from upstream's vcs. Use the
+# following commands to generate the tarball:
+# svn export -r 22 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-20110113
+# tar cJvf logwatch-20110113.tar.xz logwatch-20110113
+Source0: logwatch-20110113.tar.xz
+#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Needs proper fix. Not applied by the upstream.
-Patch2: logwatch-7.3.1-vsftpd.patch
-# Applied by upstream.
-Patch4: logwatch-7.3.6-secure.patch
-# Upstream fixed this another way.
-Patch5: logwatch-7.3.6-xntpd.patch
-# Applied by upstream.
-Patch6: logwatch-7.3.4-sshd.patch
-# Applied by upstream.
-Patch9: logwatch-7.3.4-sshd3.patch
-# Applied by upstream.
-Patch10: logwatch-7.3.4-named.patch
-# Applied by upstream.
-Patch11: logwatch-7.3.6-named2.patch
-# Applied by upstream.
-Patch12: logwatch-7.3.6-audit.patch
-# Applied by upstream.
-Patch13: logwatch-7.3.6-pam_unix.patch
-# Applied by upstream.
-Patch14: logwatch-7.3.6-named3.patch
-# Applied by upstream.
-Patch15: logwatch-7.3.6-cron.patch
-# Applied by upstream.
-Patch16: logwatch-7.3.6-zz-disk_space.patch
-# Applied by upstream.
-Patch17: logwatch-7.3.6-cron2.patch
-# Applied by upstream.
-Patch18: logwatch-7.3.6-cron3.patch
-# Applied by upstream.
-Patch20: logwatch-7.3.6-secure1.patch
-# Applied by upstream.
-Patch21: logwatch-7.3.6-sudo.patch
-# Applied by upstream.
-Patch22: logwatch-7.3.6-sshd1.patch
-# Applied by upstream.
-Patch23: logwatch-7.3.6-clamav-milter.patch
-# Upstream fixed this another way.
-Patch24: logwatch-7.3.6-conf.patch
-# Applied by upstream.
-Patch26: logwatch-7.3.6-amavis.patch
+Patch0: logwatch-vsftpd.patch
# Not applied by upstream.
-Patch27: logwatch-7.3.6-oldfiles.patch
-# Not applied by upstream.
-Patch28: logwatch-7.3.6-usage.patch
-# Applied by upstream.
-Patch29: logwatch-7.3.6-maillog.patch
-# Applied by upstream.
-Patch30: logwatch-7.3.6-amavis2.patch
-# Applied by upstream.
-Patch31: logwatch-7.3.6-openvpn.patch
-# Cannot be applied by upstream, as
-# the postfix service has been reverted to some
-# older version by upstream due to licensing issues.
-# Some parts are solved by upstream.
-Patch32: logwatch-7.3.6-postfix.patch
-# Applied by upstream.
-Patch33: logwatch-7.3.6-cron4.patch
-# Applied by upstream.
-Patch34: logwatch-7.3.6-dovecot_back.patch
-# Applied by upstream.
-Patch35: logwatch-7.3.6-audit2.patch
-# Applied by upstream.
-Patch36: logwatch-7.3.6-openvpn2.patch
-# Fedora specific.
-Patch37: logwatch-7.3.6-sendmail.patch
-# Applied by upstream.
-Patch38: logwatch-7.3.6-audit3.patch
-# Applied by upstream.
-Patch39: logwatch-7.3.6-init.patch
-# Applied by upstream.
-Patch40: logwatch-7.3.6-cron5.patch
-# Not applied by upstream.
-Patch41: logwatch-7.3.6-logrotate.patch
-# Applied by upstream.
-Patch45: logwatch-7.3.6-init2.patch
-# Applied by upstream.
-Patch46: logwatch-7.3.6-secure2.patch
-# Applied by upstream.
-Patch47: logwatch-7.3.6-exim.patch
-# Applied by upstream.
-Patch48: logwatch-7.3.6-zz-disk_space2.patch
-# Applied by upstream.
-Patch49: logwatch-7.3.6-dovecot.patch
-# Applied by upstream.
-Patch50: logwatch-7.3.6-named4.patch
-# Applied by upstream.
-Patch51: logwatch-7.3.6-openvpn3.patch
-# Applied by upstream.
-Patch52: logwatch-7.3.6-smartd.patch
-# Applied by upstream.
-Patch53: logwatch-7.3.6-sshd2.patch
-# Applied by upstream.
-Patch54: logwatch-7.3.6-exim2.patch
-# Applied by upstream.
-Patch55: logwatch-7.3.6-removeservice.patch
-# Fedora-specific change. It must be decided
-# whether it is right. Not applied to upstream.
-Patch56: logwatch-7.3.6-cron_conf.patch
-# Applied by upstream.
-Patch57: logwatch-7.3.6-named5.patch
-# Applied by upstream.
-Patch58: logwatch-7.3.6-iptables.patch
-# Applied by upstream.
-Patch59: logwatch-7.3.6-lost-connection.patch
-# Applied by upstream.
-Patch60: logwatch-7.3.6-secure3.patch
-# Applied by upstream.
-Patch61: logwatch-7.3.6-audit4.patch
-# Applied by upstream.
-Patch62: logwatch-7.3.6-dovecot2.patch
-# Applied by upstream.
-Patch63: logwatch-7.3.6-openvpn4.patch
-# Applied by upstream.
-Patch64: logwatch-7.3.6-pam_unix4.patch
-# Applied by upstream.
-Patch66: logwatch-7.3.6-named6.patch
-# Applied by upstream.
-Patch67: logwatch-7.3.6-sshd3.patch
-# Applied by upstream.
-Patch68: logwatch-7.3.6-dhcpd2.patch
-# Applied by upstream.
-Patch69: logwatch-7.3.6-named7.patch
-# Applied by upstream.
-Patch70: logwatch-7.3.6-dovecot3.patch
-# Applied by upstream.
-Patch71: logwatch-7.3.6-sendmail2.patch
-# Applied by upstream.
-# Adds manpages for configuration files.
-# rhbz#525644
-Patch73: logwatch-7.3.6-manpages.patch
-# Applied by upstream.
-# Ignore broken trust chain messages in named service
-# rhbz#581186
-Patch74: logwatch-7.3.6-named8.patch
-# Applied by upstream.
-Patch75: logwatch-7.3.6-fetchmail.patch
-
-# Match "clients-per-query increased" as well as "decreased"
-# Already included upstream (rev 9)
-Patch76: logwatch-7.3.6-named9.patch
-
-# Match "DNS format error", and variants of existing messages
-# Submitted upstream
-Patch77: logwatch-7.3.6-named10.patch
-
+Patch1: logwatch-oldfiles.patch
+# Cannot be applied, as the postfix service has been reverted to some
+# older version by upstream due to licensing issues. Some parts are
+# solved by upstream.
+Patch2: logwatch-postfix.patch
+Patch3: logwatch-automount.patch
+Patch4: logwatch-dhcpd.patch
+Patch5: logwatch-dovecot.patch
+Patch6: logwatch-smartd.patch
+Patch7: logwatch-xntpd.patch
+Patch8: logwatch-dovecot2.patch
Requires: textutils sh-utils grep mailx
Requires: perl(Date::Manip)
BuildArchitectures: noarch
@@ -162,73 +36,16 @@ that you wish with the detail that you wish. Easy to use - works right out
of the package on many systems.
%prep
-%setup -q
-%patch2 -p1
+%setup -q -n logwatch-20110113
+%patch0 -p1
+%patch1 -p1
+#%patch2 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch63 -p1
-%patch64 -p1
-%patch66 -p1
-%patch67 -p1
-%patch68 -p1
-%patch69 -p1
-%patch70 -p1
-%patch71 -p1
-%patch73 -p1
-%patch74 -p1
-%patch75 -p1
-%patch76 -p1
-%patch77 -p1
+%patch7 -p1
+%patch8 -p1
rm -f scripts/services/*.orig
%build
@@ -242,6 +59,7 @@ install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/scripts/services
install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf
install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles
install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf/services
+install -m 0755 -d %{buildroot}%{_sysconfdir}/cron.daily
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/logfiles
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/services
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/html
@@ -250,6 +68,9 @@ install -m 0755 -d %{buildroot}%{_datadir}/logwatch/dist.conf/services
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/scripts/services
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/scripts/shared
install -m 0755 -d %{buildroot}%{_datadir}/logwatch/lib
+install -m 0755 -d %{buildroot}%{_sbindir}
+install -m 0755 -d %{buildroot}%{_mandir}/man5
+install -m 0755 -d %{buildroot}%{_mandir}/man8
for i in scripts/logfiles/*; do
if [ $(ls $i | wc -l) -ne 0 ]; then
@@ -263,17 +84,23 @@ install -m 0644 scripts/services/* %{buildroot}%{_datadir}/logwatch/scripts/serv
install -m 0644 scripts/shared/* %{buildroot}%{_datadir}/logwatch/scripts/shared
install -m 0644 conf/logwatch.conf %{buildroot}%{_datadir}/logwatch/default.conf/logwatch.conf
+install -m 0644 conf/logwatch.conf %{buildroot}%{_sysconfdir}/logwatch/conf/logwatch.conf
+install -m 0644 conf/ignore.conf %{buildroot}%{_sysconfdir}/logwatch/conf/ignore.conf
+
install -m 0644 conf/logfiles/* %{buildroot}%{_datadir}/logwatch/default.conf/logfiles
install -m 0644 conf/services/* %{buildroot}%{_datadir}/logwatch/default.conf/services
install -m 0644 conf/html/* %{buildroot}%{_datadir}/logwatch/default.conf/html
install -m 0644 lib/Logwatch.pm %{buildroot}%{_datadir}/logwatch/lib/Logwatch.pm
-install -m 0755 -d %{buildroot}%{_mandir}/man8
+install -m 0644 ignore.conf.5 %{buildroot}%{_mandir}/man5
+install -m 0644 override.conf.5 %{buildroot}%{_mandir}/man5
+install -m 0644 logwatch.conf.5 %{buildroot}%{_mandir}/man5
install -m 0644 logwatch.8 %{buildroot}%{_mandir}/man8
-rm -f %{buildroot}%{_sysconfdir}/cron.daily/logwatch \
- %{buildroot}%{_sbindir}/logwatch
+install -m 0644 logwatch.cron %{buildroot}%{_sysconfdir}/cron.daily/0logwatch
+
+ln -s ../../%{_datadir}/logwatch/scripts/logwatch.pl %{buildroot}/%{_sbindir}/logwatch
# Do not install zz-fortune service on RHEL
%if 0%{?rhel}
@@ -284,70 +111,59 @@ touch %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune
chmod 644 %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune
%endif
-# install cron script
-install -m 0755 -d %{buildroot}%{_sysconfdir}/cron.daily
-cat > %{buildroot}/%{_sysconfdir}/cron.daily/0logwatch <<EOF
-#!/bin/bash
-
-DailyReport=\`grep -e "^[[:space:]]*DailyReport[[:space:]]*=[[:space:]]*" /usr/share/logwatch/default.conf/logwatch.conf | head -n1 | sed -e "s|^\s*DailyReport\s*=\s*||"\`
-
-if [ "\$DailyReport" != "No" ] && [ "\$DailyReport" != "no" ]
-then
- logwatch
-fi
-EOF
-chmod 755 %{buildroot}/%{_sysconfdir}/cron.daily/0logwatch
-
-install -m 0755 -d %{buildroot}%{_sbindir}
-ln -s ../../%{_datadir}/logwatch/scripts/logwatch.pl %{buildroot}/%{_sbindir}/logwatch
-
-
-echo "###### REGULAR EXPRESSIONS IN THIS FILE WILL BE TRIMMED FROM REPORT OUTPUT #####" > %{buildroot}%{_sysconfdir}/logwatch/conf/ignore.conf
-echo "# Local configuration options go here (defaults are in %{_datadir}/logwatch/default.conf/logwatch.conf)" > %{buildroot}%{_sysconfdir}/logwatch/conf/logwatch.conf
echo "# Configuration overrides for specific logfiles/services may be placed here." > %{buildroot}%{_sysconfdir}/logwatch/conf/override.conf
-
%files
%defattr(-,root,root)
%doc README HOWTO-Customize-LogWatch
%dir %{_var}/cache/logwatch
-%dir %{_sysconfdir}/logwatch
-%dir %{_sysconfdir}/logwatch/conf
%dir %{_sysconfdir}/logwatch/scripts
%dir %{_sysconfdir}/logwatch/conf/logfiles
%dir %{_sysconfdir}/logwatch/conf/services
%dir %{_sysconfdir}/logwatch/scripts/services
-%dir %{_datadir}/logwatch
-%dir %{_datadir}/logwatch/default.conf
-%dir %{_datadir}/logwatch/default.conf/services
-%dir %{_datadir}/logwatch/default.conf/logfiles
-%dir %{_datadir}/logwatch/default.conf/html
+%{_sysconfdir}/cron.daily/0logwatch
+%config(noreplace) %{_sysconfdir}/logwatch/conf/*.conf
%dir %{_datadir}/logwatch/dist.conf
%dir %{_datadir}/logwatch/dist.conf/services
%dir %{_datadir}/logwatch/dist.conf/logfiles
-%dir %{_datadir}/logwatch/scripts
-%dir %{_datadir}/logwatch/scripts/logfiles
-%dir %{_datadir}/logwatch/scripts/services
-%dir %{_datadir}/logwatch/scripts/shared
-%dir %{_datadir}/logwatch/scripts/logfiles/*
-%dir %{_datadir}/logwatch/lib
%{_datadir}/logwatch/scripts/logwatch.pl
-%config(noreplace) %{_sysconfdir}/logwatch/conf/*.conf
%config(noreplace) %{_datadir}/logwatch/default.conf/*.conf
%{_sbindir}/logwatch
-%{_datadir}/logwatch/scripts/shared/*
-%{_datadir}/logwatch/scripts/services/*
-%{_datadir}/logwatch/scripts/logfiles/*/*
+%{_datadir}/logwatch/scripts/shared
+%{_datadir}/logwatch/scripts/services
+%{_datadir}/logwatch/scripts/logfiles
%{_datadir}/logwatch/lib/Logwatch.pm
%{_datadir}/logwatch/default.conf/services/*.conf
%{_datadir}/logwatch/default.conf/logfiles/*.conf
%{_datadir}/logwatch/default.conf/html/*.html
-%{_sysconfdir}/cron.daily/0logwatch
-%doc %{_mandir}/man8/logwatch.8*
-
-%doc License project/CHANGES
+%{_mandir}/man*/*
+#%doc License project/CHANGES
%changelog
+* Thu Jan 13 2011 Karel Klíč <kklic at redhat.com> - 7.3.6-59.20100113svn22
+- Updated to the latest SVN upstream revision
+- Removed patches merged by upstream
+- Removed logwatch-7.3.6-usage.patch, because --usage works in the new
+ version
+- Removed logwatch-7.3.6-cron_conf.patch, because logwatch already
+ handles the same problem, only differently
+- Removed logwatch-7.3.6-sendmail.patch: if the log level becomes
+ problem again, it should be fixed differently
+- Removed Fedora-specific /etc/logwatch/conf/{logwatch,ignore}.conf,
+ upstream version is used instead
+- Renamed logwatch-7.3.1-vsftpd.patch to logwatch-vsftpd.patch,
+ logwatch-7.3.6-oldfiles.patch to logwatch-oldfiles.patch, and
+ logwatch-7.3.6-postfix.patch to logwatch-postfix.patch, because
+ versioning no longer makes sense in Logwatch (the patches does not
+ necessarily apply to the last officially released version);
+ all patches updated to apply on the latest sources
+- Added logwatch-automount.patch by Frank Crawford (rhbz#666582)
+- Added logwatch-dhcpd.patch by Frank Crawford (rhbz#666393)
+- Added logwatch-dovecot.patch by Frank Crawford (rhbz#666376)
+- Added logwatch-smartd.patch by Frank Crawford (rhbz#666382)
+- Added logwatch-xntpd.patch by Frank Crawford (rhbz#666498)
+- Added logwatch-dovecot2.patch
+
* Sat Oct 9 2010 Richard Fearn <richardfearn at gmail.com> 7.3.6-58
- named: match "DNS format error", and variants of existing messages
(rhbz#595222)
diff --git a/sources b/sources
index c9554da..21fdb5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-937d982006b2a76a83edfcfd2e5a9d7d logwatch-7.3.6.tar.gz
+b64856e1ad7fe3e2dcc30f0032d4df66 logwatch-20110113.tar.xz
More information about the scm-commits
mailing list