rpms/logwatch/devel logwatch-7.3.6-manpages.patch, 1.1, 1.2 logwatch-7.3.6-named8.patch, 1.1, 1.2 logwatch-7.3.6-zz-fortune.patch, 1.1, 1.2 logwatch.spec, 1.130, 1.131

[Karel Klíč]

Author: kklic

Update of /cvs/pkgs/rpms/logwatch/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4634

Modified Files:
	logwatch-7.3.6-manpages.patch logwatch-7.3.6-named8.patch 
	logwatch-7.3.6-zz-fortune.patch logwatch.spec 
Log Message:
Updated the previously added patches to apply with --fuzz=0


logwatch-7.3.6-manpages.patch:
 ignore.conf.5       |    1 +
 install_logwatch.sh |   30 +++++++++++++++++++++---------
 logwatch.conf.5     |   37 +++++++++++++++++++++++++++++++++++++
 override.conf.5     |    2 +-
 4 files changed, 60 insertions(+), 10 deletions(-)

Index: logwatch-7.3.6-manpages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch-7.3.6-manpages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- logwatch-7.3.6-manpages.patch	16 Apr 2010 12:50:50 -0000	1.1
+++ logwatch-7.3.6-manpages.patch	16 Apr 2010 13:21:51 -0000	1.2
@@ -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

logwatch-7.3.6-named8.patch:
 named |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: logwatch-7.3.6-named8.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch-7.3.6-named8.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- logwatch-7.3.6-named8.patch	16 Apr 2010 12:50:50 -0000	1.1
+++ logwatch-7.3.6-named8.patch	16 Apr 2010 13:21:51 -0000	1.2
@@ -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
-

logwatch-7.3.6-zz-fortune.patch:
 logwatch.pl         |    4 ++++
 services/zz-fortune |   20 +++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

Index: logwatch-7.3.6-zz-fortune.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch-7.3.6-zz-fortune.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- logwatch-7.3.6-zz-fortune.patch	16 Apr 2010 12:50:51 -0000	1.1
+++ logwatch-7.3.6-zz-fortune.patch	16 Apr 2010 13:21:52 -0000	1.2
@@ -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


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- logwatch.spec	16 Apr 2010 12:50:51 -0000	1.130
+++ logwatch.spec	16 Apr 2010 13:21:52 -0000	1.131
@@ -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 at redhat.com> 7.3.6-52
+- Updated the previously added patches to apply with --fuzz=0
+
 * Wed Apr 14 2010 Karel Klic <kklic at redhat.com> 7.3.6-51
 - Re-enabled zz-fortune with a patch that prevents sending reports 
   containing zz-fortune only (rhbz#573450)