Changes 5.2.1:

Fixes:
  Building:
    - configure --disable-snmpv2c now works
    - fix make test tests for rfc1213
    - bug 1049607: net-snmp-config --compile-subagent broken

  library:
    - bug 1084413: Can't disable file logging
    - bug 1072406: invalid operator precedence in opendir()

  agent library:
    - disconnected AgentX subagents now reconnect with correct context
    - fix table_array row insert/delete during set processing

  agent:
    - don't override clientAddr setting for local trapsinks
    - bug 1088765: Agent fails to send traps to remote target
    - bug 1034008: memory leak using SET for table_dataset
    - patch 1052460: fix agent deadlock on exec
    - bug 1055781: get-next fails to step into interfaces group correctly
    - bug 1056760: agent ignores ifspeed, type settings in snmpd.conf
    - bug 1062986: pass and pass_persist fail and crash snmpd
    - fix snmpd.conf table token to handle augments tables

  snmptrapd:
    - bug 1085981: snmptrapd complains about logging and access control
    - bug 1040711: snmptrapd: SIGHUP duplicates traphandlers (repeatedly)

  MFD:
    - Misc updates to MFD templates
    - add auto-handling of cache update for row insert/delete

Ports:
  - Win32
     - fixes for compiling without the Microsoft PSDK installed
     - fix Win32 getenv crash
  - Mac OS X compile error fix
  - HP-UX configure now detects and won't use unavailable function
  - Linux
     - patch 1055036: if-mib init order fix
     - patch 1057057: ipSystemStatsTable index fix, add ipv6
     - patch 1073897: fix if-mib data access 64bit counter wrap detection

MIBs:
  - update IP-FORWARD-MIB from an ID set to become an RFC

8 files changed, 122 insertions, 38 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 3106819b4c4..a3d2d669d05 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2004/12/28 02:47:47 reed Exp $
+# $NetBSD: Makefile,v 1.28 2005/03/30 12:10:58 adam Exp $
 
-DISTNAME=	net-snmp-5.1.2
-PKGREVISION=	3
+DISTNAME=	net-snmp-5.2.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
 		ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.net-snmp.org/
 COMMENT=	Extensible SNMP implementation
 
diff --git a/net/net-snmp/PLIST b/net/net-snmp/PLIST
index fbdf2a46219..4a997c52931 100644
--- a/net/net-snmp/PLIST
+++ b/net/net-snmp/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:48 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/03/30 12:10:58 adam Exp $
 bin/encode_keychange
 bin/fixproc
 bin/ipf-mod.pl
 bin/mib2c
+bin/mib2c-update
 bin/net-snmp-config
 bin/snmpbulkget
 bin/snmpbulkwalk
@@ -28,6 +29,7 @@ bin/traptoemail
 include/net-snmp/agent/agent_callbacks.h
 include/net-snmp/agent/agent_handler.h
 include/net-snmp/agent/agent_index.h
+include/net-snmp/agent/agent_module_config.h
 include/net-snmp/agent/agent_read_config.h
 include/net-snmp/agent/agent_registry.h
 include/net-snmp/agent/agent_trap.h
@@ -39,10 +41,12 @@ include/net-snmp/agent/cache_handler.h
 include/net-snmp/agent/debug_handler.h
 include/net-snmp/agent/ds_agent.h
 include/net-snmp/agent/instance.h
+include/net-snmp/agent/mfd.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/mib_modules.h
 include/net-snmp/agent/mode_end_call.h
+include/net-snmp/agent/multiplexer.h
 include/net-snmp/agent/net-snmp-agent-includes.h
 include/net-snmp/agent/null.h
 include/net-snmp/agent/old_api.h
@@ -56,6 +60,7 @@ include/net-snmp/agent/snmp_agent.h
 include/net-snmp/agent/snmp_vars.h
 include/net-snmp/agent/table.h
 include/net-snmp/agent/table_array.h
+include/net-snmp/agent/table_container.h
 include/net-snmp/agent/table_data.h
 include/net-snmp/agent/table_dataset.h
 include/net-snmp/agent/table_iterator.h
@@ -132,11 +137,14 @@ include/net-snmp/system/bsdi3.h
 include/net-snmp/system/bsdi4.h
 include/net-snmp/system/cygwin.h
 include/net-snmp/system/darwin.h
