From aba02be99a690640e2c28fe0e8e6ffa1135b45d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Kl=C3=AD=C4=8D?= Date: Fri, 16 Apr 2010 13:21:52 +0000 Subject: [PATCH] Updated the previously added patches to apply with --fuzz=0 --- logwatch-7.3.6-manpages.patch | 3 +-- logwatch-7.3.6-named8.patch | 7 ++----- logwatch-7.3.6-zz-fortune.patch | 4 ++-- logwatch.spec | 5 ++++- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/logwatch-7.3.6-manpages.patch b/logwatch-7.3.6-manpages.patch index c72005f..08807cd 100644 --- a/logwatch-7.3.6-manpages.patch +++ b/logwatch-7.3.6-manpages.patch @@ -68,9 +68,8 @@ index 6e4f7c1..3a34ce5 fi fi fi -@@ -287,12 +290,21 @@ else +@@ -287,11 +290,20 @@ else #Go for the safe install rather then editing man.cf - mkdir -p $MANDIR/man1m > /dev/null 2>&1 install -m 0644 logwatch.8 $MANDIR/man1m + install -m 0644 logwatch.conf.5 $MANDIR/man1m + install -m 0644 override.conf.5 $MANDIR/man1m diff --git a/logwatch-7.3.6-named8.patch b/logwatch-7.3.6-named8.patch index 6dae15f..229342e 100644 --- a/logwatch-7.3.6-named8.patch +++ b/logwatch-7.3.6-named8.patch @@ -12,8 +12,8 @@ index 9097a73..811a4b9 100755 --- a/scripts/services/named +++ b/scripts/services/named @@ -226,7 +226,8 @@ while (defined($ThisLine = )) { - ($ThisLine =~ /^must-be-secure resolving '.*': .*/) or - ($ThisLine =~ /^no valid (DS|KEY|RRSIG) resolving '.*': .*/) or + ($ThisLine =~ /^no valid KEY resolving '.*': .*/) or + ($ThisLine =~ /^no valid RRSIG resolving '.*': .*/) or ($ThisLine =~ /^not insecure resolving '.*': .*/) or - ($ThisLine =~ /^validating \@0x[[:xdigit:]]+: .* DS: must be secure failure/) + ($ThisLine =~ /^validating \@0x[[:xdigit:]]+: .* DS: must be secure failure/) or @@ -21,6 +21,3 @@ index 9097a73..811a4b9 100755 # too many timeouts resolving 'ns-ext.nrt1.isc.org/AAAA' (in '.'?): disabling EDNS: 3 Time(s) ) { # Don't care about these... --- -1.6.6.1 - diff --git a/logwatch-7.3.6-zz-fortune.patch b/logwatch-7.3.6-zz-fortune.patch index 88e4c14..397c324 100644 --- a/logwatch-7.3.6-zz-fortune.patch +++ b/logwatch-7.3.6-zz-fortune.patch @@ -15,7 +15,7 @@ index 12c935e..452dde2 100755 --- a/scripts/logwatch.pl +++ b/scripts/logwatch.pl @@ -1347,6 +1347,10 @@ sub parselogs { - &output( $index_par, "\n --------------------- $ServiceData{$Service}{'title'} $BeginVar ------------------------ \n\n", "line"); + output( $index_par, "\n --------------------- $ServiceData{$Service}{'title'} $BeginVar ------------------------ \n\n", "line"); } $has_output = 1; + # Set the environment variable indicating that the report @@ -23,7 +23,7 @@ index 12c935e..452dde2 100755 + # whether it should output something or not. + $ENV{'LOGWATCH_HAS_OUTPUT'} = 1; } - &output( $index_par, $ThisLine, "line"); + output( $index_par, $ThisLine, "line"); } diff --git a/scripts/services/zz-fortune b/scripts/services/zz-fortune index 77902fa..e290b75 100755 diff --git a/logwatch.spec b/logwatch.spec index 27446f6..1f1f8e3 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch Version: 7.3.6 -Release: 51%{?dist} +Release: 52%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -338,6 +338,9 @@ rm -rf %{buildroot} %doc License project/CHANGES %changelog +* Fri Apr 16 2010 Karel Klic 7.3.6-52 +- Updated the previously added patches to apply with --fuzz=0 + * Wed Apr 14 2010 Karel Klic 7.3.6-51 - Re-enabled zz-fortune with a patch that prevents sending reports containing zz-fortune only (rhbz#573450)