Upgrade to 0.95:

	support more devices
	severay bug fixes
[]        Apache-based HTTP authentication added.
[1107564] Disable BULKWALK on a per device or per device type basis:
          bulkwalk_no, arpnip_no, macsuck_no, discover_no use same syntax,
          see README
[1111654] Allow wrap in config file with \ char
[969117]  Automatically reloads config file in web front end when it changes.
[1392968] The map key is now automatically derived from configuration (i.e.,
          entries in node_map)
[1107578] Port Control via VLANs
[744598]  Inventory by subnet - IP Inventory feature improved to dump whole
          subnets
[1107579] The map can be clustered by device Location fields.  Thanks to Bjorn
          Isaksson for the patch.
[1393653] Modules for optional features (e.g., NBT) are now loaded when
          needed, not at startup.
[1116552] The devices in the "Choose Device" box on the Admin Panel
          are now listed in numerical order by IP address, to make
          it easier to find the one you're looking for.
[1116547] Contact field is now searched in the device search.  New backend
          database field time_recent in node database, for nodes that move
	  around a lot, it's the last time this node moved *back* to this
	  device (time_first is the first time ever).  Add macsuck_only,
	  arpnip_only, discover_only limits Get SSIDs and channel from
	  wireless base station ports, and display SSID in device
          port, add SSID inventory and SSID search
[1462199] Add SNMP timeout parameter to create_device()
[1492791] Added options snmp_force_v*
[]        pg_all, pg_run, pg_init, pg_back unified into single sql/pg script
          This script parses netdisco.conf for database settings.
[]        Add graph_png option to use png output from graphviz

6 files changed, 356 insertions, 98 deletions

diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index 53e084ae5f0..42b26adf5e6 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/11/10 17:42:48 tv Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/16 15:25:41 bouyer Exp $
 #
 
-DISTNAME=		netdisco-0.94_with_mibs
-PKGNAME=		netdisco-0.94
-PKGREVISION=		5
+DISTNAME=		netdisco-0.95_with_mibs
+PKGNAME=		netdisco-0.95
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=netdisco/}
 
@@ -21,6 +20,7 @@ DEPENDS+=		p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 DEPENDS+=		p5-Graph-[0-9]*:../../devel/p5-Graph
 DEPENDS+=		p5-GraphViz-[0-9]*:../../graphics/p5-GraphViz
 DEPENDS+=		p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
+DEPENDS+=		p5-Net-NBName-[0-9]*:../../net/p5-Net-NBName
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
@@ -39,10 +39,11 @@ REPLACE_PERL+=	mibs/chk_dups
 REPLACE_PERL+=	mibs/rm_cisco_dups
 REPLACE_PERL+=	mibs/chk_mibs
 REPLACE_PERL+=	mibs/snmpwalkmib
+REPLACE_PERL+=	sql/pg
 
-SUBST_CLASSES+=			installdir path var apachevers
+SUBST_CLASSES+=			installdir path varbase apachevers
 SUBST_STAGE.installdir=		pre-configure
-SUBST_FILES.installdir=		sql/pg_run sql/pg_init sql/pg_back
+SUBST_FILES.installdir=		sql/pg
 SUBST_FILES.installdir+=	bin/netdisco_daemon
 SUBST_FILES.installdir+=	netdisco
 SUBST_FILES.installdir+=	netdisco.conf netdisco.crontab
@@ -71,10 +72,10 @@ SUBST_FILES.path+=	INSTALL netdisco.crontab
 SUBST_SED.path=		-e "s|/usr/local/bin|${PREFIX}/bin|g"
 SUBST_MESSAGE.path=	Fixing hardcoded path.
 
-SUBST_STAGE.var=	pre-configure
-SUBST_FILES.var=	netdisco.conf
-SUBST_SED.var=		-e "s|@VARBASE@|${VARBASE}|g"
-SUBST_MESSAGE.var=	Fixing data directory.
+SUBST_STAGE.varbase=	pre-configure
+SUBST_FILES.varbase=	netdisco.conf
+SUBST_SED.varbase=		-e "s|@VARBASE@|${VARBASE}|g"
+SUBST_MESSAGE.varbase=	Fixing data directory.
 
 NETDISCOUSER?=	netdisco
 NETDISCOGROUP?=	netdisco
@@ -103,14 +104,14 @@ RCD_SCRIPTS=		netdisco
 
 .if ${PKG_APACHE} == "apache13"
 SUBST_STAGE.apachevers=	pre-configure
-SUBST_FILES.var=	netdisco_apache.conf
-SUBST_SED.var=		-e "s|@APACHE2@|\#uncomment for apache2|g"
-SUBST_MESSAGE.var=	Fixing config files for apache-1.3
+SUBST_FILES.apachevers=	netdisco_apache.conf
+SUBST_SED.apachevers=	-e "s|@APACHE2@|\#uncomment for apache2|g"
+SUBST_MESSAGE.apachevers= Fixing config files for apache-1.3
 .elif ${PKG_APACHE} == "apache2"
 SUBST_STAGE.apachevers=	pre-configure
-SUBST_FILES.var=	netdisco_apache.conf
-SUBST_SED.var=		-e "s|@APACHE2@||g"
-SUBST_MESSAGE.var=	Fixing config files for apache-2
+SUBST_FILES.apachevers=	netdisco_apache.conf
+SUBST_SED.apachevers=	-e "s|@APACHE2@||g"
+SUBST_MESSAGE.apachevers= Fixing config files for apache-2
 .endif
 
 do-build:
@@ -137,6 +138,7 @@ do-install:
 	    netdisco_apache.conf netdisco_apache_dir.conf; do \
 		${MV} ${PREFIX:Q}/netdisco/"$$i" ${EGDIR:Q}/ ;\
 	done
+	${MKDIR} ${PREFIX:Q}/netdisco/mason
 	${CHGRP} -R ${APACHE_GROUP} ${PREFIX:Q}/netdisco/mason
 	${CHMOD} -R 775 ${PREFIX:Q}/netdisco/mason
 
diff --git a/net/netdisco/PLIST b/net/netdisco/PLIST
index da0f7b8e214..b9f3be8a804 100644
--- a/net/netdisco/PLIST
+++ b/net/netdisco/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/09 20:25:28 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/12/16 15:25:41 bouyer Exp $
 netdisco/bin/catalyst_mac_vlan.pl
 netdisco/bin/debian_install.sh
 netdisco/bin/doc_munge
 netdisco/bin/fix_cvsroot
 netdisco/bin/parse_kismet_ap
 netdisco/bin/parse_mac
+netdisco/bin/pod_arg_link_fix
 netdisco/bin/port_control
 netdisco/bin/test_cache.pl
 netdisco/bin/test_cdp.pl
@@ -30,6 +31,7 @@ netdisco/html/admin_dev.html
 netdisco/html/admin_plug.gif
 netdisco/html/admin_reconfig.html
 netdisco/html/admin_user.html
+netdisco/html/apache_login.html
 netdisco/html/autohandler
 netdisco/html/change_pw.html
 netdisco/html/corner-bl.png
@@ -52,6 +54,7 @@ netdisco/html/icon_info.gif
 netdisco/html/icon_lock.gif
 netdisco/html/icon_note.gif
 netdisco/html/icon_up.gif
+netdisco/html/icon_v.gif
 netdisco/html/index.html
 netdisco/html/ip_search.html
 netdisco/html/jack_search.html
@@ -71,15 +74,23 @@ netdisco/html/traceroute.html
 netdisco/html/valid-html401.png
 netdisco/html/vcss.gif
 netdisco/mibs/README
+netdisco/mibs/UPGRADE
 netdisco/mibs/allied/ati-mib.mib
 netdisco/mibs/allied/atswtch2.mib
+netdisco/mibs/aruba/aruba-ap.my
+netdisco/mibs/aruba/aruba-switch.my
+netdisco/mibs/aruba/aruba.my
 netdisco/mibs/asante/ASANTE-AH1012-MIB.txt
 netdisco/mibs/asante/AsanteSwitchMIB.txt
 netdisco/mibs/chk_dups
 netdisco/mibs/chk_mibs
+netdisco/mibs/chk_mibs_all
 netdisco/mibs/cisco/A100-R1-MIB.my
+netdisco/mibs/cisco/ACTONA-ACTASTOR-MIB.my
 netdisco/mibs/cisco/ADMIN-AUTH-STATS-MIB.my
 netdisco/mibs/cisco/ADSL-DMT-LINE-MIB.my
