Update netdisco-1.1 and add DESTDIR support.

Changes since 1.0:
Features:
 + []        Add report with number of ports per device that are up, recently
             down and down for a longer time.
 + []        Allow selecting multiple devices in admin_dev.html for actions
             that don't require confirmation (eg macsuck, arpnip, refresh).
             Based on patch by Michael Rubashenkov.
 + []        Add arpnip_min_age, macsuck_min_age and discover_min_age config
             directives, which can be used to prevent polling devices too often.
 + [2982386] Add port_search page so that users can search for ports based
             on the configured description/name. -bldewolf
 + []        Add "Port Usage" report page. Work in progress. -jeroenvi
 + []        Add config option for adding edge styles for graphs. -bldewolf
 + []        Small changes to support devices without sysServices ("layers")
 + []        Add "show free ports" option to Device View. -jeroenvi
 + []        New version of device.html - more columns to be shown/hidden,
             (hopefully) easier to maintain & extend. For testing purposes
             added as "device-new.html". -jeroenvi
 + []        Detect wrapping in device uptime counter & compensate. -jeroenvi
 + [2982390] Added command line option for saving configurations that have
             been modified by jobs in the last x minutes.  Added commented
             cronjob to call this hourly.
 + []        Add support for IPv6 node address tracking. -jeroenvi
 + []        Add device_port_power.power column to store output power per
             PSE port in milliwatts. -jeroenvi
 + [2777415] Improved PoE support in new Device View with accurate PoE source
d
             power per port (if device supports it, fallback to class-based
             estimation). -jeroenvi
 + []        IPv6 address to hostname resolving (quick hack by rkerr)
 + [3106690] Add "arpwalk", "macwalk" and "nbtwalk" to admin panel. Patch from
             Nic Bernstein.
 + [3148218] Detect Proxim wireless APs in WAP search (J R Binks)

Bugfixes:
 * []        Fix sort_port() for ports like "GigabitEthernet2/2/3" -maxb
 * [3002989] Performance improvement for add_arp SQL query. -bldewolf
 * [2991159] Fix complaints when doing a partial MAC search. -bldewolf
 * []        Fix complaints from reports.html with no report type. -bldewolf
 * []        Improve query performance in expire_ips(). -bldewolf

3 files changed, 227 insertions, 28 deletions

diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index 047883f73e6..f3306fcac18 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,16 +1,19 @@
-# $NetBSD: Makefile,v 1.23 2011/03/15 20:36:03 bouyer Exp $
+# $NetBSD: Makefile,v 1.24 2011/05/23 19:39:09 bouyer Exp $
 #
 
-DISTNAME=		netdisco-1.0_with_mibs
-PKGNAME=		netdisco-1.0
+DISTNAME=		netdisco-1.1_with_mibs
+PKGNAME=		netdisco-1.1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=netdisco/}
 
 MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://www.netdisco.org/
 COMMENT=		Open Source web-based network management tool
+LICENSE=		modified-bsd
 
-DEPENDS+=		p5-SNMP-Info-[0-9]*:../../net/p5-SNMP-Info
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+DEPENDS+=		p5-SNMP-Info>=2.04:../../net/p5-SNMP-Info
 DEPENDS+=		p5-Apache-DBI-[0-9]*:../../databases/p5-Apache-DBI
 DEPENDS+=		p5-Apache-Session-[0-9]*:../../www/p5-Apache-Session
 DEPENDS+=		p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql
@@ -26,21 +29,24 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 .include "../../mk/bsd.prefs.mk"
 
-EGDIR=			${PREFIX}/share/examples/${PKGNAME_NOREV}
-
 USE_TOOLS+=	pax perl:run
+REPLACE_PERL+=	bin/device_to_csv
 REPLACE_PERL+=	bin/doc_munge
+REPLACE_PERL+=	bin/firewall_arp
+REPLACE_PERL+=	bin/parse_kismet_ap
 REPLACE_PERL+=	bin/pod_arg_link_fix
+REPLACE_PERL+=	bin/search_node.pl
 REPLACE_PERL+=	bin/test_cdp.pl
 REPLACE_PERL+=	bin/test_fwtable.pl
 REPLACE_PERL+=	bin/test_iproute.pl
-REPLACE_PERL+=	bin/parse_kismet_ap
+REPLACE_PERL+=	bin/snmpv3_key
 REPLACE_PERL+=	netdisco
 REPLACE_PERL+=	mibs/chk_dups
 REPLACE_PERL+=	mibs/diff_dir
 REPLACE_PERL+=	mibs/rm_cisco_dups
 REPLACE_PERL+=	mibs/chk_mibs
 REPLACE_PERL+=	mibs/snmpwalkmib
+REPLACE_PERL+=	mibs/split-extreme
 REPLACE_PERL+=	sql/pg
 
 SUBST_CLASSES+=			installdir path varbase apachevers
@@ -54,12 +60,12 @@ SUBST_FILES.installdir+=	bin/test_cache.pl bin/test_cdp.pl
 SUBST_FILES.installdir+=	bin/test_dev.pl bin/test_stats.pl
 SUBST_FILES.installdir+=	bin/debian_install.sh
 SUBST_FILES.installdir+=	bin/test_fwtable.pl bin/test_iproute.pl
-SUBST_FILES.installdir+=	doc/INSTALL.html doc/INSTALL.pod
+SUBST_FILES.installdir+=	doc/INSTALL doc/INSTALL.pod
 SUBST_FILES.installdir+=	doc/README.pod doc/README.html
-SUBST_FILES.installdir+=	doc/UPGRADE.html doc/UPGRADE.pod
+SUBST_FILES.installdir+=	doc/UPGRADE.pod
 SUBST_FILES.installdir+=	INSTALL README UPGRADE
-SUBST_FILES.installdir+=	html/doc/INSTALL.html html/doc/README.html
-SUBST_FILES.installdir+=	html/doc/UPGRADE.html html/admin_reconfig.html
+SUBST_FILES.installdir+=	html/doc/README.html
+SUBST_FILES.installdir+=	html/admin_reconfig.html
 SUBST_FILES.installdir+=	netdisco.crontab
 SUBST_FILES.installdir+=	mibs/snmp.conf
 SUBST_SED.installdir=		-e "s|/usr/local/netdisco|${PREFIX}/netdisco|g"
@@ -69,7 +75,7 @@ SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	bin/catalyst_mac_vlan.pl bin/port_control
 SUBST_FILES.path+=	bin/test_cache.pl bin/test_dev.pl bin/test_stats.pl
 SUBST_FILES.path+=	bin/parse_mac
-SUBST_FILES.path+=	doc/INSTALL.html doc/INSTALL.pod html/doc/INSTALL.html
+SUBST_FILES.path+=	doc/INSTALL.pod
 SUBST_FILES.path+=	INSTALL netdisco.crontab
 SUBST_SED.path=		-e "s|/usr/local/bin|${PREFIX}/bin|g"
 SUBST_MESSAGE.path=	Fixing hardcoded path.
@@ -102,6 +108,9 @@ CONF_FILES+=		${EGDIR:Q}/netdisco-topology.txt ${PKG_SYSCONFDIR:Q}/netdisco-topo
 
 REQD_DIRS+=		${PREFIX:Q}/netdisco ${EGDIR:Q}
 OWN_DIRS_PERMS+=	${VARBASE:Q}/netdisco ${NETDISCOUSER} ${NETDISCOGROUP} 0775
