[Pkg-nagios-changes] [pkg-nagios] r2040 - in nagiosgrapher/trunk/debian: . patches

[Alexander Reichle-Schmehl]

tags 590555 pending
thanks

Author: tolimar
Date: 2012-06-07 13:52:11 +0000 (Thu, 07 Jun 2012)
New Revision: 2040

Added:
   nagiosgrapher/trunk/debian/patches/590555.dpatch
Modified:
   nagiosgrapher/trunk/debian/changelog
   nagiosgrapher/trunk/debian/patches/00list
   nagiosgrapher/trunk/debian/patches/566248.dpatch
Log:
Fix #590555 by not accessing unitialized variables



Modified: nagiosgrapher/trunk/debian/changelog
===================================================================
--- nagiosgrapher/trunk/debian/changelog	2012-06-06 14:28:45 UTC (rev 2039)
+++ nagiosgrapher/trunk/debian/changelog	2012-06-07 13:52:11 UTC (rev 2040)
@@ -1,6 +1,9 @@
 nagiosgrapher (1.7.1-4) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Avoid accessing uninitialized values to not spam error.log (Closes: #590555)
+   * Update debian/patches/566248.dpatch to set $end when not initialized
+   * Add debian/patches/590555.dpatch to solve same problem in rrd2-graph.cgi
 
  -- Alexander Reichle-Schmehl <tolimar at debian.org>  Sat, 03 Dec 2011 13:47:44 +0100
 

Modified: nagiosgrapher/trunk/debian/patches/00list
===================================================================
--- nagiosgrapher/trunk/debian/patches/00list	2012-06-06 14:28:45 UTC (rev 2039)
+++ nagiosgrapher/trunk/debian/patches/00list	2012-06-07 13:52:11 UTC (rev 2040)
@@ -6,5 +6,6 @@
 483695
 536876
 566248
+590555
 fix-unparsable_time
 

Modified: nagiosgrapher/trunk/debian/patches/566248.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/566248.dpatch	2012-06-06 14:28:45 UTC (rev 2039)
+++ nagiosgrapher/trunk/debian/patches/566248.dpatch	2012-06-07 13:52:11 UTC (rev 2040)
@@ -5,14 +5,14 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad nagiosgrapher-1.7.1~/sbin/rrd2-graph.cgi.in nagiosgrapher-1.7.1/sbin/rrd2-graph.cgi.in
---- nagiosgrapher-1.7.1~/sbin/rrd2-graph.cgi.in	2008-12-18 10:27:55.000000000 +0100
-+++ nagiosgrapher-1.7.1/sbin/rrd2-graph.cgi.in	2010-02-18 17:11:23.000000000 +0100
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagiosgrapher-1.7.1~/sbin/rrd2-graph.cgi.in nagiosgrapher-1.7.1/sbin/rrd2-graph.cgi.in
+--- nagiosgrapher-1.7.1~/sbin/rrd2-graph.cgi.in	2012-06-07 15:35:50.000000000 +0200
++++ nagiosgrapher-1.7.1/sbin/rrd2-graph.cgi.in	2012-06-07 15:41:07.259582351 +0200
 @@ -74,6 +74,7 @@
  $title   = param("title");
  $end     = param("end");
  $start   = param("start");
-+$end = '-1' if $end eq '';
++if (defined $end) { $end = '-1' if $end eq '' } else { $end = '-1' };
  
  $width      = param("width");
  $height     = param("height");

Added: nagiosgrapher/trunk/debian/patches/590555.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/590555.dpatch	                        (rev 0)
+++ nagiosgrapher/trunk/debian/patches/590555.dpatch	2012-06-07 13:52:11 UTC (rev 2040)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 590555.dpatch by Alexander Reichle-Schmehl <tolimar at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagiosgrapher-1.7.1~/lib/NagiosGrapher.pm.in nagiosgrapher-1.7.1/lib/NagiosGrapher.pm.in
+--- nagiosgrapher-1.7.1~/lib/NagiosGrapher.pm.in	2008-12-18 10:27:55.000000000 +0100
++++ nagiosgrapher-1.7.1/lib/NagiosGrapher.pm.in	2012-06-07 15:48:04.035033718 +0200
+@@ -1366,6 +1366,7 @@
+ 
+ 	# init
+ 	my $param = $self->get_ngraphercfg_value($_[0]);
++	if (not defined $param) {$param = ""};
+ 	my $retval = 0;
+ 
+ 	# check parameter


Property changes on: nagiosgrapher/trunk/debian/patches/590555.dpatch
___________________________________________________________________
Added: svn:executable
   + *