+netdisco/mibs/cisco/AIRESPACE-REF-MIB.my
+netdisco/mibs/cisco/AIRESPACE-WIRELESS-MIB.my
 netdisco/mibs/cisco/ALTIGA-ADDRESS-STATS-MIB.my
 netdisco/mibs/cisco/ALTIGA-BMGT-STATS-MIB.my
 netdisco/mibs/cisco/ALTIGA-CAP.my
@@ -142,6 +153,7 @@ netdisco/mibs/cisco/CISCO-ADSL-CAP-LINE-MIB.my
 netdisco/mibs/cisco/CISCO-ADSL-DMT-LINE-MIB.my
 netdisco/mibs/cisco/CISCO-ALPS-MIB.my
 netdisco/mibs/cisco/CISCO-ANNOUNCEMENT-MIB.my
+netdisco/mibs/cisco/CISCO-APPLIANCE-REDUNDANCY-MIB.my
 netdisco/mibs/cisco/CISCO-APS-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-APS-MIB.my
 netdisco/mibs/cisco/CISCO-ASPP-MIB.my
@@ -166,6 +178,7 @@ netdisco/mibs/cisco/CISCO-ATM-SWITCH-FR-IWF-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-SWITCH-FR-RM-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-TRAFFIC-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-TRUNK-MIB.my
+netdisco/mibs/cisco/CISCO-ATM-TRUNK-STAT-MIB.my
 netdisco/mibs/cisco/CISCO-ATM-VIRTUAL-IF-MIB.my
 netdisco/mibs/cisco/CISCO-ATM2-MIB.my
 netdisco/mibs/cisco/CISCO-AUTHORIZATION-STATS-MIB.my
@@ -174,6 +187,7 @@ netdisco/mibs/cisco/CISCO-BCP-MIB.my
 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-BSC-MIB.my
 netdisco/mibs/cisco/CISCO-BSTUN-MIB.my
 netdisco/mibs/cisco/CISCO-BULK-FILE-MIB.my
@@ -182,6 +196,7 @@ netdisco/mibs/cisco/CISCO-C12000-IF-HC-COUNTERS-MIB.my
 netdisco/mibs/cisco/CISCO-C2900-MIB.my
 netdisco/mibs/cisco/CISCO-C6200-MIB.my
 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-METERING-MIB.my
@@ -203,12 +218,16 @@ netdisco/mibs/cisco/CISCO-CASA-MIB.my
 netdisco/mibs/cisco/CISCO-CAT6K-CROSSBAR-MIB.my
 netdisco/mibs/cisco/CISCO-CATOS-ACL-QOS-MIB.my
 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-MIB.my
 netdisco/mibs/cisco/CISCO-CDP-MIB.my
+netdisco/mibs/cisco/CISCO-CEF-MIB.my
+netdisco/mibs/cisco/CISCO-CEF-TC.my
 netdisco/mibs/cisco/CISCO-CFS-MIB.my
 netdisco/mibs/cisco/CISCO-CHANNEL-MIB.my
+netdisco/mibs/cisco/CISCO-CIDS-MIB.my
 netdisco/mibs/cisco/CISCO-CIPCMPC-MIB.my
 netdisco/mibs/cisco/CISCO-CIPCSNA-MIB.my
 netdisco/mibs/cisco/CISCO-CIPLAN-MIB.my
@@ -218,6 +237,7 @@ netdisco/mibs/cisco/CISCO-CIRCUIT-INTERFACE-MIB.my
 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-MIB.my
 netdisco/mibs/cisco/CISCO-COMPRESSION-SERVICE-ADAPTER-MIB.my
 netdisco/mibs/cisco/CISCO-CONFIG-COPY-MIB.my
@@ -225,24 +245,32 @@ netdisco/mibs/cisco/CISCO-CONFIG-MAN-MIB.my
 netdisco/mibs/cisco/CISCO-CONTENT-ENGINE-MIB.my
 netdisco/mibs/cisco/CISCO-CONTENT-NETWORK-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-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-DIFFSERV-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-DIST-DIRECTOR-MIB.my
 netdisco/mibs/cisco/CISCO-DLCSW-MIB.my
 netdisco/mibs/cisco/CISCO-DLSW-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-DLSW-MIB.my
 netdisco/mibs/cisco/CISCO-DM-MIB.my
 netdisco/mibs/cisco/CISCO-DNS-CLIENT-MIB.my
+netdisco/mibs/cisco/CISCO-DNS-SERVER-MIB.my
 netdisco/mibs/cisco/CISCO-DOCS-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-DOCS-REMOTE-QUERY-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-ASSOCIATION-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-CONTEXT-SERVICES-CLIENT-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-CONTEXT-SERVICES-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-IF-MIB.my
+netdisco/mibs/cisco/CISCO-DOT11-LBS-MIB.my
+netdisco/mibs/cisco/CISCO-DOT11-QOS-MIB.my
 netdisco/mibs/cisco/CISCO-DOT11-RADIO-DIAGNOSTIC-MIB.my
+netdisco/mibs/cisco/CISCO-DOT11-SSID-SECURITY-MIB.my
+netdisco/mibs/cisco/CISCO-DOT11-WIDS-MIB.my
 netdisco/mibs/cisco/CISCO-DS0-CROSS-CONNECT-MIB.my
 netdisco/mibs/cisco/CISCO-DS0BUNDLE-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-DS0BUNDLE-MIB.my
@@ -252,8 +280,13 @@ netdisco/mibs/cisco/CISCO-DSL-PROVISION-MIB.my
 netdisco/mibs/cisco/CISCO-DSP-MGMT-MIB.my
 netdisco/mibs/cisco/CISCO-DSPU-MIB.my
 netdisco/mibs/cisco/CISCO-DYNAMIC-ARP-INSPECTION-MIB.my
+netdisco/mibs/cisco/CISCO-DYNAMIC-PORT-VSAN-MIB.my
+netdisco/mibs/cisco/CISCO-EIGRP-MIB.my
+netdisco/mibs/cisco/CISCO-EMBEDDED-EVENT-MGR-MIB.my
 netdisco/mibs/cisco/CISCO-ENHANCED-IMAGE-MIB.my
+netdisco/mibs/cisco/CISCO-ENHANCED-IPSEC-FLOW-MIB.my
 netdisco/mibs/cisco/CISCO-ENHANCED-MEMPOOL-MIB.my
+netdisco/mibs/cisco/CISCO-ENHANCED-SLB-MIB.my
 netdisco/mibs/cisco/CISCO-ENHANCED-WRED-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-ALARM-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-ASSET-MIB.my
@@ -266,13 +299,17 @@ netdisco/mibs/cisco/CISCO-ENTITY-SENSOR-MIB.my
 netdisco/mibs/cisco/CISCO-ENTITY-VENDORTYPE-OID-MIB.my
 netdisco/mibs/cisco/CISCO-ENVMON-MIB.my
 netdisco/mibs/cisco/CISCO-EPM-NOTIFICATION-MIB.my
+netdisco/mibs/cisco/CISCO-ETHER-CFM-MIB.my
+netdisco/mibs/cisco/CISCO-ETHERNET-ACCESS-MIB.my
 netdisco/mibs/cisco/CISCO-EXT-SCSI-MIB.my
 netdisco/mibs/cisco/CISCO-FABRIC-C12K-MIB.my
 netdisco/mibs/cisco/CISCO-FABRIC-HFR-MIB.my
 netdisco/mibs/cisco/CISCO-FABRIC-MCAST-APPL-MIB.my
 netdisco/mibs/cisco/CISCO-FABRIC-MCAST-MIB.my
 netdisco/mibs/cisco/CISCO-FASTHUB-MIB.my
+netdisco/mibs/cisco/CISCO-FC-DEVICE-ALIAS-MIB.my
 netdisco/mibs/cisco/CISCO-FC-FE-MIB.my
+netdisco/mibs/cisco/CISCO-FC-MULTICAST-MIB.my
 netdisco/mibs/cisco/CISCO-FC-ROUTE-MIB.my
 netdisco/mibs/cisco/CISCO-FC-SPAN-MIB.my
 netdisco/mibs/cisco/CISCO-FCC-MIB.my
@@ -280,18 +317,24 @@ netdisco/mibs/cisco/CISCO-FCIP-MGMT-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-FCIP-MGMT-MIB.my
 netdisco/mibs/cisco/CISCO-FCPING-MIB.my
 netdisco/mibs/cisco/CISCO-FCS-MIB.my
+netdisco/mibs/cisco/CISCO-FCSP-MIB.my
 netdisco/mibs/cisco/CISCO-FCTRACEROUTE-MIB.my
 netdisco/mibs/cisco/CISCO-FDMI-MIB.my
 netdisco/mibs/cisco/CISCO-FEATURE-CONTROL-MIB.my
+netdisco/mibs/cisco/CISCO-FICON-MIB.my
+netdisco/mibs/cisco/CISCO-FILTER-GROUP-MIB.my
 netdisco/mibs/cisco/CISCO-FIPS-STATS-MIB.my
 netdisco/mibs/cisco/CISCO-FIREWALL-MIB.my
+netdisco/mibs/cisco/CISCO-FIREWALL-TC.my
 netdisco/mibs/cisco/CISCO-FLASH-MIB.my
+netdisco/mibs/cisco/CISCO-FLEX-LINKS-MIB.my
 netdisco/mibs/cisco/CISCO-FRAME-RELAY-MIB.my
 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-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
@@ -305,18 +348,29 @@ netdisco/mibs/cisco/CISCO-HSRP-MIB.my
 netdisco/mibs/cisco/CISCO-ICSUDSU-MIB.my
 netdisco/mibs/cisco/CISCO-IDSL-LINE-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-ATM2-PVCTRAP-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-DHCP-SERVER-EXT-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-DHCP-SERVER-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-DOT11-QOS-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-DOT11-QOS-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-FRR-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-IP-FORWARD-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-IP-MIB.my
+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-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-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-SCTP-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-SCTP-MIB.my
 netdisco/mibs/cisco/CISCO-IETF-VDSL-LINE-MIB.my
+netdisco/mibs/cisco/CISCO-IETF-VRRP-MIB.my
 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
@@ -325,14 +379,17 @@ netdisco/mibs/cisco/CISCO-IF-THRESHOLD-MIB.my
 netdisco/mibs/cisco/CISCO-IGMP-FILTER-MIB.my
 netdisco/mibs/cisco/CISCO-IGMP-SNOOPING-MIB.my
 netdisco/mibs/cisco/CISCO-IKE-CONFIGURATION-MIB.my
+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-MIB.my
+netdisco/mibs/cisco/CISCO-IMAGE-TC.my
 netdisco/mibs/cisco/CISCO-IMAGE-UPGRADE-MIB.my
 netdisco/mibs/cisco/CISCO-IP-ENCRYPTION-MIB.my
 netdisco/mibs/cisco/CISCO-IP-IF-MIB.my
 netdisco/mibs/cisco/CISCO-IP-LOCAL-POOL-MIB.my
+netdisco/mibs/cisco/CISCO-IP-NW-DISCOVERY-MIB.my
 netdisco/mibs/cisco/CISCO-IP-PROTOCOL-FILTER-MIB.my
 netdisco/mibs/cisco/CISCO-IP-STAT-MIB.my
 netdisco/mibs/cisco/CISCO-IP-UPLINK-REDIRECT-MIB.my
@@ -349,6 +406,7 @@ netdisco/mibs/cisco/CISCO-ISCSI-MIB.my
 netdisco/mibs/cisco/CISCO-ISDN-MIB.my
 netdisco/mibs/cisco/CISCO-ISDNU-IF-MIB.my
 netdisco/mibs/cisco/CISCO-ISNS-CLIENT-MIB.my
+netdisco/mibs/cisco/CISCO-ISNS-IP-NW-DISCOVERY-MIB.my
 netdisco/mibs/cisco/CISCO-ITP-ACL-MIB.my
 netdisco/mibs/cisco/CISCO-ITP-ACT-MIB.my
 netdisco/mibs/cisco/CISCO-ITP-GACT-MIB.my
@@ -358,6 +416,7 @@ netdisco/mibs/cisco/CISCO-ITP-GSP-MIB.my
 netdisco/mibs/cisco/CISCO-ITP-GSP2-MIB.my
 netdisco/mibs/cisco/CISCO-ITP-MLR-MIB.my
 netdisco/mibs/cisco/CISCO-ITP-MONITOR-MIB.my
+netdisco/mibs/cisco/CISCO-ITP-MSU-RATES-MIB.my
 netdisco/mibs/cisco/CISCO-ITP-RT-MIB.my
 netdisco/mibs/cisco/CISCO-ITP-SCCP-MIB.my
 netdisco/mibs/cisco/CISCO-ITP-SP-MIB.my
@@ -369,6 +428,7 @@ netdisco/mibs/cisco/CISCO-L2-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-L2-DEV-MONITORING-MIB.my
 netdisco/mibs/cisco/CISCO-L2-TUNNEL-CONFIG-MIB.my
 netdisco/mibs/cisco/CISCO-L2L3-INTERFACE-CONFIG-MIB.my
+netdisco/mibs/cisco/CISCO-L4L7MODULE-RESOURCE-LIMIT-MIB.my
 netdisco/mibs/cisco/CISCO-LAG-MIB.my
 netdisco/mibs/cisco/CISCO-LATITUDE-MIB.my
 netdisco/mibs/cisco/CISCO-LEC-DATA-VCC-MIB.my
@@ -377,9 +437,25 @@ netdisco/mibs/cisco/CISCO-LECS-MIB.my
 netdisco/mibs/cisco/CISCO-LES-MIB.my
 netdisco/mibs/cisco/CISCO-LICENSE-MGR-MIB.my
 netdisco/mibs/cisco/CISCO-LICENSE-MIB.my
+netdisco/mibs/cisco/CISCO-LINK-ERROR-MONITOR-MIB.my
 netdisco/mibs/cisco/CISCO-LOCAL-DIRECTOR-MIB.my
 netdisco/mibs/cisco/CISCO-LRE-CPE-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-AP-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-CCX-RM-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-CLIENT-ROAMING-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-CALIB-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-IDS-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-LINKTEST-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-MFP-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-QOS-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-REAP-MIB.my
+netdisco/mibs/cisco/CISCO-LWAPP-TC-MIB.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
+netdisco/mibs/cisco/CISCO-LWAPP-WLAN-SECURITY-MIB.my
 netdisco/mibs/cisco/CISCO-MAC-NOTIFICATION-MIB.my
+netdisco/mibs/cisco/CISCO-MAU-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-MEDIA-GATEWAY-MIB.my
 netdisco/mibs/cisco/CISCO-MEMORY-POOL-MIB.my
 netdisco/mibs/cisco/CISCO-METRO-PHY-MIB.my
@@ -401,7 +477,9 @@ netdisco/mibs/cisco/CISCO-MMAIL-DIAL-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-MOBILE-IP-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
 netdisco/mibs/cisco/CISCO-MVPN-MIB.my
+netdisco/mibs/cisco/CISCO-NAC-NAD-MIB.my
 netdisco/mibs/cisco/CISCO-NBAR-PROTOCOL-DISCOVERY-MIB.my
 netdisco/mibs/cisco/CISCO-NDE-MIB.my
 netdisco/mibs/cisco/CISCO-NETFLOW-MIB.my
@@ -423,12 +501,16 @@ netdisco/mibs/cisco/CISCO-PAE-MIB.my
 netdisco/mibs/cisco/CISCO-PAGP-MIB.my
 netdisco/mibs/cisco/CISCO-PIM-MIB.my
 netdisco/mibs/cisco/CISCO-PING-MIB.my
+netdisco/mibs/cisco/CISCO-PKI-PARTICIPATION-MIB.my
 netdisco/mibs/cisco/CISCO-PNNI-MIB.my
+netdisco/mibs/cisco/CISCO-POE-PD-MIB.my
 netdisco/mibs/cisco/CISCO-POP-MGMT-MIB.my
 netdisco/mibs/cisco/CISCO-PORT-CHANNEL-MIB.my
 netdisco/mibs/cisco/CISCO-PORT-QOS-MIB.my
 netdisco/mibs/cisco/CISCO-PORT-SECURITY-MIB.my
 netdisco/mibs/cisco/CISCO-PORT-STORM-CONTROL-MIB.my
+netdisco/mibs/cisco/CISCO-PORT-TRACK-MIB.my
+netdisco/mibs/cisco/CISCO-POWER-ETHERNET-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-PPPOE-MIB.my
 netdisco/mibs/cisco/CISCO-PRIVATE-VLAN-MIB.my
 netdisco/mibs/cisco/CISCO-PROCESS-MIB.my
@@ -436,13 +518,16 @@ netdisco/mibs/cisco/CISCO-PRODUCTS-MIB.my
 netdisco/mibs/cisco/CISCO-PROP-ATM-IF-MIB.my
 netdisco/mibs/cisco/CISCO-PROXY-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-PSA-MICROCODE-MIB.my
+netdisco/mibs/cisco/CISCO-PSD-CLIENT-MIB.my
 netdisco/mibs/cisco/CISCO-PSM-MIB.my
 netdisco/mibs/cisco/CISCO-PTOPO-EXTN-MIB.my
