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

[Jan Wagner]

tags 461999 pending
thanks

Author: waja-guest
Date: 2008-06-06 14:28:26 +0000 (Fri, 06 Jun 2008)
New Revision: 1477

Added:
   nagios-plugins/trunk/debian/patches/38_fix_libexec.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
   nagios-plugins/trunk/debian/rules
Log:
add check_linux_raid

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2008-06-06 13:47:14 UTC (rev 1476)
+++ nagios-plugins/trunk/debian/changelog	2008-06-06 14:28:26 UTC (rev 1477)
@@ -46,6 +46,8 @@
     anyways, thanks Josip Rodin <joy at debbugs.entuzijast.net> for profiding a
     fix (Closes: #482942)
   * mention the check_radius breakerage in NEWS.Debian
+  * add check_linux_raid into package (Closes: #461999) and add
+    38_fix_libexec.dpatch to fix libexec path
 
   [ Alexander Wirt ]
   * Call smbclient with -N (supress password prompt) if no password is

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2008-06-06 13:47:14 UTC (rev 1476)
+++ nagios-plugins/trunk/debian/patches/00list	2008-06-06 14:28:26 UTC (rev 1477)
@@ -12,4 +12,5 @@
 35_check_http_date.dpatch
 36_check_ldap_empty_base.dpatch
 37_check_radius_nas-ip-address.dpatch
+38_fix_libexec.dpatch
 50_misc_typos.dpatch

Added: nagios-plugins/trunk/debian/patches/38_fix_libexec.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/38_fix_libexec.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/38_fix_libexec.dpatch	2008-06-06 14:28:26 UTC (rev 1477)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 38_fix_libexec.dpatch by Jan Wagner <waja at cyconet.org>
+##
+## DP: fix library path
+
+ at DPATCH@
+diff -urNad nagios-plugins-1.4.12~/contrib/check_linux_raid.pl nagios-plugins-1.4.12/contrib/check_linux_raid.pl
+--- nagios-plugins-1.4.12~/contrib/check_linux_raid.pl	2007-08-28 05:19:45.000000000 +0200
++++ nagios-plugins-1.4.12/contrib/check_linux_raid.pl	2008-06-06 16:16:23.000000000 +0200
+@@ -23,7 +23,7 @@
+ #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
+ 
+ use strict;
+-use lib "/usr/local/nagios/libexec";
++use lib "/usr/lib/nagios/plugins";
+ use utils qw(%ERRORS);
+ 
+ # die with an error if we're not on Linux


Property changes on: nagios-plugins/trunk/debian/patches/38_fix_libexec.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: nagios-plugins/trunk/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules	2008-06-06 13:47:14 UTC (rev 1476)
+++ nagios-plugins/trunk/debian/rules	2008-06-06 14:28:26 UTC (rev 1477)
@@ -145,6 +145,7 @@
 	done
 	# install check_bgpstate from contrib
 	install -m 755 contrib/check_bgpstate.pl ${NP_STD_DIR}/${NP_LIBEXEC}/check_bgpstate
+	install -m 755 contrib/check_linux_raid.pl ${NP_STD_DIR}/${NP_LIBEXEC}/check_linux_raid
 	# dynamically create the postrm scripts using a template, so that we
 	# don't have to define the same list of plugin configs over and over.
 	sed -e 's/@BASIC_PLUGINS@/${basic_plugin_cfgs}/' \