+OWN_DIRS_PERMS+=	${PREFIX:Q}/netdisco/html ${NETDISCOUSER} ${NETDISCOGROUP} 0775
+OWN_DIRS_PERMS+=	${PREFIX:Q}/netdisco/mason ${NETDISCOUSER} ${APACHE_GROUP} 0775
+
 RCD_SCRIPTS=		netdisco
 RCD_SCRIPT_SRC.netdisco=	${WRKSRC:Q}/bin/netdisco_daemon
 
@@ -133,16 +142,13 @@ do-build:
 
 do-install:
 	${RM} -f ${WRKSRC:Q}/bin/netdisco_daemon
-	cd ${WRKSRC:Q} && pax -rw -pp . ${PREFIX:Q}/netdisco
-	${CHOWN} -R ${NETDISCOUSER}:${NETDISCOGROUP} ${PREFIX:Q}/netdisco
-	${CHMOD} 775 ${PREFIX:Q}/netdisco/html
+	cd ${WRKSRC:Q} && pax -rw -pp . ${DESTDIR}${PREFIX:Q}/netdisco
+	mkdir ${DESTDIR}${EGDIR}
+	
 	set -e; \
 	for i in netdisco.conf netdisco-topology.txt netdisco.crontab \
 	    netdisco_apache.conf netdisco_apache_dir.conf; do \
-		${MV} ${PREFIX:Q}/netdisco/"$$i" ${EGDIR:Q}/ ;\
+		${MV} ${DESTDIR}${PREFIX:Q}/netdisco/"$$i" ${DESTDIR}${EGDIR:Q}/ ;\
 	done
-	${MKDIR} ${PREFIX:Q}/netdisco/mason
-	${CHGRP} -R ${APACHE_GROUP} ${PREFIX:Q}/netdisco/mason
-	${CHMOD} -R 775 ${PREFIX:Q}/netdisco/mason
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netdisco/PLIST b/net/netdisco/PLIST
index f41724b45c7..34423785fe5 100644
--- a/net/netdisco/PLIST
+++ b/net/netdisco/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2011/03/15 20:36:03 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/05/23 19:39:10 bouyer Exp $
 netdisco/bin/catalyst_mac_vlan.pl
 netdisco/bin/debian_install.sh
+netdisco/bin/device_to_csv
 netdisco/bin/doc_munge
 netdisco/bin/firewall_arp
 netdisco/bin/fix_cvsroot
@@ -24,6 +25,7 @@ netdisco/bin/parse_kismet_ap
 netdisco/bin/parse_mac
 netdisco/bin/pod_arg_link_fix
 netdisco/bin/port_control
+netdisco/bin/search_node.pl
 netdisco/bin/snmpv3_key
 netdisco/bin/test_cache.pl
 netdisco/bin/test_cdp.pl
@@ -33,7 +35,6 @@ netdisco/bin/test_iproute.pl
 netdisco/bin/test_stats.pl
 netdisco/doc/ChangeLog
 netdisco/doc/INSTALL
-netdisco/doc/INSTALL.html
 netdisco/doc/INSTALL.pod
 netdisco/doc/README
 netdisco/doc/README-API-BACKEND
@@ -41,7 +42,6 @@ netdisco/doc/README-API-SHARED
 netdisco/doc/README.html
 netdisco/doc/README.pod
 netdisco/doc/UPGRADE
-netdisco/doc/UPGRADE.html
 netdisco/doc/UPGRADE.pod
 netdisco/html/admin.html
 netdisco/html/admin_chimp.gif
@@ -63,15 +63,14 @@ netdisco/html/device_module.html
 netdisco/html/device_module_search.html
 netdisco/html/device_search.html
 netdisco/html/discoball2.gif
-netdisco/html/doc/INSTALL.html
 netdisco/html/doc/README.html
-netdisco/html/doc/UPGRADE.html
 netdisco/html/doc/autohandler
 netdisco/html/doc/index.html
 netdisco/html/doc/netdisco-api-backend.html
 netdisco/html/doc/netdisco-api-shared.html
 netdisco/html/duplex.html
 netdisco/html/frontpanel.html
+netdisco/html/graphs_sample.mas
 netdisco/html/icon_down.gif
 netdisco/html/icon_info.gif
 netdisco/html/icon_lock.gif
@@ -95,6 +94,8 @@ netdisco/html/node.html
 netdisco/html/plus.gif
 netdisco/html/port_info.html
 netdisco/html/port_report.html
+netdisco/html/port_search.html
+netdisco/html/port_usage.html
 netdisco/html/portcontrol.html
 netdisco/html/powered_by_mason.jpg
 netdisco/html/public_debugging.html
@@ -106,6 +107,7 @@ netdisco/html/svg/zgrviewer-0.8.2.jar
 netdisco/html/svg/zvtm-0.9.8.jar
 netdisco/html/svg/zvtm.license.txt
 netdisco/html/traceroute.html
+netdisco/html/traffic.png
 netdisco/html/valid-html401.png
 netdisco/html/vcss.gif
 netdisco/mibs/README
@@ -365,6 +367,7 @@ netdisco/mibs/cisco/CISCO-APPLIANCE-REDUNDANCY-MIB.my
 netdisco/mibs/cisco/CISCO-APPLICATION-ACCELERATION-MIB.my
 netdisco/mibs/cisco/CISCO-APS-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-APS-MIB.my
+netdisco/mibs/cisco/CISCO-ASN-GATEWAY-MIB.my
 netdisco/mibs/cisco/CISCO-ASPP-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-ACCESS-LIST-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-ADDR-MIB.my
@@ -399,6 +402,7 @@ netdisco/mibs/cisco/CISCO-BERT-MIB.my
 netdisco/mibs/cisco/CISCO-BGP-POLICY-ACCOUNTING-MIB.my
 netdisco/mibs/cisco/CISCO-BGP4-MIB.my
 netdisco/mibs/cisco/CISCO-BITS-CLOCK-MIB.my
+netdisco/mibs/cisco/CISCO-BOOT-HWDIAGS-MIB.my
 netdisco/mibs/cisco/CISCO-BRIDGE-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-BSC-MIB.my
 netdisco/mibs/cisco/CISCO-BSTUN-MIB.my
@@ -411,6 +415,7 @@ netdisco/mibs/cisco/CISCO-C8500-REDUNDANCY-MIB.my
 netdisco/mibs/cisco/CISCO-CABLE-ADMISSION-CTRL-MIB.my
 netdisco/mibs/cisco/CISCO-CABLE-AVAILABILITY-MIB.my
 netdisco/mibs/cisco/CISCO-CABLE-DIAG-MIB.my
+netdisco/mibs/cisco/CISCO-CABLE-L2VPN-MIB.my
 netdisco/mibs/cisco/CISCO-CABLE-METERING-MIB.my
 netdisco/mibs/cisco/CISCO-CABLE-QOS-MONITOR-MIB.my
 netdisco/mibs/cisco/CISCO-CABLE-SPECTRUM-MIB.my
@@ -436,9 +441,19 @@ netdisco/mibs/cisco/CISCO-CCM-MIB.my
 netdisco/mibs/cisco/CISCO-CCME-MIB.my
 netdisco/mibs/cisco/CISCO-CDL-MIB.my
 netdisco/mibs/cisco/CISCO-CDMA-AHDLC-MIB.my
+netdisco/mibs/cisco/CISCO-CDMA-PDSN-CRP-MIB.my
 netdisco/mibs/cisco/CISCO-CDMA-PDSN-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-CDMA-PDSN-MIB.my
 netdisco/mibs/cisco/CISCO-CDP-MIB.my
