--- nagiosgrapher-1.7.1.orig/debian/NEWS +++ nagiosgrapher-1.7.1/debian/NEWS @@ -0,0 +1,9 @@ +nagiosgrapher (1.6.1rc5-6) unstable; urgency=low + + With this release of the debian packages, the placeholder tags where changed + from ###TAG### to ___TAG___ to better distinguish between #comments and those + tags. Please check your /etc/nagiosgrapher/ngraph.ncfg to fit those new tags + or new created serviceextinfo won't work correctly. + + -- Hendrik Frenzel Wed, 30 Apr 2008 01:37:03 +0200 + --- nagiosgrapher-1.7.1.orig/debian/README.Debian +++ nagiosgrapher-1.7.1/debian/README.Debian @@ -0,0 +1,26 @@ +nagiosgrapher for Debian +------------------------ + +Thank you for using this software. There are some steps to get them all work. + +Taken from make output: + + ============================================================= + Just a few steps to run the grapher ... + + ============================================================= + + To tell nagios to write service perfdata add these lines to your nagios.cfg: + + process_performance_data=1 + service_perfdata_command=ngraph-process-service-perfdata-pipe + + ============================================================= + + Please do not forget to set a proper loglevel! + +There is an example in /usr/share/doc/nagiosgrapher/examples with some more ways +to define service_perfdata_commands + + -- Hendrik Frenzel Wed, 30 Apr 2008 02:01:06 +0200 + --- nagiosgrapher-1.7.1.orig/debian/README.source +++ nagiosgrapher-1.7.1/debian/README.source @@ -0,0 +1,2 @@ +This package uses dpatch for patch management. See +/usr/share/doc/dpatch/README.source.gz for more details. --- nagiosgrapher-1.7.1.orig/debian/TODO +++ nagiosgrapher-1.7.1/debian/TODO @@ -0,0 +1,6 @@ +nagiosgrapher TODO +------------------ + +* split upstream related patches from debian patches +* update to new upstream release (curr. 1.7.1) + --- nagiosgrapher-1.7.1.orig/debian/changelog +++ nagiosgrapher-1.7.1/debian/changelog @@ -0,0 +1,134 @@ +nagiosgrapher (1.7.1-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Refresh patch 495640 to make it apply. (Closes: #718160) + + -- Margarita Manterola Fri, 09 Aug 2013 09:24:47 +0000 + +nagiosgrapher (1.7.1-4) unstable; urgency=low + + * 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 + * debian/rules: Create postrm script from postrm.in so we don't leave + cruft behind after package purge (Closes: #670434) + + -- Alexander Reichle-Schmehl Sat, 03 Dec 2011 13:47:44 +0100 + +nagiosgrapher (1.7.1-3) unstable; urgency=medium + + * Update maintainer list + * Call ucf in postrm conditionally (Closes: #639279) + * Update Homepage field + * Remove dm-upload-allowed as there's currently no maintainer + * Depend on nagios or icinga (Closes: #603705) + * Bump standards to 3.9.2 + * Add debian/README.source + * Set urgency to medium due to rc bug fix + + -- Alexander Reichle-Schmehl Sat, 03 Dec 2011 13:40:13 +0100 + +nagiosgrapher (1.7.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/rules: install standard//check_disk.ncfg + standard//check_swap.ncfg standard//check_ping.ncfg + standard//check_load.ncfg standard//check_procs.ncfg via ucf instead of + directly in the package (as it was done before) (Closes: #603456) + * Set urgency to medium due to rc bug fix + + -- Alexander Reichle-Schmehl Fri, 26 Nov 2010 17:29:27 +0100 + +nagiosgrapher (1.7.1-2) unstable; urgency=low + + [ Hendrik Frenzel ] + * rrd2-graph.cgi: + fixed uninitialized value error in rrd2-graph.cgi (Closes: 536876) + fixed empty $end variable (Closes: 566248) + * removed duplicate logrotate config (Closes: 516076) + * added $remote_fs $syslog dependency to the init script + * removed empty var/run + * escaped minus sign in manpage + + -- Hendrik Frenzel Thu, 18 Feb 2010 16:58:26 +0100 + +nagiosgrapher (1.7.1-1) unstable; urgency=low + + [ Hendrik Frenzel ] + * packaged current stable upstream release (Closes: 514362, 565914) + * removed useless README (Closes: 495640) + * fixed graph_log_regex in templates/standard/check_smtp.ncfg to better match + the log output and changed graph_log_regex to graph_perf_regex in + templates/standard/check_http.ncfg according to check_imap.ncfg (Closes: + 513969) + * changed order of setuid/setgid and added checks if those operations fail + and changed permission in create_pipe in collect2.pl from 0666 to 0660 + (Closes: 483695) + + -- Hendrik Frenzel Sun, 15 Feb 2009 13:18:02 +0100 + +nagiosgrapher (1.6.1rc5-6) unstable; urgency=low + + * patched ignorance of comments into NagiosGrapher.pm (Closes: 466854) + + changed tags in ngraph.ncfg + (see /usr/share/doc/nagiosgrapher/NEWS.Debian.gz) + * switched to nagios3 support (Closes: 479291) + + moved nagiosgraphers config for nagios3 to /etc/nagiosgrapher/nagios3 + and symlinked to /etc/nagios3/conf.d/ngraph for inclusion + * debian/watch + + changed upstreams download URL + + removed unused comments + * debian/postrm.in + + purge ucf handled configs on package purge + * debian/copyright + + switched to format as proposed on + http://wiki.debian.org/Proposals/CopyrightFormat + + -- Hendrik Frenzel Mon, 19 May 2008 22:51:09 +0200 + +nagiosgrapher (1.6.1rc5-5) unstable; urgency=low + + * patched clean and distclean targets to Makefile.in + + -- Hendrik Frenzel Mon, 21 Jan 2008 19:56:58 +0100 + +nagiosgrapher (1.6.1rc5-4) unstable; urgency=low + + * Fixed Vcs-* fields in debian/control + * update to Standards-Version to 3.7.3. + * enabled DM-Upload + * removed old Homepage stanza in debian/control + + -- Hendrik Frenzel Thu, 10 Jan 2008 00:59:43 +0100 + +nagiosgrapher (1.6.1rc5-3) unstable; urgency=low + + * Fixed example process-service-perfdata fifo_write command in README.Debian + + -- Hendrik Frenzel Thu, 18 Oct 2007 12:18:30 +0200 + +nagiosgrapher (1.6.1rc5-2) unstable; urgency=low + + * Fixed typo in logrotate script (Closes: #440149) + + -- Hendrik Frenzel Thu, 30 Aug 2007 17:17:08 +0200 + +nagiosgrapher (1.6.1rc5-1) unstable; urgency=low + + * New upstream release (Closes: #437124, #439777, #442042) + + -- Hendrik Frenzel Sat, 18 Aug 2007 00:31:55 +0200 + +nagiosgrapher (1.6.1rc3-2) unstable; urgency=low + + * Fixed some lintian warnings. + + -- Hendrik Frenzel Mon, 23 Jul 2007 22:03:14 +0200 + +nagiosgrapher (1.6.1rc3-1) unstable; urgency=low + + * Initial release (Closes: #401113: ITP: nagiosgrapher -- A graphing system for + the Nagios monitoring system project.) + + -- Hendrik Frenzel Mon, 16 Jul 2007 11:27:27 +0200 + --- nagiosgrapher-1.7.1.orig/debian/commands.cfg +++ nagiosgrapher-1.7.1/debian/commands.cfg @@ -0,0 +1,10 @@ +define command{ + command_name ngraph-process-service-perfdata-pipe + command_line /usr/lib/nagiosgrapher/fifo_write /var/lib/nagiosgrapher/ngraph.pipe '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 3 +} + +define command{ + command_name ngraph-process-service-perfdata-udp + command_line /usr/lib/nagiosgrapher/udpecho 127.0.0.1 '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 5667 +} + --- nagiosgrapher-1.7.1.orig/debian/compat +++ nagiosgrapher-1.7.1/debian/compat @@ -0,0 +1 @@ +5 --- nagiosgrapher-1.7.1.orig/debian/control +++ nagiosgrapher-1.7.1/debian/control @@ -0,0 +1,23 @@ +Source: nagiosgrapher +Section: misc +Priority: extra +Maintainer: Debian Nagios Maintainer Group +Uploaders: Alexander Reichle-Schmehl +Build-Depends: debhelper (>= 5), dpatch, cdbs, autoconf +Standards-Version: 3.9.2 +Homepage: http://www.netways.de/en/de/produkte/nagios_addons/nagiosgrapher/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-nagios/nagiosgrapher/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/nagiosgrapher/trunk/ + +Package: nagiosgrapher +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ucf, ttf-dejavu, rrdtool, librrds-perl, libgd-gd2-perl, libimage-magick-perl, libcalendar-simple-perl, liburi-perl, nagios3 | icinga, nagios-images +Suggests: netcat +Description: Charting add-on for Nagios + The "NETWAYS Nagios Grapher" is a Graphing system which uses templates to + assign services to various data sources (RRDs). Thus it is possible to + create a quantity of graphs using only a small configuration, keeping it + easy to manage. These templates are automatically applied to incoming + 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. --- nagiosgrapher-1.7.1.orig/debian/copyright +++ nagiosgrapher-1.7.1/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Frenzel + +Files: * +Copyright: © 2004-2007 NETWAYS GmbH + © 2004-2007 Gerd Mueller + © 2004-2007 Christian Doebler + © 2004-2007 Marius Hein +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL'. + +Files: debian/* +Copyright: © 2007-2008 Hendrik Frenzel +License: GPL-2+ + The Debian packaging information is under the GPL, version 2 or later. + See above. + --- nagiosgrapher-1.7.1.orig/debian/dirs +++ nagiosgrapher-1.7.1/debian/dirs @@ -0,0 +1,5 @@ +usr/sbin +usr/share/nagios3/htdocs/images/logos +var/cache/nagiosgrapher +usr/lib/cgi-bin/nagios3 +etc/nagiosgrapher/nagios3/serviceext --- nagiosgrapher-1.7.1.orig/debian/docs +++ nagiosgrapher-1.7.1/debian/docs @@ -0,0 +1,2 @@ +doc/ABOUT +doc/CONFIG --- nagiosgrapher-1.7.1.orig/debian/examples +++ nagiosgrapher-1.7.1/debian/examples @@ -0,0 +1,2 @@ +debian/exmpl/process-service-perfdata.cfg + --- nagiosgrapher-1.7.1.orig/debian/exmpl/process-service-perfdata.cfg +++ nagiosgrapher-1.7.1/debian/exmpl/process-service-perfdata.cfg @@ -0,0 +1,23 @@ +# Add one of the following commands, based on the interface you are using, +# to your /etc/nagiosgrapher/nagios3/commands.cfg + +define command { + command_name ngraph-process-service-perfdata-pipe + command_line /usr/lib/nagiosgrapher/fifo_write.pl /var/lib/nagiosgrapher/ngraph.pipe '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 3 +} + +define command{ + command_name ngraph-process-service-perfdata-nc + command_line echo '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' | nc -u -w 3 localhost 5667 +} + +define command{ + command_name ngraph-process-service-perfdata-udp + command_line /usr/lib/nagiosgrapher/udpecho 127.0.0.1 '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 5667 +} + +define command{ + command_name ngraph-process-service-perfdata-pipe + command_line /usr/lib/nagiosgrapher/fifo_write '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 3 +} + --- nagiosgrapher-1.7.1.orig/debian/init +++ nagiosgrapher-1.7.1/debian/init @@ -0,0 +1,90 @@ +#! /bin/sh +# +# skeleton example file to build /etc/init.d/ scripts. +# This file should be used to construct scripts for /etc/init.d. +# +# Written by Miquel van Smoorenburg . +# Modified for Debian +# by Ian Murdock . +# +# Version: @(#)skeleton 1.9 26-Feb-2001 miquels@cistron.nl +# + +### BEGIN INIT INFO +# Provides: nagiosgrapher +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Should-Start: $local_fs +# Should-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: NagiosGrapher daemon +# Description: Starts nagiosgrapher daemon at boottime +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/nagiosgrapher +NAME=nagiosgrapher +DESC=nagiosgrapher + +test -x $DAEMON || exit 0 + +# Include #PACKAGE# defaults if available +#if [ -f /etc/default/#PACKAGE# ] ; then +# . /etc/default/#PACKAGE# +#fi + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile /var/run/$NAME/$NAME.pid \ + --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/$NAME/$NAME.pid + echo "$NAME." + ;; + #reload) + # + # If the daemon can reload its config files on the fly + # for example by sending it SIGHUP, do it here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this a do-nothing entry. + # + # echo "Reloading $DESC configuration files." + # start-stop-daemon --stop --signal 1 --quiet --pidfile \ + # /var/run/$NAME.pid --exec $DAEMON + #;; + force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart" except that it does nothing if the + # daemon isn't already running. + # check wether $DAEMON is running. If so, restart + start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME/$NAME.pid \ + && $0 restart \ + || exit 0 + ;; + restart) + echo -n "Restarting $DESC: " + start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/$NAME/$NAME.pid + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- nagiosgrapher-1.7.1.orig/debian/links +++ nagiosgrapher-1.7.1/debian/links @@ -0,0 +1,9 @@ +usr/lib/cgi-bin/nagiosgrapher/graphs.cgi usr/lib/cgi-bin/nagios3/graphs.cgi +usr/lib/cgi-bin/nagiosgrapher/rrd2-graph.cgi usr/lib/cgi-bin/nagios3/rrd2-graph.cgi +usr/lib/cgi-bin/nagiosgrapher/rrd2-system.cgi usr/lib/cgi-bin/nagios3/rrd2-system.cgi +usr/share/nagiosgrapher/htdocs/images/dot.png usr/share/nagios3/htdocs/images/dot.png +usr/share/nagiosgrapher/htdocs/images/graph.png usr/share/nagios3/htdocs/images/graph.png +usr/share/nagiosgrapher/htdocs/images/logos/dot.png usr/share/nagios3/htdocs/images/logos/dot.png +usr/share/nagiosgrapher/htdocs/images/logos/graph.png usr/share/nagios3/htdocs/images/logos/graph.png +usr/lib/nagiosgrapher/collect2.pl usr/sbin/nagiosgrapher +etc/nagiosgrapher/nagios3 etc/nagios3/conf.d/ngraph --- nagiosgrapher-1.7.1.orig/debian/logrotate +++ nagiosgrapher-1.7.1/debian/logrotate @@ -0,0 +1,15 @@ +/var/log/nagiosgrapher/ngraph.log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 644 nagios nagios + sharedscripts + postrotate + if [ -f /var/run/nagiosgrapher/nagiosgrapher.pid ]; then + /etc/init.d/nagiosgrapher restart > /dev/null + fi + endscript +} --- nagiosgrapher-1.7.1.orig/debian/manpages +++ nagiosgrapher-1.7.1/debian/manpages @@ -0,0 +1 @@ +debian/nagiosgrapher.8 --- nagiosgrapher-1.7.1.orig/debian/nagiosgrapher.8 +++ nagiosgrapher-1.7.1/debian/nagiosgrapher.8 @@ -0,0 +1,14 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH NAGIOSGRAPHER "8" "July 2007" "nagiosgrapher" "System Commands" +.SH NAME +nagiosgrapher \- Collects data from nagios and pipes them to generate graphs. +.SH SYNOPSIS +.B nagiosgrapher +[\fI\-h | \-\-help\fR] [\fI\-v \fR] +.SH DESCRIPTION +Collects event data from nagios montitoring system and pipes them into rrd +to create graphs. +.PP +\-h \-\-help Should show you a help screen. +.PP +\-v Sets verbose level, e.g. \-v 255 --- nagiosgrapher-1.7.1.orig/debian/patches/00list +++ nagiosgrapher-1.7.1/debian/patches/00list @@ -0,0 +1,11 @@ +debian +checks +466854 +495640 +513969 +483695 +536876 +566248 +590555 +fix-unparsable_time + --- nagiosgrapher-1.7.1.orig/debian/patches/466854.dpatch +++ nagiosgrapher-1.7.1/debian/patches/466854.dpatch @@ -0,0 +1,72 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 466854.dpatch by Hendrik Frenzel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changed template marker from ### to ___ + +@DPATCH@ +diff -urNad nagiosgrapher-1.7.1~/bin/collect2.pl.in nagiosgrapher-1.7.1/bin/collect2.pl.in +--- nagiosgrapher-1.7.1~/bin/collect2.pl.in 2008-12-18 10:27:55.000000000 +0100 ++++ nagiosgrapher-1.7.1/bin/collect2.pl.in 2009-02-15 16:36:45.000000000 +0100 +@@ -618,25 +618,25 @@ + $graph_url = "host=$host&service=$service"; + + # Replace wrappers misc +- $new_image_tag =~ s/###HOST###/$host/gi; +- $new_image_tag =~ s/###SERVICE###/$service/gi; +- $new_image_tag =~ s/###URL###/$graph_url/gi; +- $new_image_tag =~ s/###ALT###/$image_alt/gi; ++ $new_image_tag =~ s/___HOST___/$host/gi; ++ $new_image_tag =~ s/___SERVICE___/$service/gi; ++ $new_image_tag =~ s/___URL___/$graph_url/gi; ++ $new_image_tag =~ s/___ALT___/$image_alt/gi; + + if (defined($new_notes_url)) { +- $new_notes_url =~ s/###HOST###/$host/gi; +- $new_notes_url =~ s/###SERVICE###/$service/gi; +- $new_notes_url =~ s/###URL###/$graph_url/gi; ++ $new_notes_url =~ s/___HOST___/$host/gi; ++ $new_notes_url =~ s/___SERVICE___/$service/gi; ++ $new_notes_url =~ s/___URL___/$graph_url/gi; + } + + # Replace wrappers, src specific + if ($image_static) { +- $new_image_tag =~ s/###IMAGESRC###/$image_src/gi; ++ $new_image_tag =~ s/___IMAGESRC___/$image_src/gi; + } + elsif (!$image_static && $image_script) { + $new_image_script = $image_script; +- $new_image_script =~ s/###URL###/$graph_url/gi; +- $new_image_tag =~ s/###IMAGESRC###/$new_image_script/gi; ++ $new_image_script =~ s/___URL___/$graph_url/gi; ++ $new_image_tag =~ s/___IMAGESRC___/$new_image_script/gi; + } + + my %args = ( +diff -urNad nagiosgrapher-1.7.1~/cfg/ngraph.ncfg.in nagiosgrapher-1.7.1/cfg/ngraph.ncfg.in +--- nagiosgrapher-1.7.1~/cfg/ngraph.ncfg.in 2009-02-15 16:32:12.000000000 +0100 ++++ nagiosgrapher-1.7.1/cfg/ngraph.ncfg.in 2009-02-15 16:34:43.000000000 +0100 +@@ -42,9 +42,9 @@ + nagios_config @NAGIOS_CONFIG@ + cgi_config @NAGIOS_CONFIG_CGI@ + +- icon_image_tag ' dot.png' alt="###ALT###" border="0">___ALT___ +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changed order of setuid/setgid in Nagiosgrapher.pm and check if its done +## DP: Changed permission in collect2.pl in create_pipe from 0666 to 0660 + +@DPATCH@ +diff -urNad nagiosgrapher-1.7.1~/bin/collect2.pl.in nagiosgrapher-1.7.1/bin/collect2.pl.in +--- nagiosgrapher-1.7.1~/bin/collect2.pl.in 2009-02-15 16:45:17.000000000 +0100 ++++ nagiosgrapher-1.7.1/bin/collect2.pl.in 2009-02-15 16:45:17.000000000 +0100 +@@ -833,7 +833,7 @@ + sub create_pipe { + unless ( -p $pipe ) { + unlink $pipe; +- POSIX::mkfifo( $pipe, 0666 ) ++ POSIX::mkfifo( $pipe, 0660 ) + || die("Can't mknod $pipe: $!"); + + $ng->print_log ("PIPE: created") if ($opt_verbose & $LOG_PIPE); +diff -urNad nagiosgrapher-1.7.1~/lib/NagiosGrapher.pm.in nagiosgrapher-1.7.1/lib/NagiosGrapher.pm.in +--- nagiosgrapher-1.7.1~/lib/NagiosGrapher.pm.in 2009-02-15 16:45:17.000000000 +0100 ++++ nagiosgrapher-1.7.1/lib/NagiosGrapher.pm.in 2009-02-15 16:47:35.000000000 +0100 +@@ -1316,8 +1316,16 @@ + chown $user, $group, $pidfile; + } + +- POSIX::setgid($group); +- POSIX::setuid($user); ++ unless (POSIX::setgid($group)) { ++ my $error = "Can't set GID to $group: $!\n"; ++ $self->print_log($error); ++ die "E: Can't set GID to $group: $!\n"; ++ } ++ unless (POSIX::setuid($user)) { ++ my $error = "Can't set UID to $user: $!\n"; ++ $self->print_log($error); ++ die "E: Can't set UID to $user: $!\n"; ++ } + + return 1; + } --- nagiosgrapher-1.7.1.orig/debian/patches/495640.dpatch +++ nagiosgrapher-1.7.1/debian/patches/495640.dpatch @@ -0,0 +1,16 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 495640.dpatch by Hendrik Frenzel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Removes useless README + +@DPATCH@ +diff -urNad nagiosgrapher-1.6.1rc5~/README nagiosgrapher-1.6.1rc5/README +--- nagiosgrapher-1.6.1rc5~/README 2006-06-07 18:18:56.000000000 +0200 ++++ nagiosgrapher-1.6.1rc5/README 1970-01-01 01:00:00.000000000 +0100 +@@ -1,5 +1,3 @@ +-The whole documentation is found in "doc/*" +- + Please mind that the file interface is now default! + So please read the install/update messages, before + restarting NagiosGrapher or Nagios! --- nagiosgrapher-1.7.1.orig/debian/patches/513969.dpatch +++ nagiosgrapher-1.7.1/debian/patches/513969.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 513969.dpatch by Hendrik Frenzel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changed graph_log_regex in graph_perf_regex in check_imap.ncfg and fixed expression +## DP: Fixed expression in check_smtp + +@DPATCH@ +diff -urNad nagiosgrapher-1.7.1~/cfg/templates/standard/check_imap.ncfg_disabled nagiosgrapher-1.7.1/cfg/templates/standard/check_imap.ncfg_disabled +--- nagiosgrapher-1.7.1~/cfg/templates/standard/check_imap.ncfg_disabled 2008-12-18 10:27:55.000000000 +0100 ++++ nagiosgrapher-1.7.1/cfg/templates/standard/check_imap.ncfg_disabled 2009-02-15 16:41:29.000000000 +0100 +@@ -5,7 +5,7 @@ + # imap + define ngraph{ + service_name IMAP +- graph_log_regex (\d+) second ++ graph_perf_regex time=\s*([0-9.]+) + graph_value sec + graph_units seconds + graph_legend response time +diff -urNad nagiosgrapher-1.7.1~/cfg/templates/standard/check_smtp.ncfg_disabled nagiosgrapher-1.7.1/cfg/templates/standard/check_smtp.ncfg_disabled +--- nagiosgrapher-1.7.1~/cfg/templates/standard/check_smtp.ncfg_disabled 2008-12-18 10:27:55.000000000 +0100 ++++ nagiosgrapher-1.7.1/cfg/templates/standard/check_smtp.ncfg_disabled 2009-02-15 16:41:29.000000000 +0100 +@@ -5,7 +5,7 @@ + #SMTP + define ngraph{ + service_name SMTP +- graph_log_regex ([0-9]+) second ++ graph_log_regex ([0-9\.]+) sec + graph_value response + graph_units sec + graph_legend Response time --- nagiosgrapher-1.7.1.orig/debian/patches/536876.dpatch +++ nagiosgrapher-1.7.1/debian/patches/536876.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 536876.dpatch by Hendrik Frenzel +## +## All lines beginning with `## DP:' are a description of the patch. +## 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 16:57:51.000000000 +0100 +@@ -540,7 +540,7 @@ + + # parsing the description + my $description = $_->{print_description}; +- $description =~ s/:/\\:/; ++ $description =~ s/:/\\:/ if (defined $description); + + # setting up end-of-line + $eol = ''; +@@ -548,7 +548,7 @@ + $eol = $ng->format_eol( $_->{print_eol} ); + } + +- $repeat = 1; ++ $repeat = 0; + $repeat = $_->{print_repeat} + 1 + if ( exists( $_->{print_repeat} ) ); + --- nagiosgrapher-1.7.1.orig/debian/patches/566248.dpatch +++ nagiosgrapher-1.7.1/debian/patches/566248.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 566248.dpatch by Hendrik Frenzel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +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"); ++if (defined $end) { $end = '-1' if $end eq '' } else { $end = '-1' }; + + $width = param("width"); + $height = param("height"); --- nagiosgrapher-1.7.1.orig/debian/patches/590555.dpatch +++ nagiosgrapher-1.7.1/debian/patches/590555.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 590555.dpatch by Alexander Reichle-Schmehl +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@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 --- nagiosgrapher-1.7.1.orig/debian/patches/checks.dpatch +++ nagiosgrapher-1.7.1/debian/patches/checks.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## check_mailq.dpatch by Hendrik Frenzel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes some regexes + +@DPATCH@ +diff -urNad nagiosgrapher-1.7.1~/cfg/templates/standard/check_load.ncfg nagiosgrapher-1.7.1/cfg/templates/standard/check_load.ncfg +--- nagiosgrapher-1.7.1~/cfg/templates/standard/check_load.ncfg 2008-12-18 10:27:55.000000000 +0100 ++++ nagiosgrapher-1.7.1/cfg/templates/standard/check_load.ncfg 2009-02-15 16:27:14.000000000 +0100 +@@ -5,7 +5,7 @@ + + define ngraph{ + service_name LOAD +- graph_log_regex ,(\d+[\.,]\d+)($|critical|warning) ++ graph_log_regex ,\s+(\d+[\.,]\d+)($|critical|warning) + graph_value 15min + graph_units load + graph_legend 15min avg load: +@@ -44,7 +44,7 @@ + + define ngraph{ + service_name LOAD +- graph_log_regex ,(\d+[\.,]\d+), ++ graph_log_regex ,\s+(\d+[\.,]\d+), + graph_value 5min + graph_units load + graph_legend 5min avg load: +@@ -83,7 +83,7 @@ + + define ngraph{ + service_name LOAD +- graph_log_regex :(\d+[\.,]\d+), ++ graph_log_regex :\s+(\d+[\.,]\d+), + graph_value 1min + graph_units load + graph_legend 1min avg load: --- nagiosgrapher-1.7.1.orig/debian/patches/debian.dpatch +++ nagiosgrapher-1.7.1/debian/patches/debian.dpatch @@ -0,0 +1,252 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## debian.dpatch by Hendrik Frenzel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Commented out unnecessary commands + +@DPATCH@ +diff -urNad nagiosgrapher-1.7.1~/Makefile.in nagiosgrapher-1.7.1/Makefile.in +--- nagiosgrapher-1.7.1~/Makefile.in 2008-12-18 10:27:55.000000000 +0100 ++++ nagiosgrapher-1.7.1/Makefile.in 2010-02-18 17:05:47.000000000 +0100 +@@ -68,7 +68,7 @@ + + default: + +-install: dirs config-install cgi-install bin-compile bin-install perl-install logrotate-config init-script image-install logfile all-install-messages ++install: dirs config-install cgi-install bin-compile bin-install perl-install init-script image-install logfile all-install-messages + + update: dirs cgi-install bin-compile bin-install perl-install init-script image-install update-messages file-interface-message + +@@ -182,11 +182,11 @@ + @exit 1 + + dirs: +- mkdir -p $(DESTDIR)/$(NG_SRVEXT_DIR) +- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_SRVEXT_DIR) ++ #mkdir -p $(DESTDIR)/$(NG_SRVEXT_DIR) ++ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_SRVEXT_DIR) + mkdir -p $(DESTDIR)/$(NG_RRD) +- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_RRD) +- mkdir -p $(DESTDIR)/$(NG_INIT_SCRIPT_DIR) ++ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_RRD) ++ #mkdir -p $(DESTDIR)/$(NG_INIT_SCRIPT_DIR) + mkdir -p `dirname $(DESTDIR)/$(NG_LOGFILE)` + mkdir -p $(DESTDIR)/$(NG_DAEMON) + mkdir -p $(DESTDIR)/$(NG_RRD) +@@ -195,8 +195,8 @@ + mkdir -p $(DESTDIR)/$(NG_PERFFILEPATH) + + logfile: +- touch $(DESTDIR)/$(NG_LOGFILE) +- chown $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_LOGFILE) ++ #touch $(DESTDIR)/$(NG_LOGFILE) ++ #chown $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_LOGFILE) + + config-install: + mkdir -p $(DESTDIR)/$(NG_CONFIG) +@@ -209,15 +209,15 @@ + cp -r cfg/templates/extra/*.ncfg* $(DESTDIR)/$(NG_CONFIG_SUB)/templates/extra + cp -r cfg/templates/standard/*.ncfg* $(DESTDIR)/$(NG_CONFIG_SUB)/templates/standard + +- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_CONFIG)/*.ncfg* +- chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NG_CONFIG)/*.ncfg* ++ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_CONFIG)/*.ncfg* ++ #chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NG_CONFIG)/*.ncfg* + + + cgi-install: + mkdir -p $(DESTDIR)/$(NAGIOS_FOLDER_CGI) + cp sbin/*.cgi $(DESTDIR)/$(NAGIOS_FOLDER_CGI) +- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_FOLDER_CGI) +- chgrp -R $(APACHE_GROUP) $(DESTDIR)/$(NAGIOS_FOLDER_CGI) ++ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_FOLDER_CGI) ++ #chgrp -R $(APACHE_GROUP) $(DESTDIR)/$(NAGIOS_FOLDER_CGI) + chmod -R 0755 $(DESTDIR)/$(NAGIOS_FOLDER_CGI) + + bin-install: +@@ -228,8 +228,8 @@ + contrib/udpecho/udpecho \ + $(DESTDIR)/$(NAGIOS_CONTRIBUTION) + +- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_CONTRIBUTION) +- chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NAGIOS_CONTRIBUTION) ++ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_CONTRIBUTION) ++ #chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NAGIOS_CONTRIBUTION) + chmod -R 0755 $(DESTDIR)/$(NAGIOS_CONTRIBUTION) + + bin-compile: +@@ -246,18 +246,12 @@ + cp lib/NagiosGrapher/*.pm $(DESTDIR)/$(PERL_INC)/NagiosGrapher + cp lib/NagiosGrapher/Hooks/*.pm $(DESTDIR)/$(PERL_INC)/NagiosGrapher/Hooks + +- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(PERL_INC) +- chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(PERL_INC) +- +-logrotate-config: +- cp cfg/logrotate/nagios_grapher $(DESTDIR)/${NG_LOGROTATE_CONF_DIR}/ +- chown root $(DESTDIR)/$(NG_LOGROTATE_CONF_DIR)/nagios_grapher +- chgrp root $(DESTDIR)/$(NG_LOGROTATE_CONF_DIR)/nagios_grapher +- chmod 0644 $(DESTDIR)/$(NG_LOGROTATE_CONF_DIR)/nagios_grapher ++ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(PERL_INC) ++ #chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(PERL_INC) + + init-script: +- cp nagios_grapher $(DESTDIR)/$(NG_INIT_SCRIPT_DIR) +- chmod 0755 $(DESTDIR)/$(NG_INIT_SCRIPT_DIR)/nagios_grapher ++ #cp nagios_grapher $(DESTDIR)/$(NG_INIT_SCRIPT_DIR) ++ #chmod 0755 $(DESTDIR)/$(NG_INIT_SCRIPT_DIR)/nagios_grapher + + image-install: + mkdir -p $(DESTDIR)/$(NAGIOS_IMAGES) +diff -urNad nagiosgrapher-1.7.1~/cfg/ngraph.ncfg.in nagiosgrapher-1.7.1/cfg/ngraph.ncfg.in +--- nagiosgrapher-1.7.1~/cfg/ngraph.ncfg.in 2008-12-18 10:27:55.000000000 +0100 ++++ nagiosgrapher-1.7.1/cfg/ngraph.ncfg.in 2010-02-18 17:04:58.000000000 +0100 +@@ -9,7 +9,7 @@ + port 5667 + buffer 1024 + interface @NG_INTERFACE@ +- # pipe @NG_INTERFACE_PIPE@ ++ pipe @NG_INTERFACE_PIPE@ + perffile_path @NG_PERFFILEPATH@ + + # please use subfolder +@@ -35,9 +35,9 @@ + serviceextinfo @NG_SRVEXT_FILE@ + serviceext_path @NG_SRVEXT_DIR@ + +- url /nagios/cgi-bin/graphs.cgi ++ url /cgi-bin/nagios3/graphs.cgi + # notes_url /wiki/index.php/$HOSTNAME$#$SERVICEDESC$ +- notes_url ++ notes_url "" + + nagios_config @NAGIOS_CONFIG@ + cgi_config @NAGIOS_CONFIG_CGI@ +@@ -45,7 +45,7 @@ + icon_image_tag ' dot.png' alt="###ALT###" border="0"> +- prefix: /usr/share/nagiosgrapher +- nagios_config: /etc/nagios2/nagios.cfg +- nagios_config_cgi: /etc/nagios2/cgi.cfg +- nagios_images: /usr/share/nagiosgrapher/htdocs/images +- nagios_images_logos: /usr/share/nagiosgrapher/htdocs/images/logos ++ prefix: /usr ++ nagios_config: /etc/nagios3/nagios.cfg ++ nagios_config_cgi: /etc/nagios3/cgi.cfg ++ nagios_images: ${prefix}/share/nagiosgrapher/htdocs/images ++ nagios_images_logos: ${prefix}/share/nagiosgrapher/htdocs/images/logos + nagios_folder_cgi: /usr/lib/cgi-bin/nagiosgrapher +- perl_inc: /usr/share/perl5 + nagios_contribution: /usr/lib/nagiosgrapher ++ perl_inc: /usr/share/perl5 + ng_config: /etc/nagiosgrapher + ng_config_sub: ${ng_config}/ngraph.d + ng_daemon: /var/run/nagiosgrapher +- ng_srvext_file: /etc/nagios2/serviceextinfo.cfg +- ng_srvext_dir: /etc/nagios2/serviceext ++ ng_srvext_file: /etc/nagios3/serviceextinfo.cfg ++ ng_srvext_dir: /etc/nagiosgrapher/nagios3/serviceext + ng_interface_pipe: /var/lib/nagiosgrapher/ngraph.pipe + ng_perffile_path: /var/lib/nagiosgrapher/ + ng_logfile: /var/log/nagiosgrapher/ngraph.log + ng_rrd: /var/lib/nagiosgrapher/rrd ++ ng_rrd_font: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansCondensed.ttf + ng_tmp_path: /tmp/nagiosgrapher +- ng_pid_file: ${ng_daemon}/nagios_grapher.pid ++ ng_cgi: /nagios3/cgi-bin ++ ng_logos: /nagios3/images/logos ++ ng_pid_file: ${ng_daemon}/nagiosgrapher.pid + init_script_dir: /etc/init.d + logrotate_conf_dir: /etc/logrotate.d + +diff -urNad nagiosgrapher-1.7.1~/configure.ac nagiosgrapher-1.7.1/configure.ac +--- nagiosgrapher-1.7.1~/configure.ac 2008-12-18 10:27:55.000000000 +0100 ++++ nagiosgrapher-1.7.1/configure.ac 2010-02-18 17:04:58.000000000 +0100 +@@ -18,7 +18,7 @@ + AC_MSG_ERROR([cannot use $PACKAGE_NAME without perl]) + fi + +-AC_PREFIX_DEFAULT([/usr/local/nagios]) ++AC_PREFIX_DEFAULT([/usr/share/nagiosgrapher]) + + + AC_DEFUN([NG_ENABLE_LAYOUT], [ +@@ -357,9 +357,9 @@ + + dnl NG_INTERFACE + AC_ARG_WITH(ng-interface, +- AC_HELP_STRING([--with-ng-interface=INTERFACE], [the interface to use (default: file)]), ++ AC_HELP_STRING([--with-ng-interface=INTERFACE], [the interface to use (default: pipe)]), + NG_INTERFACE=$withval, +- NG_INTERFACE=file ++ NG_INTERFACE=pipe + # NG_INTERFACE=network + ) + AC_SUBST(NG_INTERFACE) +@@ -373,20 +373,20 @@ + AC_SUBST(NG_SRVEXT) + + #dnl NG_SRVEXT_DIR +-#AC_ARG_WITH(ng-srvext-dir, +-# AC_HELP_STRING([--with-ng-srvext-dir=DIR], [the serviceext dir for multiple]), +-# NG_SRVEXT_DIR=$withval, +-# NG_SRVEXT_DIR=/usr/local/nagios/etc/serviceext +-#) +-#AC_SUBST(NG_SRVEXT_DIR) ++AC_ARG_WITH(ng-srvext-dir, ++ AC_HELP_STRING([--with-ng-srvext-dir=DIR], [the serviceext dir for multiple]), ++ NG_SRVEXT_DIR=$withval, ++ NG_SRVEXT_DIR=/etc/nagiosgrapher/nagios3/serviceext ++) ++AC_SUBST(NG_SRVEXT_DIR) + + #dnl NG_SRVEXT_FILE +-#AC_ARG_WITH(ng-srvext-file, +-# AC_HELP_STRING([--with-ng-srvext-file=FILE], [the serviceext file for single]), +-# NG_SRVEXT_FILE=$withval, +-# NG_SRVEXT_FILE=/usr/local/nagios/etc/serviceext.cfg +-#) +-#AC_SUBST(NG_SRVEXT_FILE) ++AC_ARG_WITH(ng-srvext-file, ++ AC_HELP_STRING([--with-ng-srvext-file=FILE], [the serviceext file for single]), ++ NG_SRVEXT_FILE=$withval, ++ NG_SRVEXT_FILE=/usr/nagiosgrapher/nagios3/serviceext.cfg ++) ++AC_SUBST(NG_SRVEXT_FILE) + + #dnl NG_LOGFILE + #AC_ARG_WITH(ng-logfile, +@@ -400,7 +400,7 @@ + AC_ARG_WITH(ng-loglevel, + AC_HELP_STRING([--with-ng-loglevel=INT], [the loglevel]), + NG_LOGLEVEL=$withval, +- NG_LOGLEVEL=1023 ++ NG_LOGLEVEL=63 + ) + AC_SUBST(NG_LOGLEVEL) + +diff -urNad 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 2010-02-18 17:04:58.000000000 +0100 +@@ -49,7 +49,7 @@ + our $ngraphcfg = '@NG_CONFIG@/ngraph.ncfg'; + our $xmlfile = 'index.xml'; + our $uniqueInstance = undef; +-our $object_cache = '@NG_DAEMON@/NagiosGrapher.obj'; ++our $object_cache = '/var/cache/nagiosgrapher/NagiosGrapher.obj'; + + $LOG_CONFIG = 128; + $LOG_HOOK = 256; --- nagiosgrapher-1.7.1.orig/debian/patches/fix-unparsable_time.dpatch +++ nagiosgrapher-1.7.1/debian/patches/fix-unparsable_time.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-unparsable_time.dpatch by Hendrik Frenzel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes "unparsable time" bug in serviceext icons (s. http://www.nagios-portal.org/wbb/index.php?page=Thread&threadID=10971) + +@DPATCH@ +diff -urNad nagiosgrapher-1.7.1~/cfg/ngraph.ncfg.in nagiosgrapher-1.7.1/cfg/ngraph.ncfg.in +--- nagiosgrapher-1.7.1~/cfg/ngraph.ncfg.in 2009-02-16 02:07:43.000000000 +0100 ++++ nagiosgrapher-1.7.1/cfg/ngraph.ncfg.in 2009-02-16 02:08:11.000000000 +0100 +@@ -44,7 +44,7 @@ + + icon_image_tag ' dot.png' alt="___ALT___" border="0">/dev/null 2>&1; then + chown "$user":"$group" "$file" + chmod "$mode" "$file" + fi + unset user + unset group + unset mode + unset file +} + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +CFGS="@@CFGS@@" +TMPL_CFGS="@@TMPL_CFGS@@" + +case "$1" in + configure) + for cfg in $CFGS; do + ucf /usr/share/nagiosgrapher/debian/cfg/$cfg \ + /etc/nagiosgrapher/$cfg + done + + for tmpl in $TMPL_CFGS; do + ucf /usr/share/nagiosgrapher/debian/cfg/ngraph.d/$tmpl \ + /etc/nagiosgrapher/ngraph.d/$tmpl + done + + for dir in /var/lib/nagiosgrapher /var/lib/nagiosgrapher/rrd \ + /var/cache/nagiosgrapher \ + /var/log/nagiosgrapher \ + /etc/nagiosgrapher/nagios3 \ + /etc/nagiosgrapher/nagios3/serviceext; do + test -d $dir && setperm nagios nagios 0755 $dir + done + + for file in /var/log/nagiosgrapher/ngraph.log \ + /var/cache/nagiosgrapher/NagiosGrapher.obj; do \ + test -f $file && setperm nagios nagios 0644 $file + done + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- nagiosgrapher-1.7.1.orig/debian/postrm.in +++ nagiosgrapher-1.7.1/debian/postrm.in @@ -0,0 +1,55 @@ +#!/bin/sh +# postrm script for nagiosgrapher +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +CFGS="@@CFGS@@" +TMPL_CFGS="@@TMPL_CFGS@@" +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +if [ "$1" = "purge" ]; then + for cfg in $CFGS; do + if [ -x /usr/bin/ucf ] ; then + ucf --purge /etc/nagiosgrapher/$cfg + fi + rm -f /etc/nagiosgrapher/$cfg + done + + for tmpl in $TMPL_CFGS; do + if [ -x /usr/bin/ucf ] ; then + ucf --purge /etc/nagiosgrapher/ngraph.d/$tmpl + fi + rm -f /etc/nagiosgrapher/ngraph.d/$tmpl + done +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- nagiosgrapher-1.7.1.orig/debian/rules +++ nagiosgrapher-1.7.1/debian/rules @@ -0,0 +1,79 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +#CFGS=ngraph.{,d/{nmgraph,extra/check_weather,standard/check_{procs,ping,pop,http,load,users}}.}ncfg +CFGS := ngraph.ncfg ngraph.d/nmgraph.ncfg +TMPL_DIR := extra/ standard/ + +PKG:=nagiosgrapher +PKG_TMP:=debian/$(PKG) + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/class/autotools.mk + +#DEB_MAKE_ENVVARS := BUILD_ROOT=$(CURDIR)/debian/tmp LC_ALL=C +#DEB_DH_INSTALL_SOURCEDIR := debian/tmp +DEB_CONFIGURE_EXTRA_FLAGS := --with-layout=debian-patch --with-ng-srvext-dir=/etc/nagiosgrapher/nagios3/serviceext --with-ng-srvext-file=/etc/nagiosgrapher/nagios3/serviceext.cfg +DEB_AUTO_UPDATE_AUTOCONF := 1 + +install/$(PKG):: + rm -f $(PKG_TMP)/usr/lib/$(PKG)/*.c + + for dir in $(TMPL_DIR); do \ + mkdir -p $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/$$dir; \ + done + + # install config templates + for cfg in $(CFGS); do \ + mv $(PKG_TMP)/etc/$(PKG)/$$cfg* \ + $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/$$cfg; \ + done + mkdir -p $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/nagios3 + cp debian/commands.cfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/nagios3/ + + # install service perf. templates + echo "List $(PKG_TMP)" + ls $(PKG_TMP) + echo "List $(PKG_TMP)/etc/" + ls $(PKG_TMP)/etc/ + echo "List $(PKG_TMP)/etc/$(PKG)" + ls $(PKG_TMP)/etc/$(PKG) + echo "List $(PKG_TMP)/etc/$(PKG)/ngraph.d/" + ls $(PKG_TMP)/etc/$(PKG)/ngraph.d/ + echo "$(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/" + ls $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/ + echo "$(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard" + ls $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/ + tmpl_cfgs="standard//check_disk.ncfg standard//check_swap.ncfg standard//check_ping.ncfg standard//check_load.ncfg standard//check_procs.ncfg standard//check_users.ncfg" \ + mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_disk.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_disk.ncfg; \ + mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_swap.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_swap.ncfg; \ + mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_ping.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_ping.ncfg; \ + mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_load.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_load.ncfg; \ + mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_procs.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_procs.ncfg; \ + mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_users.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_users.ncfg; \ + tmpl_root=$(PKG_TMP)/etc/$(PKG)/ngraph.d/templates; \ + for tmpl_dir in $(TMPL_DIR); do \ + for tmpl in $$tmpl_root/$$tmpl_dir/*.ncfg_disabled; do \ + dest=`echo $$tmpl | sed "s#.*\($$tmpl_dir/.*\.ncfg\).*#\1#"`; \ + mv $${tmpl} $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/$$dest; \ + tmpl_cfgs="$$tmpl_cfgs $$dest"; \ + done; \ + mv $$tmpl_root/$$tmpl_dir $(PKG_TMP)/etc/$(PKG)/ngraph.d/; \ + done; \ + sed "s#@@CFGS@@#$(CFGS) nagios3/commands.cfg#g;s#@@TMPL_CFGS@@#$$tmpl_cfgs#g" < debian/postinst.in > debian/postinst ; \ + sed "s#@@CFGS@@#$(CFGS) nagios3/commands.cfg#g;s#@@TMPL_CFGS@@#$$tmpl_cfgs#g" < debian/postrm.in > debian/postrm + + # fix permissions + find $(PKG_TMP)/usr/share/nagiosgrapher/htdocs/images/ -type f -name "*.png" -print0 \ + | xargs -0 chmod 0644 + chmod 0644 $(PKG_TMP)/usr/share/nagiosgrapher/debian/cfg/ngraph.d/nmgraph.ncfg + + [ ! -f README ] || mv README .README + rm -rf $(PKG_TMP)/var/run + +clean:: + [ ! -f .README ] || mv .README README + rm -f debian/postinst + rm -f debian/postrm + rm -f cfg/ngraph.ncfg --- nagiosgrapher-1.7.1.orig/debian/watch +++ nagiosgrapher-1.7.1/debian/watch @@ -0,0 +1,6 @@ +# Compulsory line, this is a version 3 file +version=3 + +opts=versionmangle=s/^([\d\.]+)-?([\d\w]*)(-[\d\.]*)$/$1$2$3/,s/-(.*)$/.$1/ \ + http://nagiosexchange.altinity.org/nagiosexchange/NagiosGrapher/NagiosGrapher-(\d.*).tar.gz +