- Update to 5.5

21 files changed, 71 insertions, 580 deletions

diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 29a25762360a..a9ae0db52ce8 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	snmp
-PORTVERSION=	5.4.2.1
-PORTREVISION=	7
+PORTVERSION=	5.5
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	net-
@@ -16,11 +15,12 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	An extendable SNMP implementation
 
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
+
 OPTIONS=	IPV6 "Build with IPv6 support" on \
 		MFD_REWRITES "Build with 64-bit Interface Counters" off \
 		PERL "Install additional perl modules" on \
 		PERL_EMBEDDED "Build embedded perl" on \
-		TKMIB "Install graphical MIB browser" off \
 		DUMMY "Enable dummy values as placeholders" on \
 		DMALLOC "Enable dmalloc debug memory allocator" off
 
@@ -34,12 +34,12 @@ WANT_PERL=	yes
 
 CONFIGURE_ENV+=	PERLPROG="${PERL}" PSPROG="${PS_CMD}" SED="${SED}"
 CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \
-		--with-mib-modules="${_NET_SNMP_MIB_MODULES}" \
 		--with-default-snmp-version="${DEFAULT_SNMP_VERSION}" \
 		--with-sys-contact="${NET_SNMP_SYS_CONTACT}" \
 		--with-sys-location="${NET_SNMP_SYS_LOCATION}" \
 		--with-logfile="${NET_SNMP_LOGFILE}" \
 		--with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \
+		--with-mib-modules="host disman/event-mib smux mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio" \
 		--with-gnu-ld --with-libwrap --with-ldflags="-lm -lkvm -ldevstat"
 
 .if defined(BATCH)
@@ -53,14 +53,6 @@ CONFIGURE_ARGS+=	--with-openssl="${OPENSSLBASE}"
 CONFIGURE_ARGS+=--with-dummy-values
 .endif
 
-.if !defined(WITH_TKMIB)
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-local:Makefile.in
-PLIST_SUB+=	WITH_TKMIB="@comment "
-.else
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
-PLIST_SUB+=	WITH_TKMIB=""
-.endif
-
 .if defined(WITH_PERL)
 USE_PERL5=	yes
 CONFIGURE_ARGS+=--with-perl-modules
@@ -92,7 +84,7 @@ PLIST_SUB+=	WITH_IPV6=""
 PLIST_SUB+=	WITH_IPV6="@comment "
 .endif
 
-SHLIB_VERSION=	16
+SHLIB_VERSION=	20
 PLIST_SUB+=	SHLIB_VERSION=${SHLIB_VERSION}
 SCRIPTS_SUB=	PREFIX=${PREFIX} PERL=${PERL}
 
@@ -101,9 +93,6 @@ NET_SNMP_SYS_CONTACT?=	nobody@nowhere.invalid
 NET_SNMP_SYS_LOCATION?=	somewhere
 NET_SNMP_LOGFILE?=	/var/log/snmpd.log
 NET_SNMP_PERSISTENTDIR?=/var/net-snmp
-NET_SNMP_MIB_MODULES?=	${NET_SNMP_MIB_MODULE_LIST}
-
-NET_SNMP_MIB_MODULE_LIST=host disman/event-mib smux mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio
 
 .if ${OSVERSION} >= 700028
 NET_SNMP_MIB_MODULE_LIST+=	sctp-mib
@@ -118,41 +107,26 @@ CONFIGURE_ARGS+=--enable-mfd-rewrites
 NET_SNMP_MIB_MODULE_LIST+=	if-mib
 .endif
 
-_NET_SNMP_MIB_MODULES=
-.for module1 in ${NET_SNMP_MIB_MODULE_LIST}
-_module1=${module1}
-_define=false
-. for module2 in ${NET_SNMP_MIB_MODULES}
-_module2=${module2}
-.  if ${_module1} == ${_module2}
-_define=true
-.  endif
-. endfor
-. if ${_define} == true
-_NET_SNMP_MIB_MODULES+=${module1}
-PLIST_SUB+=	WITH_${module1:C|.*/||:U}=""
-. else
-PLIST_SUB+=	WITH_${module1:C|.*/||:U}="@comment "
-. endif
-.endfor
-
 MAN1=		encode_keychange.1 fixproc.1 mib2c.1 mib2c-update.1 \
-		net-snmp-config.1 \
+		net-snmp-config.1 net-snmp-create-v3-user.1 \
 		snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 \
 		snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
 		snmptranslate.1 snmptrap.1 snmpusm.1 snmpvacm.1 snmpwalk.1 \
 		tkmib.1 traptoemail.1
 MAN3=		add_mibdir.3 add_module_replacement.3 \
-		config_perror.3 config_pwarn.3 \
+		config_perror.3 config_pwarn.3 config_api.3 \
 		default_store.3 fprint_description.3 \
 		fprint_objid.3 fprint_value.3 fprint_variable.3 \
 		get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \
-		netsnmp_Container_iterator.3 \
+		netsnmp_access_multiplexer.3 \
+		netsnmp_agent_handler.h.3 \
 		netsnmp_agent.3 \
 		netsnmp_baby_steps.3 \
 		netsnmp_bulk_to_next.3 \
 		netsnmp_cache_handler.3 netsnmp_container.3 \
+		netsnmp_container_iterator.3 \
+		netsnmp_container_iterator.h.3 \
 		netsnmp_debug.3 \
 		netsnmp_ds_get_boolean.3 netsnmp_ds_get_int.3 \
 		netsnmp_ds_get_string.3 \
@@ -165,6 +139,8 @@ MAN3=		add_mibdir.3 add_module_replacement.3 \
 		netsnmp_leaf.3 netsnmp_library.3 \
 		netsnmp_mib_handler_methods.3 netsnmp_mib_utilities.3 \
 		netsnmp_mode_end_call.3 netsnmp_multiplexer.3 \
+		netsnmp_netsnmp_monitor_callback_header_s.3 \
+		netsnmp_null_container.3 \
 		netsnmp_old_api.3 netsnmp_read_only.3 \
 		netsnmp_row_merge.3 \
 		netsnmp_scalar.3 \
@@ -174,8 +150,11 @@ MAN3=		add_mibdir.3 add_module_replacement.3 \
 		netsnmp_table.3 netsnmp_table_array.3 \
 		netsnmp_table_data.3 netsnmp_table_dataset.3 \
 		netsnmp_table_iterator.3 \
+		netsnmp_table_row.3 \
+		netsnmp_tools.h.3 \
 		netsnmp_utilities.3 \
 		netsnmp_watcher.3 \
+		pdu_api.3 \
 		print_description.3 print_mib.3 print_objid.3 print_value.3 \
 		print_variable.3 read_all_mibs.3 \
 		read_config.3 read_configs.3 read_config_print_usage.3 \
@@ -185,11 +164,12 @@ MAN3=		add_mibdir.3 add_module_replacement.3 \
 		register_config_handler.3 register_mib_handlers.3 \
 		register_premib_handler.3 \
 		send_easy_trap.3 send_trap_vars.3 send_v2trap.3 \
+		session_api.3 \
 		shutdown_mib.3 \
 		snmp_agent_api.3 \
 		snmp_alarm.3 snmp_alarm_register.3 \
 		snmp_alarm_register_hr.3 snmp_alarm_unregister.3 \
-		snmp_api.3 snmp_api_errstring.3 snmp_close.3 \
+		snmp_api_errstring.3 snmp_close.3 \
 		snmp_error.3 snmp_free_pdu.3 snmp_open.3 snmp_perror.3 \
 		snmp_read.3 snmp_select_info.3 \
 		snmp_send.3 snmp_sess_api.3 snmp_sess_async_send.3 \
@@ -202,7 +182,9 @@ MAN3=		add_mibdir.3 add_module_replacement.3 \
 		snprint_objid.3 snprint_value.3 snprint_variable.3 \
 		sprint_realloc_objid.3 sprint_realloc_value.3 \
 		sprint_realloc_variable.3 \
-		unregister_app_config_handler.3 \unregister_config_handler.3
+		unregister_app_config_handler.3 \
+		unregister_config_handler.3 \
+		varbind_api.3
 
 .if defined(WITH_PERL)
 MAN3PERL=	NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \
@@ -225,9 +207,6 @@ SBIN_FILES=	snmpd snmptrapd
 STARTUP_DIR=	${PREFIX}/etc/rc.d
 SCRIPT_FILES=	snmpcheck.def mib2c fixproc ipf-mod.pl snmpconf \
 		traptoemail
-.if defined(WITH_TKMIB)
-SCRIPT_FILES+=	tkmib
-.endif
 DOC_FILES=	AGENT.txt COPYING FAQ NEWS README \
 		README.agentx README.krb5 README.snmpv3 README.thread \
 		agent/mibgroup/README.smux
@@ -248,9 +227,6 @@ pre-everything::
 	@${ECHO_MSG} "				Default log file location for snmpd."
 	@${ECHO_MSG} "NET_SNMP_PERSISTENTDIR=\"${NET_SNMP_PERSISTENTDIR}\""
 	@${ECHO_MSG} "				Default directory for persistent data storage."
-	@${ECHO_MSG} "NET_SNMP_MIB_MODULES=\"${NET_SNMP_MIB_MODULE_LIST}\""
-	@${ECHO_MSG} "				Optional mib modules that can be built into the"
-	@${ECHO_MSG} "				agent"
 	@${ECHO_MSG}
 
 post-patch:
diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo
index d23d7dcb5c54..347fa5108d1d 100644
--- a/net-mgmt/net-snmp/distinfo
+++ b/net-mgmt/net-snmp/distinfo
@@ -1,3 +1,3 @@
-MD5 (net-snmp-5.4.2.1.tar.gz) = 984932520143f0c8bf7b7ce1fc9e1da1
-SHA256 (net-snmp-5.4.2.1.tar.gz) = 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c
-SIZE (net-snmp-5.4.2.1.tar.gz) = 5185390
+MD5 (net-snmp-5.5.tar.gz) = 5b2551e7bd024fbbee84dca22a5f13a1
+SHA256 (net-snmp-5.5.tar.gz) = 95936c6a95bef929e7ae0d9144c3fa20ffe62291dff94835bde88c5b5d2bf347
+SIZE (net-snmp-5.5.tar.gz) = 5531055
diff --git a/net-mgmt/net-snmp/files/patch-Makefile.in b/net-mgmt/net-snmp/files/patch-Makefile.in
index 81fd7d63781d..5c98c214c32d 100644
--- a/net-mgmt/net-snmp/files/patch-Makefile.in
+++ b/net-mgmt/net-snmp/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2007-06-09 05:32:56.000000000 +0900
-+++ Makefile.in	2008-03-25 21:10:08.842515763 +0900
-@@ -16,7 +16,7 @@
- INSTALLHEADERS=version.h
+--- Makefile.in.orig	2008-09-09 17:27:23.000000000 -0300
++++ Makefile.in	2010-06-02 14:21:34.000000000 -0300
+@@ -17,7 +17,7 @@
  INCLUDESUBDIR=system
  INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \
--	darwin.h darwin7.h darwin8.h darwin9.h freebsd5.h freebsd6.h \
-+	darwin.h darwin7.h darwin8.h darwin9.h freebsd5.h freebsd6.h freebsd7.h freebsd8.h freebsd9.h \
- 	dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h hpux.h \
- 	irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \
+ 	darwin.h darwin7.h darwin8.h darwin9.h dragonfly.h dynix.h \
+-	freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h freebsd.h \
++	freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h freebsd7.h freebsd8.h freebsd9.h freebsd.h \
+ 	generic.h \
+ 	hpux.h irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \
  	solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \
diff --git a/net-mgmt/net-snmp/files/patch-agent_mibgroup_host_hr_storage.c b/net-mgmt/net-snmp/files/patch-agent_mibgroup_host_hr_storage.c
deleted file mode 100644
index 72ba4a164333..000000000000
--- a/net-mgmt/net-snmp/files/patch-agent_mibgroup_host_hr_storage.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- agent/mibgroup/host/hr_storage.c.orig	2008-06-05 18:11:53.000000000 -0300
-+++ agent/mibgroup/host/hr_storage.c	2010-04-30 21:39:50.000000000 -0300
-@@ -523,12 +523,12 @@
- 	    return NULL;
- 
-         store_idx = name[ HRSTORE_ENTRY_NAME_LENGTH ];
--        if (HRFS_entry &&
--            netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
--                                   NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
--            Check_HR_FileSys_NFS())
--            return NULL;
--        if (store_idx > NETSNMP_MEM_TYPE_MAX ) {
-+        if (store_idx > NETSNMP_MEM_TYPE_MAX ) {	   
-+	   if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
-+				      NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
-+	       Check_HR_FileSys_NFS())
-+	     return NULL;
-+
- 	    if (HRFS_statfs(HRFS_entry->HRFS_mount, &stat_buf) < 0) {
- 		snmp_log_perror(HRFS_entry->HRFS_mount);
- 		goto try_next;
diff --git a/net-mgmt/net-snmp/files/patch-cache_handler.c b/net-mgmt/net-snmp/files/patch-cache_handler.c
deleted file mode 100644
index 0bcb75fb057b..000000000000
--- a/net-mgmt/net-snmp/files/patch-cache_handler.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- agent/helpers/cache_handler.c.orig	2009-01-25 22:40:13.000000000 +0900
-+++ agent/helpers/cache_handler.c	2009-01-25 22:44:30.000000000 +0900
-@@ -173,6 +173,31 @@
-     return cache;
- }
- 
-+/** frees a cache
-+ */
-+int
-+netsnmp_cache_free(netsnmp_cache *cache)
-+{
-+    netsnmp_cache  *pos;
-+
-+    if (NULL == cache)
-+        return SNMPERR_SUCCESS;
-+
-+    for (pos = cache_head; pos; pos = pos->next) {
-+        if (pos == cache) {
-+            snmp_log(LOG_WARNING, "not freeing cache (still in list)\n");
-+            return SNMP_ERR_GENERR;
-+        }
-+    }
-+
-+    if (cache->rootoid)
-+        free(cache->rootoid);
-+
-+    free(cache);
-+
-+    return SNMPERR_SUCCESS;
-+}
-+
- /** callback function to call cache load function */
- static void
- _timer_reload(unsigned int regNo, void *clientargs)
diff --git a/net-mgmt/net-snmp/files/patch-cache_handler.h b/net-mgmt/net-snmp/files/patch-cache_handler.h
deleted file mode 100644
index 04a597be080f..000000000000
--- a/net-mgmt/net-snmp/files/patch-cache_handler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/net-snmp/agent/cache_handler.h.orig	2009-01-25 22:37:09.000000000 +0900
-+++ include/net-snmp/agent/cache_handler.h	2009-01-25 22:38:07.000000000 +0900
-@@ -85,6 +85,8 @@
-     netsnmp_cache_create(int timeout, NetsnmpCacheLoad * load_hook,
-                          NetsnmpCacheFree * free_hook,
-                          oid * rootoid, int rootoid_len);
-+    int netsnmp_cache_free(netsnmp_cache *cache);
-+
-     netsnmp_mib_handler *
-     netsnmp_cache_handler_get(netsnmp_cache* cache);
- 
diff --git a/net-mgmt/net-snmp/files/patch-freebsd9.h b/net-mgmt/net-snmp/files/patch-freebsd9.h
index f95a87a8cc32..e55f2aa8d638 100644
--- a/net-mgmt/net-snmp/files/patch-freebsd9.h
+++ b/net-mgmt/net-snmp/files/patch-freebsd9.h
@@ -1,5 +1,5 @@
 --- include/net-snmp/system/freebsd9.h.orig	2009-09-11 10:02:17.000000000 -0400
 +++ include/net-snmp/system/freebsd9.h	2009-09-11 10:02:17.000000000 -0400
 @@ -0,0 +1,2 @@
-+#include "freebsd7.h"
-+#define freebsd7 freebsd7
++#include "freebsd8.h"
++#define freebsd8 freebsd8
diff --git a/net-mgmt/net-snmp/files/patch-hr_storage.c b/net-mgmt/net-snmp/files/patch-hr_storage.c
deleted file mode 100644
index 4fc2bd0d5544..000000000000
--- a/net-mgmt/net-snmp/files/patch-hr_storage.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- agent/mibgroup/host/hr_storage.c.orig	2007-06-08 19:33:58.000000000 +0900
-+++ agent/mibgroup/host/hr_storage.c	2008-03-25 21:26:23.470718989 +0900
-@@ -489,11 +489,13 @@
- 	 *
- 	 *********************/
- 
-+/* kuriyama: should be removed? */
- static const char *hrs_descr[] = {
-     NULL,
-     "Memory Buffers",           /* HRS_TYPE_MBUF */
-     "Real Memory",              /* HRS_TYPE_MEM */
--    "Swap Space"                /* HRS_TYPE_SWAP */
-+    "Swap Space",               /* HRS_TYPE_SWAP */
-+    "Memory Buffer Clusters"    /* HRS_TYPE_MBUFCLUSTER */
- };
- 
- 
diff --git a/net-mgmt/net-snmp/files/patch-interface.c b/net-mgmt/net-snmp/files/patch-interface.c
deleted file mode 100644
index 871f9e427e5c..000000000000
--- a/net-mgmt/net-snmp/files/patch-interface.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- agent/mibgroup/if-mib/data_access/interface.c.orig	2009-01-25 17:49:04.000000000 +0900
-+++ agent/mibgroup/if-mib/data_access/interface.c	2009-01-25 17:49:57.000000000 +0900
-@@ -775,7 +775,7 @@
-     netsnmp_conf_if_list   *if_ptr = conf_list, *if_next;
-     while (if_ptr) {
-         if_next = if_ptr->next;
--        free(if_ptr->name);
-+        free((void*)if_ptr->name);
-         free(if_ptr);
-         if_ptr = if_next;
-     }
diff --git a/net-mgmt/net-snmp/files/patch-interface_sysctl.c b/net-mgmt/net-snmp/files/patch-interface_sysctl.c
deleted file mode 100644
index 262e9c7c12ab..000000000000
--- a/net-mgmt/net-snmp/files/patch-interface_sysctl.c
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: agent/mibgroup/if-mib/data_access/interface_sysctl.c
-===================================================================
---- agent/mibgroup/if-mib/data_access/interface_sysctl.c	(revision 17324)
-+++ agent/mibgroup/if-mib/data_access/interface_sysctl.c	(working copy)
-@@ -451,22 +451,22 @@
-             NETSNMP_INTERFACE_FLAGS_HAS_V6_REASMMAX;
- 
-         /* get counters */
--        entry->stats.ibytes.low = ifp->ifm_data.ifi_ibytes;
--        entry->stats.ibytes.high = 0;
--        entry->stats.iucast.low = ifp->ifm_data.ifi_ipackets;
--        entry->stats.iucast.high = 0;
--        entry->stats.imcast.low = ifp->ifm_data.ifi_imcasts;
--        entry->stats.imcast.high = 0;
-+        entry->stats.ibytes.low = ifp->ifm_data.ifi_ibytes & 0xffffffff;
-+        entry->stats.ibytes.high = ifp->ifm_data.ifi_ibytes >> 32;
-+        entry->stats.iucast.low = ifp->ifm_data.ifi_ipackets & 0xffffffff;
-+        entry->stats.iucast.high = ifp->ifm_data.ifi_ipackets >> 32;
-+        entry->stats.imcast.low = ifp->ifm_data.ifi_imcasts & 0xffffffff;
-+        entry->stats.imcast.high = ifp->ifm_data.ifi_imcasts >> 32;
-         entry->stats.ierrors = ifp->ifm_data.ifi_ierrors;
-         entry->stats.idiscards = ifp->ifm_data.ifi_iqdrops;
-         entry->stats.iunknown_protos = ifp->ifm_data.ifi_noproto;
- 
--        entry->stats.obytes.low = ifp->ifm_data.ifi_obytes;
--        entry->stats.obytes.high = 0;
--        entry->stats.oucast.low = ifp->ifm_data.ifi_opackets;
--        entry->stats.oucast.high = 0;
--        entry->stats.omcast.low = ifp->ifm_data.ifi_omcasts;
--        entry->stats.omcast.high = 0;
-+        entry->stats.obytes.low = ifp->ifm_data.ifi_obytes & 0xffffffff;
-+        entry->stats.obytes.high = ifp->ifm_data.ifi_obytes >> 32;
-+        entry->stats.oucast.low = ifp->ifm_data.ifi_opackets & 0xffffffff;
-+        entry->stats.oucast.high = ifp->ifm_data.ifi_opackets >> 32;
-+        entry->stats.omcast.low = ifp->ifm_data.ifi_omcasts & 0xffffffff;
-+        entry->stats.omcast.high = ifp->ifm_data.ifi_omcasts >> 32;
-         entry->stats.oerrors = ifp->ifm_data.ifi_oerrors;
-         entry->ns_flags |=  NETSNMP_INTERFACE_FLAGS_HAS_BYTES |
-                             NETSNMP_INTERFACE_FLAGS_HAS_DROPS |
-
- 	  	 
diff --git a/net-mgmt/net-snmp/files/patch-interfaces.c b/net-mgmt/net-snmp/files/patch-interfaces.c
deleted file mode 100644
index bc56d6ca3a3e..000000000000
--- a/net-mgmt/net-snmp/files/patch-interfaces.c
+++ /dev/null
@@ -1,157 +0,0 @@
---- agent/mibgroup/mibII/interfaces.c.orig	Wed Oct 26 00:52:19 2005
-+++ agent/mibgroup/mibII/interfaces.c	Tue Feb 27 20:44:48 2007
-@@ -395,6 +395,133 @@
-     return NULL;
- }
- 
-+#if defined(freebsd2)
-+static char    *physaddrbuf;
-+static int      nphysaddrs;
-+struct sockaddr_dl **physaddrs;
-+
-+void
-+init_interfaces_setup(void)
-+{
-+    int             naddrs, ilen, bit;
-+    static int      mib[6]
-+    = { CTL_NET, PF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0 };
-+    char           *cp;
-+    size_t          len;
-+    struct rt_msghdr *rtm;
-+    struct if_msghdr *ifm;
-+    struct ifa_msghdr *ifam;
-+    struct sockaddr *sa;
-+
-+    naddrs = 0;
-+    if (physaddrs)
-+        free(physaddrs);
-+    if (physaddrbuf)
-+        free(physaddrbuf);
-+    physaddrbuf = 0;
-+    physaddrs = 0;
-+    nphysaddrs = 0;
-+    len = 0;
-+    if (sysctl(mib, 6, 0, &len, 0, 0) < 0)
-+        return;
-+
-+    cp = physaddrbuf = malloc(len);
-+    if (physaddrbuf == 0)
-+        return;
-+    if (sysctl(mib, 6, physaddrbuf, &len, 0, 0) < 0) {
-+        free(physaddrbuf);
-+        physaddrbuf = 0;
-+        return;
-+    }
-+
-+  loop:
-+    ilen = len;
-+    cp = physaddrbuf;
-+    while (ilen > 0) {
-+        rtm = (struct rt_msghdr *) cp;
-+        if (rtm->rtm_version != RTM_VERSION || rtm->rtm_type != RTM_IFINFO) {
-+            free(physaddrs);
-+            physaddrs = 0;
-+            free(physaddrbuf);
-+            physaddrbuf = 0;
-+        }
-+        ifm = (struct if_msghdr *) rtm;
-+#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5)
-+        if (physaddrs != 0)
-+            physaddrs[naddrs] = (void *) (ifm + 1);
-+        naddrs++;
-+#endif
-+        ilen -= ifm->ifm_msglen;
-+        cp += ifm->ifm_msglen;
-+        rtm = (struct rt_msghdr *) cp;
-+        while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) {
-+#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5)
-+            ilen -= rtm->rtm_msglen;
-+            cp += rtm->rtm_msglen;
-+#else
-+            int             is_alias = 0;
-+            ifam = (struct ifa_msghdr *) rtm;
-+            ilen -= sizeof(*ifam);
-+            cp += sizeof(*ifam);
-+            sa = (struct sockaddr *) cp;
-+#define ROUND(x) (((x) + sizeof(long) - 1) & ~sizeof(long))
-+            for (bit = 1; bit && ilen > 0; bit <<= 1) {
-+                if (!(ifam->ifam_addrs & bit))
-+                    continue;
-+                ilen -= ROUND(sa->sa_len);
-+                cp += ROUND(sa->sa_len);
-+
-+                if (bit == RTA_IFA) {
-+                    if (physaddrs)
-+#define satosdl(sa) ((struct sockaddr_dl *)(sa))
-+                        physaddrs[naddrs++]
-+                            = satosdl(sa);
-+                    else
-+                        naddrs++;
-+                }
-+                sa = (struct sockaddr *) cp;
-+            }
-+#endif
-+            rtm = (struct rt_msghdr *) cp;
-+        }
-+    }
-+    if (physaddrs) {
-+        nphysaddrs = naddrs;
-+        return;
-+    }
-+    physaddrs = malloc(naddrs * sizeof(*physaddrs));
-+    if (physaddrs == 0)
-+        return;
-+    naddrs = 0;
-+    goto loop;
-+
-+}
-+
-+static int
-+get_phys_address(int iindex, char **ap, int *len)
-+{
-+    int             i;
-+    int             once = 1;
-+
-+    do {
-+        for (i = 0; i < nphysaddrs; i++) {
-+            if (physaddrs[i]->sdl_index == iindex)
-+                break;
-+        }
-+        if (i < nphysaddrs)
-+            break;
-+        init_interfaces_setup();
-+    } while (once--);
-+
-+    if (i < nphysaddrs) {
-+        *ap = LLADDR(physaddrs[i]);
-+        *len = physaddrs[i]->sdl_alen;
-+        return 0;
-+    }
-+    return -1;
-+}
-+#endif
-+
- #ifdef USE_SYSCTL_IFLIST
- 
- static u_char  *if_list = 0;
-@@ -603,10 +730,20 @@
-         }
-         return (u_char *) & long_return;
-     case IFPHYSADDRESS:
-+#if defined(freebsd2)
-+        {
-+            char           *cp;
-+            if (get_phys_address(interface, &cp, var_len))
-+                return NULL;
-+            else
-+                return cp;
-+        }
-+#else
-         /*
-          * XXX 
-          */
-         return NULL;
-+#endif
-     case IFADMINSTATUS:
-         long_return = if_msg.ifm_flags & IFF_UP ? 1 : 2;
-         return (u_char *) & long_return;
diff --git a/net-mgmt/net-snmp/files/patch-iquery.c b/net-mgmt/net-snmp/files/patch-iquery.c
deleted file mode 100644
index e6325ba4c2f9..000000000000
--- a/net-mgmt/net-snmp/files/patch-iquery.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- agent/mibgroup/utilities/iquery.c.orig	2009-01-25 17:44:17.000000000 +0900
-+++ agent/mibgroup/utilities/iquery.c	2009-01-25 17:47:04.000000000 +0900
-@@ -186,7 +186,7 @@
-         ss->securityEngineIDLen = engIDLen;
-         if ( version == SNMP_VERSION_3 ) {
-             ss->securityNameLen = strlen(secName);
--            memdup(&(ss->securityName), (u_char*)secName, ss->securityNameLen);
-+            memdup((u_char**)&(ss->securityName), (u_char*)secName, ss->securityNameLen);
-         } else {
-             memdup( &(ss->community), secName, strlen(secName));
-             ss->community_len = strlen(secName);
diff --git a/net-mgmt/net-snmp/files/patch-net-snmp-config.h.in b/net-mgmt/net-snmp/files/patch-net-snmp-config.h.in
index 98de6015f10f..345453b58f23 100644
--- a/net-mgmt/net-snmp/files/patch-net-snmp-config.h.in
+++ b/net-mgmt/net-snmp/files/patch-net-snmp-config.h.in
@@ -1,15 +1,6 @@
---- include/net-snmp/net-snmp-config.h.in.orig	2008-07-28 20:41:40.000000000 +0900
-+++ include/net-snmp/net-snmp-config.h.in	2009-01-25 22:15:35.000000000 +0900
-@@ -126,7 +126,7 @@
- #undef STRUCT_SIGACTION_HAS_SA_SIGACTION
- 
- /* Does struct tm have a tm_gmtoff field? */
--#undef STRUCT_TM_HAS_TM_GMTOFFF
-+#undef STRUCT_TM_HAS_TM_GMTOFF
- 
- /* Does struct sockaddr have a sa_len field? */
- #undef STRUCT_SOCKADDR_HAS_SA_LEN
-@@ -1564,7 +1564,7 @@
+--- include/net-snmp/net-snmp-config.h.in.orig	2010-05-31 22:08:28.000000000 -0300
++++ include/net-snmp/net-snmp-config.h.in	2010-05-31 22:09:31.000000000 -0300
+@@ -1721,7 +1721,7 @@
  
  #define NETSNMP_EXCACHETIME 30
  #define NETSNMP_CACHEFILE ".snmp-exec-cache"
diff --git a/net-mgmt/net-snmp/files/patch-sctpScalars.h b/net-mgmt/net-snmp/files/patch-sctpScalars.h
index 036dff4a28b8..05538e0ddb0c 100644
--- a/net-mgmt/net-snmp/files/patch-sctpScalars.h
+++ b/net-mgmt/net-snmp/files/patch-sctpScalars.h
@@ -1,11 +1,11 @@
---- agent/mibgroup/sctp-mib/sctpScalars.h.orig	2009-01-23 23:43:37.000000000 +0900
-+++ agent/mibgroup/sctp-mib/sctpScalars.h	2009-01-23 23:44:12.000000000 +0900
-@@ -7,6 +7,8 @@
+--- agent/mibgroup/sctp-mib/sctpScalars.h.orig	2009-04-08 12:29:04.000000000 -0300
++++ agent/mibgroup/sctp-mib/sctpScalars.h	2010-06-01 11:02:56.000000000 -0300
+@@ -7,7 +7,7 @@
  config_require(sctp-mib/sctpScalars_common)
  #if defined( linux )
  config_require(sctp-mib/sctpScalars_linux)
-+#elif defined ( freebsd7 )
-+config_require(sctp-mib/sctpScalars_freebsd)
+-#elif defined( freebsd8 ) || defined ( freebsd7 )
++#elif defined( freebsd9 ) || defined( freebsd8 ) || defined ( freebsd7 )
+ config_require(sctp-mib/sctpScalars_freebsd)	 
  #else
  /*
-  * couldn't determine the correct file!
diff --git a/net-mgmt/net-snmp/files/patch-sctpScalars_freebsd.c b/net-mgmt/net-snmp/files/patch-sctpScalars_freebsd.c
deleted file mode 100644
index 2f187705d29b..000000000000
--- a/net-mgmt/net-snmp/files/patch-sctpScalars_freebsd.c
+++ /dev/null
@@ -1,106 +0,0 @@
---- agent/mibgroup/sctp-mib/sctpScalars_freebsd.c.orig	1970-01-01 09:00:00.000000000 +0900
-+++ agent/mibgroup/sctp-mib/sctpScalars_freebsd.c	2009-01-23 23:49:22.000000000 +0900
-@@ -0,0 +1,103 @@
-+#include <net-snmp/net-snmp-config.h>
-+#include <net-snmp/net-snmp-includes.h>
-+#include <net-snmp/agent/net-snmp-agent-includes.h>
-+
-+#include "sctpScalars_common.h"
-+
-+#include <stdio.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <stdint.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <netinet/sctp.h>
-+#include <netinet/sctp_constants.h>
-+
-+#define PROC_PREFIX          "/proc"
-+#define PROC_RTO_MIN         PROC_PREFIX "/sys/net/sctp/rto_min"
-+#define PROC_RTO_MAX         PROC_PREFIX "/sys/net/sctp/rto_max"
-+#define PROC_RTO_INITIAL     PROC_PREFIX "/sys/net/sctp/rto_initial"
-+#define PROC_VAL_COOKIE_LIFE PROC_PREFIX "/sys/net/sctp/valid_cookie_life"
-+#define PROC_MAX_INIT_RETR   PROC_PREFIX "/sys/net/sctp/max_init_retransmits"
-+#define PROC_STATS           PROC_PREFIX "/net/sctp/snmp"
-+
-+void
-+netsnmp_access_sctp_stats_arch_init()
-+{
-+}
-+
-+int
-+netsnmp_access_sctp_stats_arch_load(netsnmp_sctp_stats * sctp_stats)
-+{
-+  struct sctpstat stat;
-+  size_t len = sizeof(struct sctpstat);
-+
-+  if (sysctlbyname("net.inet.sctp.stats", &stat, &len, NULL, 0) < 0) {
-+	return(-1);
-+  }
-+  memset(sctp_stats, 0, sizeof(netsnmp_sctp_stats));
-+  sctp_stats->curr_estab = stat.sctps_currestab;
-+  sctp_stats->active_estabs = stat.sctps_activeestab;
-+  sctp_stats->passive_estabs = stat.sctps_passiveestab;
-+  sctp_stats->aborteds = stat.sctps_aborted;
-+  sctp_stats->shutdowns = stat.sctps_shutdown;
-+  sctp_stats->out_of_blues = stat.sctps_outoftheblue;
-+  sctp_stats->checksum_errors = stat.sctps_checksumerrors;
-+  sctp_stats->out_ctrl_chunks.low = stat.sctps_outcontrolchunks;
-+  sctp_stats->out_order_chunks.low = stat.sctps_outorderchunks;
-+  sctp_stats->out_unorder_chunks.low = stat.sctps_outunorderchunks;
-+  sctp_stats->in_ctrl_chunks.low = stat.sctps_incontrolchunks;
-+  sctp_stats->in_order_chunks.low = stat.sctps_inorderchunks;
-+  sctp_stats->in_unorder_chunks.low = stat.sctps_inunorderchunks;
-+  sctp_stats->frag_usr_msgs.low = stat.sctps_fragusrmsgs;
-+  sctp_stats->reasm_usr_msgs.low = stat.sctps_reasmusrmsgs;
-+  sctp_stats->out_sctp_packs.low = stat.sctps_outpackets;
-+  sctp_stats->in_sctp_packs.low = stat.sctps_inpackets;
-+  sctp_stats->discontinuity_time = 0;
-+  return 0;
-+}
-+
-+void
-+netsnmp_access_sctp_params_arch_init()
-+{
-+}
-+
-+int
-+netsnmp_access_sctp_params_arch_load(netsnmp_sctp_params * sctp_params)
-+{
-+    int             ret;
-+	size_t len = sizeof(uint32_t);
-+	unsigned int cnt = 0;
-+
-+    sctp_params->rto_algorithm = NETSNMP_SCTP_ALGORITHM_VANJ;
-+    sctp_params->max_assocs =  SCTP_MAX_NUM_OF_ASOC; 
-+	if (sysctlbyname("net.inet.sctp.rto_max",
-+					 &sctp_params->rto_max,
-+					 &len, NULL, 0) < 0) {
-+	  return(-1);
-+	}
-+	if (sysctlbyname("net.inet.sctp.rto_min",
-+					 &sctp_params->rto_min,
-+					 &len, NULL, 0) < 0) {
-+	  return(-1);
-+	}
-+	if (sysctlbyname("net.inet.sctp.rto_initial",
-+					 &sctp_params->rto_initial,
-+					 &len, NULL, 0) < 0) {
-+	  return(-1);
-+	}
-+	if (sysctlbyname("net.inet.sctp.valid_cookie_life",
-+					 &sctp_params->val_cookie_life,
-+					 &len, NULL, 0) < 0) {
-+	  return(-1);
-+	}
-+	if (sysctlbyname("net.inet.sctp.init_rtx_max",
-+					 &sctp_params->max_init_retr,
-+					 &len, NULL, 0) < 0) {
-+	  return(-1);
-+	}
-+    return 0;
-+}
diff --git a/net-mgmt/net-snmp/files/patch-sctpTables.h b/net-mgmt/net-snmp/files/patch-sctpTables.h
index 50d48e431b5d..d92fa6e0720f 100644
--- a/net-mgmt/net-snmp/files/patch-sctpTables.h
+++ b/net-mgmt/net-snmp/files/patch-sctpTables.h
@@ -1,11 +1,11 @@
---- agent/mibgroup/sctp-mib/sctpTables.h.orig	2009-01-23 23:46:39.000000000 +0900
-+++ agent/mibgroup/sctp-mib/sctpTables.h	2009-01-23 23:47:35.000000000 +0900
-@@ -14,6 +14,8 @@
- config_require(sctp-mib/sctpAssocTable)
+--- agent/mibgroup/sctp-mib/sctpTables.h.orig	2010-06-01 10:57:14.000000000 -0300
++++ agent/mibgroup/sctp-mib/sctpTables.h	2010-06-01 10:17:28.000000000 -0300
+@@ -15,7 +15,7 @@
  #if defined( linux )
  config_require(sctp-mib/sctpTables_linux)
-+#elif defined( freebsd7 )
-+config_require(sctp-mib/sctpTables_freebsd)
+ config_require(util_funcs/get_pid_from_inode)
+-#elif defined( freebsd7 ) || defined( freebsd8 )
++#elif defined( freebsd7 ) || defined( freebsd8 ) || defined( freebsd9 )
+ config_require(sctp-mib/sctpTables_freebsd)
  #else
- /*
- * couldn't determine the correct file!
+ config_error(SCTP-MIB is not available in tihs environment)
diff --git a/net-mgmt/net-snmp/files/patch-sctpTables_common.c b/net-mgmt/net-snmp/files/patch-sctpTables_common.c
deleted file mode 100644
index 9047ca289e2a..000000000000
--- a/net-mgmt/net-snmp/files/patch-sctpTables_common.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- agent/mibgroup/sctp-mib/sctpTables_common.c.orig	2009-03-07 23:32:28.000000000 +0900
-+++ agent/mibgroup/sctp-mib/sctpTables_common.c	2009-03-07 23:33:09.000000000 +0900
-@@ -1,3 +1,6 @@
-+#include <net-snmp/net-snmp-config.h>
-+#include <net-snmp/net-snmp-includes.h>
-+#include <net-snmp/agent/net-snmp-agent-includes.h>
- #include "sctpTables_common.h"
- #include "sctpAssocTable.h"
- #include "sctpAssocRemAddrTable.h"
diff --git a/net-mgmt/net-snmp/files/patch-sctpTables_common.h b/net-mgmt/net-snmp/files/patch-sctpTables_common.h
index b9152bea0544..448ccee37ee7 100644
--- a/net-mgmt/net-snmp/files/patch-sctpTables_common.h
+++ b/net-mgmt/net-snmp/files/patch-sctpTables_common.h
@@ -1,15 +1,11 @@
---- agent/mibgroup/sctp-mib/sctpTables_common.h.orig	2008-08-18 06:29:11.000000000 +0900
-+++ agent/mibgroup/sctp-mib/sctpTables_common.h	2009-02-28 14:06:27.000000000 +0900
-@@ -1,9 +1,9 @@
+--- agent/mibgroup/sctp-mib/sctpTables_common.h.orig	2010-06-01 10:58:20.000000000 -0300
++++ agent/mibgroup/sctp-mib/sctpTables_common.h	2010-06-01 10:18:02.000000000 -0300
+@@ -1,7 +1,7 @@
  #ifndef SCTP_TABLES_COMMON_H
  #define SCTP_TABLES_COMMON_H
  
--#include <net-snmp/net-snmp-config.h>
--#include <net-snmp/net-snmp-includes.h>
--#include <net-snmp/agent/net-snmp-agent-includes.h>
-+#if defined(freebsd7)
-+#define netsnmp_table_registration_info_free SNMP_FREE
-+#endif
+-#if defined(freebsd8) || defined(freebsd7)
++#if defined(freebsd9) || defined(freebsd8) || defined(freebsd7)
+ #define netsnmp_table_registration_info_free SNMP_FREE
+ #endif
  
- #define SCTP_IPADDRESS_SIZE 16
- #define SCTP_HOSTNAME_SIZE 255
diff --git a/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c b/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c
deleted file mode 100644
index 44c26b86d08c..000000000000
--- a/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- snmplib/snmpTCPIPv6Domain.c.orig	2008-06-17 17:57:14.000000000 +0900
-+++ snmplib/snmpTCPIPv6Domain.c	2008-11-14 21:34:12.000000000 +0900
-@@ -96,12 +96,23 @@
-     if (to == NULL) {
-         return strdup("TCP/IPv6: unknown");
-     } else {
--        char addr[INET6_ADDRSTRLEN];
--        char tmp[INET6_ADDRSTRLEN + 18];
-+        char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12];
- 
--        sprintf(tmp, "TCP/IPv6: [%s]:%hd",
--                inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr,
--                          INET6_ADDRSTRLEN), ntohs(to->sin6_port));
-+/*
-+ * NI_WITHSCOPEID will be obsoleted.  But some implementations require
-+ * this flag to retrieve scoped name.
-+ * (2002-07-25: kuriyama@FreeBSD.org)
-+ */
-+#ifndef NI_WITHSCOPEID
-+#define NI_WITHSCOPEID 0
-+#endif
-+	if (getnameinfo((struct sockaddr *)to, sizeof(struct sockaddr_in6),
-+			addr, sizeof(addr), NULL, 0,
-+			NI_NUMERICHOST | NI_WITHSCOPEID)) {
-+	    return strdup("UDP/IPv6: unknown");
-+	}
-+	snprintf(tmp, sizeof(tmp), "TCP/IPv6: [%s]:%hd", addr,
-+		 ntohs(to->sin6_port));
-         return strdup(tmp);
-     }
- }
diff --git a/net-mgmt/net-snmp/files/patch-snmpd.c b/net-mgmt/net-snmp/files/patch-snmpd.c
deleted file mode 100644
index c7d6d4ed06c8..000000000000
--- a/net-mgmt/net-snmp/files/patch-snmpd.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- agent/snmpd.c.orig	2009-01-25 17:25:26.000000000 +0900
-+++ agent/snmpd.c	2009-01-25 17:36:52.000000000 +0900
-@@ -426,6 +426,9 @@
-     char           *cptr, **argvptr;
-     char           *pid_file = NULL;
-     char            option_compatability[] = "-Le";
-+#if HAVE_UNISTD_H
-+    const char     *ccptr;
-+#endif
- #if HAVE_GETPID
-     int fd;
-     FILE           *PID;
-@@ -960,8 +963,8 @@
- #endif
- 
- #if HAVE_UNISTD_H
--    cptr = get_persistent_directory();
--    mkdirhier( cptr, NETSNMP_AGENT_DIRECTORY_MODE, 0 );
-+    ccptr = get_persistent_directory();
-+    mkdirhier( ccptr, NETSNMP_AGENT_DIRECTORY_MODE, 0 );
-    
-     uid = netsnmp_ds_get_int(NETSNMP_DS_APPLICATION_ID, 
- 			     NETSNMP_DS_AGENT_USERID);
-@@ -970,7 +973,7 @@
-     
- #ifdef HAVE_CHOWN
-     if ( uid != 0 || gid != 0 )
--        chown( cptr, uid, gid );
-+        chown( ccptr, uid, gid );
- #endif
- 
- #ifdef HAVE_SETGID
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 1c3179d6a6cf..66e3f2e981b8 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -4,6 +4,7 @@ bin/ipf-mod.pl
 bin/mib2c
 bin/mib2c-update
 bin/net-snmp-config