+netdisco/mibs/cisco/CISCO-CDSTV-AUTHMGR-MIB.my
+netdisco/mibs/cisco/CISCO-CDSTV-BWMGR-MIB.my
+netdisco/mibs/cisco/CISCO-CDSTV-CS-STATS-MIB.my
+netdisco/mibs/cisco/CISCO-CDSTV-FSI-MIB.my
+netdisco/mibs/cisco/CISCO-CDSTV-INGEST-TUNING-MIB.my
+netdisco/mibs/cisco/CISCO-CDSTV-INGESTMGR-MIB.my
+netdisco/mibs/cisco/CISCO-CDSTV-ISA-MIB.my
+netdisco/mibs/cisco/CISCO-CDSTV-SERVER-MIB.my
+netdisco/mibs/cisco/CISCO-CDSTV-SERVICES-MIB.my
 netdisco/mibs/cisco/CISCO-CEF-MIB.my
 netdisco/mibs/cisco/CISCO-CEF-TC.my
 netdisco/mibs/cisco/CISCO-CFS-MIB.my
@@ -454,10 +469,13 @@ netdisco/mibs/cisco/CISCO-CLASS-BASED-QOS-MIB.my
 netdisco/mibs/cisco/CISCO-CLUSTER-MIB.my
 netdisco/mibs/cisco/CISCO-CNO-SWITCH-MIB.my
 netdisco/mibs/cisco/CISCO-COMMON-MGMT-MIB.my
+netdisco/mibs/cisco/CISCO-COMMON-ROLES-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-COMMON-ROLES-MIB.my
 netdisco/mibs/cisco/CISCO-COMPRESSION-SERVICE-ADAPTER-MIB.my
 netdisco/mibs/cisco/CISCO-CONFIG-COPY-MIB.my
 netdisco/mibs/cisco/CISCO-CONFIG-MAN-MIB.my
+netdisco/mibs/cisco/CISCO-CONTACT-CENTER-APPS-MIB.my
+netdisco/mibs/cisco/CISCO-CONTENT-DELIVERY-STREAMING-MIB.my
 netdisco/mibs/cisco/CISCO-CONTENT-ENGINE-MIB.my
 netdisco/mibs/cisco/CISCO-CONTENT-NETWORK-MIB.my
 netdisco/mibs/cisco/CISCO-CONTENT-SERVICES-MIB.my
@@ -465,11 +483,16 @@ netdisco/mibs/cisco/CISCO-CONTEXT-MAPPING-MIB.my
 netdisco/mibs/cisco/CISCO-COPS-CLIENT-MIB.my
 netdisco/mibs/cisco/CISCO-CRYPTO-ACCELERATOR-MIB.my
 netdisco/mibs/cisco/CISCO-CSG-MIB.my
+netdisco/mibs/cisco/CISCO-CUICAPPS-MIB.my
+netdisco/mibs/cisco/CISCO-CVP-MIB.my
 netdisco/mibs/cisco/CISCO-DATA-COLLECTION-MIB.my
 netdisco/mibs/cisco/CISCO-DDP-IAPP-MIB.my
 netdisco/mibs/cisco/CISCO-DEVICE-EXCEPTION-REPORTING-MIB.my
 netdisco/mibs/cisco/CISCO-DHCP-SNOOPING-MIB.my
 netdisco/mibs/cisco/CISCO-DIAL-CONTROL-MIB.my
+netdisco/mibs/cisco/CISCO-DIAMETER-BASE-PROTOCOL-MIB.my
+netdisco/mibs/cisco/CISCO-DIAMETER-CC-APPL-MIB.my
+netdisco/mibs/cisco/CISCO-DIAMETER-SG-MIB.my
 netdisco/mibs/cisco/CISCO-DIFFSERV-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-DIGITAL-MEDIA-SYSTEMS-MIB.my
 netdisco/mibs/cisco/CISCO-DIST-DIRECTOR-MIB.my
@@ -521,6 +544,7 @@ netdisco/mibs/cisco/CISCO-ENTITY-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-FRU-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-PFE-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-PROVISIONING-MIB.my
+netdisco/mibs/cisco/CISCO-ENTITY-QFP-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-REDUNDANCY-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-REDUNDANCY-TC-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-SENSOR-MIB.my
@@ -530,7 +554,9 @@ netdisco/mibs/cisco/CISCO-EPM-NOTIFICATION-MIB.my
 netdisco/mibs/cisco/CISCO-ERM-MIB.my
 netdisco/mibs/cisco/CISCO-ERR-DISABLE-MIB.my
 netdisco/mibs/cisco/CISCO-ETHER-CFM-MIB.my
+netdisco/mibs/cisco/CISCO-ETHERLIKE-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-ETHERNET-ACCESS-MIB.my
+netdisco/mibs/cisco/CISCO-ETHERNET-FABRIC-EXTENDER-MIB.my
 netdisco/mibs/cisco/CISCO-EVC-MIB.my
 netdisco/mibs/cisco/CISCO-EXT-SCSI-MIB.my
 netdisco/mibs/cisco/CISCO-FABRIC-C12K-MIB.my
@@ -547,6 +573,7 @@ netdisco/mibs/cisco/CISCO-FC-SPAN-MIB.my
 netdisco/mibs/cisco/CISCO-FCC-MIB.my
 netdisco/mibs/cisco/CISCO-FCIP-MGMT-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-FCIP-MGMT-MIB.my
+netdisco/mibs/cisco/CISCO-FCOE-MIB.my
 netdisco/mibs/cisco/CISCO-FCPING-MIB.my
 netdisco/mibs/cisco/CISCO-FCS-MIB.my
 netdisco/mibs/cisco/CISCO-FCSP-MIB.my
@@ -565,24 +592,30 @@ netdisco/mibs/cisco/CISCO-FSPF-MIB.my
 netdisco/mibs/cisco/CISCO-FTP-CLIENT-MIB.my
 netdisco/mibs/cisco/CISCO-GATEKEEPER-MIB.my
 netdisco/mibs/cisco/CISCO-GGSN-EXT-MIB.my
+netdisco/mibs/cisco/CISCO-GGSN-GEO-MIB.my
 netdisco/mibs/cisco/CISCO-GGSN-MIB.my
 netdisco/mibs/cisco/CISCO-GGSN-QOS-MIB.my
 netdisco/mibs/cisco/CISCO-GGSN-SERVICE-AWARE-MIB.my
 netdisco/mibs/cisco/CISCO-GPRS-ACC-PT-MIB.my
 netdisco/mibs/cisco/CISCO-GPRS-CHARGING-MIB.my
 netdisco/mibs/cisco/CISCO-GPRS-GTP-MIB.my
+netdisco/mibs/cisco/CISCO-GPRS-ISGSN-MIB.my
+netdisco/mibs/cisco/CISCO-GPRS-L2RLY-MIB.my
 netdisco/mibs/cisco/CISCO-GSLB-DNS-MIB.my
 netdisco/mibs/cisco/CISCO-GSLB-HEALTH-MON-MIB.my
 netdisco/mibs/cisco/CISCO-GSLB-SYSTEM-MIB.my
 netdisco/mibs/cisco/CISCO-GSLB-TC-MIB.my
 netdisco/mibs/cisco/CISCO-GTP-DIRECTOR-MIB.my
 netdisco/mibs/cisco/CISCO-GTP-MIB.my
