Hello community, here is the log from the commit of package logwatch for openSUSE:Factory checked in at 2013-06-18 10:33:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/logwatch (Old) and /work/SRC/openSUSE:Factory/.logwatch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "logwatch" Changes: -------- --- /work/SRC/openSUSE:Factory/logwatch/logwatch.changes 2012-12-28 22:44:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.logwatch.new/logwatch.changes 2013-06-18 10:33:12.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 17 15:45:13 CEST 2013 - [email protected] + +- Add logwatch-parse_rsyslog_timestamps.patch that makes logwatch + understand the default timestamp format of newer rsyslog versions + (bnc#818842). + +------------------------------------------------------------------- New: ---- logwatch-parse_rsyslog_timestamps.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ logwatch.spec ++++++ --- /var/tmp/diff_new_pack.7oWUiC/_old 2013-06-18 10:33:12.000000000 +0200 +++ /var/tmp/diff_new_pack.7oWUiC/_new 2013-06-18 10:33:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package logwatch # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,7 @@ Patch0: logwatch-firewall.patch Patch2: logwatch-timestamp_in_var.patch Patch3: logwatch-dmeventd-reduce_frequency.patch +Patch4: logwatch-parse_rsyslog_timestamps.patch Requires: %date_manip_pkg Requires: cron Requires: grep @@ -54,18 +55,13 @@ through your logs for a given period of time and make a report in the areas that you wish with the detail that you wish. - - -Authors: --------- - Kirk Bauer <[email protected]> - %prep %setup -q -a 2 chmod u+w Logwatch_Setup_Files/* %patch0 %patch2 %patch3 +%patch4 dos2unix scripts/services/courier %build ++++++ logwatch-parse_rsyslog_timestamps.patch ++++++ --- scripts/shared/applystddate | 5 +++++ 1 file changed, 5 insertions(+) Index: scripts/shared/applystddate =================================================================== --- scripts/shared/applystddate.orig 2010-05-01 04:34:09.000000000 +0200 +++ scripts/shared/applystddate 2013-06-17 12:52:20.949898694 +0200 @@ -23,6 +23,7 @@ use Logwatch ':dates'; 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/ /; @@ -30,11 +31,15 @@ $SearchDate = TimeFilter('%b %e %H:%M:%S 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; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
