Update nagios-plugins pacakge to 1.4.3.

1.4.3
	Setuid plugins (check_dhcp, check_icmp) separated into plugins-root/. Run make install as root to install
	SSL plugins work with gnutls as well as OpenSSL
	check_mysql_query added to run arbitrary SQL commands, with threshold checking
	libtool now required for development systems
	Notice: check_udp (compiled from check_udp.c) will be deprecated in the next release.
	  check_udp2 should be used instead and will be renamed to check_udp

7 files changed, 79 insertions, 90 deletions

diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
index e99972ac56d..c03ee350c6c 100644
--- a/net/nagios-plugins/Makefile
+++ b/net/nagios-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:30:21 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/08/17 14:20:14 taca Exp $
 #
 
 CATEGORIES=	net sysutils
@@ -12,6 +12,10 @@ COMMENT=	Nagios plugins
 
 .include "../../mk/bsd.prefs.mk"
 
+CONFIGURE_ARGS+= --without-pgsql --without-mysql \
+		--without-smbclient-command --without-snmpget-command \
+		--without-snmpgetnext-command --without-fping-command
+
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=      --with-df-command="/bin/df -Pklt nokernfs,procfs,fdesc"
 .endif
diff --git a/net/nagios-plugins/Makefile.common b/net/nagios-plugins/Makefile.common
index b12606adfac..0e492e66e3f 100644
--- a/net/nagios-plugins/Makefile.common
+++ b/net/nagios-plugins/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2006/03/08 12:30:33 joerg Exp $
+# $NetBSD: Makefile.common,v 1.3 2006/08/17 14:20:14 taca Exp $
 #
 
-PLUGINSVERSION=	1.4.2
+PLUGINSVERSION=	1.4.3
 DISTNAME=	nagios-plugins-${PLUGINSVERSION}
 
 .include "../../net/nagios-base/Makefile.common"
diff --git a/net/nagios-plugins/PLIST b/net/nagios-plugins/PLIST
index c1fa94b862e..580b7401f82 100644
--- a/net/nagios-plugins/PLIST
+++ b/net/nagios-plugins/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/08/17 14:20:14 taca Exp $
 libexec/nagios/check_by_ssh
+libexec/nagios/check_clamd
 libexec/nagios/check_dhcp
 libexec/nagios/check_dig
 libexec/nagios/check_disk
diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo
index f5b6321d27e..2c20501f3e0 100644
--- a/net/nagios-plugins/distinfo
+++ b/net/nagios-plugins/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2006/08/17 14:20:14 taca Exp $
 
-SHA1 (nagios-plugins-1.4.2.tar.gz) = d12238c75c0bbb0c7cb8e81585effe5375b9ced4
-RMD160 (nagios-plugins-1.4.2.tar.gz) = 93d747bb445e4e59cdb72ef210feb052b7855cac
-Size (nagios-plugins-1.4.2.tar.gz) = 971447 bytes
-SHA1 (patch-ab) = 040ec551e93d13a5da7cf5b6b09bd9afbef818b1
+SHA1 (nagios-plugins-1.4.3.tar.gz) = c26fc2f31d7579c3a8174dcd1965046c4b1c8d37
+RMD160 (nagios-plugins-1.4.3.tar.gz) = bc1d4f8cddd481775c514758a462fe533e01e846
+Size (nagios-plugins-1.4.3.tar.gz) = 1257775 bytes
+SHA1 (patch-ab) = 1bcd6ddd5ef77c4ab726de4d6ac0a50fd525fa47
 SHA1 (patch-ad) = 2b88b23b790b454cb1f5e2dc1b6735a43534834c
-SHA1 (patch-ae) = df35396bb9fa1e61faf3c0067bb0b82ba6d0847d
-SHA1 (patch-af) = 95ba4451458fe50abb6f60109b67d30900661696
-SHA1 (patch-ag) = 30381eb5be9fc17c51095d859d58f8d81c09a44e
+SHA1 (patch-ae) = c22cbbaece4c9145356f96abd9d72192c226b19f
+SHA1 (patch-af) = 626810863f909652202ead6bcf4b00494d1d758f
 SHA1 (patch-ah) = b9f9f36d2c77ac08213dfea4df443872230f8099
 SHA1 (patch-ai) = 383f5b19466c82454e198e1b9cdbec2dcfd04047