+netdisco/mibs/cisco/CISCO-H225-MIB.my
+netdisco/mibs/cisco/CISCO-H320-DIAL-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-H323-TC-MIB.my
 netdisco/mibs/cisco/CISCO-H324-DIAL-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-HC-ALARM-MIB.my
 netdisco/mibs/cisco/CISCO-HEALTH-MONITOR-MIB.my
 netdisco/mibs/cisco/CISCO-HSRP-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-HSRP-MIB.my
+netdisco/mibs/cisco/CISCO-HW-MODULE-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-ICSUDSU-MIB.my
 netdisco/mibs/cisco/CISCO-IDSL-LINE-MIB.my
 netdisco/mibs/cisco/CISCO-IEEE8021-CFM-EXT-MIB.my
@@ -599,15 +632,19 @@ netdisco/mibs/cisco/CISCO-IETF-IPMROUTE-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-ISIS-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-ISNS-MGMT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-MEGACO-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-MPLS-TE-P2MP-STD-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-MSDP-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-NAT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-PIM-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-PIM-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-PPVPN-MPLS-VPN-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-PW-ATM-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-PW-ENET-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-PW-FR-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-PW-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-PW-MPLS-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-PW-TC-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-PW-TDM-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-SCTP-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-SCTP-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-VDSL-LINE-MIB.my
@@ -619,6 +656,7 @@ netdisco/mibs/cisco/CISCO-IF-CALL-SERVICE-MIB.my
 netdisco/mibs/cisco/CISCO-IF-EXTENSION-MIB.my
 netdisco/mibs/cisco/CISCO-IF-LINK-CONFIG-MIB.my
 netdisco/mibs/cisco/CISCO-IF-LOOPBACK-MIB.my
+netdisco/mibs/cisco/CISCO-IF-MONITOR-NOTIF-MIB.my
 netdisco/mibs/cisco/CISCO-IF-THRESHOLD-MIB.my
 netdisco/mibs/cisco/CISCO-IGMP-FILTER-MIB.my
 netdisco/mibs/cisco/CISCO-IGMP-SNOOPING-MIB.my
@@ -627,9 +665,11 @@ netdisco/mibs/cisco/CISCO-IKE-FLOW-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-IKE-FLOW-MIB.my
 netdisco/mibs/cisco/CISCO-IMA-MIB.my
 netdisco/mibs/cisco/CISCO-IMAGE-CHECK-MIB.my
+netdisco/mibs/cisco/CISCO-IMAGE-LICENSE-MGMT-MIB.my
 netdisco/mibs/cisco/CISCO-IMAGE-MIB.my
 netdisco/mibs/cisco/CISCO-IMAGE-TC.my
 netdisco/mibs/cisco/CISCO-IMAGE-UPGRADE-MIB.my
+netdisco/mibs/cisco/CISCO-INTERFACE-XCVR-MONITOR-MIB.my
 netdisco/mibs/cisco/CISCO-INTERFACETOPN-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-IP-ENCRYPTION-MIB.my
 netdisco/mibs/cisco/CISCO-IP-IF-MIB.my
@@ -649,7 +689,11 @@ netdisco/mibs/cisco/CISCO-IPSEC-POLICY-MAP-MIB.my
 netdisco/mibs/cisco/CISCO-IPSEC-PROVISIONING-MIB.my
 netdisco/mibs/cisco/CISCO-IPSEC-SIGNALING-MIB.my
 netdisco/mibs/cisco/CISCO-IPSEC-TC.my
+netdisco/mibs/cisco/CISCO-IPSLA-AUTOMEASURE-MIB.my
+netdisco/mibs/cisco/CISCO-IPSLA-ECHO-MIB.my
 netdisco/mibs/cisco/CISCO-IPSLA-ETHERNET-MIB.my
+netdisco/mibs/cisco/CISCO-IPSLA-JITTER-MIB.my
+netdisco/mibs/cisco/CISCO-IPSLA-TC-MIB.my
 netdisco/mibs/cisco/CISCO-ISCSI-GW-MIB.my
 netdisco/mibs/cisco/CISCO-ISCSI-MIB.my
 netdisco/mibs/cisco/CISCO-ISDN-MIB.my
@@ -696,26 +740,40 @@ netdisco/mibs/cisco/CISCO-LWAPP-ACL-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-AP-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-CCX-RM-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-CDP-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-CLIENT-ROAMING-CAPABILITY.my
 netdisco/mibs/cisco/CISCO-LWAPP-CLIENT-ROAMING-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DHCP-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CCX-CLIENT-DIAG-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CCX-CLIENT-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-CALIB-CAPABILITY.my
 netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-CALIB-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-CCX-REPORTS-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-CCX-TC-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-CCXV5-REPORTING-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-TS-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-DOT11-LDAP-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-DOT11-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOWNLOAD-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-IDS-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-INTERFACE-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-LINKTEST-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-LOCAL-AUTH-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-MESH-BATTERY-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-MESH-LINKTEST-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-MESH-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-MESH-STATS-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-MFP-CAPABILITY.my
 netdisco/mibs/cisco/CISCO-LWAPP-MFP-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-MOBILITY-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-QOS-CAPABILITY.my
 netdisco/mibs/cisco/CISCO-LWAPP-QOS-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-REAP-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-ROGUE-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-RRM-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-SYS-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-TC-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-TSM-CAPABILITY.my
 netdisco/mibs/cisco/CISCO-LWAPP-TSM-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-WEBAUTH-MIB.my
 netdisco/mibs/cisco/CISCO-LWAPP-WLAN-MIB.my
@@ -744,6 +802,8 @@ netdisco/mibs/cisco/CISCO-MGX8800-IF-MAPPING-MIB.my
 netdisco/mibs/cisco/CISCO-MMAIL-DIAL-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-MMODAL-CONTACT-APPS-MIB.my
 netdisco/mibs/cisco/CISCO-MOBILE-IP-MIB.my
+netdisco/mibs/cisco/CISCO-MOBILE-POLICY-CHARGING-CONTROL-MIB.my
+netdisco/mibs/cisco/CISCO-MOBILITY-TAP-MIB.my
 netdisco/mibs/cisco/CISCO-MODEM-MGMT-MIB.my
 netdisco/mibs/cisco/CISCO-MODULE-AUTO-SHUTDOWN-MIB.my
 netdisco/mibs/cisco/CISCO-MODULE-VIRTUALIZATION-MIB.my
@@ -756,10 +816,14 @@ netdisco/mibs/cisco/CISCO-NDE-MIB.my
 netdisco/mibs/cisco/CISCO-NETFLOW-MIB.my
 netdisco/mibs/cisco/CISCO-NETINT-MIB.my
 netdisco/mibs/cisco/CISCO-NETWORK-REGISTRAR-MIB.my
+netdisco/mibs/cisco/CISCO-NHRP-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-NMS-APPL-HEALTH-MIB.my
+netdisco/mibs/cisco/CISCO-NOTIFICATION-CONTROL-MIB.my
+netdisco/mibs/cisco/CISCO-NPORT-VIRTUALIZATION-MIB.my
 netdisco/mibs/cisco/CISCO-NS-MIB.my
 netdisco/mibs/cisco/CISCO-NTP-MIB.my
 netdisco/mibs/cisco/CISCO-OAM-MIB.my