+netdisco/mibs/cisco/CISCO-QINQ-VLAN-MIB.my
 netdisco/mibs/cisco/CISCO-QLLC01-MIB.my
 netdisco/mibs/cisco/CISCO-QOS-PIB-MIB.my
 netdisco/mibs/cisco/CISCO-QOS-POLICY-CONFIG-MIB.my
 netdisco/mibs/cisco/CISCO-QUEUE-MIB.my
 netdisco/mibs/cisco/CISCO-RADIUS-MIB.my
+netdisco/mibs/cisco/CISCO-REMOTE-ACCESS-MONITOR-MIB.my
 netdisco/mibs/cisco/CISCO-REPEATER-MIB.my
 netdisco/mibs/cisco/CISCO-RF-MIB.my
 netdisco/mibs/cisco/CISCO-RF-SUPPLEMENTAL-MIB.my
@@ -451,8 +536,13 @@ netdisco/mibs/cisco/CISCO-RMON-CONFIG-MIB.my
 netdisco/mibs/cisco/CISCO-RPMS-MIB.my
 netdisco/mibs/cisco/CISCO-RSCN-MIB.my
 netdisco/mibs/cisco/CISCO-RSRB-MIB.my
-netdisco/mibs/cisco/CISCO-RTTMON-MIB-120_5_T.my
+netdisco/mibs/cisco/CISCO-RTTMON-ICMP-MIB.my
+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-SANTAP-MIB.my
+netdisco/mibs/cisco/CISCO-SCSI-FLOW-MIB.my
 netdisco/mibs/cisco/CISCO-SCSI-MIB.my
 netdisco/mibs/cisco/CISCO-SCTP-MIB.my
 netdisco/mibs/cisco/CISCO-SDLLC-MIB.my
@@ -463,22 +553,29 @@ netdisco/mibs/cisco/CISCO-SIBU-MANAGERS-MIB.my
 netdisco/mibs/cisco/CISCO-SIBU-STACKABLE-DUAL-SPEED-HUB-MIB.my
 netdisco/mibs/cisco/CISCO-SIP-UA-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-SMI.my
 netdisco/mibs/cisco/CISCO-SNA-LLC-MIB.my
 netdisco/mibs/cisco/CISCO-SNAPSHOT-MIB.my
+netdisco/mibs/cisco/CISCO-SNMP-NOTIFICATION-EXT-MIB.my
+netdisco/mibs/cisco/CISCO-SNMP-TARGET-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-SNMP-VACM-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-SONET-MIB.my
 netdisco/mibs/cisco/CISCO-SP-MIB.my
 netdisco/mibs/cisco/CISCO-SRP-MIB.my
+netdisco/mibs/cisco/CISCO-SRST-MIB.my
 netdisco/mibs/cisco/CISCO-SSG-MIB.my
 netdisco/mibs/cisco/CISCO-SSL-PROXY-MIB.my
+netdisco/mibs/cisco/CISCO-SSM-PROV-MIB.my
 netdisco/mibs/cisco/CISCO-ST-TC.my
 netdisco/mibs/cisco/CISCO-STACK-MIB.my
 netdisco/mibs/cisco/CISCO-STACKMAKER-MIB.my
+netdisco/mibs/cisco/CISCO-STACKWISE-MIB.my
 netdisco/mibs/cisco/CISCO-STP-EXTENSIONS-MIB.my
 netdisco/mibs/cisco/CISCO-STUN-MIB.my
+netdisco/mibs/cisco/CISCO-SVC-INTERFACE-MIB.my
 netdisco/mibs/cisco/CISCO-SVI-AUTOSTATE-MIB.my
 netdisco/mibs/cisco/CISCO-SWITCH-CGMP-MIB.my
 netdisco/mibs/cisco/CISCO-SWITCH-ENGINE-MIB.my
@@ -490,15 +587,19 @@ netdisco/mibs/cisco/CISCO-SYSLOG-MIB.my
 netdisco/mibs/cisco/CISCO-SYSTEM-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-SYSTEM-MIB.my
 netdisco/mibs/cisco/CISCO-TAP-MIB.my
+netdisco/mibs/cisco/CISCO-TAP2-MIB.my
 netdisco/mibs/cisco/CISCO-TBRIDGE-DEV-IF-MIB.my
 netdisco/mibs/cisco/CISCO-TC-NO-U32.my
 netdisco/mibs/cisco/CISCO-TC.my
 netdisco/mibs/cisco/CISCO-TCP-MIB.my
 netdisco/mibs/cisco/CISCO-TCPOFFLOAD-MIB.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-TS-STACK-MIB.my
 netdisco/mibs/cisco/CISCO-UDLDP-MIB.my
+netdisco/mibs/cisco/CISCO-UNIFIED-FIREWALL-MIB.my
+netdisco/mibs/cisco/CISCO-UNITY-EXPRESS-MIB.my
 netdisco/mibs/cisco/CISCO-VINES-MIB.my
 netdisco/mibs/cisco/CISCO-VIRTUAL-NW-IF-MIB.my
 netdisco/mibs/cisco/CISCO-VISM-ATM-TRUNK-MIB.my
@@ -520,19 +621,23 @@ netdisco/mibs/cisco/CISCO-VISM-XGCP-EXT.my
 netdisco/mibs/cisco/CISCO-VLAN-BRIDGE-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
 netdisco/mibs/cisco/CISCO-VMPS-MIB.my
 netdisco/mibs/cisco/CISCO-VOA-MIB.my
 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-CAS-MODULE-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-COMMON-DIAL-CONTROL-MIB.my
+netdisco/mibs/cisco/CISCO-VOICE-CONNECTIVITY-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-DIAL-CONTROL-MIB.my
 netdisco/mibs/cisco/CISCO-VOICE-DNIS-MIB.my
 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-TONE-CADENCE-MIB.my
 netdisco/mibs/cisco/CISCO-VPDN-MGMT-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-VPDN-MGMT-MIB.my
 netdisco/mibs/cisco/CISCO-VSAN-MIB.my
@@ -542,6 +647,7 @@ netdisco/mibs/cisco/CISCO-VTP-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-AAL2-PROFILES-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-ANNOUNCEMENT-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-ATM-CONN-MIB.my
+netdisco/mibs/cisco/CISCO-WAN-ATM-CONN-STAT-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-ATM-COSB-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-ATM-CUG-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-ATM-PARTY-MIB.my
@@ -582,6 +688,8 @@ netdisco/mibs/cisco/CISCO-WAN-T38-FAXRELAY-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-TOPOLOGY-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-TRAP-VARS-MIB.my
 netdisco/mibs/cisco/CISCO-WAN-VISM-TONE-PLAN-MIB.my
+netdisco/mibs/cisco/CISCO-WDS-IDS-MIB.my
+netdisco/mibs/cisco/CISCO-WDS-INFO-MIB.my
 netdisco/mibs/cisco/CISCO-WIRELESS-DOCS-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-WIRELESS-DOCS-IF-MIB.my
 netdisco/mibs/cisco/CISCO-WIRELESS-EXP-MIB.my
@@ -591,10 +699,13 @@ netdisco/mibs/cisco/CISCO-WIRELESS-P2MP-PHY-MIB.my
 netdisco/mibs/cisco/CISCO-WIRELESS-P2MP-RF-METRICS-MIB.my
 netdisco/mibs/cisco/CISCO-WIRELESS-P2P-BPI-MIB.my
 netdisco/mibs/cisco/CISCO-WIRELESS-TC-MIB.my
+netdisco/mibs/cisco/CISCO-WLAN-MAN-MIB.my
 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-MIB.my
+netdisco/mibs/cisco/CISCO-ZS-EXT-MIB.my
 netdisco/mibs/cisco/CISCO-ZS-MIB.my
 netdisco/mibs/cisco/CISCOWAN-SMI.my
 netdisco/mibs/cisco/CISCOWORKS-MIB.my
@@ -613,8 +724,6 @@ netdisco/mibs/cisco/GENERICOBJECT-MIB.my
 netdisco/mibs/cisco/IBM-6611-APPN-MIB.my
 netdisco/mibs/cisco/IGMP-MIB.my
 netdisco/mibs/cisco/IMA-MIB.my
-netdisco/mibs/cisco/INT-SERV-GUARANTEED-MIB.my
-netdisco/mibs/cisco/INT-SERV-MIB.my
 netdisco/mibs/cisco/IPMROUTE-MIB.my
 netdisco/mibs/cisco/LAN-EMULATION-CLIENT-MIB.my
 netdisco/mibs/cisco/LANOPTICS-ALERTS-MIB.my