-SHA1 (patch-aj) = 2e65a5b3bf9b666276867702a787f00da17ff29a
 SHA1 (patch-ak) = c3d9f6ea9a971c45ec4159f800c2a975a3013c82
diff --git a/net/nagios-plugins/patches/patch-ab b/net/nagios-plugins/patches/patch-ab
index e45d20bd03b..0390e11ef48 100644
--- a/net/nagios-plugins/patches/patch-ab
+++ b/net/nagios-plugins/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
+$NetBSD: patch-ab,v 1.2 2006/08/17 14:20:14 taca Exp $
 
---- configure.orig	2005-08-01 14:34:46.000000000 -0700
-+++ configure	2005-08-03 17:03:52.000000000 -0700
-@@ -8406,7 +8406,7 @@
+--- configure.orig	2006-04-19 12:52:19.000000000 +0900
++++ configure
+@@ -24395,7 +24395,7 @@ _ACEOF
  
  fi
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
    if test -n "$PGSQL"; then
      LDFLAGS="$LDFLAGS -L$PGSQL/lib"
      CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
-@@ -9051,7 +9051,7 @@
+@@ -25040,7 +25040,7 @@ _ACEOF
  
  fi
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
    EXTRAS="$EXTRAS check_radius"
  	RADIUSLIBS="-lradiusclient"
  
-@@ -9132,7 +9132,7 @@
+@@ -25121,7 +25121,7 @@ _ACEOF
  
  fi
  
@@ -29,34 +29,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
    LDAPLIBS="-lldap -llber"\
    LDAPINCLUDE="-I/usr/include/ldap"
  
-@@ -9362,7 +9362,7 @@
-   withval="$with_mysql"
-   MYSQL=$withval
- fi;
--if test -n "$MYSQL"; then
-+if false; then
-   MYSQLLIBDIR=$MYSQL/lib/mysql
-   CPPFLAGS="-I$MYSQL/include"
-   echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient" >&5
-@@ -10050,7 +10050,7 @@
- fi
- 
- fi
--if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then
-+if false; then
- 
- 
- for ac_header in mysql/mysql.h mysql/errmsg.h
-@@ -14789,7 +14789,7 @@
- echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6
- if test -n "$PATH_TO_NSLOOKUP"
- then
--	if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
-+	if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | fgrep "Invalid option: sil" >/dev/null
+@@ -30212,7 +30212,7 @@ fi
  	then
- 		ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
- 		echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
-@@ -15131,7 +15131,7 @@
+ 		echo "$as_me:$LINENO: checking for nslookup syntax" >&5
+ echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6
+-		if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
++		if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | fgrep "Invalid option: sil" >/dev/null
+ 		then
+ 			ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
+ 			echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
+@@ -30530,7 +30530,7 @@ else
  echo "${ECHO_T}no" >&6
  fi
  
@@ -65,34 +47,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -15182,7 +15182,7 @@
- echo "${ECHO_T}no" >&6
- fi
- 
--if test -x "$PATH_TO_SMBCLIENT"
-+if false
- then
- 
- cat >>confdefs.h <<_ACEOF
-@@ -15287,7 +15287,7 @@
- echo "${ECHO_T}no" >&6
- fi
- 
--if test -x "$PATH_TO_SNMPGET"
-+if false
- then
- 
- cat >>confdefs.h <<_ACEOF
-@@ -15339,7 +15339,7 @@
- echo "${ECHO_T}no" >&6
- fi
- 
--if test -x "$PATH_TO_SNMPGETNEXT"
-+if false
+@@ -30698,7 +30698,7 @@ if test "${with_snmpget_command+set}" = 
+   withval="$with_snmpget_command"
+   PATH_TO_SNMPGET=$withval
+ fi;
+-if test -n "$PATH_TO_SNMPGET"
++if test -n "$PATH_TO_SNMPGET" -a "$PATH_TO_SNMPGET" != "no"
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -15348,7 +15348,7 @@
+@@ -30765,7 +30765,7 @@ _ACEOF
  
  fi
  