+bin/net-snmp-create-v3-user
 bin/snmpbulkget
 bin/snmpbulkwalk
 bin/snmpcheck
@@ -23,7 +24,7 @@ bin/snmptrap
 bin/snmpusm
 bin/snmpvacm
 bin/snmpwalk
-%%WITH_TKMIB%%bin/tkmib
+bin/tkmib
 bin/traptoemail
 @exec mkdir %D/etc/snmp 2>/dev/null || true
 include/net-snmp/agent/agent_callbacks.h
@@ -32,6 +33,7 @@ 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_sysORTable.h
 include/net-snmp/agent/agent_trap.h
 include/net-snmp/agent/all_helpers.h
 include/net-snmp/agent/auto_nlist.h
@@ -60,6 +62,7 @@ include/net-snmp/agent/snmp_agent.h
 include/net-snmp/agent/snmp_vars.h
 include/net-snmp/agent/stash_cache.h
 include/net-snmp/agent/stash_to_next.h
+include/net-snmp/agent/sysORTable.h
 include/net-snmp/agent/table.h
 include/net-snmp/agent/table_array.h
 include/net-snmp/agent/table_container.h
@@ -84,12 +87,14 @@ include/net-snmp/library/container_list_ssll.h
 include/net-snmp/library/container_null.h
 include/net-snmp/library/data_list.h
 include/net-snmp/library/default_store.h
