Package: nagiosgrapher Severity: wishlist Hi,
I've uploaded a NMU of nagiosgrapher to delayed-7 to fix the two bugs making nagiosgrapher unusable (logrotate and multigraph). Attached is the diff. Regards, Daniel -- Address: Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist Email: [EMAIL PROTECTED] Internet: http://people.panthera-systems.net/~daniel-baumann/
diff -Naur NagiosGrapher-1.6.1-rc3.orig/debian/changelog NagiosGrapher-1.6.1-rc3/debian/changelog --- NagiosGrapher-1.6.1-rc3.orig/debian/changelog 2008-01-17 16:29:35.000000000 +0000 +++ NagiosGrapher-1.6.1-rc3/debian/changelog 2008-01-17 16:43:07.000000000 +0000 @@ -1,3 +1,16 @@ +nagiosgrapher (1.6.1rc3-2.1) unstable; urgency=low + + * Non-maintainer upload (to delayed-7). + * Fixing typo in logrotate script (Closes: #440149). + * Added patch from Horst Krause to fix bug in graphs.cgi to not always shows + only the first service graph when a host has multiple service graphs + (Closes: #437124, #439777). + * Bumped policy to 3.7.3, no other changes needed. + * Using new homepage field in control. + * Converted copyright to UTF-8. + + -- Daniel Baumann <[EMAIL PROTECTED]> Thu, 17 Jan 2008 17:36:00 +0100 + nagiosgrapher (1.6.1rc3-2) unstable; urgency=low * Fixed some lintian warnings. diff -Naur NagiosGrapher-1.6.1-rc3.orig/debian/control NagiosGrapher-1.6.1-rc3/debian/control --- NagiosGrapher-1.6.1-rc3.orig/debian/control 2008-01-17 16:29:35.000000000 +0000 +++ NagiosGrapher-1.6.1-rc3/debian/control 2008-01-17 16:36:32.000000000 +0000 @@ -3,7 +3,8 @@ Priority: extra Maintainer: Hendrik Frenzel <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5), dpatch, cdbs, autoconf -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 +Homepage: http://www.nagiosexchange.org/NagiosGrapher.84.0.html Package: nagiosgrapher Architecture: any @@ -17,5 +18,3 @@ data, thus creating a new service in Nagios will automatically create the graph once valid data is seen for that service. Correlations between different graphs is also possible. - . - Homepage: http://www.nagiosexchange.org/NagiosGrapher.84.0.html diff -Naur NagiosGrapher-1.6.1-rc3.orig/debian/copyright NagiosGrapher-1.6.1-rc3/debian/copyright --- NagiosGrapher-1.6.1-rc3.orig/debian/copyright 2008-01-17 16:29:35.000000000 +0000 +++ NagiosGrapher-1.6.1-rc3/debian/copyright 2008-01-17 16:42:46.000000000 +0000 @@ -5,7 +5,7 @@ Upstream Authors: - Gerd Müller <[EMAIL PROTECTED]> + Gerd Müller <[EMAIL PROTECTED]> Copyright: diff -Naur NagiosGrapher-1.6.1-rc3.orig/debian/logrotate NagiosGrapher-1.6.1-rc3/debian/logrotate --- NagiosGrapher-1.6.1-rc3.orig/debian/logrotate 2008-01-17 16:29:35.000000000 +0000 +++ NagiosGrapher-1.6.1-rc3/debian/logrotate 2008-01-17 16:33:31.000000000 +0000 @@ -6,7 +6,7 @@ delaycompress notifempty create 644 nagios nagios - charedscripts + sharedscripts postrotate if [ -f /var/run/nagiosgrapher/nagiosgrapher.pid ]; then /etc/init.d/nagiosgrapher restart > /dev/null diff -Naur NagiosGrapher-1.6.1-rc3.orig/debian/patches/00list NagiosGrapher-1.6.1-rc3/debian/patches/00list --- NagiosGrapher-1.6.1-rc3.orig/debian/patches/00list 2008-01-17 16:29:35.000000000 +0000 +++ NagiosGrapher-1.6.1-rc3/debian/patches/00list 2008-01-17 16:40:20.000000000 +0000 @@ -1,3 +1,3 @@ debian nmgraph - +multigraph diff -Naur NagiosGrapher-1.6.1-rc3.orig/debian/patches/multigraph.dpatch NagiosGrapher-1.6.1-rc3/debian/patches/multigraph.dpatch --- NagiosGrapher-1.6.1-rc3.orig/debian/patches/multigraph.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ NagiosGrapher-1.6.1-rc3/debian/patches/multigraph.dpatch 2008-01-17 16:40:16.000000000 +0000 @@ -0,0 +1,21 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## multigraph.dpatch by Horst Krause +## +## DP: Fixes bug in graphcs.cgi to not always shows only the first service +## DP: graph when a host has multiple service graphs +## DP: (Closes: #437124, #439777). + [EMAIL PROTECTED]@ + +diff -Naurp NagiosGrapher-1.6.1-rc3.orig/sbin/graphs.cgi NagiosGrapher-1.6.1-rc3/sbin/graphs.cgi +--- NagiosGrapher-1.6.1-rc3.orig/sbin/graphs.cgi 2007-03-07 14:03:44.000000000 +0000 ++++ NagiosGrapher-1.6.1-rc3/sbin/graphs.cgi 2008-01-17 16:37:35.000000000 +0000 +@@ -207,7 +207,7 @@ sub action_graph { + $h->checkPageBrowserAuth(); + + # If the current differs from the selected, start the default service ... +- if ($h->Param('old_host') ne $h->Host) { ++ if ($h->Param('old_host') && length($h->Param('old_host')) > 0 && $h->Param('old_host') ne $h->Host) { + $service = [sort(keys(%{$xmlhash->{host}->{$h->Host}->{service}}))]->[1]; + $h->Service($service); + }