@@ -623,11 +732,12 @@ netdisco/mibs/cisco/LANOPTICS-ETHERNET-OPTION-MIB.my
 netdisco/mibs/cisco/LANOPTICS-HUB-MIB.my
 netdisco/mibs/cisco/LANOPTICS-RING-MANAGER-MIB.my
 netdisco/mibs/cisco/LANOPTICS-SYSTEM-MIB.my
-netdisco/mibs/cisco/LS100-R2-MIB.my
+netdisco/mibs/cisco/LS100-R3-MIB.my
 netdisco/mibs/cisco/LS2020-R2-MIB.my
 netdisco/mibs/cisco/MADGEBOX-MIB.my
 netdisco/mibs/cisco/MADGERSW-MIB.my
 netdisco/mibs/cisco/METRO1500-MIB.my
+netdisco/mibs/cisco/MPLS-L3VPN-STD-MIB.my
 netdisco/mibs/cisco/MPLS-LDP-MIB.my
 netdisco/mibs/cisco/MPLS-LSR-MIB.my
 netdisco/mibs/cisco/MPLS-TE-MIB.my
@@ -654,15 +764,99 @@ netdisco/mibs/cisco/OLD-CISCO-TS-MIB.my
 netdisco/mibs/cisco/OLD-CISCO-VINES-MIB.my
 netdisco/mibs/cisco/OLD-CISCO-XNS-MIB.my
 netdisco/mibs/cisco/ONS15501-MIB.my
+netdisco/mibs/cisco/PCUBE-CONFIG-COPY.my
+netdisco/mibs/cisco/PCUBE-ENGAGE-MIB.my
+netdisco/mibs/cisco/PCUBE-PRODUCTS.my
+netdisco/mibs/cisco/PCUBE-SE-MIB.my
+netdisco/mibs/cisco/PCUBE-SMI.my
 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/v1-readme
 netdisco/mibs/cisco/v2-readme
 netdisco/mibs/cisco1.diff
 netdisco/mibs/cisco2.diff
-netdisco/mibs/foundry/B2R07604A.MIB
-netdisco/mibs/foundry/foundry.mib
+netdisco/mibs/dell/apollo.mib
+netdisco/mibs/dell/dell_ita.mib
+netdisco/mibs/dell/env_mib.mib
+netdisco/mibs/dell/macbaseprio.mib
+netdisco/mibs/dell/mnginf.mib
+netdisco/mibs/dell/qosclimib.mib
+netdisco/mibs/dell/rl_sensor.mib
+netdisco/mibs/dell/rlaaa.mib
+netdisco/mibs/dell/rlapplication.mib
+netdisco/mibs/dell/rlcopy.mib
+netdisco/mibs/dell/rldhcp.mib
+netdisco/mibs/dell/rldnscl.mib
+netdisco/mibs/dell/rlfft.mib
+netdisco/mibs/dell/rlfile.mib
+netdisco/mibs/dell/rlinterfaces.mib
+netdisco/mibs/dell/rlip.mib
+netdisco/mibs/dell/rlipmulticast.mib
+netdisco/mibs/dell/rliprouter.mib
+netdisco/mibs/dell/rllcli.mib
+netdisco/mibs/dell/rlmng.mib
+netdisco/mibs/dell/rlphy.mib
+netdisco/mibs/dell/rlphysdescription.mib
+netdisco/mibs/dell/rlqosserv.mib
+netdisco/mibs/dell/rlrmon.mib
+netdisco/mibs/dell/rlsnmp.mib
+netdisco/mibs/dell/rlsnmpv2.mib
+netdisco/mibs/dell/rlsntp.mib
+netdisco/mibs/dell/rlssh.mib
+netdisco/mibs/dell/rlssl.mib
+netdisco/mibs/dell/rlsyslog.mib
+netdisco/mibs/dell/rltuning.mib
+netdisco/mibs/dell/rludp.mib
+netdisco/mibs/dell/rlvlan.mib
+netdisco/mibs/dell/trunk.mib
+netdisco/mibs/diff_dir
+netdisco/mibs/extreme/extreme-base.mib
+netdisco/mibs/extreme/extreme-dlcs.mib
+netdisco/mibs/extreme/extreme-eaps.mib
+netdisco/mibs/extreme/extreme-edp.mib
+netdisco/mibs/extreme/extreme-esrp.mib
+netdisco/mibs/extreme/extreme-fdb.mib
+netdisco/mibs/extreme/extreme-filetransfer.mib
+netdisco/mibs/extreme/extreme-netflow.mib
+netdisco/mibs/extreme/extreme-np.mib
+netdisco/mibs/extreme/extreme-ospf.mib
+netdisco/mibs/extreme/extreme-pbqos.mib
+netdisco/mibs/extreme/extreme-poe.mib
+netdisco/mibs/extreme/extreme-port.mib
+netdisco/mibs/extreme/extreme-pos.mib
+netdisco/mibs/extreme/extreme-qos.mib
+netdisco/mibs/extreme/extreme-rtstats.mib
+netdisco/mibs/extreme/extreme-services.mib
+netdisco/mibs/extreme/extreme-slb.mib
+netdisco/mibs/extreme/extreme-snmpv3.mib
+netdisco/mibs/extreme/extreme-stp-extensions.mib
+netdisco/mibs/extreme/extreme-system.mib
+netdisco/mibs/extreme/extreme-trap.mib
+netdisco/mibs/extreme/extreme-trappoll.mib
+netdisco/mibs/extreme/extreme-v2trap.mib
+netdisco/mibs/extreme/extreme-vc.mib
+netdisco/mibs/extreme/extreme-vlan.mib
+netdisco/mibs/foundry/FOUNDRY-CAR-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-AGENT-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-APPLETALK-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-BGP4-GROUP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-IGMP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-IP-ACL-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-IP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-IP-VRRP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-IPX-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-OSPF-GROUP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-POS-GROUP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-ROOT-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-ROUTER-TRAP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-SWITCH-GROUP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-TRAP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-VSRP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-SN-WIRELESS-GROUP-MIB.mib
+netdisco/mibs/foundry/FOUNDRY-VLAN-CAR-MIB.mib
 netdisco/mibs/hp/h2r07604c.mib
 netdisco/mibs/hp/hp-sn-agent.mib
 netdisco/mibs/hp/hp-sn-appletalk.mib
@@ -675,6 +869,10 @@ netdisco/mibs/hp/hp-sn-pos.mib
 netdisco/mibs/hp/hp-sn-sw-l4-switch.mib
 netdisco/mibs/hp/hp-sn-trap.mib
 netdisco/mibs/hp/hp_procurve_420.mib
+netdisco/mibs/hp/hpacmxlbase.mib
+netdisco/mibs/hp/hpacmxlifext.mib
+netdisco/mibs/hp/hpacmxlmemproc.mib
+netdisco/mibs/hp/hpacmxlsystem.mib
 netdisco/mibs/hp/hpentmib.mib
 netdisco/mibs/hp/hphttpmg.mib
 netdisco/mibs/hp/hpicf8023rptr.mib
@@ -682,21 +880,30 @@ netdisco/mibs/hp/hpicfbasic.mib
 netdisco/mibs/hp/hpicfbridge.mib
 netdisco/mibs/hp/hpicfchain.mib
 netdisco/mibs/hp/hpicfchassis.mib
+netdisco/mibs/hp/hpicfconnectionratefilter.mib
+netdisco/mibs/hp/hpicfdot1x.mib
 netdisco/mibs/hp/hpicfdownload.mib
 netdisco/mibs/hp/hpicfetwist.mib
 netdisco/mibs/hp/hpicfff.mib
 netdisco/mibs/hp/hpicfgenrptr.mib
+netdisco/mibs/hp/hpicfipaddress.mib
 netdisco/mibs/hp/hpicfiproute.mib
+netdisco/mibs/hp/hpicfjumbo.mib
 netdisco/mibs/hp/hpicflinktest.mib
 netdisco/mibs/hp/hpicfoid.mib
 netdisco/mibs/hp/hpicfospf.mib
+netdisco/mibs/hp/hpicfpim.mib
+netdisco/mibs/hp/hpicfratelimit.mib
 netdisco/mibs/hp/hpicfrip.mib
 netdisco/mibs/hp/hpicfsecurity.mib
 netdisco/mibs/hp/hpicfsntp.mib
 netdisco/mibs/hp/hpicfstack.mib
 netdisco/mibs/hp/hpicftc.mib
