Update to V3.6.1, as sent in in PR 7322 by Greg A. Woods <woods@planix.com>

Changes:
 - 3.6.1 is a bugfix release
 - This package uses NetBSD's libwrap

5 files changed, 124 insertions, 62 deletions

diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index 4f7e8c22703..c9de0b1c910 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,34 +1,56 @@
-# $NetBSD: Makefile,v 1.9 1999/03/07 04:02:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/05 00:59:07 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp
 #
 
-DISTNAME=	ucd-snmp-3.6
+DISTNAME=	ucd-snmp-3.6.1
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
-		ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
+		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.ece.ucdavis.edu/ucd-snmp/
 
+BUILD_DEPENDS+=	autoconf:../../devel/autoconf
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-defaults
+CONFIGURE_ARGS+= --with-defaults
+CONFIGURE_ARGS+= --with-libwrap
+# note the default appends a redundant and silly ".log"
+CONFIGURE_ARGS+= --with-logfile="/var/log/snmpd"
+# this might make it easier to use scotty's mibs, and local ones too
+CONFIGURE_ARGS+= --with-mibdirs="${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs"
+
+# pass down PKG_PREFIX to simulate pkg_add's environment
+MAKE_ENV+=	PKG_PREFIX="${PREFIX}"
+
+.include "../../mk/bsd.prefs.mk"
+
+# XXX This most horrible hack is necessary because of the stupid linker's
+# insistence on requiring that all externals referenced from a shared library
+# be defined, even if nothing elese from the library is ever used.  In this
+# case the libwrap.so library is at fault as it references 'deny_severity' and
+# 'allow_severity', but none of the configure tests will include this, nor
+# indeed will any product binary except for snmpd (which is the only one that
+# actualy uses tcp_wrappers).
+#
+# /usr/libexec/ld.so: Undefined symbol "_deny_severity" in conftest:/usr/lib/libwrap.so.0.0
+#
+CFLAGS+=	-static
 
-BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \
-		snmpstatus snmptest snmptranslate snmptrap snmpwalk
-SBIN=		snmpd snmptrapd
+pre-configure:
+	(cd ${WRKSRC}; autoreconf --force)
 
+# Need to run INSTALL script as this doesn't happen automagically from pkgsrc.
 post-install:
