Skip to content
Snippets Groups Projects
Commit ad21dab1 authored by Sergej Pupykin's avatar Sergej Pupykin
Browse files

upd

parent 927d2e74
No related branches found
Tags 4.0-3
No related merge requests found
......@@ -2,7 +2,7 @@
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=logwatch
pkgver=7.4.2
pkgver=7.4.3
pkgrel=1
arch=('any')
pkgdesc="Logwatch is a customizable log analysis system."
......@@ -14,7 +14,7 @@ backup=(etc/logwatch/conf/logwatch.conf
etc/logwatch/conf/ignore.conf
etc/logwatch/conf/override.conf)
source=(http://downloads.sourceforge.net/project/logwatch/logwatch-$pkgver/logwatch-$pkgver.tar.gz)
md5sums=('6eef537d20a7ec3bd3c99109853e2a05')
md5sums=('22bd22841caa45f12c605abc3e0c2b09')
package() {
cd $srcdir/$pkgname-$pkgver
......
--- /usr/share/logwatch/scripts/shared/applystddate.orig 2009-12-15 14:36:04.000000000 +0000
+++ /usr/share/logwatch/scripts/shared/applystddate.orig 2010-04-19 14:25:55.000000000 +0000
@@ -15,6 +15,7 @@
my $Debug = $ENV{'LOGWATCH_DEBUG'} || 0;
$SearchDate = TimeFilter('%b %e %H:%M:%S');
+$SearchDateRsyslog = TimeFilter('%Y-%m-%dT%H:%M:%S\.[0-9]+[+-][0-9]{2}:[0-9]{2}');
# The date might be "Dec 09", but it needs to be "Dec 9"...
#$SearchDate =~ s/ 0/ /;
@@ -22,11 +23,15 @@
if ( $Debug > 5 ) {
print STDERR "DEBUG: Inside ApplyStdDate...\n";
print STDERR "DEBUG: Looking For: " . $SearchDate . "\n";
+ print STDERR "DEBUG: Looking For: " . $SearchDateRsyslog . "\n";
}
while (defined($ThisLine = <STDIN>)) {
if ($ThisLine =~ m/^$SearchDate /o) {
print $ThisLine;
+ } elsif ($ThisLine =~ /^$SearchDateRsyslog /o) {
+ $ThisLine =~ s/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})\.[0-9]+[+-][0-9]{2}:[0-9]{2} //o;
+ print POSIX::strftime("%b %e %H:%M:%S", $6, $5, $4, $3+1, $2-1, $1 - 1900) . " " . $ThisLine;
} elsif ($ThisLine =~ m/(Mon|Tue|Wed|Thu|Fri|Sat|Sun) $SearchDate \d{4}/o) {
print $ThisLine;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment