Update to 5.0.9. PR19939 by Greg A. Woods.

Changes from NEWS file:
--------8<--------8<--------8<--------8<--------8<--------8<--------8<
*5.0.9*

 SECURITY:
    - An existing user/community could get access to data in MIB
      objects that were explicitly excluded from their view.

 Fixes:
    - Perl build environment should better under Windows
    - Misc kerberos support fixes.
    - Improvements on various manual pages.
    - A annoying bug with SETs being passed to pass scripts was fixed.
    - The often talked about VACM optimization improvement was fixed again.
    - mib2c handles augmentation tables better now.
    - Various 64 bit issues have been addressed.

*5.0.8*
 New:
    - No new features will be added to the 5.0.x line.

 Ports:
    - Update libtool to version 1.4.3, for the benefit of Darwin
    - diskio support for Darwin
    - Updates for OpenBSD 3.
    - Updates to solaris README

 Fixes:
    - find libwrap w/nsl on RedHat
    - fix for openssl 0.9.7
    - Fix some AgentX memory leaks
    - use macro for inline function prototypes
    - Attempt to find unused port before running tests
    - Use SNMP_SLEEP environment variable when running tests
    - calculate a proper ifSpeed under linux when possible
    - better daemonization of snmpd
    - close and reopen snmptrapd log files on HUP
    - support for 16 bit reuqest ids
    - Recognize new 't' code in display hints
    - misc other fixes

*5.0.7*
 New:
    - VACM (access control) optimizations which will greatly benefit
      people who wish to exclude large portions of the MIB tree from
      some people.  Previously this was a large resource drain.
    - Add command line option to snmpd to set syslog facility
    - Reverse DISPLAY-HINT processing, i.e. it allows you to input data
      formatted like a DISPLAY-HINT prescribes
    - Support setting of sysDescr and sysObjectID via snmpd.conf
      configuration directives
    - New output option to force display of strings as hex
    - Persistent directory can be specified at runtime
    - Add support for Linux virtual interfaces in the ipAddressTable.
    - implemented the mteEventTable and the mteEventNotificationTable
      form the DISMAN-EVENT-MIB.

 Fixes:
    - AgentX no longer flagged as experimental
    - A few memory leak fixes for the table_iterator agent API.
    - Processed flag cleared before each pass of a set request
    - Remove snmpd pid file on exit
    - Restore default behaviour of building shared libraries
    - misc other fixes
--------8<--------8<--------8<--------8<--------8<--------8<--------8<

6 files changed, 52 insertions, 27 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 0f584314e11..77e9fa3f114 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2003/08/30 22:51:27 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/12 12:07:18 uebayasi Exp $
 
-DISTNAME=	net-snmp-5.0.6
+DISTNAME=	net-snmp-5.0.9
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
 		ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
@@ -19,7 +19,7 @@ NET_SNMP_SYS_CONTACT?=		default_user@contact.domain
 NET_SNMP_SYS_LOCATION?=		defaultlocation
 NET_SNMP_LOGFILE?=		/var/log/snmpd.log
 NET_SNMP_PERSISTENTDIR?=	/var/net-snmp
-NET_SNMP_MIBDIRS?=		\$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs
+NET_SNMP_MIBDIRS?=		\$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm3.0.0/mibs
 
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
@@ -28,11 +28,12 @@ DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-.if ${OPSYS} == "NetBSD"
+.if ${OPSYS} == "NetBSD" && empty(CFLAGS:U:M*-Dnetbsd1*)
 CFLAGS+=		-Dnetbsd1
 .endif
 
 GNU_CONFIGURE=		yes
+
 CONFIGURE_ARGS+=	--enable-shared
 # net-snmp doesn't do IPv6 on Solaris
 .if (defined(USE_INET6) && (${USE_INET6} == "YES")) && ${OPSYS} != "SunOS"
@@ -45,14 +46,23 @@ IPV6H=			"@comment "
 PLIST_SUBST+=   	IPV6H=${IPV6H}
 CONFIGURE_ARGS+=	--with-defaults
 CONFIGURE_ARGS+=	--with-libwrap
+.if defined(NET_SNMP_USE_SSL) && ${NET_SNMP_USE_SSL} == "YES"
 CONFIGURE_ARGS+=	--with-openssl
+.endif
 CONFIGURE_ARGS+=	--with-sys-contact="${NET_SNMP_SYS_CONTACT}"
 CONFIGURE_ARGS+=	--with-sys-location="${NET_SNMP_SYS_LOCATION}"
-CONFIGURE_ARGS+=	--with-logfile="${NET_SNMP_LOGFILE}"
+#
+# NOTE:  if you specify a logfile then this file will be written to by
+# default and although it can be disabled on the command line, the
+# daemon must be stopped to cycle it properly.  Remember rc.d/snmpd
+# will use '-s' to enable standard syslog logging anyway.
+#
+CONFIGURE_ARGS+=	--without-logfile
 CONFIGURE_ARGS+=	--with-persistent-directory="${NET_SNMP_PERSISTENTDIR}"
 .if !empty(NET_SNMP_MIBDIRS)
 CONFIGURE_ARGS+=	--with-mibdirs="${NET_SNMP_MIBDIRS}"
 .endif