+include/net-snmp/system/darwin7.h
 include/net-snmp/system/dynix.h
 include/net-snmp/system/freebsd.h
 include/net-snmp/system/freebsd2.h
 include/net-snmp/system/freebsd3.h
 include/net-snmp/system/freebsd4.h
+include/net-snmp/system/freebsd5.h
+include/net-snmp/system/freebsd6.h
 include/net-snmp/system/generic.h
 include/net-snmp/system/hpux.h
 include/net-snmp/system/irix.h
@@ -204,8 +212,8 @@ lib/libnetsnmp.la
 lib/libnetsnmpagent.la
 lib/libnetsnmphelpers.la
 lib/libnetsnmpmibs.la
-lib/libsnmp.la
 lib/libnetsnmptrapd.la
+lib/libsnmp.la
 man/man1/mib2c.1
 man/man1/snmpbulkget.1
 man/man1/snmpbulkwalk.1
@@ -235,7 +243,6 @@ man/man3/init_mib_internals.3
 man/man3/mib_api.3
 man/man3/netsnmp_Container_iterator.3
 man/man3/netsnmp_agent.3
-man/man3/netsnmp_asn1_packet_parse.3
 man/man3/netsnmp_baby_steps.3
 man/man3/netsnmp_bulk_to_next.3
 man/man3/netsnmp_cache_handler.3
@@ -305,6 +312,7 @@ man/man3/snmp_set_mib_warnings.3
 man/man3/snmp_set_save_descriptions.3
 man/man3/snmp_timeout.3
 man/man3/snmp_trap_api.3
+man/man5/mib2c.conf.5
 man/man5/snmp.conf.5
 man/man5/snmp_config.5
 man/man5/snmpd.conf.5
@@ -315,17 +323,83 @@ man/man8/snmptrapd.8
 sbin/snmpd
 sbin/snmptrapd
 share/examples/net-snmp/EXAMPLE.conf
+share/snmp/mib2c-data/default-mfd-top.m2c
+share/snmp/mib2c-data/details-enums.m2i
+share/snmp/mib2c-data/details-node.m2i
+share/snmp/mib2c-data/details-table.m2i
+share/snmp/mib2c-data/generic-ctx-copy.m2i
+share/snmp/mib2c-data/generic-ctx-get.m2i
+share/snmp/mib2c-data/generic-ctx-set.m2i
+share/snmp/mib2c-data/generic-data-allocate.m2i
+share/snmp/mib2c-data/generic-data-context.m2i
+share/snmp/mib2c-data/generic-get-char.m2i
+share/snmp/mib2c-data/generic-get-decl-bot.m2i
+share/snmp/mib2c-data/generic-get-decl.m2i
+share/snmp/mib2c-data/generic-get-long.m2i
+share/snmp/mib2c-data/generic-get-oid.m2i
+share/snmp/mib2c-data/generic-header-bottom.m2i
+share/snmp/mib2c-data/generic-header-top.m2i
+share/snmp/mib2c-data/generic-source-includes.m2i
+share/snmp/mib2c-data/generic-table-constants.m2c
+share/snmp/mib2c-data/generic-table-enums.m2c
+share/snmp/mib2c-data/generic-table-indexes-from-oid.m2i
+share/snmp/mib2c-data/generic-table-indexes-set.m2i
+share/snmp/mib2c-data/generic-table-indexes-to-oid.m2i
+share/snmp/mib2c-data/generic-table-indexes-varbind-setup.m2i
+share/snmp/mib2c-data/generic-table-indexes.m2i
+share/snmp/mib2c-data/generic-table-oids.m2c
+share/snmp/mib2c-data/generic-value-map-func.m2i
+share/snmp/mib2c-data/generic-value-map-reverse.m2i
+share/snmp/mib2c-data/generic-value-map.m2i
+share/snmp/mib2c-data/m2c-internal-warning.m2i
+share/snmp/mib2c-data/m2c_setup_enum.m2i
+share/snmp/mib2c-data/m2c_setup_node.m2i
+share/snmp/mib2c-data/m2c_setup_table.m2i
+share/snmp/mib2c-data/mfd-access-container-cached-defines.m2i
+share/snmp/mib2c-data/mfd-access-unsorted-external-defines.m2i
+share/snmp/mib2c-data/mfd-data-access.m2c
+share/snmp/mib2c-data/mfd-data-get.m2c
+share/snmp/mib2c-data/mfd-data-set.m2c
+share/snmp/mib2c-data/mfd-doxygen.m2c
+share/snmp/mib2c-data/mfd-interactive-setup.m2c
+share/snmp/mib2c-data/mfd-interface.m2c
+share/snmp/mib2c-data/mfd-makefile.m2m
+share/snmp/mib2c-data/mfd-readme.m2c
+share/snmp/mib2c-data/mfd-top.m2c
+share/snmp/mib2c-data/node-get.m2i
+share/snmp/mib2c-data/node-set.m2i
+share/snmp/mib2c-data/node-storage.m2i
+share/snmp/mib2c-data/node-varbind-validate.m2i
+share/snmp/mib2c-data/parent-dependencies.m2i
+share/snmp/mib2c-data/parent-set.m2i
+share/snmp/mib2c-data/subagent.m2c
+share/snmp/mib2c-data/syntax-COUNTER64-get.m2i
+share/snmp/mib2c-data/syntax-DateAndTime-get.m2d
+share/snmp/mib2c-data/syntax-DateAndTime-get.m2i
+share/snmp/mib2c-data/syntax-DateAndTime-readme.m2i
+share/snmp/mib2c-data/syntax-InetAddress-get.m2i
+share/snmp/mib2c-data/syntax-InetAddress-set.m2i
+share/snmp/mib2c-data/syntax-InetAddressType-get.m2i
+share/snmp/mib2c-data/syntax-InetAddressType-set.m2i
+share/snmp/mib2c-data/syntax-RowStatus-dependencies.m2i
+share/snmp/mib2c-data/syntax-RowStatus-get.m2i
+share/snmp/mib2c-data/syntax-RowStatus-varbind-validate.m2i
+share/snmp/mib2c-data/syntax-StorageType-dependencies.m2i
+share/snmp/mib2c-data/syntax-TestAndIncr-get.m2i
 share/snmp/mib2c.access_functions.conf
 share/snmp/mib2c.array-user.conf
 share/snmp/mib2c.check_values.conf
 share/snmp/mib2c.check_values_local.conf
 share/snmp/mib2c.column_defines.conf
 share/snmp/mib2c.column_enums.conf
