Make this use net-snmp; ucd-snmp is dead.

5 files changed, 78 insertions, 4 deletions

diff --git a/net/netsaint-plugin-snmp/Makefile b/net/netsaint-plugin-snmp/Makefile
index 4dbb14e124d..ae9e821cdf5 100644
--- a/net/netsaint-plugin-snmp/Makefile
+++ b/net/netsaint-plugin-snmp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/10/02 21:13:11 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/22 16:40:50 christos Exp $
 #
 
 DISTNAME=	netsaint-plugins-1.2.9-4
 PKGNAME=	netsaint-plugin-snmp-1.2.9.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netsaintplug/}
 
@@ -12,7 +12,7 @@ HOMEPAGE=	http://netsaintplug.sourceforge.net/
 COMMENT=	SNMP monitoring plug-in for netsaint
 
 DEPENDS+=	netsaint-base-[0-9]*:../../net/netsaint-base
-DEPENDS+=	ucd-snmp-4.2.4*:../../net/ucd-snmp
+DEPENDS+=	net-snmp-5.0.9*:../../net/net-snmp
 
 .include "../../net/netsaint-base/Makefile.common"
 
diff --git a/net/netsaint-plugin-snmp/distinfo b/net/netsaint-plugin-snmp/distinfo
index ac91c0cb252..9cd35bf8eef 100644
--- a/net/netsaint-plugin-snmp/distinfo
+++ b/net/netsaint-plugin-snmp/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.4 2002/07/02 13:00:29 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/02/22 16:40:50 christos Exp $
 
 SHA1 (netsaint-plugins-1.2.9-4.tar.gz) = d4d6a52c0f5ca8470cd9b9ee52d427b2ecf940e6
 Size (netsaint-plugins-1.2.9-4.tar.gz) = 352023 bytes
+SHA1 (patch-aa) = 4b76d47ff44a77efd3deac9dbb7b450973c5ad51
+SHA1 (patch-ab) = 207efcd2f1d8811c6beadf2b82ac402926ac604c
+SHA1 (patch-ac) = abed2a29b49ee9b0c66332304604c2a3d9d6b3e5
diff --git a/net/netsaint-plugin-snmp/patches/patch-aa b/net/netsaint-plugin-snmp/patches/patch-aa
new file mode 100644
index 00000000000..775c6b8b5b8
--- /dev/null
+++ b/net/netsaint-plugin-snmp/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1 2004/02/22 16:40:51 christos Exp $
+
+--- plugins/check_hpjd.c.orig	2001-04-13 16:19:47.000000000 -0400
++++ plugins/check_hpjd.c	2004-02-22 11:36:09.000000000 -0500
+@@ -21,7 +21,7 @@
+ *
+ * Dependencies:
+ *
+-* This plugin used the 'snmpget' command included with the UCD-SNMP
++* This plugin used the 'snmpget' command included with the NET-SNMP
+ * package.  If you don't have the package installed you will need to
+ * download it from http://ucd-snmp.ucdavis.edu before you can use
+ * this plugin.
+@@ -135,7 +135,8 @@
+ 		 HPJD_GD_STATUS_DISPLAY);
+ 
+ 	/* get the command to run */
+-	sprintf(command_line,"%s -v 1 %s %s %s",PATH_TO_SNMPGET,address,community,query_string);
++	sprintf(command_line,"%s -v 1 -c %s %s %s",PATH_TO_SNMPGET,
++	    community,address,query_string);
+ 
+ 	/* run the command */
+ 	child_process=spopen(command_line);
diff --git a/net/netsaint-plugin-snmp/patches/patch-ab b/net/netsaint-plugin-snmp/patches/patch-ab
new file mode 100644
index 00000000000..0ba4752fffe
--- /dev/null
+++ b/net/netsaint-plugin-snmp/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 2004/02/22 16:40:51 christos Exp $
+
+--- plugins/check_snmp.c.orig	2001-04-13 16:19:47.000000000 -0400
++++ plugins/check_snmp.c	2004-02-22 11:35:15.000000000 -0500
+@@ -146,13 +146,13 @@
+ 	/* create the command line to execute */
+ 	if (getnext==TRUE) {
+ 		command_line = ssprintf (command_line,
+-			"%s -m ALL -v 1 %s %s %s",
+-			PATH_TO_SNMPGETNEXT, server_address, community, oid);
++			"%s -m ALL -v 1 -c %s %s %s",
++			PATH_TO_SNMPGETNEXT, community, server_address, oid);
+ 	}
+ 	else {
+ 		command_line = ssprintf (command_line,
+-			"%s -m ALL -v 1 %s %s %s",
+-			PATH_TO_SNMPGET, server_address, community, oid);
++			"%s -m ALL -v 1 -c %s %s %s",
++			PATH_TO_SNMPGET, community, server_address, oid);
+ 	}
+ 
+ 	/* run the command */
+@@ -647,7 +647,7 @@
+ 		"    Return OK state (for that OID) if case-insensitive extended REGEX matches\n"
+ 		" -l, --label=STRING\n"
+ 		"    Prefix label for output from plugin (default -s 'SNMP')\n\n"
+-		"- This plugin uses the 'snmpget' command included with the UCD-SNMP package.\n"
++		"- This plugin uses the 'snmpget' command included with the NET-SNMP package.\n"
+ 		"  If you don't have the package installed, you will need to download it from\n"
+ 		"  http://ucd-snmp.ucdavis.edu before you can use this plugin.\n"
+ 		"- Multiple OIDs may be indicated by a comma- or space-delimited list (lists with\n"
diff --git a/net/netsaint-plugin-snmp/patches/patch-ac b/net/netsaint-plugin-snmp/patches/patch-ac
new file mode 100644
index 00000000000..839c317a916
--- /dev/null
+++ b/net/netsaint-plugin-snmp/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2004/02/22 16:40:51 christos Exp $
+
+--- plugins/check_by_ssh.c.orig	2001-04-23 03:43:11.000000000 -0400
++++ plugins/check_by_ssh.c	2004-02-22 11:38:04.000000000 -0500
+@@ -387,9 +387,9 @@
+ 
+ 
+ 
+-#define OPTIONS "\
+--H <host> [-P port] [-f] [-y] [-t timeout] [-i identity]\n
+-             [-l user] [-n name] [-s servicelist] [-O outputfile]"
++#define OPTIONS \
++"-H <host> [-P port] [-f] [-y] [-t timeout] [-i identity]\n" \
++"          [-l user] [-n name] [-s servicelist] [-O outputfile]"
+ 
+ void print_usage(void)
+ {