+netdisco/mibs/hp/hpicfudpforward.mib
+netdisco/mibs/hp/hpicfusrauth.mib
 netdisco/mibs/hp/hpicfvg.mib
 netdisco/mibs/hp/hpicfvgrptr.mib
+netdisco/mibs/hp/hpicfvrrp.mib
 netdisco/mibs/hp/hpicfxrrp.mib
 netdisco/mibs/hp/hpnetswitch.mib
 netdisco/mibs/hp/hpr-sn-switch.mib
@@ -708,12 +915,46 @@ netdisco/mibs/hp/hpswitchstat.mib
 netdisco/mibs/hp/hpvlan.mib
 netdisco/mibs/hp/ipx.mib
 netdisco/mibs/hp/orinoco.mib
+netdisco/mibs/hp/sflow.mib
 netdisco/mibs/hp1.diff
+netdisco/mibs/juniper/mib-jnx-atm-cos.txt
+netdisco/mibs/juniper/mib-jnx-atm.txt
+netdisco/mibs/juniper/mib-jnx-bgpmib2.txt
+netdisco/mibs/juniper/mib-jnx-cfgmgmt.txt
+netdisco/mibs/juniper/mib-jnx-chas-defines.txt
+netdisco/mibs/juniper/mib-jnx-chassis-alarm.txt
+netdisco/mibs/juniper/mib-jnx-chassis.txt
+netdisco/mibs/juniper/mib-jnx-coll.txt
+netdisco/mibs/juniper/mib-jnx-cos.txt
+netdisco/mibs/juniper/mib-jnx-dcu.txt
+netdisco/mibs/juniper/mib-jnx-dfc.txt
+netdisco/mibs/juniper/mib-jnx-exp.txt
+netdisco/mibs/juniper/mib-jnx-firewall.txt
+netdisco/mibs/juniper/mib-jnx-hostresources.txt
+netdisco/mibs/juniper/mib-jnx-if-extensions.txt
+netdisco/mibs/juniper/mib-jnx-ipsec-monitor-asp.txt
+netdisco/mibs/juniper/mib-jnx-ipv4.txt
+netdisco/mibs/juniper/mib-jnx-ipv6.txt
+netdisco/mibs/juniper/mib-jnx-ldp.txt
+netdisco/mibs/juniper/mib-jnx-mac.txt
+netdisco/mibs/juniper/mib-jnx-mpls.txt
+netdisco/mibs/juniper/mib-jnx-ping.txt
+netdisco/mibs/juniper/mib-jnx-pmon.txt
+netdisco/mibs/juniper/mib-jnx-rmon.txt
+netdisco/mibs/juniper/mib-jnx-rpf.txt
+netdisco/mibs/juniper/mib-jnx-rsvp.txt
+netdisco/mibs/juniper/mib-jnx-scu.txt
+netdisco/mibs/juniper/mib-jnx-smi.txt
+netdisco/mibs/juniper/mib-jnx-sonet.txt
+netdisco/mibs/juniper/mib-jnx-sp.txt
+netdisco/mibs/juniper/mib-jnx-traceroute.txt
+netdisco/mibs/juniper/mib-jnx-vpn.txt
 netdisco/mibs/mib_index.txt
 netdisco/mibs/mkindex
 netdisco/mibs/net-snmp/LM-SENSORS-MIB.txt
 netdisco/mibs/net-snmp/NET-SNMP-AGENT-MIB.txt
 netdisco/mibs/net-snmp/NET-SNMP-EXAMPLES-MIB.txt
+netdisco/mibs/net-snmp/NET-SNMP-EXTEND-MIB.txt
 netdisco/mibs/net-snmp/NET-SNMP-MIB.txt
 netdisco/mibs/net-snmp/NET-SNMP-MONITOR-MIB.txt
 netdisco/mibs/net-snmp/NET-SNMP-SYSTEM-MIB.txt
@@ -726,6 +967,13 @@ netdisco/mibs/net-snmp/UCD-IPFILTER-MIB.txt
 netdisco/mibs/net-snmp/UCD-IPFWACC-MIB.txt
 netdisco/mibs/net-snmp/UCD-SNMP-MIB-OLD.txt
 netdisco/mibs/net-snmp/UCD-SNMP-MIB.txt
+netdisco/mibs/netscreen/NETSCREEN-INTERFACE-MIB.mib
+netdisco/mibs/netscreen/NETSCREEN-NSRP-MIB.mib
+netdisco/mibs/netscreen/NETSCREEN-OSPF-MIB.mib
+netdisco/mibs/netscreen/NETSCREEN-PRODUCTS-MIB.mib
+netdisco/mibs/netscreen/NETSCREEN-RESOURCE-MIB.mib
+netdisco/mibs/netscreen/NETSCREEN-SET-GEN-MIB.mib
+netdisco/mibs/netscreen/NETSCREEN-SMI.mib
 netdisco/mibs/nortel/AAC.mib
 netdisco/mibs/nortel/CSMACD.MIB
 netdisco/mibs/nortel/Commgmt.mib
@@ -737,32 +985,42 @@ netdisco/mibs/nortel/PriL3mgmt.mib
 netdisco/mibs/nortel/SSH.mib
 netdisco/mibs/nortel/TAG1Q.MIB
 netdisco/mibs/nortel/WFCOMMON.MIB
+netdisco/mibs/nortel/WSS2270-SW20-switching.mib
 netdisco/mibs/nortel/altroot.mib
-netdisco/mibs/nortel/bayxlr003.mib
-netdisco/mibs/nortel/bnlog002.mib
+netdisco/mibs/nortel/baystackadac.mib
+netdisco/mibs/nortel/baystacklacpext.mib
+netdisco/mibs/nortel/baystackmulticastflooding.mib
+netdisco/mibs/nortel/baystackpethext.mib
+netdisco/mibs/nortel/bayxlr.mib
+netdisco/mibs/nortel/bnlog.mib
+netdisco/mibs/nortel/bsee.mib
 netdisco/mibs/nortel/ccfg210.mib
 netdisco/mibs/nortel/cd3ex201.mib
 netdisco/mibs/nortel/croot217.mib
 netdisco/mibs/nortel/cvlan000.mib
 netdisco/mibs/nortel/dvmrp.mib
 netdisco/mibs/nortel/mcast201.mib
+netdisco/mibs/nortel/nnmst.mib
+netdisco/mibs/nortel/nnrst.mib
 netdisco/mibs/nortel/ntwlanap006.mib
 netdisco/mibs/nortel/rapid_city.mib
-netdisco/mibs/nortel/s5age154.mib
-netdisco/mibs/nortel/s5cha135.mib
-netdisco/mibs/nortel/s5com112.mib
-netdisco/mibs/nortel/s5ctr121.trp
-netdisco/mibs/nortel/s5ecm117.mib
-netdisco/mibs/nortel/s5emt104.mib
-netdisco/mibs/nortel/s5erl102.mib
-netdisco/mibs/nortel/s5eth121.mib
-netdisco/mibs/nortel/s5etr113.trp
-netdisco/mibs/nortel/s5ifx103.mib
-netdisco/mibs/nortel/s5reg200.mib
-netdisco/mibs/nortel/s5roo117.mib
-netdisco/mibs/nortel/s5sbs103.mib
-netdisco/mibs/nortel/s5tcs112.mib
-netdisco/mibs/nortel/synro199.mib
+netdisco/mibs/nortel/s3com.mib
+netdisco/mibs/nortel/s3eth.mib
+netdisco/mibs/nortel/s5age.mib
+netdisco/mibs/nortel/s5cha.mib
+netdisco/mibs/nortel/s5com.mib
+netdisco/mibs/nortel/s5ctr.mib
+netdisco/mibs/nortel/s5ecm.mib
+netdisco/mibs/nortel/s5emt.mib
+netdisco/mibs/nortel/s5erl.mib
+netdisco/mibs/nortel/s5eth.mib
+netdisco/mibs/nortel/s5etr.mib
+netdisco/mibs/nortel/s5ifx.mib
+netdisco/mibs/nortel/s5reg.mib
+netdisco/mibs/nortel/s5roo.mib
+netdisco/mibs/nortel/s5sbs.mib
+netdisco/mibs/nortel/s5tcs.mib
+netdisco/mibs/nortel/synro.mib
 netdisco/mibs/nortel/tigonNetwork.mib
 netdisco/mibs/nortel/tigonPhysical.mib
 netdisco/mibs/nortel/tigonSwitch.mib
@@ -771,6 +1029,7 @@ netdisco/mibs/rfc/ADSL-LINE-EXT-MIB.txt
 netdisco/mibs/rfc/ADSL-LINE-MIB.txt
 netdisco/mibs/rfc/ADSL-TC-MIB.txt
 netdisco/mibs/rfc/AGENTX-MIB.txt
