[pkgsrc/trunk]: pkgsrc/net/netdisco Upgrade to 0.95:

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b5dfc1819539
branches:  trunk
changeset: 522659:b5dfc1819539
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Sat Dec 16 15:25:41 2006 +0000

description:
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

diffstat:

 net/netdisco/Makefile         |   34 ++-
 net/netdisco/PLIST            |  358 ++++++++++++++++++++++++++++++++++++++---
 net/netdisco/distinfo         |   12 +-
 net/netdisco/patches/patch-ab |   17 -
 net/netdisco/patches/patch-ac |   11 -
 net/netdisco/patches/patch-ad |   22 +-
 6 files changed, 356 insertions(+), 98 deletions(-)

diffs (truncated from 1122 to 300 lines):

diff -r 9f2cc7a3f8ac -r b5dfc1819539 net/netdisco/Makefile
--- a/net/netdisco/Makefile     Sat Dec 16 15:17:48 2006 +0000
+++ b/net/netdisco/Makefile     Sat Dec 16 15:25:41 2006 +0000
@@ -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-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/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_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 @@
 
 .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 @@
            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 -r 9f2cc7a3f8ac -r b5dfc1819539 net/netdisco/PLIST
--- a/net/netdisco/PLIST        Sat Dec 16 15:17:48 2006 +0000
+++ b/net/netdisco/PLIST        Sat Dec 16 15:25:41 2006 +0000
@@ -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_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_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/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-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-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-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-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-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-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-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-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-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-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-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