+CONFIGURE_ARGS+=	--with-mib-modules="smux host"
 #
 # Using "dummy" values is technically not compliant with SNMP specs, but
 # otherwise, some tools, e.g. net/tcl-scotty, net/tkined, may ignore results
@@ -65,7 +75,7 @@ CONFIGURE_ARGS+=	--with-dummy-values
 #
 CONFIGURE_ARGS+=	--enable-ucd-snmp-compatibility
 
-.if !exists(/usr/bin/lpstat)
+.if (${OPSYS} == "NetBSD") || !exists(/usr/bin/lpstat)
 CONFIGURE_ENV+=		ac_cv_path_LPSTAT_PATH=no
 .endif
 CONFIGURE_ENV+=		PERLPROG="${PERL5}"
@@ -100,7 +110,9 @@ post-install:
 		${PREFIX}/share/examples/net-snmp/EXAMPLE.conf
 
 .include "../../lang/perl5/buildlink2.mk"
+.if defined(NET_SNMP_USE_SSL) && ${NET_SNMP_USE_SSL} == "YES"
 .include "../../security/openssl/buildlink2.mk"
+.endif
 .include "../../security/tcp_wrappers/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/net-snmp/PLIST b/net/net-snmp/PLIST
index 9f8422d0fda..6bffadd54b0 100644
--- a/net/net-snmp/PLIST
+++ b/net/net-snmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/05/06 21:10:39 grant Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/09/12 12:07:18 uebayasi Exp $
 bin/encode_keychange
 bin/fixproc
 bin/ipf-mod.pl
@@ -42,6 +42,7 @@ include/net-snmp/agent/instance.h
 include/net-snmp/agent/mib_module_config.h
 include/net-snmp/agent/mib_module_includes.h
 include/net-snmp/agent/multiplexer.h
+include/net-snmp/agent/mode_end_call.h
 include/net-snmp/agent/net-snmp-agent-includes.h
 include/net-snmp/agent/null.h
 include/net-snmp/agent/old_api.h
@@ -141,6 +142,7 @@ include/net-snmp/system/solaris.h
 include/net-snmp/system/solaris2.6.h
 include/net-snmp/system/solaris2.7.h
 include/net-snmp/system/solaris2.8.h
+include/net-snmp/system/solaris2.9.h
 include/net-snmp/system/sunos.h
 include/net-snmp/system/svr5.h
 include/net-snmp/system/sysv.h
@@ -194,33 +196,32 @@ lib/libnetsnmp.a
 lib/libnetsnmp.la
 lib/libnetsnmp.so
 lib/libnetsnmp.so.5
-lib/libnetsnmp.so.5.6
+lib/libnetsnmp.so.5.9
 lib/libnetsnmpagent.a
 lib/libnetsnmpagent.la
 lib/libnetsnmpagent.so
 lib/libnetsnmpagent.so.5
-lib/libnetsnmpagent.so.5.6
+lib/libnetsnmpagent.so.5.9
 lib/libnetsnmphelpers.a
 lib/libnetsnmphelpers.la
 lib/libnetsnmphelpers.so
 lib/libnetsnmphelpers.so.5
-lib/libnetsnmphelpers.so.5.6
+lib/libnetsnmphelpers.so.5.9
 lib/libnetsnmpmibs.a
 lib/libnetsnmpmibs.la
 lib/libnetsnmpmibs.so
 lib/libnetsnmpmibs.so.5
-lib/libnetsnmpmibs.so.5.6
+lib/libnetsnmpmibs.so.5.9
 lib/libsnmp.a
 lib/libsnmp.la
 lib/libsnmp.so
 lib/libsnmp.so.5
-lib/libsnmp.so.5.6
+lib/libsnmp.so.5.9
 man/man1/mib2c.1
 man/man1/snmpbulkget.1
 man/man1/snmpbulkwalk.1
 man/man1/snmpcmd.1
 man/man1/snmpconf.1
-man/man1/snmpd.1
 man/man1/snmpdelta.1
 man/man1/snmpdf.1
 man/man1/snmpget.1
@@ -248,7 +249,10 @@ man/man3/netsnmp_debug.3
 man/man3/netsnmp_example_scalar_int.3
 man/man3/netsnmp_handler.3
 man/man3/netsnmp_instance.3
+man/man3/netsnmp_library.3
 man/man3/netsnmp_mib_handler_methods.3
+man/man3/netsnmp_mib_utilities.3
+man/man3/netsnmp_mode_end_call.3
 man/man3/netsnmp_multiplexer.3
 man/man3/netsnmp_old_api.3
 man/man3/netsnmp_read_only.3
@@ -306,6 +310,7 @@ man/man5/snmp_config.5
 man/man5/snmpd.conf.5
 man/man5/snmptrapd.conf.5
 man/man5/variables.5
+man/man8/snmpd.8
 man/man8/snmptrapd.8
 sbin/snmpd
 sbin/snmptrapd
@@ -315,8 +320,10 @@ share/snmp/mib2c.column_defines.conf
 share/snmp/mib2c.column_enums.conf
 share/snmp/mib2c.conf
 share/snmp/mib2c.create-dataset.conf