+netdisco/mibs/cisco/CISCO-OBMI-MIB.my
 netdisco/mibs/cisco/CISCO-OPTICAL-IF-CROSS-CONNECT-MIB.my
 netdisco/mibs/cisco/CISCO-OPTICAL-IF-EXTN-MIB.my
 netdisco/mibs/cisco/CISCO-OPTICAL-MONITOR-MIB.my
@@ -821,6 +885,7 @@ netdisco/mibs/cisco/CISCO-RTTMON-MIB.my
 netdisco/mibs/cisco/CISCO-RTTMON-RTP-MIB.my
 netdisco/mibs/cisco/CISCO-RTTMON-TC-MIB.my
 netdisco/mibs/cisco/CISCO-SAA-APM-MIB.my
+netdisco/mibs/cisco/CISCO-SAN-BASE-SVC-MIB.my
 netdisco/mibs/cisco/CISCO-SANTAP-MIB.my
 netdisco/mibs/cisco/CISCO-SCSI-FLOW-MIB.my
 netdisco/mibs/cisco/CISCO-SCSI-MIB.my
@@ -836,14 +901,18 @@ netdisco/mibs/cisco/CISCO-SERVICE-CONTROL-TP-STATS-MIB.my
 netdisco/mibs/cisco/CISCO-SERVICE-CONTROLLER-MIB.my
 netdisco/mibs/cisco/CISCO-SESS-BORDER-CTRLR-CALL-STATS-MIB.my
 netdisco/mibs/cisco/CISCO-SESS-BORDER-CTRLR-EVENT-MIB.my
+netdisco/mibs/cisco/CISCO-SEU-MITIGATION-MIB.my
 netdisco/mibs/cisco/CISCO-SIBU-FLASH-MIB.my
 netdisco/mibs/cisco/CISCO-SIBU-MANAGERS-MIB.my
 netdisco/mibs/cisco/CISCO-SIBU-STACKABLE-DUAL-SPEED-HUB-MIB.my
+netdisco/mibs/cisco/CISCO-SIP-CALLS-MIB.my
 netdisco/mibs/cisco/CISCO-SIP-UA-MIB.my
+netdisco/mibs/cisco/CISCO-SLB-DFP-MIB.my
 netdisco/mibs/cisco/CISCO-SLB-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-SLB-HEALTH-MON-MIB.my
 netdisco/mibs/cisco/CISCO-SLB-MIB.my
 netdisco/mibs/cisco/CISCO-SM-FILE-DOWNLOAD-MIB.my
+netdisco/mibs/cisco/CISCO-SMART-INSTALL-MIB.my
 netdisco/mibs/cisco/CISCO-SME-MIB.my
 netdisco/mibs/cisco/CISCO-SMI.my
 netdisco/mibs/cisco/CISCO-SNA-LLC-MIB.my
@@ -889,15 +958,24 @@ netdisco/mibs/cisco/CISCO-TCPOFFLOAD-MIB.my
 netdisco/mibs/cisco/CISCO-TELEPRESENCE-CALL-MIB.my
 netdisco/mibs/cisco/CISCO-TELEPRESENCE-MIB.my
 netdisco/mibs/cisco/CISCO-TELNET-SERVER-MIB.my
+netdisco/mibs/cisco/CISCO-THREAT-MITIGATION-SERVICE-MIB.my
+netdisco/mibs/cisco/CISCO-TM.my
 netdisco/mibs/cisco/CISCO-TN3270SERVER-MIB.my
 netdisco/mibs/cisco/CISCO-TPC-MIB.my
 netdisco/mibs/cisco/CISCO-TRANSACTION-CONNECTION-MIB.my
+netdisco/mibs/cisco/CISCO-TRUSTSEC-SXP-MIB.my
+netdisco/mibs/cisco/CISCO-TRUSTSEC-TC-MIB.my
 netdisco/mibs/cisco/CISCO-TS-STACK-MIB.my
 netdisco/mibs/cisco/CISCO-UDLDP-MIB.my
+netdisco/mibs/cisco/CISCO-UNIFIED-COMPUTING-MIB.my
 netdisco/mibs/cisco/CISCO-UNIFIED-FIREWALL-MIB.my
 netdisco/mibs/cisco/CISCO-UNITY-EXPRESS-MIB.my
+netdisco/mibs/cisco/CISCO-UNITY-MIB.my
 netdisco/mibs/cisco/CISCO-USER-CONNECTION-TAP-MIB.my
+netdisco/mibs/cisco/CISCO-VIDEO-SESSION-MIB.my
 netdisco/mibs/cisco/CISCO-VINES-MIB.my
+netdisco/mibs/cisco/CISCO-VIRTUAL-INTERFACE-MIB.my
+netdisco/mibs/cisco/CISCO-VIRTUAL-NIC-MIB.my
 netdisco/mibs/cisco/CISCO-VIRTUAL-NW-IF-MIB.my
 netdisco/mibs/cisco/CISCO-VIRTUAL-SWITCH-MIB.my
 netdisco/mibs/cisco/CISCO-VISM-ATM-TRUNK-MIB.my
@@ -917,6 +995,7 @@ netdisco/mibs/cisco/CISCO-VISM-SVC-MIB.my
 netdisco/mibs/cisco/CISCO-VISM-TRAPS-MIB.my
 netdisco/mibs/cisco/CISCO-VISM-XGCP-EXT.my
 netdisco/mibs/cisco/CISCO-VLAN-BRIDGING-MIB.my
+netdisco/mibs/cisco/CISCO-VLAN-GROUP-MIB.my
 netdisco/mibs/cisco/CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB.my
 netdisco/mibs/cisco/CISCO-VLAN-MEMBERSHIP-MIB.my
 netdisco/mibs/cisco/CISCO-VLAN-TRANSLATION-MIB.my
@@ -927,6 +1006,7 @@ netdisco/mibs/cisco/CISCO-VOICE-ANALOG-IF-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-APPLICATIONS-OID-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-APPS-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-ATM-DIAL-CONTROL-MIB.my
+netdisco/mibs/cisco/CISCO-VOICE-CARD-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-CAS-MODULE-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-COMMON-DIAL-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-CONNECTIVITY-MIB.my
@@ -936,9 +1016,14 @@ netdisco/mibs/cisco/CISCO-VOICE-ENABLED-LINK-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-FR-DIAL-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-HDLC-DIAL-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-IF-MIB.my
+netdisco/mibs/cisco/CISCO-VOICE-LMR-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-TONE-CADENCE-MIB.my
+netdisco/mibs/cisco/CISCO-VOICE-URI-CLASS-MIB.my
+netdisco/mibs/cisco/CISCO-VOIP-TAP-MIB.my
 netdisco/mibs/cisco/CISCO-VPDN-MGMT-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-VPDN-MGMT-MIB.my
+netdisco/mibs/cisco/CISCO-VQE-TOOLS-MIB.my
+netdisco/mibs/cisco/CISCO-VQES-MIB.my
 netdisco/mibs/cisco/CISCO-VSAN-MIB.my
 netdisco/mibs/cisco/CISCO-VSI-CONTROLLER-MIB.my
 netdisco/mibs/cisco/CISCO-VSIMASTER-MIB.my
@@ -1004,6 +1089,7 @@ netdisco/mibs/cisco/CISCO-WLAN-VLAN-MIB.my
 netdisco/mibs/cisco/CISCO-WRED-MIB.my
 netdisco/mibs/cisco/CISCO-WWNMGR-MIB.my
 netdisco/mibs/cisco/CISCO-XDSL-LINE-MIB.my