+share/snmp/mib2c.column_storage.conf
 share/snmp/mib2c.conf
 share/snmp/mib2c.create-dataset.conf
+share/snmp/mib2c.genhtml.conf
 share/snmp/mib2c.int_watch.conf
 share/snmp/mib2c.iterate.conf
 share/snmp/mib2c.iterate_access.conf
+share/snmp/mib2c.mfd.conf
 share/snmp/mib2c.notify.conf
 share/snmp/mib2c.old-api.conf
 share/snmp/mib2c.scalar.conf
@@ -338,6 +412,7 @@ share/snmp/mibs/HOST-RESOURCES-MIB.txt
 share/snmp/mibs/HOST-RESOURCES-TYPES.txt
 share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
 share/snmp/mibs/IANA-LANGUAGE-MIB.txt
+share/snmp/mibs/IANA-RTPROTO-MIB.txt
 share/snmp/mibs/IANAifType-MIB.txt
 share/snmp/mibs/IF-INVERTED-STACK-MIB.txt
 share/snmp/mibs/IF-MIB.txt
@@ -351,6 +426,7 @@ share/snmp/mibs/IPV6-TCP-MIB.txt
 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-EXTEND-MIB.txt
 share/snmp/mibs/NET-SNMP-MIB.txt
 share/snmp/mibs/NET-SNMP-TC.txt
 share/snmp/mibs/NOTIFICATION-LOG-MIB.txt
@@ -367,6 +443,7 @@ 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-USM-AES-MIB.txt
+share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
 share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
 share/snmp/mibs/SNMPv2-CONF.txt
 share/snmp/mibs/SNMPv2-MIB.txt
@@ -374,12 +451,14 @@ 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/TRANSPORT-ADDRESS-MIB.txt
 share/snmp/mibs/UCD-DEMO-MIB.txt
 share/snmp/mibs/UCD-DISKIO-MIB.txt
 share/snmp/mibs/UCD-DLMOD-MIB.txt
 share/snmp/mibs/UCD-IPFWACC-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
 share/snmp/mibs/UDP-MIB.txt
