[Pkg-nagios-changes] [pkg-nagios] r1826 - in nagiosgrapher/trunk/debian: . patches
Hendrik Frenzel
hfrenzel-guest at alioth.debian.org
Thu Feb 18 17:41:29 UTC 2010
tags 516076 pending
tags 536876 pending
tags 565914 pending
tags 566248 pending
thanks
Author: hfrenzel-guest
Date: 2010-02-18 17:41:28 +0000 (Thu, 18 Feb 2010)
New Revision: 1826
Added:
nagiosgrapher/trunk/debian/patches/536876.dpatch
nagiosgrapher/trunk/debian/patches/566248.dpatch
Modified:
nagiosgrapher/trunk/debian/NEWS
nagiosgrapher/trunk/debian/changelog
nagiosgrapher/trunk/debian/control
nagiosgrapher/trunk/debian/init
nagiosgrapher/trunk/debian/nagiosgrapher.8
nagiosgrapher/trunk/debian/patches/00list
nagiosgrapher/trunk/debian/patches/debian.dpatch
nagiosgrapher/trunk/debian/rules
Log:
various fixes
Modified: nagiosgrapher/trunk/debian/NEWS
===================================================================
--- nagiosgrapher/trunk/debian/NEWS 2010-02-17 16:44:09 UTC (rev 1825)
+++ nagiosgrapher/trunk/debian/NEWS 2010-02-18 17:41:28 UTC (rev 1826)
@@ -6,3 +6,4 @@
or new created serviceextinfo won't work correctly.
-- Hendrik Frenzel <hfrenzel at scunc.net> Wed, 30 Apr 2008 01:37:03 +0200
+
Modified: nagiosgrapher/trunk/debian/changelog
===================================================================
--- nagiosgrapher/trunk/debian/changelog 2010-02-17 16:44:09 UTC (rev 1825)
+++ nagiosgrapher/trunk/debian/changelog 2010-02-18 17:41:28 UTC (rev 1826)
@@ -1,7 +1,20 @@
+nagiosgrapher (1.7.1-2) UNRELEASED; 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 <hfrenzel at scunc.net> 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)
+ * 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
Modified: nagiosgrapher/trunk/debian/control
===================================================================
--- nagiosgrapher/trunk/debian/control 2010-02-17 16:44:09 UTC (rev 1825)
+++ nagiosgrapher/trunk/debian/control 2010-02-18 17:41:28 UTC (rev 1826)
@@ -4,7 +4,7 @@
Maintainer: Hendrik Frenzel <hfrenzel at scunc.net>
Uploaders: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5), dpatch, cdbs, autoconf
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
Homepage: http://www.nagiosexchange.org/NagiosGrapher.84.0.html
Vcs-Svn: svn://svn.debian.org/svn/pkg-nagios/nagiosgrapher/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/nagiosgrapher/trunk/
Modified: nagiosgrapher/trunk/debian/init
===================================================================
--- nagiosgrapher/trunk/debian/init 2010-02-17 16:44:09 UTC (rev 1825)
+++ nagiosgrapher/trunk/debian/init 2010-02-18 17:41:28 UTC (rev 1826)
@@ -12,8 +12,8 @@
### BEGIN INIT INFO
# Provides: nagiosgrapher
-# Required-Start: $all
-# Required-Stop: $all
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
# Should-Start: $local_fs
# Should-Stop: $local_fs
# Default-Start: 2 3 4 5
Modified: nagiosgrapher/trunk/debian/nagiosgrapher.8
===================================================================
--- nagiosgrapher/trunk/debian/nagiosgrapher.8 2010-02-17 16:44:09 UTC (rev 1825)
+++ nagiosgrapher/trunk/debian/nagiosgrapher.8 2010-02-18 17:41:28 UTC (rev 1826)
@@ -4,11 +4,11 @@
nagiosgrapher \- Collects data from nagios and pipes them to generate graphs.
.SH SYNOPSIS
.B nagiosgrapher
-[\fI-h | --help\fR] [\fI-v <level>\fR]
+[\fI\-h | \-\-help\fR] [\fI\-v <level>\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.
+\-h \-\-help Should show you a help screen.
.PP
--v <level> Sets verbose level, e.g. -v 255
+\-v <level> Sets verbose level, e.g. \-v 255
Modified: nagiosgrapher/trunk/debian/patches/00list
===================================================================
--- nagiosgrapher/trunk/debian/patches/00list 2010-02-17 16:44:09 UTC (rev 1825)
+++ nagiosgrapher/trunk/debian/patches/00list 2010-02-18 17:41:28 UTC (rev 1826)
@@ -4,5 +4,7 @@
495640
513969
483695
+536876
+566248
fix-unparsable_time
Added: nagiosgrapher/trunk/debian/patches/536876.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/536876.dpatch (rev 0)
+++ nagiosgrapher/trunk/debian/patches/536876.dpatch 2010-02-18 17:41:28 UTC (rev 1826)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 536876.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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} ) );
+
Property changes on: nagiosgrapher/trunk/debian/patches/536876.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: nagiosgrapher/trunk/debian/patches/566248.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/566248.dpatch (rev 0)
+++ nagiosgrapher/trunk/debian/patches/566248.dpatch 2010-02-18 17:41:28 UTC (rev 1826)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 566248.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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
+@@ -74,6 +74,7 @@
+ $title = param("title");
+ $end = param("end");
+ $start = param("start");
++$end = '-1' if $end eq '';
+
+ $width = param("width");
+ $height = param("height");
Property changes on: nagiosgrapher/trunk/debian/patches/566248.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: nagiosgrapher/trunk/debian/patches/debian.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/debian.dpatch 2010-02-17 16:44:09 UTC (rev 1825)
+++ nagiosgrapher/trunk/debian/patches/debian.dpatch 2010-02-18 17:41:28 UTC (rev 1826)
@@ -7,7 +7,16 @@
@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 2009-02-16 02:13:29.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
@@ -66,20 +75,21 @@
chmod -R 0755 $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
bin-compile:
-@@ -246,8 +246,8 @@
+@@ -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)
- logrotate-config:
- cp cfg/logrotate/nagios_grapher $(DESTDIR)/${NG_LOGROTATE_CONF_DIR}/
-@@ -256,8 +256,8 @@
- chmod 0644 $(DESTDIR)/$(NG_LOGROTATE_CONF_DIR)/nagios_grapher
-
init-script:
- cp nagios_grapher $(DESTDIR)/$(NG_INIT_SCRIPT_DIR)
- chmod 0755 $(DESTDIR)/$(NG_INIT_SCRIPT_DIR)/nagios_grapher
@@ -90,7 +100,7 @@
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 2009-02-16 02:12:20.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
@@ -123,7 +133,7 @@
log_level @NG_LOGLEVEL@
diff -urNad nagiosgrapher-1.7.1~/config.layout nagiosgrapher-1.7.1/config.layout
--- nagiosgrapher-1.7.1~/config.layout 2008-12-18 10:27:55.000000000 +0100
-+++ nagiosgrapher-1.7.1/config.layout 2009-02-16 02:12:20.000000000 +0100
++++ nagiosgrapher-1.7.1/config.layout 2010-02-18 17:04:58.000000000 +0100
@@ -58,25 +58,28 @@
# layout for debian package install as provided by the debian patches of Hendrik Frenzel
@@ -164,7 +174,7 @@
</Layout>
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 2009-02-16 02:12:20.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
@@ -230,7 +240,7 @@
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 2009-02-16 02:12:20.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';
Modified: nagiosgrapher/trunk/debian/rules
===================================================================
--- nagiosgrapher/trunk/debian/rules 2010-02-17 16:44:09 UTC (rev 1825)
+++ nagiosgrapher/trunk/debian/rules 2010-02-18 17:41:28 UTC (rev 1826)
@@ -18,7 +18,7 @@
DEB_AUTO_UPDATE_AUTOCONF := 1
install/$(PKG)::
- rm -f debian/$(PKG)/usr/lib/$(PKG)/*.c
+ 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; \
@@ -47,8 +47,11 @@
# 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
+
+ mv README .README
+ rm -rf $(PKG_TMP)/var/run
- mv README .README
clean::
[ ! -f .README ] || mv .README README
rm -f debian/postinst
More information about the Pkg-nagios-changes
mailing list