+netdisco/mibs/cisco/CISCO-XGCP-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-XGCP-MIB.my
 netdisco/mibs/cisco/CISCO-ZS-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-ZS-MIB.my
@@ -1021,10 +1107,17 @@ netdisco/mibs/cisco/DOCS-IF-EXT-MIB.my
 netdisco/mibs/cisco/DOCS-IF3-MIB.my
 netdisco/mibs/cisco/DOCS-IFEXT2-MIB.my
 netdisco/mibs/cisco/DOCS-L2VPN-MIB.my
+netdisco/mibs/cisco/DOCS-LOADBAL3-MIB.my
+netdisco/mibs/cisco/DOCS-LOADBALANCING-MIB.my
+netdisco/mibs/cisco/DOCS-MCAST-AUTH-MIB.my
+netdisco/mibs/cisco/DOCS-MCAST-MIB.my
 netdisco/mibs/cisco/DOCS-QOS-MIB.my
 netdisco/mibs/cisco/DOCS-QOS3-MIB.my
+netdisco/mibs/cisco/DOCS-SEC-MIB.my
 netdisco/mibs/cisco/DOCS-SUBMGT-MIB.my
+netdisco/mibs/cisco/DOCS-SUBMGT3-MIB.my
 netdisco/mibs/cisco/DOCS-TEST-MIB.my
+netdisco/mibs/cisco/DTI-MIB.my
 netdisco/mibs/cisco/ERR-STATUS-MIB.my
 netdisco/mibs/cisco/ESMODULE-MIB.my
 netdisco/mibs/cisco/ESSWITCH-MIB.my
@@ -1053,8 +1146,10 @@ netdisco/mibs/cisco/MADGERSW-MIB.my
 netdisco/mibs/cisco/METRO1500-MIB.my
 netdisco/mibs/cisco/MPLS-LDP-MIB.my
 netdisco/mibs/cisco/MPLS-LSR-MIB.my
+netdisco/mibs/cisco/MPLS-TC-MIB.my
 netdisco/mibs/cisco/MPLS-TE-MIB.my
 netdisco/mibs/cisco/MPLS-VPN-MIB.my
+netdisco/mibs/cisco/MPOA-MIB.my
 netdisco/mibs/cisco/MSDP-MIB.my
 netdisco/mibs/cisco/NETRANGER.my
 netdisco/mibs/cisco/NOVELL-IPX-MIB.my
@@ -1086,6 +1181,7 @@ netdisco/mibs/cisco/PNNI-MIB.my
 netdisco/mibs/cisco/RTM-MIB.my
 netdisco/mibs/cisco/VIPER-MIB.my
 netdisco/mibs/cisco/XGCP-MIB.my
+netdisco/mibs/cisco/draft-ietf-ipfc-fcmgmt-int-mib-04.my
 netdisco/mibs/cisco/v1-readme
 netdisco/mibs/cisco/v2-readme
 netdisco/mibs/cisco1.diff
@@ -1265,6 +1361,7 @@ netdisco/mibs/hp/hpentmib.mib
 netdisco/mibs/hp/hphttpmg.mib
 netdisco/mibs/hp/hpicf8023rptr.mib
 netdisco/mibs/hp/hpicfarpprotect.mib
+netdisco/mibs/hp/hpicfauth.mib
 netdisco/mibs/hp/hpicfautorun.mib
 netdisco/mibs/hp/hpicfautz.mib
 netdisco/mibs/hp/hpicfbasic.mib
@@ -1272,33 +1369,45 @@ netdisco/mibs/hp/hpicfbridge.mib
 netdisco/mibs/hp/hpicfchain.mib
 netdisco/mibs/hp/hpicfchassis.mib
 netdisco/mibs/hp/hpicfconnectionratefilter.mib
+netdisco/mibs/hp/hpicfdcfan.mib
+netdisco/mibs/hp/hpicfdcpower.mib
+netdisco/mibs/hp/hpicfdhcpsnoop.mib
+netdisco/mibs/hp/hpicfdhcpv6relay.mib
+netdisco/mibs/hp/hpicfdosfilter.mib
 netdisco/mibs/hp/hpicfdot1x.mib
 netdisco/mibs/hp/hpicfdownload.mib
 netdisco/mibs/hp/hpicfetwist.mib
 netdisco/mibs/hp/hpicfff.mib
+netdisco/mibs/hp/hpicfftrco.mib
 netdisco/mibs/hp/hpicfgenrptr.mib
 netdisco/mibs/hp/hpicfgppc.mib
 netdisco/mibs/hp/hpicfhighavailability.mib
 netdisco/mibs/hp/hpicfinstmon.mib
 netdisco/mibs/hp/hpicfipaddress.mib
+netdisco/mibs/hp/hpicfiplockdown.mib
 netdisco/mibs/hp/hpicfiproute.mib
 netdisco/mibs/hp/hpicfjumbo.mib
 netdisco/mibs/hp/hpicfl3macconfig.mib
 netdisco/mibs/hp/hpicflinktest.mib
 netdisco/mibs/hp/hpicfmld.mib
 netdisco/mibs/hp/hpicfoid.mib
+netdisco/mibs/hp/hpicfoobm.mib
 netdisco/mibs/hp/hpicfospf.mib
 netdisco/mibs/hp/hpicfpim.mib
+netdisco/mibs/hp/hpicfpoe.mib
 netdisco/mibs/hp/hpicfproviderbridge.mib
 netdisco/mibs/hp/hpicfratelimit.mib
 netdisco/mibs/hp/hpicfrip.mib
+netdisco/mibs/hp/hpicfsavepower.mib
 netdisco/mibs/hp/hpicfsecurity.mib
 netdisco/mibs/hp/hpicfsnmp.mib
 netdisco/mibs/hp/hpicfsntp.mib
 netdisco/mibs/hp/hpicfstack.mib
+netdisco/mibs/hp/hpicfsyslog.mib
 netdisco/mibs/hp/hpicftc.mib
 netdisco/mibs/hp/hpicfudld.mib
 netdisco/mibs/hp/hpicfudpforward.mib
+netdisco/mibs/hp/hpicfusbport.mib
 netdisco/mibs/hp/hpicfusrauth.mib
 netdisco/mibs/hp/hpicfusrprof.mib
 netdisco/mibs/hp/hpicfvg.mib
@@ -1308,6 +1417,7 @@ netdisco/mibs/hp/hpicfxrrp.mib
 netdisco/mibs/hp/hpnetswitch.mib
 netdisco/mibs/hp/hpr-sn-switch.mib
 netdisco/mibs/hp/hpswitchconfig.mib
+netdisco/mibs/hp/hpswitchdistributedtrunk.mib
 netdisco/mibs/hp/hpswitchdma.mib
 netdisco/mibs/hp/hpswitchdrivers.mib
 netdisco/mibs/hp/hpswitchstack.mib
@@ -1378,16 +1488,49 @@ netdisco/mibs/netscreen/NETSCREEN-SET-GEN-MIB.mib
 netdisco/mibs/netscreen/NETSCREEN-SMI.mib
 netdisco/mibs/nortel.diff
 netdisco/mibs/nortel/AAC.mib
