Source: collectd
Version: 5.6.1-2
Severity: normal
Tags: patch
User: pkg-nagios-de...@lists.alioth.debian.org
Dear Maintainer,
Please update your package to deal with the nagios3 removal from Debian
(#845765).
Consider applying the attached patch.
Kind Regards,
Bas
diff -Nru collectd-5.6.1/debian/changelog collectd-5.6.1/debian/changelog
--- collectd-5.6.1/debian/changelog 2016-11-01 07:32:47.000000000 +0100
+++ collectd-5.6.1/debian/changelog 2016-12-03 20:01:05.000000000 +0100
@@ -1,3 +1,11 @@
+collectd (5.6.1-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Depend on icinga instead of nagios packages (nagios3 removed from Debian).
+ * Add patch to use nagios-nrpe-server & monitoring-plugin paths for Debian.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sat, 03 Dec 2016 20:00:12 +0100
+
collectd (5.6.1-2) unstable; urgency=medium
* debian/control:
diff -Nru collectd-5.6.1/debian/collectd.conf collectd-5.6.1/debian/collectd.conf
--- collectd-5.6.1/debian/collectd.conf 2016-10-15 20:54:36.000000000 +0200
+++ collectd-5.6.1/debian/collectd.conf 2016-12-03 19:54:46.000000000 +0100
@@ -813,7 +813,7 @@
#</Plugin>
#<Plugin notify_nagios>
-# CommandFile "/usr/local/nagios/var/rw/nagios.cmd"
+# CommandFile "/var/lib/icinga/rw/icinga.cmd"
#</Plugin>
#<Plugin ntpd>
diff -Nru collectd-5.6.1/debian/control collectd-5.6.1/debian/control
--- collectd-5.6.1/debian/control 2016-11-01 07:32:47.000000000 +0100
+++ collectd-5.6.1/debian/control 2016-12-03 19:53:14.000000000 +0100
@@ -242,7 +242,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: collectd
-Suggests: nagios3 | nagios2
+Suggests: icinga
Replaces: collectd (<< 4.6.1-1~)
Description: statistics collection and monitoring daemon (utilities)
collectd is a small daemon which collects system information periodically and
diff -Nru collectd-5.6.1/debian/patches/nagios-debian-paths.patch collectd-5.6.1/debian/patches/nagios-debian-paths.patch
--- collectd-5.6.1/debian/patches/nagios-debian-paths.patch 1970-01-01 01:00:00.000000000 +0100
+++ collectd-5.6.1/debian/patches/nagios-debian-paths.patch 2016-12-03 19:59:26.000000000 +0100
@@ -0,0 +1,24 @@
+Description: Use paths for nagios-nrpe-server & monitoring-plugins Debian packages.
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/contrib/exec-nagios.conf
++++ b/contrib/exec-nagios.conf
+@@ -1,15 +1,15 @@
+ # Run `perldoc exec-nagios.px' for details on this config file.
+
+-NRPEConfig /etc/nrpe.cfg
++NRPEConfig /etc/nagios/nrpe.cfg
+
+ Interval 300
+
+-<Script /usr/lib/nagios/check_tcp>
++<Script /usr/lib/nagios/plugins/check_tcp>
+ Arguments -H alice -p 22
+ Type delay
+ </Script>
+
+-<Script /usr/lib/nagios/check_dns>
++<Script /usr/lib/nagios/plugins/check_dns>
+ Arguments -H alice
+ Type delay
+ </Script>
diff -Nru collectd-5.6.1/debian/patches/series collectd-5.6.1/debian/patches/series
--- collectd-5.6.1/debian/patches/series 2016-10-15 20:54:36.000000000 +0200
+++ collectd-5.6.1/debian/patches/series 2016-12-03 19:59:54.000000000 +0100
@@ -2,3 +2,4 @@
rrd_filter_path.patch
collection_conf_path.patch
myplugin_includes.patch
+nagios-debian-paths.patch