+share/snmp/snmp_perl_trapd.pl
 share/snmp/snmpconf-data/snmp-data/authopts
 share/snmp/snmpconf-data/snmp-data/debugging
 share/snmp/snmpconf-data/snmp-data/mibs
@@ -393,7 +472,10 @@ share/snmp/snmpconf-data/snmpd-data/operation
 share/snmp/snmpconf-data/snmpd-data/snmpconf-config
 share/snmp/snmpconf-data/snmpd-data/system
 share/snmp/snmpconf-data/snmpd-data/trapsinks
+share/snmp/snmpconf-data/snmptrapd-data/authentication
 share/snmp/snmpconf-data/snmptrapd-data/formatting
+share/snmp/snmpconf-data/snmptrapd-data/logging
+share/snmp/snmpconf-data/snmptrapd-data/runtime
 share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config
 share/snmp/snmpconf-data/snmptrapd-data/traphandle
 @dirrm share/snmp/snmpconf-data/snmptrapd-data
@@ -401,6 +483,7 @@ share/snmp/snmpconf-data/snmptrapd-data/traphandle
 @dirrm share/snmp/snmpconf-data/snmp-data
 @dirrm share/snmp/snmpconf-data
 @dirrm share/snmp/mibs
+@dirrm share/snmp/mib2c-data
 @dirrm share/examples/net-snmp
 @dirrm include/ucd-snmp
 @dirrm include/net-snmp/system
diff --git a/net/net-snmp/buildlink3.mk b/net/net-snmp/buildlink3.mk
index c018ff3945e..ca059d0fa7f 100644
--- a/net/net-snmp/buildlink3.mk
+++ b/net/net-snmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/11/05 10:33:07 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/03/30 12:10:58 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NET_SNMP_BUILDLINK3_MK:=	${NET_SNMP_BUILDLINK3_MK}+
@@ -16,4 +16,6 @@ BUILDLINK_RECOMMENDED.net-snmp+=	net-snmp>=5.1.2nb2
 BUILDLINK_PKGSRCDIR.net-snmp?=	../../net/net-snmp
 .endif	# NET_SNMP_BUILDLINK3_MK
 
+.include "../../security/tcp_wrappers/buildlink3.mk"
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index 1351ce26c3e..d2a5cefb510 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.13 2005/02/24 12:13:54 agc Exp $
+$NetBSD: distinfo,v 1.14 2005/03/30 12:10:58 adam Exp $
 
-SHA1 (net-snmp-5.1.2.tar.gz) = cf82a86d1b44408890cabe471181b62049cb11d0
-RMD160 (net-snmp-5.1.2.tar.gz) = e5d50e22dbf59ee75e236abb7359e95d4fc4b6f2
-Size (net-snmp-5.1.2.tar.gz) = 3253579 bytes
+SHA1 (net-snmp-5.2.1.tar.gz) = f8ec23b4d2706bef50cbc2d37ad9d292e107b0fb
+RMD160 (net-snmp-5.2.1.tar.gz) = ad7a57cfe0552a71a6dadb263ac300c84d98b541
+Size (net-snmp-5.2.1.tar.gz) = 3971320 bytes
 SHA1 (patch-aa) = df9bcea942743e9bcd843724612b7d82ea364eca
 SHA1 (patch-ac) = 43dbf5519feac2a13b893f659090fa24de773ee8
-SHA1 (patch-ad) = 522872c90ac1e442dafb1d210af6e978ac741ce9
-SHA1 (patch-ae) = 122cd63fcdfa01e94083a9f635c3c46d364a0237
-SHA1 (patch-af) = 21febf32bd44c63a96284b231d39abb00c050532
+SHA1 (patch-ad) = 9703dc9451f3fa7a61bae9c8d13b916aa52c0a6b
+SHA1 (patch-ae) = 750412088b9ccd5fb50bd6e7fc049903f6113a39
+SHA1 (patch-af) = 09c60f20179f0cadf116aa31335e9ec4ef54c4c8
 SHA1 (patch-ag) = bdb76aecc3a301871c990db1440dc3d78f480bf4
 SHA1 (patch-ai) = 8255b8ebfea1242076c87f879169d5f24b0f83e1