+share/snmp/mib2c.int_watch.conf
 share/snmp/mib2c.iterate.conf
 share/snmp/mib2c.old-api.conf
+share/snmp/mib2c.scalar.conf
 share/snmp/mibs/AGENTX-MIB.txt
 share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
 share/snmp/mibs/DISMAN-SCRIPT-MIB.txt
@@ -340,6 +347,7 @@ share/snmp/mibs/IPV6-UDP-MIB.txt
 share/snmp/mibs/NET-SNMP-AGENT-MIB.txt
 share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt
 share/snmp/mibs/NET-SNMP-MIB.txt
+share/snmp/mibs/NET-SNMP-TC.txt
 share/snmp/mibs/NOTIFICATION-LOG-MIB.txt
 share/snmp/mibs/RFC-1215.txt
 share/snmp/mibs/RFC1155-SMI.txt
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index f8cb6a2e174..e130d7338e3 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/10/24 08:29:33 jlam Exp $
+$NetBSD: distinfo,v 1.2 2003/09/12 12:07:18 uebayasi Exp $
 
-SHA1 (net-snmp-5.0.6.tar.gz) = c4aa9e638161014a02bc670fc7d5c09a34024f8c
-Size (net-snmp-5.0.6.tar.gz) = 2209625 bytes
-SHA1 (patch-aa) = 186aeb6c637a3ebe2a0d65d819a4af2bfc4467e9
+SHA1 (net-snmp-5.0.9.tar.gz) = bb27bdf38da96833a3fa55f8c6a14732ab2c1991
+Size (net-snmp-5.0.9.tar.gz) = 2345822 bytes
+SHA1 (patch-aa) = 40ef03e182f8e8bb4f01f67f97c200c6e82f3d82
diff --git a/net/net-snmp/files/snmpd.sh b/net/net-snmp/files/snmpd.sh
index d8d10ba0be2..633b1f4519f 100644
--- a/net/net-snmp/files/snmpd.sh
+++ b/net/net-snmp/files/snmpd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: snmpd.sh,v 1.1.1.1 2002/10/24 08:29:34 jlam Exp $
+# $NetBSD: snmpd.sh,v 1.2 2003/09/12 12:07:19 uebayasi Exp $
 #
 # PROVIDE: snmpd
 # REQUIRE: DAEMON
@@ -13,7 +13,7 @@ name="snmpd"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
 pidfile="/var/run/${name}.pid"
-snmpd_flags="-s"		# log using syslog
+snmpd_flags="-s -S d"		# log using syslog LOG_DAEMON
 command_args="-P ${pidfile}"
 
 if [ -f @PKG_SYSCONFDIR@/snmpd.conf ]; then
diff --git a/net/net-snmp/files/snmptrapd.sh b/net/net-snmp/files/snmptrapd.sh
index c9215ca8fd0..7225189a6c6 100644
--- a/net/net-snmp/files/snmptrapd.sh
+++ b/net/net-snmp/files/snmptrapd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: snmptrapd.sh,v 1.1.1.1 2002/10/24 08:29:34 jlam Exp $
+# $NetBSD: snmptrapd.sh,v 1.2 2003/09/12 12:07:19 uebayasi Exp $
 #
 # PROVIDE: snmptrapd
 # REQUIRE: DAEMON
@@ -13,7 +13,12 @@ name="snmptrapd"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
 pidfile="/var/run/${name}.pid"
-snmptrapd_flags="-s -l 1"	# log using syslog w/ facility LOG_LOCAL1
+# XXX this should include '-S 1' to explicitly set LOG_LOCAL1, but if
+# it's there snmptrapd blows up saying "no syslog facility specified"
+# and then printing a usage message (and the old -l complains too!)
+#   --woods
+#
+snmptrapd_flags="-s"	# log using syslog w/ facility LOG_LOCAL1
 command_args="-u ${pidfile}"
 
 if [ -f @PKG_SYSCONFDIR@/snmptrapd.conf ]; then
diff --git a/net/net-snmp/patches/patch-aa b/net/net-snmp/patches/patch-aa
index 14b6d93e462..8437edbb09b 100644
--- a/net/net-snmp/patches/patch-aa
+++ b/net/net-snmp/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/24 08:29:34 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2003/09/12 12:07:19 uebayasi Exp $
 
---- agent/snmp_agent.c.orig	Sat Oct  5 16:41:58 2002
+--- agent/snmp_agent.c.orig	Sat Mar 15 02:37:08 2003
 +++ agent/snmp_agent.c
-@@ -69,6 +69,10 @@ SOFTWARE.
- #include <dmalloc.h>
- #endif
+@@ -74,6 +74,10 @@ SOFTWARE.
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
+ #include <net-snmp/library/snmp_assert.h>
  
 +#if HAVE_SYSLOG_H
 +#include <syslog.h>
@@ -12,4 +12,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/24 08:29:34 jlam Exp $
 +
  #ifdef USE_LIBWRAP
  #include <tcpd.h>
- int             allow_severity = LOG_INFO;
+ #include <syslog.h>