+netdisco/mibs/rfc/ALARM-MIB.txt
 netdisco/mibs/rfc/APM-MIB.txt
 netdisco/mibs/rfc/APPC-MIB.txt
 netdisco/mibs/rfc/APPLETALK-MIB.txt
@@ -779,6 +1038,7 @@ netdisco/mibs/rfc/APPN-DLUR-MIB.txt
 netdisco/mibs/rfc/APPN-MIB.txt
 netdisco/mibs/rfc/APPN-TRAP-MIB.txt
 netdisco/mibs/rfc/APS-MIB.txt
+netdisco/mibs/rfc/ARC-MIB.txt
 netdisco/mibs/rfc/ATM-ACCOUNTING-INFORMATION-MIB.txt
 netdisco/mibs/rfc/ATM-MIB.txt
 netdisco/mibs/rfc/ATM-TC-MIB.txt
@@ -807,6 +1067,8 @@ netdisco/mibs/rfc/DNS-RESOLVER-MIB.txt
 netdisco/mibs/rfc/DNS-SERVER-MIB.txt
 netdisco/mibs/rfc/DOCS-BPI-MIB.txt
 netdisco/mibs/rfc/DOCS-CABLE-DEVICE-MIB.txt
+netdisco/mibs/rfc/DOCS-IETF-BPI2-MIB.txt
+netdisco/mibs/rfc/DOCS-IETF-SUBMGT-MIB.txt
 netdisco/mibs/rfc/DOCS-IF-MIB.txt
 netdisco/mibs/rfc/DOT12-IF-MIB.txt
 netdisco/mibs/rfc/DOT12-RPTR-MIB.txt
@@ -818,9 +1080,12 @@ netdisco/mibs/rfc/DSA-MIB.txt
 netdisco/mibs/rfc/EBN-MIB.txt
 netdisco/mibs/rfc/ENTITY-MIB.txt
 netdisco/mibs/rfc/ENTITY-SENSOR-MIB.txt
+netdisco/mibs/rfc/ENTITY-STATE-MIB.txt
+netdisco/mibs/rfc/ENTITY-STATE-TC-MIB.txt
 netdisco/mibs/rfc/ETHER-CHIPSET-MIB.txt
 netdisco/mibs/rfc/ETHER-WIS.txt
 netdisco/mibs/rfc/EtherLike-MIB.txt
+netdisco/mibs/rfc/FC-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
@@ -841,7 +1106,9 @@ netdisco/mibs/rfc/HOST-RESOURCES-TYPES.txt
 netdisco/mibs/rfc/HPR-IP-MIB.txt
 netdisco/mibs/rfc/HPR-MIB.txt
 netdisco/mibs/rfc/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
+netdisco/mibs/rfc/IANA-CHARSET-MIB.txt
 netdisco/mibs/rfc/IANA-FINISHER-MIB.txt
+netdisco/mibs/rfc/IANA-ITU-ALARM-TC-MIB.txt
 netdisco/mibs/rfc/IANA-LANGUAGE-MIB.txt
 netdisco/mibs/rfc/IANA-MALLOC-MIB.txt
 netdisco/mibs/rfc/IANA-PRINTER-MIB.txt
@@ -855,6 +1122,8 @@ netdisco/mibs/rfc/IF-INVERTED-STACK-MIB.txt
 netdisco/mibs/rfc/IF-MIB.txt
 netdisco/mibs/rfc/IGMP-STD-MIB.txt
 netdisco/mibs/rfc/INET-ADDRESS-MIB.txt
+netdisco/mibs/rfc/INT-SERV-GUARANTEED-MIB.my
+netdisco/mibs/rfc/INT-SERV-MIB.my
 netdisco/mibs/rfc/INTEGRATED-SERVICES-GUARANTEED-MIB.txt
 netdisco/mibs/rfc/INTEGRATED-SERVICES-MIB.txt
 netdisco/mibs/rfc/INTERFACETOPN-MIB.txt
@@ -863,6 +1132,7 @@ netdisco/mibs/rfc/IP-MIB.txt
 netdisco/mibs/rfc/IPATM-IPMC-MIB.txt
 netdisco/mibs/rfc/IPMROUTE-STD-MIB.txt
 netdisco/mibs/rfc/IPOA-MIB.txt
+netdisco/mibs/rfc/IPV6-FLOW-LABEL-MIB.txt
 netdisco/mibs/rfc/IPV6-ICMP-MIB.txt
 netdisco/mibs/rfc/IPV6-MIB.txt
 netdisco/mibs/rfc/IPV6-MLD-MIB.txt
@@ -870,14 +1140,25 @@ netdisco/mibs/rfc/IPV6-TC.txt
 netdisco/mibs/rfc/IPV6-TCP-MIB.txt
 netdisco/mibs/rfc/IPV6-UDP-MIB.txt
 netdisco/mibs/rfc/ISDN-MIB.txt
+netdisco/mibs/rfc/ITU-ALARM-MIB.txt
+netdisco/mibs/rfc/ITU-ALARM-TC-MIB.txt
 netdisco/mibs/rfc/Job-Monitoring-MIB.txt
 netdisco/mibs/rfc/L2TP-MIB.txt
 netdisco/mibs/rfc/MALLOC-MIB.txt
 netdisco/mibs/rfc/MAU-MIB.txt
 netdisco/mibs/rfc/MIOX25-MIB.txt
 netdisco/mibs/rfc/MIP-MIB.txt
+netdisco/mibs/rfc/MPLS-FTN-STD-MIB.txt
+netdisco/mibs/rfc/MPLS-LDP-ATM-STD-MIB.txt
+netdisco/mibs/rfc/MPLS-LDP-FRAME-RELAY-STD-MIB.txt
+netdisco/mibs/rfc/MPLS-LDP-GENERIC-STD-MIB.txt
+netdisco/mibs/rfc/MPLS-LDP-STD-MIB.txt
+netdisco/mibs/rfc/MPLS-LSR-STD-MIB.txt
+netdisco/mibs/rfc/MPLS-TC-STD-MIB.txt
+netdisco/mibs/rfc/MPLS-TE-STD-MIB.txt
 netdisco/mibs/rfc/MTA-MIB.txt
 netdisco/mibs/rfc/Modem-MIB.txt
+netdisco/mibs/rfc/NAT-MIB.txt
 netdisco/mibs/rfc/NETWORK-SERVICES-MIB.txt
 netdisco/mibs/rfc/NHRP-MIB.txt
 netdisco/mibs/rfc/NOTIFICATION-LOG-MIB.txt
@@ -888,6 +1169,7 @@ netdisco/mibs/rfc/P-BRIDGE-MIB.txt
 netdisco/mibs/rfc/PARALLEL-MIB.txt
 netdisco/mibs/rfc/PIM-MIB.txt
 netdisco/mibs/rfc/PINT-MIB.txt
+netdisco/mibs/rfc/POLICY-BASED-MANAGEMENT-MIB.txt
 netdisco/mibs/rfc/POWER-ETHERNET-MIB.txt
 netdisco/mibs/rfc/PPP-BRIDGE-NCP-MIB.txt
 netdisco/mibs/rfc/PPP-IP-NCP-MIB.txt
@@ -912,6 +1194,7 @@ netdisco/mibs/rfc/RFC1271-MIB.txt
 netdisco/mibs/rfc/RFC1285-MIB.my
 netdisco/mibs/rfc/RFC1381-MIB.txt
 netdisco/mibs/rfc/RFC1382-MIB.txt
+netdisco/mibs/rfc/RFC1389-MIB.txt
 netdisco/mibs/rfc/RFC1406-MIB.my
 netdisco/mibs/rfc/RFC1414-MIB.txt
 netdisco/mibs/rfc/RIPv2-MIB.txt
@@ -923,6 +1206,7 @@ netdisco/mibs/rfc/ROHC-UNCOMPRESSED-MIB.txt
 netdisco/mibs/rfc/RS-232-MIB.txt
 netdisco/mibs/rfc/RSVP-MIB.txt
 netdisco/mibs/rfc/RTP-MIB.txt
+netdisco/mibs/rfc/SCTP-MIB.txt
 netdisco/mibs/rfc/SIP-MIB.txt
 netdisco/mibs/rfc/SLAPM-MIB.txt
 netdisco/mibs/rfc/SMON-MIB.txt
@@ -947,9 +1231,12 @@ netdisco/mibs/rfc/SNMPv2-TC.txt
 netdisco/mibs/rfc/SNMPv2-TM.txt
 netdisco/mibs/rfc/SONET-MIB.txt
 netdisco/mibs/rfc/SOURCE-ROUTING-MIB.txt