-SHA1 (patch-aj) = ba320b1b8d5c4e14456f919b70e84de4b86ac73b
+SHA1 (patch-aj) = 495d2c2b409c5957a9baaa29ecd699a4d6946332
diff --git a/net/net-snmp/patches/patch-ad b/net/net-snmp/patches/patch-ad
index 243410bd723..1622aed926c 100644
--- a/net/net-snmp/patches/patch-ad
+++ b/net/net-snmp/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2004/05/14 13:30:34 adam Exp $
+$NetBSD: patch-ad,v 1.3 2005/03/30 12:10:58 adam Exp $
 
---- agent/mibgroup/ucd_snmp.h.orig	2003-06-09 22:11:51.000000000 +0000
+--- agent/mibgroup/ucd_snmp.h.orig	2004-08-17 09:06:38.000000000 +0000
 +++ agent/mibgroup/ucd_snmp.h
-@@ -40,6 +40,10 @@ config_arch_require(freebsd5, ucd-snmp/v
+@@ -41,6 +41,10 @@ config_arch_require(freebsd5, ucd-snmp/v
  config_arch_require(freebsd5, ucd-snmp/memory_freebsd2)
  config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1)
  config_arch_require(netbsd1, ucd-snmp/memory_netbsd1)
diff --git a/net/net-snmp/patches/patch-ae b/net/net-snmp/patches/patch-ae
index 6582fc15538..35628af1651 100644
--- a/net/net-snmp/patches/patch-ae
+++ b/net/net-snmp/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2004/08/13 11:28:50 adam Exp $
+$NetBSD: patch-ae,v 1.4 2005/03/30 12:10:58 adam Exp $
 
---- snmplib/snmpUDPIPv6Domain.c.orig	2004-04-20 19:10:30.000000000 +0000
+--- snmplib/snmpUDPIPv6Domain.c.orig	2004-12-24 14:42:23.000000000 +0000
 +++ snmplib/snmpUDPIPv6Domain.c
-@@ -68,6 +68,10 @@ const struct in6_addr in6addr_any = IN6A
+@@ -67,6 +67,10 @@ const struct in6_addr in6addr_any = IN6A
  #include <dmalloc.h>
  #endif
  
diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af
index e1ea7ebd20e..258933b6f1f 100644
--- a/net/net-snmp/patches/patch-af
+++ b/net/net-snmp/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2004/08/13 11:28:50 adam Exp $
+$NetBSD: patch-af,v 1.4 2005/03/30 12:10:58 adam Exp $
 
---- configure.orig	2004-07-05 06:52:34.000000000 +0000
+--- configure.orig	2005-01-25 01:00:12.000000000 +0000
 +++ configure
-@@ -11214,6 +11214,53 @@ fi
+@@ -16597,6 +16597,53 @@ fi
  
  fi
  
diff --git a/net/net-snmp/patches/patch-aj b/net/net-snmp/patches/patch-aj
index b20cc984aed..fa2a2b06eed 100644
--- a/net/net-snmp/patches/patch-aj
+++ b/net/net-snmp/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2004/07/10 17:59:17 thorpej Exp $
+$NetBSD: patch-aj,v 1.2 2005/03/30 12:10:58 adam Exp $
 
---- include/net-snmp/agent/snmp_vars.h.orig	Thu Jul  8 18:17:53 2004
-+++ include/net-snmp/agent/snmp_vars.h	Thu Jul  8 18:18:02 2004
-@@ -74,7 +74,7 @@
-     struct nlist;
- 
-     extern long     long_return;
--    extern uint32_t ipaddr_return;
-+    extern in_addr_t ipaddr_return;
-     extern u_char   return_buf[];
- 
-     extern oid      nullOid[];
+--- net-snmp-config.in.orig	2005-03-30 13:48:27.000000000 +0000
++++ net-snmp-config.in
+@@ -34,7 +34,7 @@ libdir=@libdir@
+ NSC_LDFLAGS="@LDFLAGS@"
+ NSC_INCLUDEDIR=${includedir}
+ NSC_LIBDIR=-L${libdir}
+-NSC_LIBS="@LIBS@ @WRAPLIBS@"
++NSC_LIBS="@LIBS@"
+ NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@"
+ NSC_PREFIX=$prefix
+ NSC_EXEC_PREFIX=$exec_prefix