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