+netdisco/mibs/rfc/SSPM-MIB.txt
 netdisco/mibs/rfc/SYSAPPL-MIB.txt
 netdisco/mibs/rfc/TCP-MIB.txt
 netdisco/mibs/rfc/TCPIPX-MIB.txt
+netdisco/mibs/rfc/TE-LINK-STD-MIB.txt
+netdisco/mibs/rfc/TE-MIB.txt
 netdisco/mibs/rfc/TN3270E-MIB.txt
 netdisco/mibs/rfc/TN3270E-RT-MIB.txt
 netdisco/mibs/rfc/TOKEN-RING-RMON-MIB.txt
@@ -959,34 +1246,40 @@ netdisco/mibs/rfc/TRANSPORT-ADDRESS-MIB.txt
 netdisco/mibs/rfc/TUNNEL-MIB.txt
 netdisco/mibs/rfc/UDP-MIB.txt
 netdisco/mibs/rfc/UPS-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/VPN-TC-STD-MIB.txt
 netdisco/mibs/rfc/VRRP-MIB.txt
 netdisco/mibs/rfc/WWW-MIB.txt
-netdisco/mibs/rfcmibs.diff
+netdisco/mibs/rfc/lldp.mib
+netdisco/mibs/rfc/lldp_dot1.mib
+netdisco/mibs/rfc/lldp_dot3.mib
+netdisco/mibs/rfc1.diff
 netdisco/mibs/rm_cisco_dups
 netdisco/mibs/snmp.conf
 netdisco/mibs/snmpwalkmib
+netdisco/mibs/to_locase
 netdisco/mibs/walk_all
 netdisco/netdisco
 netdisco/netdisco.pm
-netdisco/oui.txt
 netdisco/sql/admin.sql
 netdisco/sql/device.sql
 netdisco/sql/device_ip.sql
 netdisco/sql/device_port.sql
 netdisco/sql/device_port_log.sql
+netdisco/sql/device_port_ssid.sql
 netdisco/sql/log.sql
 netdisco/sql/node.sql
 netdisco/sql/node_ip.sql
 netdisco/sql/node_nbt.sql
 netdisco/sql/oui.sql
-netdisco/sql/pg_all
-netdisco/sql/pg_back
-netdisco/sql/pg_init
-netdisco/sql/pg_run
+netdisco/sql/pg
 netdisco/sql/sessions.sql
+netdisco/sql/subnets.sql
 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/user_log.sql
 netdisco/sql/users.sql
 share/examples/netdisco/netdisco-topology.txt
@@ -999,11 +1292,16 @@ share/examples/rc.d/netdisco
 @dirrm netdisco/sql
 @dirrm netdisco/mibs/rfc
 @dirrm netdisco/mibs/nortel
+@dirrm netdisco/mibs/netscreen
 @dirrm netdisco/mibs/net-snmp
+@dirrm netdisco/mibs/juniper
 @dirrm netdisco/mibs/hp
 @dirrm netdisco/mibs/foundry
+@dirrm netdisco/mibs/extreme
+@dirrm netdisco/mibs/dell
 @dirrm netdisco/mibs/cisco
 @dirrm netdisco/mibs/asante
+@dirrm netdisco/mibs/aruba
 @dirrm netdisco/mibs/allied
 @dirrm netdisco/mibs
 @dirrm netdisco/mason
diff --git a/net/netdisco/distinfo b/net/netdisco/distinfo
index 910e54be39a..6e7702c8129 100644
--- a/net/netdisco/distinfo
+++ b/net/netdisco/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.3 2006/03/09 20:25:28 bouyer Exp $
+$NetBSD: distinfo,v 1.4 2006/12/16 15:25:41 bouyer Exp $
 
-SHA1 (netdisco-0.94_with_mibs.tar.gz) = f5179b313aaba4dea88f84d80d1909e65b5ae10d
-RMD160 (netdisco-0.94_with_mibs.tar.gz) = 77c63e99e44926ff3115994ac58c894002164e94
-Size (netdisco-0.94_with_mibs.tar.gz) = 6903970 bytes
+SHA1 (netdisco-0.95_with_mibs.tar.gz) = 0aedc3ba409be8f6697b18eac9f839ea22cb6d53
+RMD160 (netdisco-0.95_with_mibs.tar.gz) = 138dba8d7e31d6f0ea35a0b41f3d76d705637713
+Size (netdisco-0.95_with_mibs.tar.gz) = 8318725 bytes
 SHA1 (patch-aa) = 8b235fd46284866cc5e2b5f8c682c316900c9b04
-SHA1 (patch-ab) = 935d704459ed85943595d1d4685b4ddeb588a8bc
-SHA1 (patch-ac) = f5b7ab932b096a81c3080d23683c0911a720d5c0
-SHA1 (patch-ad) = 966af8ab75f3df6281b263583369a2962abfef1e
+SHA1 (patch-ad) = 88afec93b9d2e642a88ca9a422a3a511d2f5f4a3
diff --git a/net/netdisco/patches/patch-ab b/net/netdisco/patches/patch-ab
deleted file mode 100644
index a3f2b721794..00000000000
--- a/net/netdisco/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/05/25 17:06:49 bouyer Exp $
-
---- sql/pg_init.orig	2005-05-24 15:03:37.000000000 +0200
-+++ sql/pg_init	2005-05-24 15:04:03.000000000 +0200
-@@ -5,10 +5,10 @@
- 
- # Change these to match your setup
- # Linux Default 
--SYSDBUSER=postgres
-+# SYSDBUSER=postgres
- 
- # BSD Default
--# SYSDBUSER=pgsql
-+SYSDBUSER=pgsql
- 
- DB=netdisco
- 
diff --git a/net/netdisco/patches/patch-ac b/net/netdisco/patches/patch-ac
deleted file mode 100644
index 24ec9a79c95..00000000000
--- a/net/netdisco/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/05/27 02:26:00 minskim Exp $
-
---- sql/pg_all.orig	2004-10-28 22:45:36.000000000 -0500
-+++ sql/pg_all
-@@ -5,5 +5,5 @@
- 
- FILES="admin.sql device.sql device_ip.sql device_port.sql device_port_log.sql \
--       log.sql node.sql node_ip.sql oui.sql sessions.sql user_log.sql users.sql"
-+       log.sql node.sql node_ip.sql node_nbt.sql oui.sql sessions.sql user_log.sql users.sql"
- 
- rm -f pg_all.input
diff --git a/net/netdisco/patches/patch-ad b/net/netdisco/patches/patch-ad
index e94c4211531..cb10d74b335 100644
--- a/net/netdisco/patches/patch-ad
+++ b/net/netdisco/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2006/03/09 20:25:28 bouyer Exp $
+$NetBSD: patch-ad,v 1.2 2006/12/16 15:25:41 bouyer Exp $
 
---- netdisco_apache.conf.orig	2004-03-07 20:13:49.000000000 +0100
-+++ netdisco_apache.conf	2006-03-09 16:34:23.000000000 +0100
-@@ -4,8 +4,10 @@
+--- netdisco_apache.conf.orig	2006-11-14 01:27:14.000000000 +0100
++++ netdisco_apache.conf	2006-12-06 22:08:24.000000000 +0100
+@@ -14,8 +14,10 @@
  
  # Pool Database Connections
  PerlModule Apache::DBI
@@ -14,7 +14,7 @@ $NetBSD: patch-ad,v 1.1 2006/03/09 20:25:28 bouyer Exp $
  	order allow,deny
  	allow from all
  </Directory>
-@@ -14,12 +16,12 @@
+@@ -24,12 +26,12 @@
  # Preload the netdisco module into global server space.
  #   and parse the config file only once.
  { package HTML::Mason::Commands;
@@ -30,15 +30,3 @@ $NetBSD: patch-ad,v 1.1 2006/03/09 20:25:28 bouyer Exp $
      #use Apache::ProxyRewriteMax;
  }
  
-@@ -30,8 +32,9 @@
-     use strict;
- 
-     my $ah = new HTML::Mason::ApacheHandler(
--        comp_root              => '/usr/local/netdisco/html',
--        data_dir               => '/usr/local/netdisco/mason',
-+@APACHE2@        args_method            => 'mod_perl',
-+        comp_root              => '/usr/pkg/netdisco/html',
-+        data_dir               => '/usr/pkg/netdisco/mason',
-         request_class          => 'MasonX::Request::WithApacheSession',
-         session_class          => 'Apache::Session::Postgres',
-         session_commit         => 1,