-	( cd ${PREFIX}/bin; strip ${BIN} )
-	( cd ${PREFIX}/sbin; strip ${SBIN} )
 	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	@for F in ${WRKSRC}/etc/* ; do \
-		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done
-	@if [ ! -f ${PREFIX}/etc/rc.d/snmpd.sh ]; then \
-		${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/snmpd.sh; \
-		${ECHO} "[ -x ${PREFIX}/sbin/snmpd ] && ${PREFIX}/sbin/snmpd && ${ECHO} -n ' snmpd'" >> ${PREFIX}/etc/rc.d/snmpd.sh; \
-		chmod 751 ${PREFIX}/etc/rc.d/snmpd.sh; \
-	 fi
+		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; \
+	done
+	${ECHO} "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \
+	${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/snmpd.sh; \
+	${ECHO} "[ -x ${PREFIX}/sbin/snmpd ] && ${PREFIX}/sbin/snmpd && ${ECHO} -n ' snmpd'" >> ${PREFIX}/etc/rc.d/snmpd.sh
+	${CHMOD} 755 ${PREFIX}/etc/rc.d/snmpd.sh
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/snmp/dlmod
+	${TOUCH} ${PREFIX}/lib/snmp/dlmod/.keepme
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ucd-snmp/files/md5 b/net/ucd-snmp/files/md5
index 93b438f761d..7f4dbaa38b9 100644
--- a/net/ucd-snmp/files/md5
+++ b/net/ucd-snmp/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/03/07 04:02:06 hubertf Exp $
+$NetBSD: md5,v 1.6 1999/04/05 00:59:08 hubertf Exp $
 
-MD5 (ucd-snmp-3.6.tar.gz) = 3be64678ece8add138182d29c9432572
+MD5 (ucd-snmp-3.6.1.tar.gz) = 4ebb94d59c086cef4dbb27396f9b77cb
diff --git a/net/ucd-snmp/patches/patch-aa b/net/ucd-snmp/patches/patch-aa
index 4763a0ce345..f3a14578368 100644
--- a/net/ucd-snmp/patches/patch-aa
+++ b/net/ucd-snmp/patches/patch-aa
@@ -1,20 +1,44 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:11:02 agc Exp $
-
---- configure-orig	Fri Jun 19 22:14:25 1998
-+++ configure	Mon Aug  3 16:44:56 1998
-@@ -4599,11 +4599,11 @@
- #include "confdefs.h"
- 
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
-+/* #define KERNEL
-+#define _KERNEL */
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
-+/* #undef KERNEL
-+#undef _KERNEL */
- #include <net/route.h>
- 
- int main() {
+*** configure.in-ORIG	Mon Mar 15 18:31:43 1999
+--- configure.in	Sun Apr  4 16:42:20 1999
+***************
+*** 821,831 ****
+  
+  AC_CHECK_STRUCT_FOR([
+  #include <sys/types.h>
+- #define KERNEL
+- #define _KERNEL
+  #include <sys/socket.h>
+- #undef KERNEL
+- #undef _KERNEL
+  #include <net/route.h>
+  ], rtentry, rt_dst, no)
+  
+--- 821,827 ----
+***************
+*** 836,846 ****
+  dnl 4.4 compat
+  AC_TRY_COMPILE([
+  #include <sys/types.h>
+- #define KERNEL
+- #define _KERNEL
+  #include <sys/socket.h>
+- #undef KERNEL
+- #undef _KERNEL
+  #include <net/route.h>
+  ],[
+  
+--- 832,838 ----
+***************
+*** 857,867 ****
+  if test "x$ac_cv_RTENTRY_TYPE" = "x"; then
+  AC_TRY_COMPILE([
+  #include <sys/types.h>
+- #define KERNEL
+- #define _KERNEL
+  #include <sys/socket.h>
+- #undef KERNEL
+- #undef _KERNEL
+  #include <net/route.h>
+  ],[
+  struct rtentry rt; 
+--- 849,855 ----
diff --git a/net/ucd-snmp/pkg/MESSAGE b/net/ucd-snmp/pkg/MESSAGE
index 6a4eefc7de4..8297fc81e27 100644
--- a/net/ucd-snmp/pkg/MESSAGE
+++ b/net/ucd-snmp/pkg/MESSAGE
@@ -1,6 +1,23 @@
 # 
-# $NetBSD: MESSAGE,v 1.2 1998/08/07 11:11:03 agc Exp $
+# $NetBSD: MESSAGE,v 1.3 1999/04/05 00:59:08 hubertf Exp $
 #
 # You may want to install the x11/p5-Tk and net/p5-SNMP packages to
 # use the tkmib application!
 #
+# You may also want to install the net/scotty package to do network
+# monitoring.
+#
+# Finally, a note from the maintainer:
+# 
+#   I'm asking (begging) people to send me a postcard of your home city,
+#   area, or country.  I intend to arrange them into a logo, take a
+#   picture of them all, and use the picture on the ucd-snmp web page.
+#   I've gotten a few already, but need a lot more to make the logo a
+#   decent size.  The first pass from the postcards people have sent me so far
+#   can be seen on the ucd-snmp web site, listed below.  If you wish to send 
+#   a postcard, please send it to:
+# 
+#          Wes Hardaker
+#          IT - DCAS
+#          UCDavis
+#          Davis CA, 95616
diff --git a/net/ucd-snmp/pkg/PLIST b/net/ucd-snmp/pkg/PLIST
index cdd7384f640..a569b014cbd 100644
--- a/net/ucd-snmp/pkg/PLIST
+++ b/net/ucd-snmp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/03/07 04:02:06 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/04/05 00:59:08 hubertf Exp $
 bin/snmpnetstat
 bin/snmpwalk
 bin/snmpbulkwalk
@@ -27,13 +27,11 @@ include/ucd-snmp/snmp_client.h
 include/ucd-snmp/snmp_debug.h
 include/ucd-snmp/snmp_impl.h
 include/ucd-snmp/system.h
-include/ucd-snmp/ucd-snmp-includes.h
-include/ucd-snmp/view.h
 include/ucd-snmp/ucd-snmp-config.h
+include/ucd-snmp/ucd-snmp-includes.h
 include/ucd-snmp/version.h
+include/ucd-snmp/view.h
 lib/libsnmp.a
-lib/snmp/dlmod/dlmod_mib.so
-lib/snmp/dlmod/example.so
 man/man1/snmpcmd.1
 man/man1/snmpget.1
 man/man1/snmpset.1
@@ -65,34 +63,35 @@ share/examples/ucd-snmp/acl.conf
 share/examples/ucd-snmp/context.conf
 share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
+share/snmp/mibs/DLMOD-MIB.txt
+share/snmp/mibs/EtherLike-MIB.txt
+share/snmp/mibs/HOST-RESOURCES-MIB.txt
+share/snmp/mibs/IANAifType-MIB.txt
+share/snmp/mibs/IF-MIB.txt
+share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/IPFWACC-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-M2M-MIB.txt
-share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
 share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
 share/snmp/mibs/SNMP-PROXY-MIB.txt
+share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/SNMPv2-CONF.txt
+share/snmp/mibs/SNMPv2-M2M-MIB.txt
+share/snmp/mibs/SNMPv2-MIB.txt
+share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/SNMPv2-SMI.txt
+share/snmp/mibs/SNMPv2-TC.txt
+share/snmp/mibs/SNMPv2-TM.txt
 share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/IPFWACC-MIB.txt
-share/snmp/mibs/DLMOD-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
 @unexec /bin/rm -f %D/share/snmp/mibs/.index
+lib/snmp/dlmod/.keepme
 @dirrm lib/snmp/dlmod
 @dirrm share/snmp/mibs
 @dirrm share/snmp