Date: Fri, 18 Aug 2006 15:09:44 +0400 (MSD) From: Dmitriy Kirhlarov <dimma@higis.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: des@FreeBSD.org Subject: ports/102223: [PATCH] update for nav to version 3.1.0 Message-ID: <200608181109.k7IB9iq1034657@dkirhlarov.mow.oilspace.com> Resent-Message-ID: <200608181120.k7IBKDOe034080@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102223 >Category: ports >Synopsis: [PATCH] update for nav to version 3.1.0 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Aug 18 11:20:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dmitriy Kirhlarov >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD dimma 6.1-STABLE FreeBSD 6.1-STABLE #0: Wed Aug 2 16:56:13 UTC 2006 root@jailhost1:/usr/obj/usr/src/sys/THINKPAD_KST i386 >Description: This patch looking py-snmp2 from ports/102220 >How-To-Repeat: >Fix: diff -urNB /usr/ports/net-mgmt/nav.orig/Makefile nav/Makefile --- /usr/ports/net-mgmt/nav.orig/Makefile Tue Aug 15 12:08:59 2006 +++ nav/Makefile Fri Aug 18 13:06:10 2006 @@ -6,10 +6,10 @@ # PORTNAME= nav -PORTVERSION= 3.0.b10 -CATEGORIES= net-mgmt -MASTER_SITES= http://metanav.ntnu.no/downloads/v3/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/_beta/} +PORTVERSION= 3.1.0 +CATEGORIES= net-mgmt java +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}nav/ +DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= des@FreeBSD.org COMMENT= Network Administration Visualized @@ -19,17 +19,7 @@ ginstall:${PORTSDIR}/sysutils/coreutils \ gfind:${PORTSDIR}/misc/findutils EXTRACT_DEPENDS+= ginstall:${PORTSDIR}/sysutils/coreutils \ - ${LOCALBASE}/share/java/classes/snmp.jar:${PORTSDIR}/java/drexelsnmp -.if exists(${LOCALBASE}/jakarta-tomcat4.1) -TOMCAT_DEPEND= ${LOCALBASE}/jakarta-tomcat4.1:${PORTSDIR}/www/jakarta-tomcat41 -CATALINA_HOME= ${LOCALBASE}/jakarta-tomcat4.1 -.elif exists(${LOCALBASE}/jakarta-tomcat4.0.6) -TOMCAT_DEPEND= ${LOCALBASE}/jakarta-tomcat4.0.6:${PORTSDIR}/www/jakarta-tomcat4 -CATALINA_HOME= ${LOCALBASE}/jakarta-tomcat4.0.6 -.else -TOMCAT_DEPEND= ${LOCALBASE}/jakarta-tomcat5.0:${PORTSDIR}/www/jakarta-tomcat5 -CATALINA_HOME= ${LOCALBASE}/jakarta-tomcat5.0 -.endif + ${JAVALIBDIR}/snmp.jar:${PORTSDIR}/java/drexelsnmp RUN_DEPENDS= ${LOCALBASE}/libexec/apache2/mod_python.so:${PORTSDIR}/www/mod_python3 \ ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \ ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \ @@ -37,13 +27,31 @@ ${PYTHON_SITELIBDIR}/rrdtool/_rrdtool.so:${PORTSDIR}/net/py-rrdtool_lgpl \ ${PYTHON_SITELIBDIR}/psycopgmodule.so:${PORTSDIR}/databases/py-psycopg \ ${LOCALBASE}/cricket/cricket/collect-subtrees:${PORTSDIR}/net-mgmt/cricket \ - ${LOCALBASE}/share/java/classes/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc \ + ${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc \ ${PYTHON_SITELIBDIR}/forgetSQL.py:${PORTSDIR}/databases/py-forgetsql \ ${PYTHON_SITELIBDIR}/forgetHTML.py:${PORTSDIR}/www/py-forgethtml \ - ${TOMCAT_DEPEND} + ${PYTHON_SITELIBDIR}/IPy.py:${PORTSDIR}/net-mgmt/py-ipy \ + ${PYTHON_SITELIBDIR}/pysnmp/asn1.py:${PORTSDIR}/net-mgmt/py-snmp2 + +.if exists(${LOCALBASE}/jakarta-tomcat4.1) +TOMCAT_DEPEND= ${LOCALBASE}/jakarta-tomcat4.1:${PORTSDIR}/www/jakarta-tomcat41 +CATALINA_HOME= ${LOCALBASE}/jakarta-tomcat4.1 +.elif exists(${LOCALBASE}/jakarta-tomcat4.0.6) +TOMCAT_DEPEND= ${LOCALBASE}/jakarta-tomcat4.0.6:${PORTSDIR}/www/jakarta-tomcat4 +CATALINA_HOME= ${LOCALBASE}/jakarta-tomcat4.0.6 +.elif exists(${LOCALBASE}/jakarta-tomcat5.0) +TOMCAT_DEPEND= ${LOCALBASE}/jakarta-tomcat5.0:${PORTSDIR}/www/jakarta-tomcat5 +CATALINA_HOME= ${LOCALBASE}/jakarta-tomcat5.0 +.else +TOMCAT_DEPEND= ${LOCALBASE}/tomcat5.5:${PORTSDIR}/www/tomcat55 +CATALINA_HOME= ${LOCALBASE}/tomcat5.5 +.endif + +RUN_DEPENDS+= ${TOMCAT_DEPEND} EXTRACT_DEPENDS+= ${TOMCAT_DEPEND} BUILD_DEPENDS+= ${TOMCAT_DEPEND} +MAKE_ENV+= CLASSPATH=${CATALINA_HOME}/common/lib/servlet-api.jar HAS_CONFIGURE= yes USE_PERL5= yes USE_PYTHON= 2.3+ @@ -53,6 +61,7 @@ WITH_APACHE2= yes USE_GMAKE= yes USE_PHP= yes +USE_GETTEXT= yes WANT_PHP_MOD= yes NO_PACKAGE= Requires manual configuration during build @@ -69,14 +78,21 @@ .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500600 -IGNORE= This port requires perl 5.6 or newer +IGNORE= this port requires perl 5.6 or newer .endif -.if !defined(BATCH) -pre-everything:: - @${DIALOG} --title "NAV" --msgbox "Remember to switch Apache2 on for the PHP port." 5 60 +.if defined(WITHOUT_NLS) +PLIST_SUB+= NLS="@comment " +.else +USE_GETTEXT= yes +PLIST_SUB+= NLS="" .endif +#.if !defined(BATCH) +#pre-everything:: +# @${DIALOG} --title "NAV" --msgbox "Remember to switch Apache2 on for the PHP port." 5 60 +#.endif + post-extract: ${INSTALL} -d -m 0755 ${WRKSRC}/src/SimpleSnmp/build ${INSTALL_DATA} ${LOCALBASE}/share/java/classes/snmp.jar ${WRKSRC}/src/SimpleSnmp/build @@ -121,7 +137,10 @@ @${ECHO} auto-config: - @LOCALBASE=${LOCALBASE} PORTSDIR=${PORTSDIR} ${SH} ${SCRIPTDIR}/myautoconf + @LOCALBASE=${LOCALBASE} PORTSDIR=${PORTSDIR} \ + JAVA_HOME=${JAVA_HOME} CATALINA_HOME=${CATALINA_HOME} \ + JAVALIBDIR=${JAVALIBDIR} \ + SITE_PERL=${SITE_PERL} ${SH} ${SCRIPTDIR}/myautoconf # TODO # diff -urNB /usr/ports/net-mgmt/nav.orig/distinfo nav/distinfo --- /usr/ports/net-mgmt/nav.orig/distinfo Tue Aug 15 12:08:59 2006 +++ nav/distinfo Wed Aug 16 13:16:47 2006 @@ -1,3 +1,3 @@ -MD5 (nav-3.0_beta10.tar.gz) = 093d9c0546749076d99943d75819cc3e -SHA256 (nav-3.0_beta10.tar.gz) = 8ea86d9c3ab2ccf5031ca2fbb35ab2f9670167acc589ea7f7b43dbe7ce676481 -SIZE (nav-3.0_beta10.tar.gz) = 4298892 +MD5 (nav-3.1.0.tar.gz) = b7039b59e8440f2bdc3aac276bffcdcc +SHA256 (nav-3.1.0.tar.gz) = 897323996c28a5e8bda0605f75a08d81765ce6a84deb67822d8eceb8197a784f +SIZE (nav-3.1.0.tar.gz) = 4416113 diff -urNB /usr/ports/net-mgmt/nav.orig/files/patch-doc-Makefile.in nav/files/patch-doc-Makefile.in --- /usr/ports/net-mgmt/nav.orig/files/patch-doc-Makefile.in Thu Jan 1 03:00:00 1970 +++ nav/files/patch-doc-Makefile.in Wed Aug 16 17:10:21 2006 @@ -0,0 +1,10 @@ +--- doc/Makefile.in.orig Wed Aug 16 17:07:39 2006 ++++ doc/Makefile.in Wed Aug 16 17:08:35 2006 +@@ -12,6 +12,7 @@ + + docfiles = sql/logger.sql \ + sql/manage.sql \ ++ sql/types.sql \ + sql/navprofiles.sql \ + sql/arnold.sql \ + sql/README \ diff -urNB /usr/ports/net-mgmt/nav.orig/files/patch-subsystem-alertEngine-alertdaemon.pl nav/files/patch-subsystem-alertEngine-alertdaemon.pl --- /usr/ports/net-mgmt/nav.orig/files/patch-subsystem-alertEngine-alertdaemon.pl Tue Aug 15 12:08:59 2006 +++ nav/files/patch-subsystem-alertEngine-alertdaemon.pl Thu Jan 1 03:00:00 1970 @@ -1,45 +0,0 @@ ---- subsystem/alertEngine/alertdaemon.pl.orig Tue Feb 15 14:05:23 2005 -+++ subsystem/alertEngine/alertdaemon.pl Tue Feb 15 14:07:58 2005 -@@ -37,9 +37,16 @@ - use IO::Handle; - - use NAV::AlertEngine::Engine; -+use vars qw ($pscmd); - - #BEGIN {require "alertengine.cfg";} - -+if ((POSIX::uname)[0] eq "FreeBSD") { -+ $pscmd = "ps axc -opid,tty,time,command"; -+} else { -+ $pscmd = "ps -e"; -+} -+ - #################################################### - ## Engine - #################################################### -@@ -66,6 +73,7 @@ - my ($pid, $tid) = split / /, <pid_file>; - close(pid_file); - open ps_file, "ps -e | grep $pid | wc -l|"; -+ open ps_file, "$pscmd | grep $pid | wc -l|"; - my $count=<ps_file>; - close(ps_file); - if($count==0) { -@@ -144,7 +152,7 @@ - die "Cannot open pidfile"; - my ($pid, $tid) = split / /, <pid_file>; - close(pid_file); -- open ps_file, "ps -e | grep $pid | wc -l|"; -+ open ps_file, "$pscmd | grep $pid | wc -l|"; - my $count=<ps_file>; - close(ps_file); - if($count==0) { -@@ -179,7 +187,7 @@ - die "Cannot open pidfile"; - my ($pid, $tid) = split / /, <pid_file>; - close(pid_file); -- open ps_file, "ps -e | grep $pid | wc -l|"; -+ open ps_file, "$pscmd | grep $pid | wc -l|"; - my $count=<ps_file>; - close(ps_file); - if($count>0) { diff -urNB /usr/ports/net-mgmt/nav.orig/files/patch-subsystem-lib-python-src-nav-ip.py nav/files/patch-subsystem-lib-python-src-nav-ip.py --- /usr/ports/net-mgmt/nav.orig/files/patch-subsystem-lib-python-src-nav-ip.py Tue Aug 15 12:08:59 2006 +++ nav/files/patch-subsystem-lib-python-src-nav-ip.py Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- subsystem/lib-python/src/nav/ip.py.orig Sat Nov 20 18:35:46 2004 -+++ subsystem/lib-python/src/nav/ip.py Sat Nov 20 18:35:57 2004 -@@ -106,7 +106,7 @@ - address = address.strip() - matches = _cidrPattern.match(address) - -- fullmask = 0xFFFFFFFF -+ fullmask = 0xFFFFFFFFL - - if matches: - g = matches.groups() diff -urNB /usr/ports/net-mgmt/nav.orig/pkg-plist nav/pkg-plist --- /usr/ports/net-mgmt/nav.orig/pkg-plist Tue Aug 15 12:08:59 2006 +++ nav/pkg-plist Fri Aug 18 14:33:53 2006 @@ -1,7 +1,10 @@ nav/apache/tools/alertprofiles.tool +nav/apache/tools/arnold.tool nav/apache/tools/cricket.tool nav/apache/tools/devicemanagement.tool nav/apache/tools/editdb.tool +nav/apache/tools/ipinfo.tool +nav/apache/tools/l2trace.tool nav/apache/tools/logger.tool nav/apache/tools/machinetracker.tool nav/apache/tools/messages.tool @@ -87,7 +90,7 @@ nav/apache/webroot/alertprofiles/kunnskap.php nav/apache/webroot/alertprofiles/leading_zero.function.php nav/apache/webroot/alertprofiles/listing.php -nav/apache/webroot/alertprofiles/locale/en/LC_MESSAGES/messages.mo +%%NLS%%nav/apache/webroot/alertprofiles/locale/en/LC_MESSAGES/messages.mo nav/apache/webroot/alertprofiles/locale/en/LC_MESSAGES/messages.po nav/apache/webroot/alertprofiles/loginordie.php nav/apache/webroot/alertprofiles/modules/account-info.php @@ -115,13 +118,14 @@ nav/apache/webroot/alertprofiles/modules/user-to-group-admin.php nav/apache/webroot/alertprofiles/modules/wap-setup.php nav/apache/webroot/alertprofiles/modules/welcome.php -nav/apache/webroot/alertprofiles/phpinfo.php nav/apache/webroot/alertprofiles/session.php nav/apache/webroot/alertprofiles/timeplan.php nav/apache/webroot/alertprofiles/wap/.htaccess nav/apache/webroot/alertprofiles/wap/db.php nav/apache/webroot/alertprofiles/wap/index.php nav/apache/webroot/alertprofiles/wap/varlib.php +nav/apache/webroot/arnold/.htaccess +nav/apache/webroot/arnold/arnoldhandler.py nav/apache/webroot/browse/.htaccess nav/apache/webroot/browse/index nav/apache/webroot/devicemanagement/.htaccess @@ -138,7 +142,10 @@ nav/apache/webroot/images/arpcam/camlogo+fill.gif nav/apache/webroot/images/arpcam/fill.gif nav/apache/webroot/images/arpcam/info.gif +nav/apache/webroot/images/arpcam/ipinfolink.png nav/apache/webroot/images/arpcam/mtlogo+fill.gif +nav/apache/webroot/images/bar-end.gif +nav/apache/webroot/images/bar-fill.gif nav/apache/webroot/images/blank.gif nav/apache/webroot/images/emotd/emotdlogo+fill.gif nav/apache/webroot/images/emotd/top-l.gif @@ -199,26 +206,33 @@ nav/apache/webroot/images/toolbox/module-footer-end.gif nav/apache/webroot/images/toolbox/module-footer-fill.gif nav/apache/webroot/images/toolbox/module-footer-start.gif +nav/apache/webroot/images/toolbox/tools/arnold.png nav/apache/webroot/images/toolbox/tools/cricket.gif nav/apache/webroot/images/toolbox/tools/devbrowser.gif nav/apache/webroot/images/toolbox/tools/devman.gif nav/apache/webroot/images/toolbox/tools/editdb.gif nav/apache/webroot/images/toolbox/tools/emotd.gif +nav/apache/webroot/images/toolbox/tools/ipinfo.png +nav/apache/webroot/images/toolbox/tools/l2trace.png nav/apache/webroot/images/toolbox/tools/network-explorer.gif nav/apache/webroot/images/toolbox/tools/ragen.gif nav/apache/webroot/images/toolbox/tools/searchtools.gif nav/apache/webroot/images/toolbox/tools/stat.gif nav/apache/webroot/images/toolbox/tools/status.gif nav/apache/webroot/images/toolbox/tools/syslog-analyzer.gif +nav/apache/webroot/images/toolbox/tools/useradmin.png nav/apache/webroot/images/toolbox/tools/vlanplot.gif nav/apache/webroot/images/wrench.gif nav/apache/webroot/index.py +nav/apache/webroot/ipinfo/.htaccess +nav/apache/webroot/l2trace/.htaccess +nav/apache/webroot/l2trace/l2trace.py nav/apache/webroot/logger/.htaccess -nav/apache/webroot/logger/main.py +nav/apache/webroot/logger/loggerhandler.py nav/apache/webroot/machinetracker/.htaccess nav/apache/webroot/machinetracker/machinetracker.py nav/apache/webroot/messages/.htaccess -nav/apache/webroot/messages/main.py +nav/apache/webroot/messages/messageshandler.py nav/apache/webroot/navAdmin/.htaccess nav/apache/webroot/navAdmin/index nav/apache/webroot/preferences/.htaccess @@ -232,6 +246,19 @@ nav/apache/webroot/report/Matrix.py nav/apache/webroot/report/Report.py nav/apache/webroot/report/reporthandler.py +nav/apache/webroot/source/arnold.svg +nav/apache/webroot/source/devman-toolicon.psd +nav/apache/webroot/source/editdb-toolicon.psd +nav/apache/webroot/source/editdb.svg +nav/apache/webroot/source/l2trace.svg +nav/apache/webroot/source/navbar-separator.psd +nav/apache/webroot/source/navlogo.svg +nav/apache/webroot/source/network-explorer-toolicon.psd +nav/apache/webroot/source/ntnu-toolicon.psd +nav/apache/webroot/source/router.svg +nav/apache/webroot/source/status.svg +nav/apache/webroot/source/toolicon-background.psd +nav/apache/webroot/source/useradmin.svg nav/apache/webroot/status/.htaccess nav/apache/webroot/status/StatusDefaultPrefs.py nav/apache/webroot/status/StatusPrefs.py @@ -244,6 +271,7 @@ nav/apache/webroot/vPServer/index nav/apache/webroot/vlanPlot/.htaccess nav/apache/webroot/vlanPlot/gfx/nav_logo.gif +nav/apache/webroot/vlanPlot/icons/core.gif nav/apache/webroot/vlanPlot/icons/default_grp_icon.gif nav/apache/webroot/vlanPlot/icons/elink.gif nav/apache/webroot/vlanPlot/icons/fddi.gif @@ -256,7 +284,6 @@ nav/apache/webroot/vlanPlot/icons/lan.gif nav/apache/webroot/vlanPlot/icons/mas.gif nav/apache/webroot/vlanPlot/icons/srv.gif -nav/apache/webroot/vlanPlot/icons/stam.gif nav/apache/webroot/vlanPlot/icons/sw.gif nav/apache/webroot/vlanPlot/icons/tildelt.gif nav/apache/webroot/vlanPlot/icons/undef.gif @@ -266,7 +293,9 @@ nav/apache/webroot/vlanPlot/vlanPlot.jar nav/bin/alertdaemon.pl nav/bin/alertengine.pl +nav/bin/arnold.pl nav/bin/arplogger.pl +nav/bin/autoenable.pl nav/bin/checkService.py nav/bin/cleanrrds.pl nav/bin/dump.py @@ -280,30 +309,32 @@ nav/bin/maintengine.py nav/bin/makecricketconfig.pl nav/bin/nav -nav/bin/navenv.sh nav/bin/navTemplate.py nav/bin/navclean.py +nav/bin/navenv.sh nav/bin/networkDiscovery.sh nav/bin/pg_backup.pl nav/bin/pping.py nav/bin/safe_smsd.pl nav/bin/servicemon.py nav/bin/smsd.pl +nav/bin/start_arnold.pl +nav/bin/t1000.pl nav/bin/thresholdMon.py nav/bin/vprrd.py nav/doc/cricket/README nav/doc/cricket/cricket-config/.nav nav/doc/cricket/cricket-config/Defaults -nav/doc/cricket/cricket-config/giga-router-interfaces/.nav -nav/doc/cricket/cricket-config/giga-router-interfaces/Defaults -nav/doc/cricket/cricket-config/giga-switch-ports/.nav -nav/doc/cricket/cricket-config/giga-switch-ports/Defaults +nav/doc/cricket/cricket-config/router-interfaces-snmpv1-and-giga/.nav +nav/doc/cricket/cricket-config/router-interfaces-snmpv1-and-giga/Defaults nav/doc/cricket/cricket-config/router-interfaces/.nav nav/doc/cricket/cricket-config/router-interfaces/Defaults nav/doc/cricket/cricket-config/routers/.nav nav/doc/cricket/cricket-config/routers/Defaults nav/doc/cricket/cricket-config/servers/.nav nav/doc/cricket/cricket-config/servers/Defaults +nav/doc/cricket/cricket-config/switch-ports-snmpv1-and-giga/.nav +nav/doc/cricket/cricket-config/switch-ports-snmpv1-and-giga/Defaults nav/doc/cricket/cricket-config/switch-ports/.nav nav/doc/cricket/cricket-config/switch-ports/Defaults nav/doc/cricket/cricket-config/switches/.nav @@ -313,19 +344,26 @@ nav/doc/cricket/public_html/cricket.css nav/doc/getting-started.txt nav/doc/sql/README +nav/doc/sql/arnold.sql nav/doc/sql/logger.sql nav/doc/sql/manage.sql nav/doc/sql/navprofiles.sql nav/doc/sql/snmpoid.sql +nav/doc/sql/types.sql +nav/doc/sql/upgrades/3.0_beta10.sql nav/doc/sql/upgrades/3.0_beta7.sql nav/doc/sql/upgrades/3.0_beta8.sql +nav/doc/sql/upgrades/3.0_rc1.sql nav/doc/sql/upgrades/README nav/etc/alertengine.cfg nav/etc/alertmsg.conf +nav/etc/arnold/arnold.cfg +nav/etc/arnold/mailtemplates/README +nav/etc/arnold/nonblock.cfg +nav/etc/cricket-views.conf nav/etc/cricketoids.txt nav/etc/cron.d/backup nav/etc/cron.d/cricket -nav/etc/cricket-views.conf nav/etc/cron.d/iptrace nav/etc/cron.d/logengine nav/etc/cron.d/mactrace @@ -347,6 +385,7 @@ nav/etc/init.d/pping nav/etc/init.d/servicemon nav/etc/init.d/smsd +nav/etc/l2trace.conf nav/etc/logger.conf nav/etc/machinetracker.conf nav/etc/nav.conf @@ -361,6 +400,7 @@ nav/etc/vPServer.conf nav/etc/webfront/contact-information.txt nav/etc/webfront/external-links.txt +nav/etc/webfront/ipinfo.conf nav/etc/webfront/nav-links.conf nav/etc/webfront/webfront.conf nav/etc/webfront/welcome-anonymous.txt @@ -376,6 +416,7 @@ nav/lib/java/eventEngine/device-plugins/Netel.jar nav/lib/java/eventEngine/eventEngine.jar nav/lib/java/eventEngine/handler-plugins/BoxState.jar +nav/lib/java/eventEngine/handler-plugins/CallScript.jar nav/lib/java/eventEngine/handler-plugins/DeviceTracker.jar nav/lib/java/eventEngine/handler-plugins/Info.jar nav/lib/java/eventEngine/handler-plugins/MaintenanceState.jar @@ -398,8 +439,9 @@ nav/lib/java/getDeviceData/device-plugins/CiscoSwIOS.jar nav/lib/java/getDeviceData/device-plugins/CiscoSwIOSaddon.jar nav/lib/java/getDeviceData/device-plugins/CiscoSwMenu.jar -nav/lib/java/getDeviceData/device-plugins/DeviceMem.jar nav/lib/java/getDeviceData/device-plugins/DNSCheck.jar +nav/lib/java/getDeviceData/device-plugins/DeviceMem.jar +nav/lib/java/getDeviceData/device-plugins/GetVlanFromInterface.jar nav/lib/java/getDeviceData/device-plugins/HP.jar nav/lib/java/getDeviceData/device-plugins/MibIISw.jar nav/lib/java/getDeviceData/device-plugins/Server.jar @@ -407,6 +449,7 @@ nav/lib/java/getDeviceData/device-plugins/Typeoid.jar nav/lib/java/getDeviceData/getDeviceData.jar nav/lib/java/networkDiscovery/networkDiscovery.jar +nav/lib/perl/NAV.pm nav/lib/perl/NAV/AlertEngine/Alert.pm nav/lib/perl/NAV/AlertEngine/AlertsBase.pm nav/lib/perl/NAV/AlertEngine/Engine.pm @@ -416,8 +459,8 @@ nav/lib/perl/NAV/AlertEngine/QueuedAlerts.pm nav/lib/perl/NAV/AlertEngine/User.pm nav/lib/perl/NAV/AlertEngine/UserGroups.pm +nav/lib/perl/NAV/Arnold.pm nav/lib/perl/NAV/Path.pm -nav/lib/perl/NAV.pm nav/lib/perl/NetAddr/IP.pm nav/lib/python/nav/Snmp.py nav/lib/python/nav/__init__.py @@ -430,11 +473,13 @@ nav/lib/python/nav/db/forgotten/navprofiles.py nav/lib/python/nav/db/manage.py nav/lib/python/nav/db/navprofiles.py +nav/lib/python/nav/debug.py nav/lib/python/nav/dump.py nav/lib/python/nav/errors.py +nav/lib/python/nav/event.py nav/lib/python/nav/getstatus.py -nav/lib/python/nav/ip.py nav/lib/python/nav/path.py +nav/lib/python/nav/pwhash.py nav/lib/python/nav/rrd/__init__.py nav/lib/python/nav/rrd/presenter.py nav/lib/python/nav/startstop.py @@ -480,6 +525,8 @@ nav/lib/python/nav/statemon/checker/PortChecker.py nav/lib/python/nav/statemon/checker/PostgresqlChecker.descr nav/lib/python/nav/statemon/checker/PostgresqlChecker.py +nav/lib/python/nav/statemon/checker/RadiusChecker.descr +nav/lib/python/nav/statemon/checker/RadiusChecker.py nav/lib/python/nav/statemon/checker/RpcChecker.descr nav/lib/python/nav/statemon/checker/RpcChecker.py nav/lib/python/nav/statemon/checker/SmbChecker.descr @@ -508,6 +555,7 @@ nav/lib/python/nav/statemon/rrd.py nav/lib/python/nav/statemon/service.py nav/lib/python/nav/statemon/timeoutsocket.py +nav/lib/python/nav/util.py nav/lib/python/nav/web/SearchBox.py nav/lib/python/nav/web/TreeSelect.py nav/lib/python/nav/web/URI.py @@ -521,6 +569,8 @@ nav/lib/python/nav/web/devBrowser/rrd.py nav/lib/python/nav/web/devBrowser/service.py nav/lib/python/nav/web/devBrowser/servicetable.py +nav/lib/python/nav/web/ipinfo/__init__.py +nav/lib/python/nav/web/ipinfo/config.py nav/lib/python/nav/web/ldapAuth.py nav/lib/python/nav/web/messages/__init__.py nav/lib/python/nav/web/messages/conf.py @@ -535,6 +585,7 @@ nav/lib/python/nav/web/serviceHelper.py nav/lib/python/nav/web/state.py nav/lib/python/nav/web/tableview.py +nav/lib/python/nav/web/templates/ArnoldTemplate.py nav/lib/python/nav/web/templates/ChangeLinkTemplate.py nav/lib/python/nav/web/templates/DeviceBrowserTemplate.py nav/lib/python/nav/web/templates/EditTemplate.py @@ -544,6 +595,7 @@ nav/lib/python/nav/web/templates/EmotdTemplate.py nav/lib/python/nav/web/templates/FeederTemplate.py nav/lib/python/nav/web/templates/FrontpageTemplate.py +nav/lib/python/nav/web/templates/IPInfo.py nav/lib/python/nav/web/templates/LoggerTemplate.py nav/lib/python/nav/web/templates/LoginTemplate.py nav/lib/python/nav/web/templates/MachineTrackerTemplate.py @@ -564,6 +616,7 @@ nav/lib/python/nav/web/templates/__init__.py nav/lib/python/nav/web/templates/deviceManagementTemplate.py nav/lib/python/nav/web/templates/editdbTemplate.py +nav/lib/python/nav/web/templates/l2traceTemplate.py nav/lib/python/nav/web/templates/selectTreeTemplate.py nav/lib/python/nav/web/templates/useradmin/AccountList.py nav/lib/python/nav/web/templates/useradmin/AccountPage.py @@ -575,105 +628,111 @@ nav/lib/python/nav/web/toolbox.py nav/lib/python/nav/web/urlbuilder.py nav/lib/python/rotater.py -@exec install -d -m 0755 -o navcron -g nav %D/nav/var/rrd %D/nav/var/run %D/nav/var/pg_backup %D/nav/var/log -@unexec rm %D/nav/var/log/thresholdMon.log 2>/dev/null || true -@unexec rm %D/nav/var/run/*.pid 2>/dev/null || true -@dirrmtry nav/var/log/* -@dirrmtry nav/var/log -@dirrmtry nav/var/rrd -@dirrmtry nav/var/run -@dirrmtry nav/var/pg_backup -@dirrmtry nav/var -@unexec find %D/nav/lib/python/nav -type f -name "*.pyc" -delete 2>/dev/null || true -@dirrm nav/apache/tools -@dirrm nav/apache/webapps -@dirrm nav/apache/webroot/alertprofiles/css -@dirrm nav/apache/webroot/alertprofiles/documents -@dirrm nav/apache/webroot/alertprofiles/icons -@dirrm nav/apache/webroot/alertprofiles/images -@dirrm nav/apache/webroot/alertprofiles/locale/en/LC_MESSAGES -@dirrm nav/apache/webroot/alertprofiles/locale/en -@dirrm nav/apache/webroot/alertprofiles/locale -@dirrm nav/apache/webroot/alertprofiles/modules -@dirrm nav/apache/webroot/alertprofiles/wap -@dirrm nav/apache/webroot/alertprofiles -@dirrm nav/apache/webroot/browse -@dirrm nav/apache/webroot/devicemanagement -@dirrm nav/apache/webroot/editdb -@dirrm nav/apache/webroot/images/arpcam -@dirrm nav/apache/webroot/images/emotd -@dirrm nav/apache/webroot/images/form -@dirrm nav/apache/webroot/images/login -@dirrm nav/apache/webroot/images/lys -@dirrm nav/apache/webroot/images/main -@dirrm nav/apache/webroot/images/ragen -@dirrm nav/apache/webroot/images/status -@dirrm nav/apache/webroot/images/tabs -@dirrm nav/apache/webroot/images/toolbox/tools -@dirrm nav/apache/webroot/images/toolbox -@dirrm nav/apache/webroot/images -@dirrm nav/apache/webroot/logger -@dirrm nav/apache/webroot/machinetracker -@dirrm nav/apache/webroot/messages -@dirrm nav/apache/webroot/navAdmin -@dirrm nav/apache/webroot/preferences/navigation -@dirrm nav/apache/webroot/preferences -@dirrm nav/apache/webroot/report -@dirrm nav/apache/webroot/status -@dirrm nav/apache/webroot/toolbox -@dirrm nav/apache/webroot/vPServer -@dirrm nav/apache/webroot/vlanPlot/gfx -@dirrm nav/apache/webroot/vlanPlot/icons -@dirrm nav/apache/webroot/vlanPlot -@dirrm nav/apache/webroot -@dirrm nav/apache -@dirrm nav/bin -@dirrm nav/doc/cricket/cricket -@dirrm nav/doc/cricket/cricket-config/giga-router-interfaces -@dirrm nav/doc/cricket/cricket-config/giga-switch-ports -@dirrm nav/doc/cricket/cricket-config/router-interfaces -@dirrm nav/doc/cricket/cricket-config/routers -@dirrm nav/doc/cricket/cricket-config/servers -@dirrm nav/doc/cricket/cricket-config/switch-ports -@dirrm nav/doc/cricket/cricket-config/switches -@dirrm nav/doc/cricket/cricket-config -@dirrm nav/doc/cricket/public_html -@dirrm nav/doc/cricket -@dirrm nav/doc/sql/upgrades -@dirrm nav/doc/sql -@dirrm nav/doc -@dirrm nav/etc/cron.d -@dirrm nav/etc/init.d -@dirrm nav/etc/report -@dirrm nav/etc/webfront -@dirrm nav/etc -@dirrm nav/lib/java/eventEngine/device-plugins -@dirrm nav/lib/java/eventEngine/handler-plugins -@dirrm nav/lib/java/eventEngine -@dirrm nav/lib/java/getBoksMacs -@dirrm nav/lib/java/getDeviceData/data-plugins -@dirrm nav/lib/java/getDeviceData/device-plugins -@dirrm nav/lib/java/getDeviceData -@dirrm nav/lib/java/networkDiscovery -@dirrm nav/lib/java -@dirrm nav/lib/perl/NAV/AlertEngine -@dirrm nav/lib/perl/NAV -@dirrm nav/lib/perl/NetAddr -@dirrm nav/lib/perl -@dirrm nav/lib/python/nav/db/forgotten -@dirrm nav/lib/python/nav/db -@dirrm nav/lib/python/nav/rrd -@dirrm nav/lib/python/nav/statemon/DNS -@dirrm nav/lib/python/nav/statemon/checker -@dirrm nav/lib/python/nav/statemon -@dirrm nav/lib/python/nav/web/devBrowser -@dirrm nav/lib/python/nav/web/messages -@dirrm nav/lib/python/nav/web/pyproxy +share/nls/POSIX +share/nls/en_US.US-ASCII +@dirrm nav/var/run +@dirrm nav/var/rrd +@dirrm nav/var/pg_backup +@dirrm nav/var/log/networkDiscovery +@dirrm nav/var/log/getDeviceData +@dirrm nav/var/log/eventEngine +@dirrm nav/var/log +@dirrm nav/var @dirrm nav/lib/python/nav/web/templates/useradmin @dirrm nav/lib/python/nav/web/templates +@dirrm nav/lib/python/nav/web/pyproxy +@dirrm nav/lib/python/nav/web/messages +@dirrm nav/lib/python/nav/web/ipinfo +@dirrm nav/lib/python/nav/web/devBrowser @dirrm nav/lib/python/nav/web +@dirrm nav/lib/python/nav/statemon/checker +@dirrm nav/lib/python/nav/statemon/DNS +@dirrm nav/lib/python/nav/statemon +@dirrm nav/lib/python/nav/rrd +@dirrm nav/lib/python/nav/db/forgotten +@dirrm nav/lib/python/nav/db @dirrm nav/lib/python/nav @dirrm nav/lib/python +@dirrm nav/lib/perl/NetAddr +@dirrm nav/lib/perl/NAV/AlertEngine +@dirrm nav/lib/perl/NAV +@dirrm nav/lib/perl +@dirrm nav/lib/java/networkDiscovery +@dirrm nav/lib/java/getDeviceData/device-plugins +@dirrm nav/lib/java/getDeviceData/data-plugins +@dirrm nav/lib/java/getDeviceData +@dirrm nav/lib/java/getBoksMacs +@dirrm nav/lib/java/eventEngine/handler-plugins +@dirrm nav/lib/java/eventEngine/device-plugins +@dirrm nav/lib/java/eventEngine +@dirrm nav/lib/java @dirrm nav/lib -@dirrmtry nav -@unexec echo "Some files/directories may be left in %D/nav/var." +@dirrm nav/etc/webfront +@dirrm nav/etc/report +@dirrm nav/etc/init.d +@dirrm nav/etc/cron.d +@dirrm nav/etc/arnold/mailtemplates +@dirrm nav/etc/arnold +@dirrm nav/etc +@dirrm nav/doc/sql/upgrades +@dirrm nav/doc/sql +@dirrm nav/doc/cricket/public_html +@dirrm nav/doc/cricket/cricket-config/switches +@dirrm nav/doc/cricket/cricket-config/switch-ports-snmpv1-and-giga +@dirrm nav/doc/cricket/cricket-config/switch-ports +@dirrm nav/doc/cricket/cricket-config/servers +@dirrm nav/doc/cricket/cricket-config/routers +@dirrm nav/doc/cricket/cricket-config/router-interfaces-snmpv1-and-giga +@dirrm nav/doc/cricket/cricket-config/router-interfaces +@dirrm nav/doc/cricket/cricket-config +@dirrm nav/doc/cricket/cricket +@dirrm nav/doc/cricket +@dirrm nav/doc +@dirrm nav/bin +@dirrm nav/apache/webroot/vlanPlot/icons +@dirrm nav/apache/webroot/vlanPlot/gfx +@dirrm nav/apache/webroot/vlanPlot +@dirrm nav/apache/webroot/vPServer +@dirrm nav/apache/webroot/toolbox +@dirrm nav/apache/webroot/status +@dirrm nav/apache/webroot/source +@dirrm nav/apache/webroot/report +@dirrm nav/apache/webroot/preferences/navigation +@dirrm nav/apache/webroot/preferences +@dirrm nav/apache/webroot/navAdmin +@dirrm nav/apache/webroot/messages +@dirrm nav/apache/webroot/machinetracker +@dirrm nav/apache/webroot/logger +@dirrm nav/apache/webroot/l2trace +@dirrm nav/apache/webroot/ipinfo +@dirrm nav/apache/webroot/images/toolbox/tools +@dirrm nav/apache/webroot/images/toolbox +@dirrm nav/apache/webroot/images/tabs +@dirrm nav/apache/webroot/images/status +@dirrm nav/apache/webroot/images/ragen +@dirrm nav/apache/webroot/images/main +@dirrm nav/apache/webroot/images/lys +@dirrm nav/apache/webroot/images/login +@dirrm nav/apache/webroot/images/form +@dirrm nav/apache/webroot/images/emotd +@dirrm nav/apache/webroot/images/arpcam +@dirrm nav/apache/webroot/images +@dirrm nav/apache/webroot/editdb +@dirrm nav/apache/webroot/devicemanagement +@dirrm nav/apache/webroot/browse +@dirrm nav/apache/webroot/arnold +@dirrm nav/apache/webroot/alertprofiles/wap +@dirrm nav/apache/webroot/alertprofiles/modules +@dirrm nav/apache/webroot/alertprofiles/locale/en/LC_MESSAGES +@dirrm nav/apache/webroot/alertprofiles/locale/en +@dirrm nav/apache/webroot/alertprofiles/locale +@dirrm nav/apache/webroot/alertprofiles/images +@dirrm nav/apache/webroot/alertprofiles/icons +@dirrm nav/apache/webroot/alertprofiles/documents +@dirrm nav/apache/webroot/alertprofiles/css +@dirrm nav/apache/webroot/alertprofiles +@dirrm nav/apache/webroot +@dirrm nav/apache/webapps +@dirrm nav/apache/tools +@dirrm nav/apache +@dirrm nav diff -urNB /usr/ports/net-mgmt/nav.orig/scripts/myautoconf nav/scripts/myautoconf --- /usr/ports/net-mgmt/nav.orig/scripts/myautoconf Tue Aug 15 12:08:59 2006 +++ nav/scripts/myautoconf Fri Aug 18 14:31:44 2006 @@ -23,6 +23,23 @@ echo "if [ -f $LOCALBASE/nav/bin/navenv.sh ]; then . $LOCALBASE/nav/bin/navenv.sh; fi" >>/etc/profile fi +# hints from http://metanav.ntnu.no/moin.cgi/InstallingOnRHEL4 +# It's look like dirty hack for me, but I don't know how possible did it correctly +ln -fs $LOCALBASE/nav/lib/java/*.jar $JAVA_HOME/jre/lib/ext +ln -fs $JAVALIBDIR/postgresql.jar $JAVA_HOME/jre/lib/ext +ln -fs $LOCALBASE/nav/lib/perl/NAV.pm $SITE_PERL +ln -fs $LOCALBASE/nav/lib/perl/NAV $SITE_PERL +ln -fs $LOCALBASE/nav/lib/perl/NetAddr $SITE_PERL +ln -fs $LOCALBASE/nav/apache/webapps/*.war $CATALINA_HOME/webapps + +cat << EOF > $LOCALBASE/lib/python2.4/site-packages/sitecustomize.py +import sys +sys.path.append('$LOCALBASE/nav/lib/python') +EOF + +cat $CATALINA_HOME/conf/server.xml | awk '{ if ($0 ~ "Service.*Catalina") {print $0, "\n", "\t\t<Connector port="8080" address='127.0.0.1' />"} {print $0}}' > \ + $CATALINA_HOME/conf/server.xml.tmp && mv $CATALINA_HOME/conf/server.xml.tmp $CATALINA_HOME/conf/server.xml + if [ ! -f $LOCALBASE/etc/cricket-conf.pl ] then echo "Default cricket config missing, copying default one to" @@ -32,7 +49,7 @@ setdbcvar() { # $1: variable $2: password $3: config - sed "s/^$1=.*/$1=$2/" $3 >$3.tmp + sed -e "s/^$1=.*/$1=$2/" $3 >$3.tmp cp $3.tmp $3 rm -f $3.tmp } @@ -75,8 +92,7 @@ pconf=$pdir/postgresql.conf phbaconf=$pdir/pg_hba.conf pgsqlp=`$LOCALBASE/bin/apg -M NCL -n 1` - navreadp=`$LOCALBASE/bin/apg -M NCL -n 1` - navwritep=`$LOCALBASE/bin/apg -M NCL -n 1` + nav=`$LOCALBASE/bin/apg -M NCL -n 1` navdbconf=$LOCALBASE/nav/etc/db.conf navdbbkconf=$LOCALBASE/nav/etc/pg_backup.conf @@ -105,31 +121,29 @@ # firstdb=`su -l pgsql -c "$LOCALBASE/bin/psql -l -t -A" | head -1 | cut -d'|' -f1` PGUSER=pgsql export PGUSER - $LOCALBASE/bin/createdb --encoding UTF-8 manage - $LOCALBASE/bin/createdb --encoding UTF-8 navprofiles - $LOCALBASE/bin/createdb --encoding UTF-8 logger + $LOCALBASE/bin/createuser -A -D nav + $LOCALBASE/bin/createdb --owner nav --encoding UTF-8 arnold + $LOCALBASE/bin/createdb --owner nav --encoding UTF-8 manage + $LOCALBASE/bin/createdb --owner nav --encoding UTF-8 navprofiles + $LOCALBASE/bin/createdb --owner nav --encoding UTF-8 logger $LOCALBASE/bin/createlang plpgsql manage $LOCALBASE/bin/createlang plpgsql navprofiles - $LOCALBASE/bin/createlang plpgsql logger - $LOCALBASE/bin/createuser -A -D navread - $LOCALBASE/bin/createuser -A -D navwrite - $LOCALBASE/bin/psql -f $LOCALBASE/nav/doc/sql/manage.sql manage - $LOCALBASE/bin/psql -f $LOCALBASE/nav/doc/sql/navprofiles.sql navprofiles - $LOCALBASE/bin/psql -f $LOCALBASE/nav/doc/sql/logger.sql logger - $LOCALBASE/bin/psql -f $LOCALBASE/nav/doc/sql/snmpoid.sql manage + $LOCALBASE/bin/psql -f $LOCALBASE/nav/doc/sql/manage.sql manage nav + $LOCALBASE/bin/psql -f $LOCALBASE/nav/doc/sql/types.sql manage nav + $LOCALBASE/bin/psql -f $LOCALBASE/nav/doc/sql/snmpoid.sql manage nav + $LOCALBASE/bin/psql -f $LOCALBASE/nav/doc/sql/navprofiles.sql navprofiles nav + $LOCALBASE/bin/psql -f $LOCALBASE/nav/doc/sql/logger.sql logger nav + $LOCALBASE/bin/psql -f $LOCALBASE/nav/doc/sql/arnold.sql arnold nav echo "Setting passwords." + echo "alter user nav with password '$nav';" | $LOCALBASE/bin/psql $usedb echo "alter user pgsql with password '$pgsqlp';" | $LOCALBASE/bin/psql $usedb - echo "alter user navread with password '$navreadp';" | $LOCALBASE/bin/psql $usedb - echo "alter user navwrite with password '$navwritep';" | $LOCALBASE/bin/psql $usedb echo - echo "Password for database user navread: $navreadp" - echo "Password for database user navwrite: $navwritep" + echo "Password for database user nav: $nav" echo "Password for database user pgsql: $pgsqlp" echo "Make a mental note of it!" echo echo "Setting database passwords in NAV db.conf and pg_backup.conf." - setdbcvar userpw_navread $navreadp $navdbconf - setdbcvar userpw_navwrite $navwritep $navdbconf + setdbcvar userpw_nav $nav $navdbconf setdbcvar username pgsql $navdbbkconf setdbcvar password $pgsqlp $navdbbkconf echo "Configure database to only allow authentcated connections." >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608181109.k7IB9iq1034657>