+include/net-snmp/library/dir_utils.h
 include/net-snmp/library/factory.h
 include/net-snmp/library/fd_event_manager.h
 include/net-snmp/library/file_utils.h
 include/net-snmp/library/getopt.h
 include/net-snmp/library/int64.h
 include/net-snmp/library/keytools.h
+include/net-snmp/library/large_fd_set.h
 include/net-snmp/library/lcd_time.h
 include/net-snmp/library/md5.h
 include/net-snmp/library/mib.h
@@ -100,6 +105,7 @@ include/net-snmp/library/read_config.h
 include/net-snmp/library/scapi.h
 include/net-snmp/library/snmp-tc.h
 include/net-snmp/library/snmp.h
+include/net-snmp/library/snmpAliasDomain.h
 include/net-snmp/library/snmpCallbackDomain.h
 include/net-snmp/library/snmpTCPDomain.h
 %%WITH_IPV6%%include/net-snmp/library/snmpTCPIPv6Domain.h
@@ -125,6 +131,7 @@ include/net-snmp/library/system.h
 include/net-snmp/library/text_utils.h
 include/net-snmp/library/tools.h
 include/net-snmp/library/transform_oids.h
+include/net-snmp/library/types.h
 include/net-snmp/library/ucd_compat.h
 include/net-snmp/library/vacm.h
 include/net-snmp/library/winpipe.h
