diff --git a/.gitignore b/.gitignore index 08d269a..00f738e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ logwatch-7.3.6.tar.gz /logwatch-svn25.tar.xz /logwatch-svn46.tar.xz /logwatch-svn50.tar.xz +/logwatch-svn85.tar.xz diff --git a/logwatch-dovecot.patch b/logwatch-dovecot.patch index 4895755..b49d744 100644 --- a/logwatch-dovecot.patch +++ b/logwatch-dovecot.patch @@ -1,15 +1,17 @@ ---- logwatch-svn50.dist/scripts/services/dovecot 2011-02-23 09:20:30.000000000 +1100 -+++ logwatch-svn50/scripts/services/dovecot 2011-04-26 14:07:53.000000000 +1000 +Index: scripts/services/dovecot +=================================================================== +--- scripts/services/dovecot (revision 85) ++++ scripts/services/dovecot (working copy) @@ -121,7 +121,7 @@ # We don't care about these } elsif ( $ThisLine =~ /Killed with signal /) { $End++; -- } elsif ( $ThisLine =~ /Dovecot (v\d[^ ]* |)starting up$/) { +- } elsif ( $ThisLine =~ /Dovecot (v\d[^ ]* |)starting up( \(core dumps disabled\))?$/) { + } elsif ( $ThisLine =~ /Dovecot (v\d[^ ]* |)starting up( \(.*\))?$/) { $Restarts++; $End = 0; } elsif ( ($User, $Host) = ( $ThisLine =~ /^pop3-login: Login: (.*?) \[(.*)\]/ ) ) { -@@ -147,15 +147,15 @@ +@@ -147,15 +147,16 @@ } # 'lda' for dovecot 2.0, 'deliver' for earlier versions @@ -18,8 +20,8 @@ $Deliver{$User}{$Mailbox}++; # For Sieve-based delivery -- } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda|deliver)\((.*)\): sieve: msgid=.*: stored mail into mailbox '(\S+)'/ ) ) { -+ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda|deliver)\((.*)\): sieve: msgid=.*: stored mail into mailbox '(.*)'/ ) ) { + } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda\(|deliver\(|lmtp\(\d+, )(.*)\): (?:[^:]+: )?sieve: msgid=.*: stored mail into mailbox '(\S+)'/ ) ) { ++ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda|deliver)\((.*)\): sieve: msgid=.*: stored mail into mailbox '(.*)'/ ) ) { $Deliver{$User}{$Mailbox}++; # LMTP-based delivery diff --git a/logwatch-secure.patch b/logwatch-secure.patch index 060b8bb..67b2581 100644 --- a/logwatch-secure.patch +++ b/logwatch-secure.patch @@ -1,15 +1,8 @@ ---- logwatch-svn50.dist/scripts/services/secure 2011-02-25 02:21:40.000000000 +1100 -+++ logwatch-svn50/scripts/services/secure 2011-04-26 14:30:58.000000000 +1000 -@@ -218,7 +218,7 @@ - ( $ThisLine =~ /com.apple.SecurityServer: Entering service/) or - ( $ThisLine =~ /^(xinetd|xinetd-ipv6)\[\d+\]: EXIT: /) or - ( $ThisLine =~ /^crond\(\w+\)\[\d+\]: session /) or -- ( $ThisLine =~ /pam_systemd\(\w+:session\): Moving/) or -+ ( $ThisLine =~ /pam_systemd\(.+:session\): Moving/) or - ( $ThisLine =~ /^sshd\(\w+\)\[\d+\]: authentication failure/) or - ( $ThisLine =~ /^sshd\(\w+\)\[\d+\]: check pass; user unknown/) or - ( $ThisLine =~ /^sshd\(\w+\)\[\d+\]: session /) or -@@ -243,10 +243,12 @@ +Index: scripts/services/secure +=================================================================== +--- scripts/services/secure (revision 85) ++++ scripts/services/secure (working copy) +@@ -244,10 +244,12 @@ ( $ThisLine =~ /PAM pam_set_item: attempt to set conv\(\) to NULL/) or ( $ThisLine =~ /PAM pam_get_item: nowhere to place requested item/) or ( $ThisLine =~ /pam_succeed_if\(.*:.*\): error retrieving information about user [a-zA-Z]*/ ) or @@ -22,7 +15,7 @@ ( $ThisLine =~ /sshd.*: Accepted \S+ for \S+ from [\d\.:a-f]+ port \d+/) or # ssh script reads this log ( $ThisLine =~ /userhelper.*: running (.*) with context (.*)/) or ( $ThisLine =~ /userhelper.*: pam_thinkfinger(.*): conversation failed/) or -@@ -254,7 +256,10 @@ +@@ -255,7 +257,10 @@ ( $ThisLine =~ /polkit-grant-helper\[\d+\]: granted authorization for [^ ]* to uid [0-9]* \[auth=.*\]/) or ( $ThisLine =~ /polkit-grant-helper\[\d+\]: granted authorization for [^ ]* to session .* \[uid=[0-9]*\]/) or ( $ThisLine =~ /polkit-grant-helper-pam\[\d+\]: pam_thinkfinger\(polkit:auth\): conversation failed/) or @@ -30,16 +23,16 @@ + ( $ThisLine =~ /polkitd\(authority=.*\): (Unr|R)egistered Authentication Agent/) or + ( $ThisLine =~ /(gdm-session-worker|gdm-password)\[\d+\]: gkr-pam: no password is available for user/) or + ( $ThisLine =~ /gkr-pam: the password for the login keyring was invalid/) or -+ ( $ThisLine =~ /groupadd\[\d+\]: group added to /) or # Details in other messages ++ ( $ThisLine =~ /groupadd\[\d+\]: group added to /) or # Details in other messages ( $ThisLine =~ /gdm-session-worker\[\d+\]: pam_namespace\(gdm:session\): Unmount of [^ ]* failed, Device or resource busy/) ) { # Ignore these entries -@@ -379,13 +384,13 @@ +@@ -380,13 +385,13 @@ $DeletedGroups .= " $ThisLine\n"; } elsif ( $ThisLine =~ s/^(?:useradd|adduser)\[\d+\]: new group: name=(.+), (?:gid|GID)=(\d+).*$/$1 ($2)/ ) { $NewGroups .= " $ThisLine\n"; - } elsif ( (undef,$User,,undef,$Group) = ($ThisLine =~ /(usermod|useradd)\[\d+\]: add `([^ ]+)' to (shadow |)group `([^ ]+)'/ )) { -+ } elsif ( (undef,$User,,undef,$Group) = ($ThisLine =~ /(usermod|useradd)\[\d+\]: add [`']([^ ]+)' to (shadow |)group [`']([^ ]+)'/ )) { ++ } elsif ( (undef,$User,,undef,$Group) = ($ThisLine =~ /(usermod|useradd)\[\d+\]: add [`']([^ ]+)' to (shadow|)group [`']([^ ]+)'/ )) { $AddToGroup{$Group}{$User}++; } elsif ( $ThisLine =~ s/^groupadd\[\d+\]: new group: name=(.+), (?:gid|GID)=(\d+).*$/$1 ($2)/ ) { $NewGroups .= " $ThisLine\n"; @@ -50,7 +43,7 @@ push @RemoveFromGroup, " user $1 from group $3\n"; # This is an inetd lookup... $1 is the service (i.e. ftp), $2 is the response # I don't think these are important to log at this time -@@ -472,7 +477,7 @@ +@@ -473,7 +478,7 @@ } elsif ( ($Client,$User) = ($ThisLine =~ /vmware-authd\[\d+\]: login from ([0-9\.]+) as ([^ ]+)/) ) { $UserLogin{$User}++; } elsif ( ($User) = ($ThisLine =~ /vmware-authd\[\d+\]: pam_unix_auth\(vmware-authd:auth\): authentication failure; logname= uid=0 euid=0 tty= ruser= rhost= user=([^ ]*)/) ) { diff --git a/logwatch-xntpd.patch b/logwatch-xntpd.patch index 840aafd..4273d06 100644 --- a/logwatch-xntpd.patch +++ b/logwatch-xntpd.patch @@ -1,7 +1,8 @@ -diff -up logwatch-svn46/scripts/services/xntpd.improve logwatch-svn46/scripts/services/xntpd ---- logwatch-svn46/scripts/services/xntpd.improve 2011-03-28 14:47:20.203582860 +0200 -+++ logwatch-svn46/scripts/services/xntpd 2011-03-28 14:48:14.978714233 +0200 -@@ -142,6 +142,7 @@ while (defined(my $ThisLine = )) +Index: scripts/services/xntpd +=================================================================== +--- scripts/services/xntpd (revision 85) ++++ scripts/services/xntpd (working copy) +@@ -142,6 +142,7 @@ ($ThisLine =~ m/tickadj = /) or # startup ($ThisLine =~ m/precision = /) or # startup ($ThisLine =~ m/ (succeeded|failed)/) or # startup @@ -9,16 +10,16 @@ diff -up logwatch-svn46/scripts/services/xntpd.improve logwatch-svn46/scripts/se ($ThisLine =~ m/kernel time (discipline|sync) status/) or # startup ($ThisLine =~ m/kernel time sync (dis|en)abled /) or # startup ($ThisLine =~ m/frequency initialized/) or # startup -@@ -154,6 +155,8 @@ while (defined(my $ThisLine = )) +@@ -154,6 +155,8 @@ ($ThisLine =~ /Listening on interface .* Disabled/) or ($ThisLine =~ /Listen and drop on /) or ($ThisLine =~ /Listening on routing socket on/) or -+ ($ThisLine =~ /.* interface .* -> \(null\)/) or -+ ($ThisLine =~/Deferring DNS for/) or - ($ThisLine =~ /ntp_io: estimated max descriptors: \d*, initial socket boundary: \d*/) - ) { - # Ignore these -@@ -174,7 +177,7 @@ while (defined(my $ThisLine = )) ++ ($ThisLine =~ /.* interface .* -> \(null\)/) or ++ ($ThisLine =~/Deferring DNS for/) or + ($ThisLine =~ /ntp_io: estimated max descriptors: \d*, initial socket boundary: \d*/) or + ($ThisLine =~ /peers refreshed$/) or + ($ThisLine =~ /restrict: error in address/) or +@@ -177,7 +180,7 @@ } elsif ( my (undef,$TimeStep) = ($ThisLine =~ /(offset) ([^ ]+) sec/ )) { push @TimeReset, $TimeStep; # MEv end no leadin to line @@ -27,7 +28,7 @@ diff -up logwatch-svn46/scripts/services/xntpd.improve logwatch-svn46/scripts/se $Interfaces{$ListenOn}++; } elsif ( my ($ListenOn) = ($ThisLine =~ /Listen normally on \d+ (.*)/ )) { $Interfaces{$ListenOn}++; -@@ -193,7 +196,7 @@ while (defined(my $ThisLine = )) +@@ -196,7 +199,7 @@ $TwoInst{$name}++; } elsif ( my ($Error) = ($ThisLine =~ /(no server(s reachable| suitable for synchronization found))/ )) { $Errors{$Error}++; diff --git a/logwatch.spec b/logwatch.spec index 4f1e2ef..5e3a262 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,15 +1,15 @@ Summary: A log file analysis program Name: logwatch Version: 7.4.0 -Release: 8.20110328svn50%{?dist} +Release: 1.20120229svn85%{?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 50 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-svn50 -# tar cJvf logwatch-svn50.tar.xz logwatch-svn50 -Source0: logwatch-svn50.tar.xz +# svn export -r 85 https://logwatch.svn.sourceforge.net/svnroot/logwatch logwatch-svn85 +# tar cJvf logwatch-svn85.tar.xz logwatch-svn85 +Source0: logwatch-svn85.tar.xz #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Needs proper fix. Not applied by the upstream. Patch0: logwatch-vsftpd.patch @@ -25,8 +25,6 @@ Patch5: logwatch-xntpd.patch Patch6: logwatch-smartd.patch Patch7: logwatch-dovecot.patch Patch8: logwatch-sshd.patch -# Fixes typo in sendmail script output -Patch9: logwatch-sendmail.patch Patch10: logwatch-secure-grammar.patch Requires: textutils sh-utils grep mailx Requires: perl(Date::Manip) @@ -39,17 +37,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 -n logwatch-svn50 +%setup -q -n logwatch-svn85 %patch0 -p1 %patch1 -p1 -%patch2 -p1 +%patch2 -p0 %patch3 -p1 %patch4 -p1 -%patch5 -p1 +%patch5 -p0 %patch6 -p1 -%patch7 -p1 +%patch7 -p0 %patch8 -p1 -%patch9 -p1 %patch10 -p1 rm -f scripts/services/*.orig @@ -142,6 +139,11 @@ echo "# Configuration overrides for specific logfiles/services may be placed her %{_mandir}/man*/* %changelog +* Wed Feb 29 2012 Jan Synáček - 7.4.0-1.20120229svn85 +- Update to revision 85 +- Drop sendmail patch +- Update xntpd,secure and dovecot patches + * Wed Jan 04 2012 Jan Synáček - 7.4.0-8.20110328svn50 - Updated -manpage patch (rhbz#719061) diff --git a/sources b/sources index 8576773..43dd4db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4477292f4cc42487fc5f4c94d9b80467 logwatch-svn50.tar.xz +7e26506612777f483d9dfc27ad04d2e4 logwatch-svn85.tar.xz