+netdisco/mibs/nortel/BAY-STACK-EDM-MIB.mib
+netdisco/mibs/nortel/BAY-STACK-IGMP-EXT-MIB.mib
+netdisco/mibs/nortel/BAY-STACK-IP-FWD-NH-MIB.mib
+netdisco/mibs/nortel/BAY-STACK-LLDP-EXT-MED-MIB.mib
+netdisco/mibs/nortel/BAY-STACK-NES-MIB.mib
+netdisco/mibs/nortel/BAY-STACK-NOTIFICATIONS-MIB.mib
+netdisco/mibs/nortel/BAY-STACK-NOTIFY-CONTROL-MIB.mib
+netdisco/mibs/nortel/BAY-STACK-PORT-MIRRORING-MIB.mib
+netdisco/mibs/nortel/BAY-STACK-UNICAST-STORM-CONTROL-MIB.mib
+netdisco/mibs/nortel/BUNDLE-MIB.mib
+netdisco/mibs/nortel/CHASSIS-MIB.mib
+netdisco/mibs/nortel/CONFIG-MGMT-MIB.mib
 netdisco/mibs/nortel/CSMACD.MIB
 netdisco/mibs/nortel/Commgmt.mib
+netdisco/mibs/nortel/DSX-TC-MIB.mib
+netdisco/mibs/nortel/DSX-TE1-MIB.mib
+netdisco/mibs/nortel/DSX-TE3-MIB.mib
+netdisco/mibs/nortel/DVMRP-STD-MIB.mib
+netdisco/mibs/nortel/ENVIRONMENT-MIB.mib
+netdisco/mibs/nortel/FR-MIB.mib
+netdisco/mibs/nortel/GENERIC-HDLC-MIB.mib
 netdisco/mibs/nortel/HARDWARE.MIB
 netdisco/mibs/nortel/L2mgmt.mib
 netdisco/mibs/nortel/L3mgmt.mib
+netdisco/mibs/nortel/LLDP-EXT-MED-MIB.mib
 netdisco/mibs/nortel/MODULE.MIB
+netdisco/mibs/nortel/NORTEL-MIB.mib
+netdisco/mibs/nortel/NT-ENTERPRISE-DATA-MIB.mib
+netdisco/mibs/nortel/NTN-QOS-POLICY-AUX-MIB.mib
+netdisco/mibs/nortel/NTN-QOS-POLICY-EVOL-PIB.mib
+netdisco/mibs/nortel/NTN-QOS-POLICY-EXT-PIB.mib
 netdisco/mibs/nortel/OSPF.MIB
+netdisco/mibs/nortel/POLICY-FRAMEWORK-PIB.mib
+netdisco/mibs/nortel/PPP-MIB.mib
 netdisco/mibs/nortel/PriL3mgmt.mib
+netdisco/mibs/nortel/QOS-POLICY-802-PIB.mib
+netdisco/mibs/nortel/QOS-POLICY-IP-PIB.mib
+netdisco/mibs/nortel/QOSSLA-MIB.mib
+netdisco/mibs/nortel/SNMP-MIB.mib
 netdisco/mibs/nortel/SSH.mib
+netdisco/mibs/nortel/SYSTEM-MIB.mib
 netdisco/mibs/nortel/TAG1Q.MIB
+netdisco/mibs/nortel/TRIPLE-DES-CONSORTIUM-MIB.mib
 netdisco/mibs/nortel/WFCOMMON.MIB
 netdisco/mibs/nortel/altroot.mib
 netdisco/mibs/nortel/aosbwm.mib
@@ -1411,17 +1554,39 @@ netdisco/mibs/nortel/baystacksourceguard.mib
 netdisco/mibs/nortel/baystackstats.mib
 netdisco/mibs/nortel/baystackvrrpext.mib
 netdisco/mibs/nortel/bayxlr.mib
+netdisco/mibs/nortel/bgp.mib
 netdisco/mibs/nortel/bnlog.mib
 netdisco/mibs/nortel/bsee.mib
 netdisco/mibs/nortel/ccfg210.mib
 netdisco/mibs/nortel/cd3ex201.mib
+netdisco/mibs/nortel/ces.mib
+netdisco/mibs/nortel/cesTraps.mib
+netdisco/mibs/nortel/ces_id.mib
+netdisco/mibs/nortel/ces_trapAck.mib
 netdisco/mibs/nortel/croot217.mib
 netdisco/mibs/nortel/cvlan000.mib
 netdisco/mibs/nortel/dvmrp.mib
 netdisco/mibs/nortel/mcast201.mib
+netdisco/mibs/nortel/newoak.mib
 netdisco/mibs/nortel/nnmst.mib
 netdisco/mibs/nortel/nnrst.mib
+netdisco/mibs/nortel/nortel-ap-status-mib.my
+netdisco/mibs/nortel/nortel-ap-tc.my
+netdisco/mibs/nortel/nortel-basic.my
+netdisco/mibs/nortel/nortel-client-session-mib.my
+netdisco/mibs/nortel/nortel-client-session-tc.my
+netdisco/mibs/nortel/nortel-external-server-mib.my
+netdisco/mibs/nortel/nortel-info-rf-detect-mib.my
+netdisco/mibs/nortel/nortel-port-mib.my
+netdisco/mibs/nortel/nortel-reg-chassis.my
+netdisco/mibs/nortel/nortel-reg-devices.my
+netdisco/mibs/nortel/nortel-rf-detect-tc.my
+netdisco/mibs/nortel/nortel-root.my
+netdisco/mibs/nortel/nortel-system-mib.my
+netdisco/mibs/nortel/nortel-trap.my
 netdisco/mibs/nortel/nortelsecurenetworkaccess.mib
+netdisco/mibs/nortel/ntEnterpriseDataTasmanMgmtchassis.mib
+netdisco/mibs/nortel/ntEnterpriseDataTasmanMgmtethernet.mib
 netdisco/mibs/nortel/ntwlanap006.mib
 netdisco/mibs/nortel/rapid_city.mib
 netdisco/mibs/nortel/rcmlt.mib
@@ -1445,6 +1610,7 @@ netdisco/mibs/nortel/synro.mib
 netdisco/mibs/nortel/tigonNetwork.mib
 netdisco/mibs/nortel/tigonPhysical.mib
 netdisco/mibs/nortel/tigonSwitch.mib
+netdisco/mibs/nortel/wf_pgm.mib
 netdisco/mibs/rfc/ACCOUNTING-CONTROL-MIB.txt
 netdisco/mibs/rfc/ADSL-LINE-EXT-MIB.txt
 netdisco/mibs/rfc/ADSL-LINE-MIB.txt
@@ -1467,8 +1633,18 @@ netdisco/mibs/rfc/ATM-ACCOUNTING-INFORMATION-MIB.txt
 netdisco/mibs/rfc/ATM-MIB.txt
 netdisco/mibs/rfc/ATM-TC-MIB.txt
 netdisco/mibs/rfc/ATM2-MIB.txt
+netdisco/mibs/rfc/BEGEMOT-BRIDGE-MIB.txt
+netdisco/mibs/rfc/BEGEMOT-HOSTRES-MIB.txt
+netdisco/mibs/rfc/BEGEMOT-IP-MIB.txt
+netdisco/mibs/rfc/BEGEMOT-MIB.txt
+netdisco/mibs/rfc/BEGEMOT-MIB2-MIB.txt
+netdisco/mibs/rfc/BEGEMOT-NETGRAPH.txt
+netdisco/mibs/rfc/BEGEMOT-PF-MIB.txt
+netdisco/mibs/rfc/BEGEMOT-SNMPD.txt
 netdisco/mibs/rfc/BGP4-MIB.txt
 netdisco/mibs/rfc/BRIDGE-MIB.txt
