Updated the previously added patches to apply with --fuzz=0

This commit is contained in:
Karel Klíč 2010-04-16 13:21:52 +00:00
parent c2a51fa9d7
commit aba02be99a
4 changed files with 9 additions and 10 deletions

View File

@ -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

View File

@ -12,8 +12,8 @@ index 9097a73..811a4b9 100755
--- a/scripts/services/named
+++ b/scripts/services/named
@@ -226,7 +226,8 @@ while (defined($ThisLine = <STDIN>)) {
($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

View File

@ -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

View File

@ -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 <kklic@redhat.com> 7.3.6-52
- Updated the previously added patches to apply with --fuzz=0
* Wed Apr 14 2010 Karel Klic <kklic@redhat.com> 7.3.6-51
- Re-enabled zz-fortune with a patch that prevents sending reports
containing zz-fortune only (rhbz#573450)