net/nagios-plugins/patches/002-plugins.patch

   1 diff -urN nagios-plugins-1.4.11/configure nagios-plugins-1.4.11.new/configure
   2 --- nagios-plugins-1.4.11/configure     2007-12-13 23:42:38.000000000 +0100
   3 +++ nagios-plugins-1.4.11.new/configure 2008-02-11 07:56:02.000000000 +0100
   4 @@ -27226,7 +27226,7 @@
   5
   6  if test "$ac_cv_have_decl_swapctl" = "yes";
   7  then
   8 -       EXTRAS="$EXTRAS check_swap"
   9 +       EXTRAS="$EXTRAS"
  10         { echo "$as_me:$LINENO: checking for 2-arg (SVR4) swapctl" >&5
  11  echo $ECHO_N "checking for 2-arg (SVR4) swapctl... $ECHO_C" >&6; }
  12         if test "$ac_cv_type_swaptbl_t" = "yes" -a \
  13 @@ -27365,7 +27365,7 @@
  14  #define HAVE_SWAP 1
  15  _ACEOF
  16
  17 -       EXTRAS="$EXTRAS check_swap"
  18 +       EXTRAS="$EXTRAS"
  19  fi
  20  if test "x$ac_cv_swap_command" != "x"
  21  then
  22 @@ -27417,7 +27417,7 @@
  23  #define PROC_MEMINFO "$ac_cv_proc_meminfo"
  24  _ACEOF
  25
  26 -       EXTRAS="$EXTRAS check_swap"
  27 +       EXTRAS="$EXTRAS"
  28  fi
  29
  30  # Extract the first word of "dig", so it can be a program name with args.
  31 diff -urN nagios-plugins-1.4.11/plugins/Makefile.am nagios-plugins-1.4.11.new/plugins/Makefile.am
  32 --- nagios-plugins-1.4.11/plugins/Makefile.am   2007-12-12 02:27:48.000000000 +0100
  33 +++ nagios-plugins-1.4.11.new/plugins/Makefile.am       2008-02-11 08:08:14.000000000 +0100
  34 @@ -22,8 +22,8 @@
  35  check_tcp_programs = check_ftp check_imap check_nntp check_pop \
  36         check_udp check_clamd @check_tcp_ssl@
  37
  38 -EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
  39 -       check_swap check_fping check_ldap check_game check_dig \
  40 +EXTRA_PROGRAMS = check_mysql check_radius check_snmp check_hpjd \
  41 +       check_fping check_ldap check_game check_dig \
  42         check_nagios check_by_ssh check_dns check_nt check_ide_smart    \
  43         check_procs check_mysql_query check_apt
  44
  45 diff -urN nagios-plugins-1.4.11/plugins/Makefile.in nagios-plugins-1.4.11.new/plugins/Makefile.in
  46 --- nagios-plugins-1.4.11/plugins/Makefile.in   2007-12-13 23:42:36.000000000 +0100
  47 +++ nagios-plugins-1.4.11.new/plugins/Makefile.in       2008-02-11 08:08:22.000000000 +0100
  48 @@ -35,7 +35,7 @@
  49  build_triplet = @build@
  50  host_triplet = @host@
  51  libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \
  52 -       check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \
  53 +       check_dummy$(EXEEXT) check_http$(EXEEXT) \
  54         check_load$(EXEEXT) check_mrtg$(EXEEXT) \
  55         check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \
  56         check_ntp_peer$(EXEEXT) check_nwstat$(EXEEXT) \
  57 @@ -44,8 +44,8 @@
  58         check_time$(EXEEXT) check_ntp_time$(EXEEXT) check_ups$(EXEEXT) \
  59         check_users$(EXEEXT) negate$(EXEEXT) urlize$(EXEEXT) @EXTRAS@
  60  EXTRA_PROGRAMS = check_mysql$(EXEEXT) check_radius$(EXEEXT) \
  61 -       check_pgsql$(EXEEXT) check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \
  62 -       check_swap$(EXEEXT) check_fping$(EXEEXT) check_ldap$(EXEEXT) \
  63 +       check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \
  64 +       check_fping$(EXEEXT) check_ldap$(EXEEXT) \
  65         check_game$(EXEEXT) check_dig$(EXEEXT) check_nagios$(EXEEXT) \
  66         check_by_ssh$(EXEEXT) check_dns$(EXEEXT) check_nt$(EXEEXT) \
  67         check_ide_smart$(EXEEXT) check_procs$(EXEEXT) \
  68 --- nagios-plugins-1.4.11/plugins/check_pgsql.c 2007-01-28 22:46:41.000000000 +0100
  69 +++ nagios-plugins-1.4.11.new/plugins/check_pgsql.c     2008-02-13 15:47:11.000000000 +0100
  70 @@ -45,6 +45,7 @@
  71  #include "netutils.h"
  72  #include <libpq-fe.h>
  73
  74 +#define NAMEDATALEN 64
  75  #define DEFAULT_DB "template1"
  76  #define DEFAULT_HOST "127.0.0.1"
  77