Date: Thu, 13 Jun 2013 08:20:00 GMT From: geoffroy desvernay <dgeo@centrale-marseille.fr> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/177956: [MAINTAINER] net-mgmt/netdisco: update to 1.2 Message-ID: <201306130820.r5D8K0vu045394@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/177956; it has been noted by GNATS.
From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/177956: [MAINTAINER] net-mgmt/netdisco: update to 1.2
Date: Thu, 13 Jun 2013 10:11:49 +0200
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
------enig2CWMWVBNBNIRRSGWTGXXQ
Content-Type: multipart/mixed;
boundary="------------010807040500040705040503"
This is a multi-part message in MIME format.
--------------010807040500040705040503
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Le 06/12/2013 21:35, Raphael Kubo da Costa a =C3=A9crit :
> geoffroy desvernay <dgeo@centrale-marseille.fr> writes:
>=20
>> Le 06/11/2013 23:39, Raphael Kubo da Costa a =C3=A9crit :
>>> You seem to have missed the attachment in your mail from May 6. Can y=
ou
>>> send it again?
>>>
>> Of course, sorry for the delay, and Thank you for taking care !
>=20
> I've noticed a few problems after build the port here with the default
> options.
>=20
> - %%OUIDL%%%%DATADIR%%/oui.txt is not installed but is in the plist.
Corrected, I forgot this one...
> - The pkg-deinstall script failed because there was no apxs here. I
> guess it should be a dependency?
apache is already a 'run' dependency=E2=80=A6 and apxs is only used to gu=
ess
apache's conf dir.: I made it non-fatal (if apxs is not present,
apache's config should not be critical :)
Thank you for your tests.
Geoffroy.
--=20
*geoffroy desvernay*
C.R.I - Administration syst=C3=A8mes et r=C3=A9seaux
Ecole Centrale de Marseille
--------------010807040500040705040503
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 320739.
=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 320739)
+++ 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 320739)
+++ 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 320739)
+++ 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 320739)
+++ files/pkg-message.in (working copy)
@@ -6,8 +6,8 @@
1) Examine all the configuration files in %%ETCDIR%%,
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
+ 2) You should consider downloading a fresh OUI database
+ # 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-deinstall
=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-deinstall (revision 320739)
+++ pkg-deinstall (working copy)
@@ -12,7 +12,8 @@
=20
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
=20
confdir=3D`${apxscmd} -q SYSCONFDIR`
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 320739)
+++ pkg-plist (working copy)
@@ -3,7 +3,6 @@
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 @@
%%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 @@
%%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 @@
%%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
--------------010807040500040705040503--
------enig2CWMWVBNBNIRRSGWTGXXQ
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/
iQEcBAEBAgAGBQJRuX7FAAoJEC0NWrh8JT1S+zAIAK7PQLFz651SuacKHvfnwDOR
7c3wLWoREPmtxmSg7k3+40qqmcuPvsFtYtK6TYHTAWwweHcrGlFskOnHOxfjDwnP
yDQ3dQNZDppARqICXxQ7JSORuTId4ZkhWJaZVX2/SGtA2D6Uu6tesG10aAtFiqfb
67ya8NnttfidnIbjAANF4K16BLRAJC2InEXpjGnHTUFUa5w+FlDQDGC19S8BN7Lg
0BmewHQ91g/94vVeE8pH1uYjZCSEXIDs79bov4ObvlajXYAHdnw6skJeaO4ZisxH
YNkFzzI6ZTQkZCYp6UqJuZBDplrSI8yyjp4Tr2w6I8JzYB1MPVFqXQVmSzA9ctA=
=qcFD
-----END PGP SIGNATURE-----
------enig2CWMWVBNBNIRRSGWTGXXQ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306130820.r5D8K0vu045394>