@@ -269,6 +276,7 @@ sbin/snmptrapd
 %%DATADIR%%/mib2c.notify.conf
 %%DATADIR%%/mib2c.old-api.conf
 %%DATADIR%%/mib2c.perl.conf
+%%DATADIR%%/mib2c.raw-table.conf
 %%DATADIR%%/mib2c.scalar.conf
 %%DATADIR%%/mib2c.table_data.conf
 %%DATADIR%%/mib2c-data/default-mfd-top.m2c
@@ -338,7 +346,7 @@ sbin/snmptrapd
 %%DATADIR%%/mib2c-data/syntax-StorageType-dependencies.m2i
 %%DATADIR%%/mib2c-data/syntax-TestAndIncr-get.m2i
 %%DATADIR%%/mibs/AGENTX-MIB.txt
-%%WITH_EVENT-MIB%%%%DATADIR%%/mibs/DISMAN-EVENT-MIB.txt
+%%DATADIR%%/mibs/DISMAN-EVENT-MIB.txt
 %%DATADIR%%/mibs/DISMAN-SCHEDULE-MIB.txt
 %%DATADIR%%/mibs/DISMAN-SCRIPT-MIB.txt
 %%DATADIR%%/mibs/EtherLike-MIB.txt
@@ -359,14 +367,15 @@ sbin/snmptrapd
 %%DATADIR%%/mibs/IPV6-TC.txt
 %%DATADIR%%/mibs/IPV6-TCP-MIB.txt
 %%DATADIR%%/mibs/IPV6-UDP-MIB.txt
-%%WITH_MTA_SENDMAIL%%%%DATADIR%%/mibs/MTA-MIB.txt
+%%DATADIR%%/mibs/MTA-MIB.txt
 %%DATADIR%%/mibs/NET-SNMP-AGENT-MIB.txt
 %%DATADIR%%/mibs/NET-SNMP-EXAMPLES-MIB.txt
 %%DATADIR%%/mibs/NET-SNMP-EXTEND-MIB.txt
 %%DATADIR%%/mibs/NET-SNMP-MIB.txt
+%%DATADIR%%/mibs/NET-SNMP-PASS-MIB.txt
 %%DATADIR%%/mibs/NET-SNMP-TC.txt
 %%DATADIR%%/mibs/NET-SNMP-VACM-MIB.txt
-%%WITH_MTA_SENDMAIL%%%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt
+%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt
 %%DATADIR%%/mibs/NOTIFICATION-LOG-MIB.txt
 %%DATADIR%%/mibs/RFC-1215.txt
 %%DATADIR%%/mibs/RFC1155-SMI.txt