@@ -101,17 +65,17 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
  then
  	echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5
  echo $ECHO_N "checking for Net::SNMP perl module... $ECHO_C" >&6
-@@ -15500,7 +15500,7 @@
- echo "${ECHO_T}no" >&6
- fi
- 
--if test -x "$PATH_TO_FPING"
-+if false
+@@ -30929,7 +30929,7 @@ if test "${with_fping_command+set}" = se
+   withval="$with_fping_command"
+   PATH_TO_FPING=$withval
+ fi;
+-if test -n "$PATH_TO_FPING"
++if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no"
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -16657,7 +16657,7 @@
- 	EXTRAS="$EXTRAS check_dig"
+@@ -32115,7 +32115,7 @@ _ACEOF
+ 
  fi
  
 -if test -f plugins/check_nt.c ; then
@@ -119,3 +83,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
    EXTRAS="$EXTRAS check_nt"
  elif test -f ../plugins/check_nt.c ; then
    EXTRAS="$EXTRAS check_nt"
+@@ -41104,6 +41104,12 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
++	: Avoid regenerating within pkgsrc
++	exit 0
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
diff --git a/net/nagios-plugins/patches/patch-ae b/net/nagios-plugins/patches/patch-ae
index 2ae1ccd6eed..3fb10bc7073 100644
--- a/net/nagios-plugins/patches/patch-ae
+++ b/net/nagios-plugins/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
+$NetBSD: patch-ae,v 1.2 2006/08/17 14:20:14 taca Exp $
 
---- plugins/Makefile.am.orig	Fri Jul 11 08:11:06 2003
+--- plugins/Makefile.am.orig	2006-03-21 20:42:59.000000000 +0900
 +++ plugins/Makefile.am
-@@ -33,7 +33,7 @@ TESTS = @PLUGIN_TEST@
- test:
+@@ -46,7 +46,7 @@ test:
+ 	cd tests && make test
  	perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
  
 -AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@
@@ -11,3 +11,12 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
  
  ##############################################################################
  # the actual targets
+@@ -155,7 +155,7 @@ install-exec-hook:
+ 	cd $(DESTDIR)$(libexecdir) && \
+ 	for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
+ 	if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
+-	
++
+ clean-local:
+ 	rm -f $(check_tcp_programs)
+ 
diff --git a/net/nagios-plugins/patches/patch-af b/net/nagios-plugins/patches/patch-af
index c859f50fd96..22432cdf3e2 100644
--- a/net/nagios-plugins/patches/patch-af
+++ b/net/nagios-plugins/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
+$NetBSD: patch-af,v 1.2 2006/08/17 14:20:14 taca Exp $
 
---- plugins/Makefile.in.orig	2005-09-19 15:58:12.000000000 +0200
-+++ plugins/Makefile.in	2005-10-14 21:57:33.000000000 +0200
-@@ -402,7 +402,7 @@
+--- plugins/Makefile.in.orig	2006-04-19 12:52:11.000000000 +0900
++++ plugins/Makefile.in
+@@ -407,7 +407,7 @@ SSLOBJS = sslutils.o
  NETLIBS = $(NETOBJS) $(SOCKETLIBS)
  TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
  TESTS = @PLUGIN_TEST@
@@ -11,12 +11,12 @@ $NetBSD: patch-af,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
  
  ##############################################################################
  # the actual targets
-@@ -977,7 +977,7 @@
+@@ -1129,7 +1129,7 @@ $(check_tcp_programs): check_tcp
  install-exec-hook:
  	cd $(DESTDIR)$(libexecdir) && \
  	for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
--	if [ -x check_ldaps ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
-+	#if [ -x check_ldaps ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
+-	if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
++#	if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
  
  clean-local:
  	rm -f $(check_tcp_programs)