Updated to the latest svn revision, removed patches merged by upstream
This commit is contained in:
Karel Klic
parent
164744f193
commit
ee71123cb4
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
logwatch-7.3.6.tar.gz
|
||||
/logwatch-20110113.tar.xz
|
||||
/logwatch-20110201.tar.xz
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- 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/)
|
||||
@ -1,67 +0,0 @@
|
||||
--- 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 {
|
||||
@ -1,14 +0,0 @@
|
||||
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
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up logwatch-20110113/scripts/services/pam_unix.orig logwatch-20110113/scripts/services/pam_unix
|
||||
--- logwatch-20110113/scripts/services/pam_unix.orig 2011-01-06 23:16:39.000000000 +0100
|
||||
+++ logwatch-20110113/scripts/services/pam_unix 2011-01-17 19:02:29.218968788 +0100
|
||||
@@ -218,7 +218,7 @@ while ($line = <STDIN>) {
|
||||
if ($line =~ s/^password changed for (.+)/$1/) {
|
||||
($Detail >= 5) && $data{$service}{'Password changed'}{$line}++;
|
||||
}
|
||||
- } elsif (($service eq 'gdm') || ($service eq 'kdm') || ($service eq 'kcheckpass') || ($service eq 'xdm') || ($service eq 'imap') || ($service eq 'dovecot') || ($service eq 'cups')) {
|
||||
+ } elsif (grep $_ eq $service, qw/gdm gdm-password kdm kcheckpass xdm imap dovecot cups/) {
|
||||
if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) {
|
||||
($Detail >= 5) && $data{$service}{'Sessions Opened'}{$line}++;
|
||||
} elsif ($line =~ s/^authentication failure;.* user=(.+)$/$1/) {
|
||||
@ -1,13 +0,0 @@
|
||||
--- 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)/ )) {
|
||||
@ -1,36 +0,0 @@
|
||||
--- 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,14 @@ 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++;
|
||||
@ -1,15 +1,15 @@
|
||||
Summary: A log file analysis program
|
||||
Name: logwatch
|
||||
Version: 7.3.6
|
||||
Release: 62.20110113svn22%{?dist}
|
||||
Release: 63.20110201svn23%{?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 22 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-20110113
|
||||
# tar cJvf logwatch-20110113.tar.xz logwatch-20110113
|
||||
Source0: logwatch-20110113.tar.xz
|
||||
# svn export -r 23 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-20110201
|
||||
# tar cJvf logwatch-20110201.tar.xz logwatch-20110201
|
||||
Source0: logwatch-20110201.tar.xz
|
||||
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
# Needs proper fix. Not applied by the upstream.
|
||||
Patch0: logwatch-vsftpd.patch
|
||||
@ -18,20 +18,9 @@ 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
|
||||
# Sent to upstream.
|
||||
Patch3: logwatch-automount.patch
|
||||
#Patch2: logwatch-postfix.patch
|
||||
# Sent to upstream.
|
||||
Patch4: logwatch-dhcpd.patch
|
||||
# Sent to upstream.
|
||||
Patch5: logwatch-dovecot.patch
|
||||
# Sent to upstream.
|
||||
Patch6: logwatch-smartd.patch
|
||||
# Sent to upstream.
|
||||
Patch7: logwatch-xntpd.patch
|
||||
# Sent to upstream.
|
||||
Patch8: logwatch-dovecot2.patch
|
||||
Patch9: logwatch-pam_unix.patch
|
||||
Requires: textutils sh-utils grep mailx
|
||||
Requires: perl(Date::Manip)
|
||||
BuildArchitectures: noarch
|
||||
@ -43,17 +32,10 @@ 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-20110113
|
||||
%setup -q -n logwatch-20110201
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
#%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
rm -f scripts/services/*.orig
|
||||
|
||||
%build
|
||||
@ -148,6 +130,9 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
|
||||
#%doc License project/CHANGES
|
||||
|
||||
%changelog
|
||||
* Wed Feb 2 2011 Karel Klic <kklic@redhat.com> - 7.3.6-63.20110201svn23
|
||||
- Updated to the latest svn revision, removed patches merged by upstream
|
||||
|
||||
* Sun Jan 23 2011 Richard Fearn <richardfearn@gmail.com> - 7.3.6-62.20110113svn22
|
||||
- Fix rhbz#671201: make /etc/cron.daily/0logwatch executable
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user