[Pkg-nagios-changes] [pkg-nagios-plugins] 203/413: provide check_host and check_rta_multi

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit 5213f02a6301e0a234775cd0d5dab3ce11e68506
Author: Jan Wagner <waja at cyconet.org>
Date:   Sun Jan 10 20:44:18 2010 +0000

    provide check_host and check_rta_multi
---
 debian/changelog                          |  2 ++
 debian/patches/00list                     |  1 +
 debian/patches/02_check_icmp_links.dpatch | 32 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1da0d3a..6281dee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ nagios-plugins (1.4.14-1) unstable; urgency=low
   * Move qstat from Depends to Recommends, since its just used for check_game
     and that seems not really essential, leaving note in NEWS file, thanks to
     Steve Lane (Closes: #561770)
+  * Add 02_check_icmp_links.dpatch to provide check_host and check_rta_multi,
+    thanks to Justin T Pryzby for reporting (Closes: #563090)
 
  -- Jan Wagner <waja at cyconet.org>  Sun, 20 Dec 2009 19:55:45 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index f8ee343..23375ff 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
+02_check_icmp_links.dpatch
 06_checkircd.dpatch
 13_subst.in_again.dpatch
 14_check_log_paths.dpatch
diff --git a/debian/patches/02_check_icmp_links.dpatch b/debian/patches/02_check_icmp_links.dpatch
new file mode 100644
index 0000000..6dccf1d
--- /dev/null
+++ b/debian/patches/02_check_icmp_links.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_check_icmp_links.dpatch by Jan Wagner <waja at cyconet.org>
+##
+## DP: Create symlinks for check_icmp to provide default values for some situations
+
+ at DPATCH@
+diff -urNad nagios-plugins-1.4.14~/plugins-root/Makefile.am nagios-plugins-1.4.14/plugins-root/Makefile.am
+--- nagios-plugins-1.4.14~/plugins-root/Makefile.am	2008-11-30 22:23:18.000000000 +0100
++++ nagios-plugins-1.4.14/plugins-root/Makefile.am	2010-01-10 20:39:03.000000000 +0100
+@@ -71,7 +71,8 @@
+ 	else \
+ 	  echo "WARNING: insufficient access; not installing setuid plugins"; \
+ 	  echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
+-	fi
++	fi ; \
++	if [ -x $(DESTDIR)$(libexecdir)/check_icmp ] ; then rm -f $(DESTDIR)$(libexecdir)/check_host $(DESTDIR)$(libexecdir)/check_rta_multi ; ln -s check_icmp $(DESTDIR)$(libexecdir)/check_host ; ln -s check_icmp $(DESTDIR)$(libexecdir)/check_rta_multi ; fi
+ 
+ # /* Author Coreutils team sub-citation */
+ 
+diff -urNad nagios-plugins-1.4.14~/plugins-root/Makefile.in nagios-plugins-1.4.14/plugins-root/Makefile.in
+--- nagios-plugins-1.4.14~/plugins-root/Makefile.in	2009-09-16 10:37:59.000000000 +0200
++++ nagios-plugins-1.4.14/plugins-root/Makefile.in	2010-01-10 20:39:13.000000000 +0100
+@@ -1162,7 +1162,8 @@
+ 	else \
+ 	  echo "WARNING: insufficient access; not installing setuid plugins"; \
+ 	  echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
+-	fi
++	fi ; \
++	if [ -x $(DESTDIR)$(libexecdir)/check_icmp ] ; then rm -f $(DESTDIR)$(libexecdir)/check_host $(DESTDIR)$(libexecdir)/check_rta_multi ; ln -s check_icmp $(DESTDIR)$(libexecdir)/check_host ; ln -s check_icmp $(DESTDIR)$(libexecdir)/check_rta_multi ; fi
+ 
+ clean-local:
+ 	rm -f NP-VERSION-FILE

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git