[net] Monitoring: Finally collected a Nagios programs under Monitoring submenu.

[openwrt/svn-archive/archive.git] / net / nagios-plugins / patches / 002-plugins.patch

diff --git a/net/nagios-plugins/patches/002-plugins.patch b/net/nagios-plugins/patches/002-plugins.patch
index 4b13de35061c1eb8afbc2e3c748c042bfaae617c..402aabad7dc279d8ac690637257cb2675d3c511c 100644 (file)
--- a/net/nagios-plugins/patches/002-plugins.patch
+++ b/net/nagios-plugins/patches/002-plugins.patch
@@ -1,7 +1,6 @@
-diff -urN nagios-plugins-1.4.11/configure nagios-plugins-1.4.11.new/configure
---- nagios-plugins-1.4.11/configure    2007-12-13 23:42:38.000000000 +0100
-+++ nagios-plugins-1.4.11.new/configure        2008-02-11 07:56:02.000000000 +0100
-@@ -27226,7 +27226,7 @@
+--- a/configure
++++ b/configure
+@@ -28209,7 +28209,7 @@ fi
  
  if test "$ac_cv_have_decl_swapctl" = "yes";
  then
@@ -10,7 +9,7 @@ diff -urN nagios-plugins-1.4.11/configure nagios-plugins-1.4.11.new/configure
        { echo "$as_me:$LINENO: checking for 2-arg (SVR4) swapctl" >&5
  echo $ECHO_N "checking for 2-arg (SVR4) swapctl... $ECHO_C" >&6; }
        if test "$ac_cv_type_swaptbl_t" = "yes" -a \
-@@ -27365,7 +27365,7 @@
+@@ -28348,7 +28348,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HAVE_SWAP 1
  _ACEOF
  
@@ -19,7 +18,7 @@ diff -urN nagios-plugins-1.4.11/configure nagios-plugins-1.4.11.new/configure
  fi
  if test "x$ac_cv_swap_command" != "x"
  then
-@@ -27417,7 +27417,7 @@
+@@ -28400,7 +28400,7 @@ cat >>confdefs.h <<_ACEOF
  #define PROC_MEMINFO "$ac_cv_proc_meminfo"
  _ACEOF
  
@@ -28,10 +27,9 @@ diff -urN nagios-plugins-1.4.11/configure nagios-plugins-1.4.11.new/configure
  fi
  
  # Extract the first word of "dig", so it can be a program name with args.
-diff -urN nagios-plugins-1.4.11/plugins/Makefile.am nagios-plugins-1.4.11.new/plugins/Makefile.am
---- nagios-plugins-1.4.11/plugins/Makefile.am  2007-12-12 02:27:48.000000000 +0100
-+++ nagios-plugins-1.4.11.new/plugins/Makefile.am      2008-02-11 08:08:14.000000000 +0100
-@@ -22,8 +22,8 @@
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -34,8 +34,8 @@ libexec_PROGRAMS = check_apt check_clust
  check_tcp_programs = check_ftp check_imap check_nntp check_pop \
        check_udp check_clamd @check_tcp_ssl@
  
@@ -42,10 +40,9 @@ diff -urN nagios-plugins-1.4.11/plugins/Makefile.am nagios-plugins-1.4.11.new/pl
        check_nagios check_by_ssh check_dns check_nt check_ide_smart    \
        check_procs check_mysql_query check_apt
  
-diff -urN nagios-plugins-1.4.11/plugins/Makefile.in nagios-plugins-1.4.11.new/plugins/Makefile.in
---- nagios-plugins-1.4.11/plugins/Makefile.in  2007-12-13 23:42:36.000000000 +0100
-+++ nagios-plugins-1.4.11.new/plugins/Makefile.in      2008-02-11 08:08:22.000000000 +0100
-@@ -35,7 +35,7 @@
+--- a/plugins/Makefile.in
++++ b/plugins/Makefile.in
+@@ -32,7 +32,7 @@ POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
  libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \
@@ -54,7 +51,7 @@ diff -urN nagios-plugins-1.4.11/plugins/Makefile.in nagios-plugins-1.4.11.new/pl
        check_load$(EXEEXT) check_mrtg$(EXEEXT) \
        check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \
        check_ntp_peer$(EXEEXT) check_nwstat$(EXEEXT) \
-@@ -44,8 +44,8 @@
+@@ -41,8 +41,8 @@ libexec_PROGRAMS = check_apt$(EXEEXT) ch
        check_time$(EXEEXT) check_ntp_time$(EXEEXT) check_ups$(EXEEXT) \
        check_users$(EXEEXT) negate$(EXEEXT) urlize$(EXEEXT) @EXTRAS@
  EXTRA_PROGRAMS = check_mysql$(EXEEXT) check_radius$(EXEEXT) \
@@ -65,11 +62,11 @@ diff -urN nagios-plugins-1.4.11/plugins/Makefile.in nagios-plugins-1.4.11.new/pl
        check_game$(EXEEXT) check_dig$(EXEEXT) check_nagios$(EXEEXT) \
        check_by_ssh$(EXEEXT) check_dns$(EXEEXT) check_nt$(EXEEXT) \
        check_ide_smart$(EXEEXT) check_procs$(EXEEXT) \
---- nagios-plugins-1.4.11/plugins/check_pgsql.c        2007-01-28 22:46:41.000000000 +0100
-+++ nagios-plugins-1.4.11.new/plugins/check_pgsql.c    2008-02-13 15:47:11.000000000 +0100
-@@ -45,6 +45,7 @@
- #include "netutils.h"
+--- a/plugins/check_pgsql.c
++++ b/plugins/check_pgsql.c
+@@ -39,6 +39,7 @@ const char *email = "nagiosplug-devel@li
  #include <libpq-fe.h>
+ #include <pg_config_manual.h>
  
 +#define NAMEDATALEN 64
  #define DEFAULT_DB "template1"