From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jun 12 16:40:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C68ED11F for ; Wed, 12 Jun 2013 16:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id A88051C43 for ; Wed, 12 Jun 2013 16:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CGe2Q7051288 for ; Wed, 12 Jun 2013 16:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5CGe2u2051287; Wed, 12 Jun 2013 16:40:02 GMT (envelope-from gnats) Date: Wed, 12 Jun 2013 16:40:02 GMT Message-Id: <201306121640.r5CGe2u2051287@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: geoffroy desvernay Subject: Re: ports/177956: [MAINTAINER] net-mgmt/netdisco: update to 1.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: geoffroy desvernay List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jun 2013 16:40:02 -0000 The following reply was made to PR ports/177956; it has been noted by GNATS. From: geoffroy desvernay To: Raphael Kubo da Costa Cc: bug-followup@FreeBSD.org Subject: Re: ports/177956: [MAINTAINER] net-mgmt/netdisco: update to 1.2 Date: Wed, 12 Jun 2013 18:23:14 +0200 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2KWKIPLXCICFNLHBPUASP Content-Type: multipart/mixed; boundary="------------070507020503040708050502" This is a multi-part message in MIME format. --------------070507020503040708050502 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Le 06/11/2013 23:39, Raphael Kubo da Costa a =E9crit : > You seem to have missed the attachment in your mail from May 6. Can you= > send it again? >=20 Of course, sorry for the delay, and Thank you for taking care ! --=20 *geoffroy desvernay* C.R.I - Administration syst=E8mes et r=E9seaux Ecole Centrale de Marseille --------------070507020503040708050502 Content-Type: text/x-patch; name="netdisco.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="netdisco.diff" =3D=3D=3D> Updating from SVN Updating '.': At revision 320703. =3D=3D=3D> Generating patch =3D=3D=3D> Viewing diff with more Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Makefile (revision 320703) +++ Makefile (working copy) @@ -2,24 +2,23 @@ # $FreeBSD$ =20 PORTNAME=3D netdisco -PORTVERSION=3D 1.1 +PORTVERSION=3D 1.2 CATEGORIES=3D net-mgmt www MASTER_SITES=3D SF =20 MAINTAINER=3D dgeo@centrale-marseille.fr COMMENT=3D Web-based network management tool for moderate to large netwo= rks =20 -OPTIONS_DEFINE=3D GRAPHVIZ OUIDL MIBS +OPTIONS_DEFINE=3D GRAPHVIZ MIBS OPTIONS_DEFAULT=3DGRAPHVIZ MIBS MIBS_DESC=3D Depend on net-mgmt/netdisco-mibs -OUIDL_DESC=3D Download oui.txt file GRAPHVIZ_DESC=3D Install GraphViz for network map support =20 RUN_DEPENDS+=3D ${APACHE_PKGNAMEPREFIX}mod_perl2>=3D0:${PORTSDIR}/www/mo= d_perl2 \ p5-Apache-DBI>=3D0:${PORTSDIR}/www/p5-Apache-DBI \ p5-libapreq2>=3D0:${PORTSDIR}/www/p5-libapreq2 \ p5-Net-SNMP>=3D0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ - p5-SNMP-Info>=3D0:${PORTSDIR}/net-mgmt/p5-SNMP-Info \ + p5-SNMP-Info>=3D3.01:${PORTSDIR}/net-mgmt/p5-SNMP-Info \ p5-HTML-Mason>=3D0:${PORTSDIR}/www/p5-HTML-Mason \ p5-DB_File-Lock>=3D0:${PORTSDIR}/devel/p5-DB_File-Lock \ p5-Apache-Session>=3D0:${PORTSDIR}/www/p5-Apache-Session \ @@ -44,7 +43,7 @@ NETDISCO_DBDIR=3D /var/db/netdisco =20 SUB_FILES=3D pkg-message -SUB_LIST=3D NETDISCO_DBDIR=3D${NETDISCO_DBDIR} NETDISCO_RUNDIR=3D${NETDI= SCO_RUNDIR} NETDISCO_USER=3D${USERS} +SUB_LIST=3D NETDISCO_DBDIR=3D${NETDISCO_DBDIR} NETDISCO_RUNDIR=3D${NETDI= SCO_RUNDIR} NETDISCO_USER=3D${USERS} NETDISCO_GROUP=3D${GROUPS} PLIST_SUB=3D NETDISCO_DBDIR=3D${NETDISCO_DBDIR} NETDISCO_RUNDIR=3D${NETD= ISCO_RUNDIR} =20 WRKSRC=3D ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -86,12 +85,6 @@ p5-GraphViz>=3D0:${PORTSDIR}/graphics/p5-GraphViz .endif =20 -.if ${PORT_OPTIONS:MOUIDL} -PLIST_SUB+=3D OUIDL=3D"" -.else -PLIST_SUB+=3D OUIDL=3D"@comment " -.endif - pre-install: . for i in ${ALTER_FILES} @(${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} 2>/dev/null || ${TRUE}) @@ -159,10 +152,6 @@ fi) . endif =20 -. if ${PORT_OPTIONS:MOUIDL} - ${FETCH_CMD} -q -o ${DATADIR}/oui.txt http://standards.ieee.org/develo= p/regauth/oui/oui.txt -. endif - post-install: @${CAT} ${PKGMESSAGE} =20 Index: distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- distinfo (revision 320703) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (netdisco-1.1.tar.gz) =3D 849e9f80a0833af3f4eb8a114c629fa43c238b2= 44cf41d63ef9063d5ef169151 -SIZE (netdisco-1.1.tar.gz) =3D 1403579 +SHA256 (netdisco-1.2.tar.gz) =3D 18af19b5753eb752edf9d4fb7e8865628ac35cf= 7b60266c7d50da020e9994a1f +SIZE (netdisco-1.2.tar.gz) =3D 1349238 Index: files/patch-netdisco.conf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/patch-netdisco.conf (revision 320703) +++ files/patch-netdisco.conf (working copy) @@ -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 @@ =20 # ---- General Settings ---- @@ -14,7 +14,7 @@ timeout =3D 180 macsuck_timeout =3D 240 #macsuck_all_vlans =3D true -@@ -65,7 +65,7 @@ +@@ -67,7 +67,7 @@ =20 # ---- Admin Panel Daemon Settings ---- daemon_bg =3D true @@ -23,7 +23,7 @@ daemon_poll =3D 2 =20 # ---- Port Control Settings --- -@@ -80,7 +80,7 @@ +@@ -82,7 +82,7 @@ # Data Archiving and Logging compresslogs =3D true compress =3D /usr/bin/gzip -f @@ -32,12 +32,13 @@ logextension =3D txt #nmis_dump =3D netdisco_nmis =20 -@@ -131,24 +131,7 @@ - # snmptimeout in micro-seconds before retry, 1000000 micro-seconds =3D = 1 second - snmptimeout =3D 1000000=20 +@@ -136,25 +136,7 @@ snmpretries =3D 3 + #If you want to use a Net-SNMP configuration file uncomment and set to = 0 + #ignoresnmpconf =3D 1 -mibdirs =3D \ - $home/mibs/allied, \ +- $home/mibs/apc, \ - $home/mibs/arista, \ - $home/mibs/aruba, \ - $home/mibs/asante, \ Index: files/pkg-message.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- files/pkg-message.in (revision 320703) +++ files/pkg-message.in (working copy) @@ -7,7 +7,7 @@ and modify them to suit your needs. =20 2) if you didn't use the port's option for that (OUIDL),=20 - # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/regauth/= oui/oui.txt + # fetch -o %%DATADIR%%/oui.txt http://standards.ieee.org/develop/= regauth/oui/oui.txt =20 3) Run the following to create and initialise the netdisco database:= # perl %%DATADIR%%/sql/pg --init Index: pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- pkg-plist (revision 320703) +++ pkg-plist (working copy) @@ -21,7 +21,9 @@ %%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 +34,7 @@ %%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 +59,6 @@ %%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 =3D=3D=3D> Done --------------070507020503040708050502-- ------enig2KWKIPLXCICFNLHBPUASP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJRuKBzAAoJEC0NWrh8JT1SDSoIAJD6Fd0rQ7+QEMDWwDeKuxbU ml2yC+LFXWH6RLF8gNbNdhWlt+y4G5cKwAI1Sa5yp0D4PuphqBHj0yaM6EBy30/E 4Zjf/RQB7GXkbWv47CYA16WBhxLxLWdgoKFfiZgFqUVbXFGkr9a/nWGx0Ma6o5EO a2n94YpPZdQbqgMUcBDxSAtIgfB+hni6zRgZ7/Kwjkp68j3zl/OlGv60CayZ53wF XqzUC17+HGNyLiInG1nRbpRD2hAovKds/b6JYrCCLyvIkKC0Y9+fnAGsOhb7tGTU PvpY/oaQBSMliTgTZNou+hHtw9bE5PtHuZ8rNPixRxbmtkillTbej0+bfFsRxMc= =ZFlm -----END PGP SIGNATURE----- ------enig2KWKIPLXCICFNLHBPUASP--