+netdisco/mibs/rfc/CAPWAP-BASE-MIB.txt
+netdisco/mibs/rfc/CAPWAP-DOT11-MIB.txt
 netdisco/mibs/rfc/CHARACTER-MIB.txt
 netdisco/mibs/rfc/CIRCUIT-IF-MIB.txt
 netdisco/mibs/rfc/CLNS-MIB.txt
@@ -1507,6 +1683,7 @@ netdisco/mibs/rfc/DS1-MIB.txt
 netdisco/mibs/rfc/DS3-MIB.txt
 netdisco/mibs/rfc/DSA-MIB.txt
 netdisco/mibs/rfc/DSMON-MIB.txt
+netdisco/mibs/rfc/DVB-RCS-MIB.txt
 netdisco/mibs/rfc/EBN-MIB.txt
 netdisco/mibs/rfc/EFM-CU-MIB.txt
 netdisco/mibs/rfc/ENTITY-MIB.txt
@@ -1521,6 +1698,8 @@ netdisco/mibs/rfc/FCIP-MGMT-MIB.txt
 netdisco/mibs/rfc/FDDI-SMT73-MIB.txt
 netdisco/mibs/rfc/FIBRE-CHANNEL-FE-MIB.txt
 netdisco/mibs/rfc/FLOW-METER-MIB.txt
+netdisco/mibs/rfc/FOKUS-MIB.txt
+netdisco/mibs/rfc/FORCES-MIB.txt
 netdisco/mibs/rfc/FR-ATM-PVC-SERVICE-IWF-MIB.txt
 netdisco/mibs/rfc/FR-MFR-MIB.txt
 netdisco/mibs/rfc/FRAME-RELAY-DTE-MIB.txt
@@ -1550,6 +1729,7 @@ netdisco/mibs/rfc/IANA-LANGUAGE-MIB.txt
 netdisco/mibs/rfc/IANA-MALLOC-MIB.txt
 netdisco/mibs/rfc/IANA-MAU-MIB.txt
 netdisco/mibs/rfc/IANA-PRINTER-MIB.txt
+netdisco/mibs/rfc/IANA-PWE3-MIB.txt
 netdisco/mibs/rfc/IANA-RTPROTO-MIB.txt
 netdisco/mibs/rfc/IANATn3270eTC-MIB.txt
 netdisco/mibs/rfc/IANAifType-MIB.txt
@@ -1571,6 +1751,8 @@ netdisco/mibs/rfc/INTERFACETOPN-MIB.txt
 netdisco/mibs/rfc/IP-FORWARD-MIB.txt
 netdisco/mibs/rfc/IP-MIB.txt
 netdisco/mibs/rfc/IPATM-IPMC-MIB.txt
+netdisco/mibs/rfc/IPFIX-MIB.txt
+netdisco/mibs/rfc/IPFIX-SELECTOR-MIB.txt
 netdisco/mibs/rfc/IPMCAST-MIB.txt
 netdisco/mibs/rfc/IPMROUTE-STD-MIB.txt
 netdisco/mibs/rfc/IPOA-MIB.txt
@@ -1619,9 +1801,11 @@ netdisco/mibs/rfc/NEMO-MIB.txt
 netdisco/mibs/rfc/NETWORK-SERVICES-MIB.txt
 netdisco/mibs/rfc/NHRP-MIB.txt
 netdisco/mibs/rfc/NOTIFICATION-LOG-MIB.txt
+netdisco/mibs/rfc/NTPv4-MIB.txt
 netdisco/mibs/rfc/OPT-IF-MIB.txt
 netdisco/mibs/rfc/OSPF-MIB.txt
 netdisco/mibs/rfc/OSPF-TRAP-MIB.txt
+netdisco/mibs/rfc/OSPFV3-MIB.txt
 netdisco/mibs/rfc/P-BRIDGE-MIB.txt
 netdisco/mibs/rfc/PARALLEL-MIB.txt
 netdisco/mibs/rfc/PIM-BSR-MIB.txt
@@ -1638,6 +1822,12 @@ netdisco/mibs/rfc/PPP-IP-NCP-MIB.txt
 netdisco/mibs/rfc/PPP-LCP-MIB.txt
 netdisco/mibs/rfc/PPP-SEC-MIB.txt
 netdisco/mibs/rfc/PTOPO-MIB.txt
+netdisco/mibs/rfc/PW-ATM-MIB.txt
+netdisco/mibs/rfc/PW-ENET-STD-MIB.txt
+netdisco/mibs/rfc/PW-MPLS-STD-MIB.txt
+netdisco/mibs/rfc/PW-STD-MIB.txt
+netdisco/mibs/rfc/PW-TC-STD-MIB.txt
+netdisco/mibs/rfc/PW-TDM-MIB.txt
 netdisco/mibs/rfc/PerfHist-TC-MIB.txt
 netdisco/mibs/rfc/Printer-MIB.txt
 netdisco/mibs/rfc/Q-BRIDGE-MIB.txt
@@ -1750,6 +1940,8 @@ netdisco/mibs/rfc/URI-TC-MIB.txt
 netdisco/mibs/rfc/VDSL-LINE-EXT-MCM-MIB.txt
 netdisco/mibs/rfc/VDSL-LINE-EXT-SCM-MIB.txt
 netdisco/mibs/rfc/VDSL-LINE-MIB.txt
+netdisco/mibs/rfc/VDSL2-LINE-MIB.txt
+netdisco/mibs/rfc/VDSL2-LINE-TC-MIB.txt
 netdisco/mibs/rfc/VPN-TC-STD-MIB.txt
 netdisco/mibs/rfc/VRRP-MIB.txt
 netdisco/mibs/rfc/WWW-MIB.txt
@@ -1793,6 +1985,7 @@ netdisco/sql/upgrade-0.92-to-0.93.sql
 netdisco/sql/upgrade-0.93-to-0.94.sql
 netdisco/sql/upgrade-0.94-to-0.95.sql
 netdisco/sql/upgrade-0.95-to-1.0.sql
+netdisco/sql/upgrade-1.0-to-1.1.sql
 netdisco/sql/user_log.sql
 netdisco/sql/users.sql
 share/examples/netdisco/netdisco-topology.txt
diff --git a/net/netdisco/distinfo b/net/netdisco/distinfo
index b48b1af2faa..10ca8a6402f 100644
--- a/net/netdisco/distinfo
+++ b/net/netdisco/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2011/03/15 20:36:03 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2011/05/23 19:39:10 bouyer Exp $
 
-SHA1 (netdisco-1.0_with_mibs.tar.gz) = ee4903c72ca49403dc362f2457f7ecee270505d5
-RMD160 (netdisco-1.0_with_mibs.tar.gz) = 318d1c3e3dfd1abd8bd42f23d5f3c41fdaea0ff4
-Size (netdisco-1.0_with_mibs.tar.gz) = 12701473 bytes
+SHA1 (netdisco-1.1_with_mibs.tar.gz) = 181025062cc41fa509405b92708ea28b6d719b83
+RMD160 (netdisco-1.1_with_mibs.tar.gz) = e33e329dbfc722b0d4eb14aa3b16a69fb3b2e0d5
+Size (netdisco-1.1_with_mibs.tar.gz) = 13883416 bytes
 SHA1 (patch-aa) = 7f0f1bf04754aa9b1ee722b3f5137ef820737485
 SHA1 (patch-ad) = 74a867d4774860a812bce1df4e78213ab6438ab7