[Pkg-nagios-changes] [pkg-nagios] r1810 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

tags 563090 pending
thanks

Author: waja
Date: 2010-01-10 20:44:18 +0000 (Sun, 10 Jan 2010)
New Revision: 1810

Added:
   nagios-plugins/trunk/debian/patches/02_check_icmp_links.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
provide check_host and check_rta_multi

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2009-12-20 19:06:02 UTC (rev 1809)
+++ nagios-plugins/trunk/debian/changelog	2010-01-10 20:44:18 UTC (rev 1810)
@@ -30,6 +30,8 @@
   * 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
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2009-12-20 19:06:02 UTC (rev 1809)
+++ nagios-plugins/trunk/debian/patches/00list	2010-01-10 20:44:18 UTC (rev 1810)
@@ -1,3 +1,4 @@
+02_check_icmp_links.dpatch
 06_checkircd.dpatch
 13_subst.in_again.dpatch
 14_check_log_paths.dpatch

Added: nagios-plugins/trunk/debian/patches/02_check_icmp_links.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/02_check_icmp_links.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/02_check_icmp_links.dpatch	2010-01-10 20:44:18 UTC (rev 1810)
@@ -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