Date: Thu, 13 Jun 2013 11:43:07 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320758 - in head/net-mgmt/netdisco: . files Message-ID: <201306131143.r5DBh7v5029537@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Thu Jun 13 11:43:07 2013 New Revision: 320758 URL: http://svnweb.freebsd.org/changeset/ports/320758 Log: - Update to 1.2. - Removed option to fetch oui.txt while building the port (let the user read pkg-message). PR: ports/177956 Submitted by: Geoffroy Desvernay <dgeo@centrale-marseille.fr> (maintainer) Modified: head/net-mgmt/netdisco/Makefile head/net-mgmt/netdisco/distinfo head/net-mgmt/netdisco/files/patch-netdisco.conf head/net-mgmt/netdisco/files/pkg-message.in head/net-mgmt/netdisco/pkg-deinstall head/net-mgmt/netdisco/pkg-plist Modified: head/net-mgmt/netdisco/Makefile ============================================================================== --- head/net-mgmt/netdisco/Makefile Thu Jun 13 11:25:14 2013 (r320757) +++ head/net-mgmt/netdisco/Makefile Thu Jun 13 11:43:07 2013 (r320758) @@ -2,24 +2,23 @@ # $FreeBSD$ PORTNAME= netdisco -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= net-mgmt www MASTER_SITES= SF MAINTAINER= dgeo@centrale-marseille.fr COMMENT= Web-based network management tool for moderate to large networks -OPTIONS_DEFINE= GRAPHVIZ OUIDL MIBS +OPTIONS_DEFINE= GRAPHVIZ MIBS OPTIONS_DEFAULT=GRAPHVIZ MIBS MIBS_DESC= Depend on net-mgmt/netdisco-mibs -OUIDL_DESC= Download oui.txt file GRAPHVIZ_DESC= Install GraphViz for network map support RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \ p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI \ p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \ p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ - p5-SNMP-Info>=0:${PORTSDIR}/net-mgmt/p5-SNMP-Info \ + p5-SNMP-Info>=3.01:${PORTSDIR}/net-mgmt/p5-SNMP-Info \ p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason \ p5-DB_File-Lock>=0:${PORTSDIR}/devel/p5-DB_File-Lock \ p5-Apache-Session>=0:${PORTSDIR}/www/p5-Apache-Session \ @@ -44,7 +43,7 @@ NETDISCO_RUNDIR=/var/run NETDISCO_DBDIR= /var/db/netdisco SUB_FILES= pkg-message -SUB_LIST= NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${USERS} +SUB_LIST= NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${USERS} NETDISCO_GROUP=${GROUPS} PLIST_SUB= NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -86,12 +85,6 @@ RUN_DEPENDS+= p5-Graph>=0:${PORTSDIR}/ma p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz .endif -.if ${PORT_OPTIONS:MOUIDL} -PLIST_SUB+= OUIDL="" -.else -PLIST_SUB+= OUIDL="@comment " -.endif - pre-install: . for i in ${ALTER_FILES} @(${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} 2>/dev/null || ${TRUE}) @@ -159,10 +152,6 @@ do-install: fi) . endif -. if ${PORT_OPTIONS:MOUIDL} - ${FETCH_CMD} -q -o ${DATADIR}/oui.txt http://standards.ieee.org/develop/regauth/oui/oui.txt -. endif - post-install: @${CAT} ${PKGMESSAGE} Modified: head/net-mgmt/netdisco/distinfo ============================================================================== --- head/net-mgmt/netdisco/distinfo Thu Jun 13 11:25:14 2013 (r320757) +++ head/net-mgmt/netdisco/distinfo Thu Jun 13 11:43:07 2013 (r320758) @@ -1,2 +1,2 @@ -SHA256 (netdisco-1.1.tar.gz) = 849e9f80a0833af3f4eb8a114c629fa43c238b244cf41d63ef9063d5ef169151 -SIZE (netdisco-1.1.tar.gz) = 1403579 +SHA256 (netdisco-1.2.tar.gz) = 18af19b5753eb752edf9d4fb7e8865628ac35cf7b60266c7d50da020e9994a1f +SIZE (netdisco-1.2.tar.gz) = 1349238 Modified: head/net-mgmt/netdisco/files/patch-netdisco.conf ============================================================================== --- head/net-mgmt/netdisco/files/patch-netdisco.conf Thu Jun 13 11:25:14 2013 (r320757) +++ head/net-mgmt/netdisco/files/patch-netdisco.conf Thu Jun 13 11:43:07 2013 (r320758) @@ -1,5 +1,5 @@ ---- netdisco.conf.orig 2010-08-03 15:35:43.000000000 +0200 -+++ netdisco.conf 2012-02-16 13:10:38.000000000 +0100 +--- netdisco.conf.orig 2013-04-13 12:30:38.000000000 +0200 ++++ netdisco.conf 2013-04-18 16:25:10.000000000 +0200 @@ -13,11 +13,11 @@ # ---- General Settings ---- @@ -14,7 +14,7 @@ timeout = 180 macsuck_timeout = 240 #macsuck_all_vlans = true -@@ -65,7 +65,7 @@ +@@ -67,7 +67,7 @@ # ---- Admin Panel Daemon Settings ---- daemon_bg = true @@ -23,7 +23,7 @@ daemon_poll = 2 # ---- Port Control Settings --- -@@ -80,7 +80,7 @@ +@@ -82,7 +82,7 @@ # Data Archiving and Logging compresslogs = true compress = /usr/bin/gzip -f @@ -32,12 +32,13 @@ logextension = txt #nmis_dump = netdisco_nmis -@@ -131,24 +131,7 @@ - # snmptimeout in micro-seconds before retry, 1000000 micro-seconds = 1 second - snmptimeout = 1000000 +@@ -136,25 +136,7 @@ snmpretries = 3 + #If you want to use a Net-SNMP configuration file uncomment and set to 0 + #ignoresnmpconf = 1 -mibdirs = \ - $home/mibs/allied, \ +- $home/mibs/apc, \ - $home/mibs/arista, \ - $home/mibs/aruba, \ - $home/mibs/asante, \ Modified: head/net-mgmt/netdisco/files/pkg-message.in ============================================================================== --- head/net-mgmt/netdisco/files/pkg-message.in Thu Jun 13 11:25:14 2013 (r320757) +++ head/net-mgmt/netdisco/files/pkg-message.in Thu Jun 13 11:43:07 2013 (r320758) @@ -6,8 +6,8 @@ In order to get up and running, there ar 1) Examine all the configuration files in %%ETCDIR%%, and modify them to suit your needs. - 2) if you didn't use the port's option for that (OUIDL), - # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/regauth/oui/oui.txt + 2) You should consider downloading a fresh OUI database + # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/develop/regauth/oui/oui.txt 3) Run the following to create and initialise the netdisco database: # perl %%DATADIR%%/sql/pg --init Modified: head/net-mgmt/netdisco/pkg-deinstall ============================================================================== --- head/net-mgmt/netdisco/pkg-deinstall Thu Jun 13 11:25:14 2013 (r320757) +++ head/net-mgmt/netdisco/pkg-deinstall Thu Jun 13 11:43:07 2013 (r320758) @@ -12,7 +12,8 @@ tmpdir=${PKG_TMPDIR}/deinst_netdisco.$$ if [ ! -x ${apxscmd} ]; then echo Can\'t find the apxs program: ${apxscmd}. - exit 1 + echo Don\'t forget to update apache config manually + exit 0 fi confdir=`${apxscmd} -q SYSCONFDIR` Modified: head/net-mgmt/netdisco/pkg-plist ============================================================================== --- head/net-mgmt/netdisco/pkg-plist Thu Jun 13 11:25:14 2013 (r320757) +++ head/net-mgmt/netdisco/pkg-plist Thu Jun 13 11:43:07 2013 (r320758) @@ -3,7 +3,6 @@ bin/parse_kismet_ap bin/parse_mac bin/port_control %%SITE_PERL%%/netdisco.pm -%%OUIDL%%%%DATADIR%%/oui.txt %%DATADIR%%/sql/admin.sql %%DATADIR%%/sql/device.sql %%DATADIR%%/sql/device_ip.sql @@ -21,7 +20,9 @@ bin/port_control %%DATADIR%%/sql/node_ip.sql %%DATADIR%%/sql/node_monitor.sql %%DATADIR%%/sql/node_nbt.sql +%%DATADIR%%/sql/node_vlan.sql %%DATADIR%%/sql/node_wireless.sql +%%DATADIR%%/sql/node_wireless_ssid.sql %%DATADIR%%/sql/oui.sql %%DATADIR%%/sql/pg %%DATADIR%%/sql/process.sql @@ -32,6 +33,7 @@ bin/port_control %%DATADIR%%/sql/upgrade-0.94-to-0.95.sql %%DATADIR%%/sql/upgrade-0.95-to-1.0.sql %%DATADIR%%/sql/upgrade-1.0-to-1.1.sql +%%DATADIR%%/sql/upgrade-1.1-to-1.2.sql %%DATADIR%%/sql/user_log.sql %%DATADIR%%/sql/users.sql %%DATADIR%%/Makefile @@ -56,7 +58,6 @@ bin/port_control %%WWWDIR%%/device_search.html %%WWWDIR%%/discoball2.gif %%WWWDIR%%/doc/ChangeLog.txt -%%WWWDIR%%/doc/README.html %%WWWDIR%%/doc/index.html %%WWWDIR%%/doc/netdisco-api-backend.html %%WWWDIR%%/doc/netdisco-api-shared.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306131143.r5DBh7v5029537>