Date: Fri, 5 Feb 2010 19:20:04 GMT From: "Anton Vinokurov" <anton@netams.com> To: freebsd-ports-bugs@FreeBSD.org Subject: RE: ports/143410: [PATCH] net-mgmt/netams: update to 3.4.5 Message-ID: <201002051920.o15JK4BL038058@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/143410; it has been noted by GNATS. From: "Anton Vinokurov" <anton@netams.com> To: "'Sylvio Cesar Teixeira'" <sylvio@FreeBSD.org>, <bug-followup@FreeBSD.org> Cc: "'Yuriy Shkandybin'" <jura@netams.com> Subject: RE: ports/143410: [PATCH] net-mgmt/netams: update to 3.4.5 Date: Fri, 5 Feb 2010 21:13:28 +0300 Это составное сообщение в формате MIME. ------=_NextPart_000_008E_01CAA6A8.10B7D4C0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -----Original Message----- From: Sylvio Cesar Teixeira Amorim [mailto:sylvio@scjamorim.org] On Behalf Of Sylvio Cesar Teixeira Sent: Friday, February 05, 2010 1:11 AM To: bug-followup@FreeBSD.org; anton@netams.com Subject: Re: ports/143410: [PATCH] net-mgmt/netams: update to 3.4.5 Hi, the patch continue with problem. Try use the tool: porttools, with command: port submit Regards, Sylvio Cesar ------=_NextPart_000_008E_01CAA6A8.10B7D4C0 Content-Type: application/octet-stream; name="netams_port_3.4.5.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="netams_port_3.4.5.diff" diff -ruN /usr/ports/net-mgmt/netams/Makefile ./Makefile --- /usr/ports/net-mgmt/netams/Makefile 2009-08-22 04:32:02.000000000 = +0400 +++ ./Makefile 2010-02-05 21:05:49.000000000 +0300 @@ -2,29 +2,39 @@ # Date created: 24 December 2003 # Whom: jura@netams.com # -# $FreeBSD: ports/net-mgmt/netams/Makefile,v 1.25 2009/08/22 00:32:02 = amdmi3 Exp $ +# $FreeBSD$ # =20 PORTNAME=3D netams -DISTVERSION=3D 3.4.1rc1 +PORTVERSION=3D 3.4.5 CATEGORIES=3D net-mgmt -MASTER_SITES=3D http://www.netams.com/files/ +MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE} \ + http://www.netams.com/files/ +MASTER_SITE_SUBDIR=3D ${PORTNAME} +DISTNAME=3D ${PORTNAME}-${PORTVERSION} =20 MAINTAINER=3D jura@netams.com COMMENT=3D Network Traffic Accounting and Monitoring Software =20 +BUILD_DEPENDS=3D = ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \ + ${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \ + ${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil \ + ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \ + = ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql= 50 \ + ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ + = ${SITE_PERL}/Crypt/GeneratePassword.pm:${PORTSDIR}/security/p5-Crypt-Gene= ratePassword + +RUN_DDEPENDS=3D httpd:${PORTSDIR}/www/apache22 \ + mysql-server>=3D5.0.86:${PORTSDIR}/databases/mysql50-server + +LIB_DEPENDS=3D gd.4:${PORTSDIR}/graphics/gd \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ + mysqlclient.15:${PORTSDIR}/databases/mysql50-client \ + pcap.7:${PORTSDIR}/net/libpcap \ + USE_SUBMAKE=3D yes -USE_RC_SUBR=3D netams +USE_RC_SUBR=3D netams.sh MANCOMPRESSED=3D no -SUB_FILES=3D pkg-message - -OPTIONS=3D DEBUG "Build with debug symbols" off \ - BW "Build with bandwidth limitation functionality" on \ - HASH "Build with HASH storage support" off \ - MYSQL "Build with MySQL storage support" on \ - POSTGRESQL "Build with PostgreSQL storage support" off \ - FREERADIUS "Build with FreeRadius and rlm module" off \ - CGI "Install admin/user CGI scripts" off =20 SCRIPTS_ENV=3D WRKDIRPREFIX=3D"${WRKDIRPREFIX}" \ PREFIX=3D"${PREFIX}" \ @@ -32,220 +42,66 @@ MKDIR=3D"${MKDIR}" \ REALCURDIR=3D"${.CURDIR}" =20 -ADMINCGI=3D .htaccess access.cgi account.cgi billing_users_table.sql = cardtool.cgi \ - config.cgi graph.cgi index.cgi login.cgi monitor.cgi netams.cgi \ - plan.cgi policy.cgi quota.cgi radius.cgi rrdgraph.cgi russian.res \ - showusercard.cgi showusercard.tmpl statistic.cgi subplan.cgi unit.cgi = \ - user.cgi view.cgi -USERCGI=3D .htaccess activate.cgi activate.tmpl admintool.cgi = config.cgi \ - login.cgi netams_api.pl netams_example.cgi netams_graph.cgi \ - netams_html.cgi russian.res statistic.pl usertool.cgi -IMAGES=3D admintool-logo.gif logo-small.gif logo.gif logo_sm.jpg = rrdgraph-logo.gif \ - showtable-logo.gif +DATADIR=3D ${PREFIX}/etc + +WWWDIR=3D ${PREFIX}/www/netams + +ADMINCGI=3D .htaccess index.cgi policy.cgi showusercard.cgi user.cgi \ + access.cgi login.cgi quota.cgi showusercard.tmpl view.cgi \ + account.cgi netams.cgi radius.cgi subplan.cgi config.cgi \ + plan.cgi russian.res unit.cgi cardtool.cgi graph.cgi \ + monitor.cgi rrdgraph.cgi statistic.cgi +CGI=3D .htaccess config.cgi netams_api.pl russian.res \ + netams_example.cgi usertool.cgi admintool.cgi login.cgi \ + netams_graph.cgi activate.cgi activate.tmpl netams_html.cgi \ + statistic.pl +IMAGES=3D logo_sm.jpg admintool-logo.gif showtable-logo.gif = rrdgraph-logo.gif MAN8=3D netams.8 flowprobe.8 netamsctl.8 =20 .include <bsd.port.pre.mk> =20 -.if ${ARCH} !=3D "i386" -BROKEN=3D does not compile -.elif ${OSVERSION} >=3D 800000 -BROKEN=3D does not compile -.endif - -PLIST_FILES+=3D etc/netams.conf.sample \ - libexec/netams \ - sbin/flowprobe \ - sbin/ipfw2netflow \ - sbin/ascii2netflow \ - bin/netamsctl \ - %%DATADIR%%/ru-networks.txt.sample \ - %%DATADIR%%/.netamsctl.rc \ - %%DATADIR%%/netams-netgraphctl.sh \ - %%DATADIR%%/netams-startup-failover.sh \ - %%DATADIR%%/ua-networks-get.sh \ - %%DATADIR%%/snmp2netams.pl \ - %%DATADIR%%/subnet-sum.c \ - %%DATADIR%%/TODO.txt - -.if defined(WITH_MYSQL) -USE_MYSQL=3D yes -IGNORE_WITH_MYSQL=3D 323 -PLIST_FILES+=3D %%DATADIR%%/cardtool_schema.sql \ - %%DATADIR%%/mysql_rotate.pl -.endif - -.if defined(WITH_POSTGRESQL) -USE_PGSQL=3D yes -PLIST_FILES+=3D %%DATADIR%%/cardtool_schema-Pg.sql \ - %%DATADIR%%/postgresql_schema.sql -.endif - -.if defined(WITH_FREERADIUS) -FREERADIUS_VERSION=3D`${CAT} ${PORTSDIR}/net/freeradius/Makefile|grep = PORTVERSION?=3D|${SED} -n 's|PORTVERSION?=3D[^0-9]*\([0-9\.]*\)|\1|p'` -RUN_DEPENDS+=3D freeradius>=3D1.1.7:${PORTSDIR}/net/freeradius -PLIST_FILES+=3D lib/rlm_netams.a \ - lib/rlm_netams.la \ - lib/rlm_netams.so \ - lib/rlm_netams-${FREERADIUS_VERSION}.la \ - lib/rlm_netams-${FREERADIUS_VERSION}.so \ - %%DATADIR%%/README.radius -.endif - -.if defined(WITH_CGI) -USE_APACHE=3D 1.3+ -USE_PERL5=3D yes -.for f in ${IMAGES} -PLIST_FILES+=3D %%WWWDIR%%/cgi-bin/images/${f} -.endfor -.for f in ${USERCGI} -PLIST_FILES+=3D %%WWWDIR%%/cgi-bin/${f} -.endfor -.for f in ${ADMINCGI} -PLIST_FILES+=3D %%WWWDIR%%/cgi-bin/admin/${f} -.endfor -PLIST_FILES+=3D %%WWWDIR%%/index.html \ - %%DATADIR%%/httpd.conf -.endif - -PLIST_FILES+=3D "@unexec ${RMDIR} %D/www/netams/cgi-bin/images = 2>/dev/null || ${TRUE}" \ - "@unexec ${RMDIR} %D/www/netams/cgi-bin/admin 2>/dev/null || ${TRUE}" = \ - "@unexec ${RMDIR} %D/www/netams/cgi-bin 2>/dev/null || ${TRUE}" \ - "@unexec ${RMDIR} %D/www/netams 2>/dev/null || ${TRUE}" \ - "@unexec ${RMDIR} %D/share/netams 2>/dev/null || ${TRUE}" - -pre-patch: -.if defined(WITH_DEBUG) - @${REINPLACE_CMD} -e 's|#\(echo.*Memory_debug.*DEFINE +=3D = -DMEMORY_DEBUG.*\)|\1|' \ - ${WRKSRC}/configure.sh - @${REINPLACE_CMD} -e 's|#\(echo.*Mutex_debug.*DEFINE +=3D = -DMUTEX_DEBUG.*\)|\1|' \ - ${WRKSRC}/configure.sh -.else - @${REINPLACE_CMD} -e 's|.*sh configure.sh|& -nodebug|' \ - ${WRKSRC}/Makefile -.endif - -.if defined(WITHOUT_BW) - @${REINPLACE_CMD} -e 's|.*BW_limit.*DEFINE +=3D -DHAVE_BW.*|#&|' \ - ${WRKSRC}/configure.sh -.endif - -.if defined(WITH_HASH) - @${REINPLACE_CMD} -e 's|#\(echo.*Hash_database.*DEFINE +=3D = -DUSE_HASH.*\)|\1|' \ - ${WRKSRC}/configure.sh -.endif - - @${REINPLACE_CMD} -e 's|^CC.*|CC=3D${CXX}|; s|^CPP.*|CPP=3D${CXX}|' \ - ${WRKSRC}/src/Makefile - @${REINPLACE_CMD} -e 's|^CC.*|CC=3D${CC}|; s|^CPP.*|CPP=3D${CXX}|' \ - ${WRKSRC}/lib/Makefile \ - ${WRKSRC}/lib/libipulog/Makefile - -.if defined(WITHOUT_MYSQL) - @${REINPLACE_CMD} -e 's|locate_file "libmysqlclient\.so".*|v1=3D"" = \&\& v2=3D""|' \ - ${WRKSRC}/configure.sh -.endif - -.if defined(WITHOUT_POSTGRESQL) - @${REINPLACE_CMD} -e 's|locate_file "libpq\.so".*|v1=3D"" \&\& = v2=3D""|' \ - ${WRKSRC}/configure.sh -.endif - -.if defined(WITHOUT_FREERADIUS) - @${REINPLACE_CMD} -e 's|locate_file "openssl\/md5\.h".*|v1=3D""|; = s|echo "No RADIUS support.*|| ' \ - ${WRKSRC}/configure.sh -.endif - -pre-install: -.if defined(WITH_FREERADIUS) - @cd ${PORTSDIR}/net/freeradius/ && make - @${FIND} ${PORTSDIR}/net/freeradius/ -type d -name "freeradius*" -exec = ${CP} -R ${WRKSRC}/addon/rlm_netams '{}'/src/modules/ \; - @cd `${FIND} ${PORTSDIR}/net/freeradius/ -type d -name = "freeradius*"`/src/modules/rlm_netams && ${GMAKE} && ${GMAKE} install -.endif - do-install: - ${MKDIR} ${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/src/netams ${PREFIX}/libexec/netams ${INSTALL_PROGRAM} ${WRKSRC}/src/flowprobe ${PREFIX}/sbin/flowprobe ${INSTALL_PROGRAM} ${WRKSRC}/src/ipfw2netflow = ${PREFIX}/sbin/ipfw2netflow ${INSTALL_PROGRAM} ${WRKSRC}/src/ascii2netflow = ${PREFIX}/sbin/ascii2netflow ${INSTALL_PROGRAM} ${WRKSRC}/src/netamsctl ${PREFIX}/bin/netamsctl - ${INSTALL_DATA} ${WRKSRC}/addon/netams.conf = ${PREFIX}/etc/netams.conf.sample - ${INSTALL_DATA} ${WRKSRC}/addon/ru-networks.txt = ${DATADIR}/ru-networks.txt.sample - ${INSTALL_DATA} ${WRKSRC}/addon/.netamsctl.rc ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/addon/netams-netgraphctl.sh ${DATADIR} - ${CHMOD} 0755 ${DATADIR}/netams-netgraphctl.sh - ${INSTALL_DATA} ${WRKSRC}/addon/netams-startup-failover.sh ${DATADIR} - ${CHMOD} 0755 ${DATADIR}/netams-startup-failover.sh - ${INSTALL_DATA} ${WRKSRC}/addon/ua-networks-get.sh ${DATADIR} - ${CHMOD} 0755 ${DATADIR}/ua-networks-get.sh - @${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!/usr/local/bin/perl|' = ${WRKSRC}/addon/snmp2netams.pl - ${INSTALL_DATA} ${WRKSRC}/addon/snmp2netams.pl ${DATADIR} - ${CHMOD} 0755 ${DATADIR}/snmp2netams.pl - ${INSTALL_DATA} ${WRKSRC}/addon/subnet-sum.c ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/doc/TODO.txt ${DATADIR} - -.if defined(WITH_MYSQL) - ${INSTALL_DATA} ${WRKSRC}/addon/cardtool_schema.sql ${DATADIR} - @${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!/usr/local/bin/perl|' = ${WRKSRC}/addon/mysql_rotate.pl - ${INSTALL_DATA} ${WRKSRC}/addon/mysql_rotate.pl ${DATADIR} - ${CHMOD} 0755 ${DATADIR}/mysql_rotate.pl -.endif - -.if defined(WITH_POSTGRESQL) - ${INSTALL_DATA} ${WRKSRC}/addon/cardtool_schema-Pg.sql ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/addon/postgresql_schema.sql ${DATADIR} -.endif - -.if defined(WITH_CGI) - ${INSTALL_DATA} ${WRKSRC}/addon/netams-apache ${DATADIR}/httpd.conf - ${MKDIR} ${WWWDIR}/cgi-bin/admin ${WWWDIR}/cgi-bin/images - ${INSTALL_DATA} ${WRKSRC}/addon/index.html ${WWWDIR} + ${MKDIR} ${WWWDIR} ${WWWDIR}/cgi-bin ${WWWDIR}/cgi-bin/admin = ${WWWDIR}/images \ + ${DATADIR}/netams ${DATADIR}/netams/tools = ${DATADIR}/netams/tools/oracle \ + ${DATADIR}/apache22 ${DATADIR}/apache22/Includes + ${INSTALL_DATA} ${WRKSRC}/addon/netams.conf = ${DATADIR}/netams/netams.conf.sample + ${INSTALL_DATA} ${WRKSRC}/addon/ru-networks.txt = ${DATADIR}/netams/ru-networks.txt.sample + ${INSTALL_DATA} ${WRKSRC}/addon/ua-networks.txt = ${DATADIR}/netams/ua-networks.txt.sample + ${INSTALL_DATA} ${WRKSRC}/addon/.netamsctl.rc ${DATADIR}/.netamsctl.rc + ${INSTALL_DATA} ${WRKSRC}/addon/mysql_rotate.pl = ${DATADIR}/netams/mysql_rotate.pl + ${INSTALL_DATA} ${WRKSRC}/addon/snmp2netams.pl = ${DATADIR}/netams/snmp2netams.pl + ${INSTALL_DATA} ${WRKSRC}/addon/ua-networks-get.sh = ${DATADIR}/netams/ua-networks-get.sh + ${INSTALL_DATA} ${WRKSRC}/cgi-bin/admin/billing_users_table.sql = ${DATADIR}/netams/tools/billing_users_table.sql + ${INSTALL_DATA} ${WRKSRC}/addon/cardtool_schema-Pg.sql = ${DATADIR}/netams/tools/cardtool_schema-Pg.sql + ${INSTALL_DATA} ${WRKSRC}/addon/cardtool_schema.sql = ${DATADIR}/netams/tools/cardtool_schema.sql + ${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams.sh = ${DATADIR}/netams/tools/oracle/netams.sh + ${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_drop.sql = ${DATADIR}/netams/tools/oracle/netams_drop.sql + ${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_tb.sql = ${DATADIR}/netams/tools/oracle/netams_tb.sql + ${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_tg.sql = ${DATADIR}/netams/tools/oracle/netams_tg.sql + ${INSTALL_DATA} ${WRKSRC}/addon/oracle/netams_ts.sql = ${DATADIR}/netams/tools/oracle/netams_ts.sql + ${INSTALL_DATA} ${WRKSRC}/addon/index.html ${WWWDIR}/index.html + ${INSTALL_DATA} ${WRKSRC}/addon/netams.js ${WWWDIR}/netams.js + ${INSTALL_DATA} ${WRKSRC}/addon/netams-apache-freebsd.conf = ${DATADIR}/apache22/Includes/netams-apache-freebsd.conf .for f in ${IMAGES} - ${INSTALL_DATA} ${WRKSRC}/cgi-bin/images/${f} ${WWWDIR}/cgi-bin/images + ${INSTALL_DATA} ${WRKSRC}/cgi-bin/images/${f} ${WWWDIR}/images/ .endfor -.for f in ${USERCGI} - @${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!/usr/local/bin/perl|' = ${WRKSRC}/cgi-bin/${f} - ${INSTALL_DATA} ${WRKSRC}/cgi-bin/${f} ${WWWDIR}/cgi-bin +.for f in ${CGI} + ${INSTALL_DATA} ${WRKSRC}/cgi-bin/${f} ${WWWDIR}/cgi-bin/ .endfor .for f in ${ADMINCGI} - @${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!/usr/local/bin/perl|' = ${WRKSRC}/cgi-bin/admin/${f} - ${INSTALL_DATA} ${WRKSRC}/cgi-bin/admin/${f} ${WWWDIR}/cgi-bin/admin + ${INSTALL_DATA} ${WRKSRC}/cgi-bin/admin/${f} ${WWWDIR}/cgi-bin/admin/ .endfor - @${FIND} ${WWWDIR} -name *.cgi | ${XARGS} ${CHMOD} 755 - @${FIND} ${WWWDIR} -name *.pl | ${XARGS} ${CHMOD} 755 -.endif - -.if defined(WITH_FREERADIUS) - ${INSTALL_DATA} ${WRKSRC}/addon/rlm_netams/README = ${DATADIR}/README.radius -.endif - .for f in ${MAN8} - ${INSTALL_MAN} ${WRKSRC}/doc/${f} ${MAN8PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/doc/${f} ${PREFIX}/man/man8/ .endfor =20 post-install: -.if defined(WITH_FREERADIUS) - cd ${PORTSDIR}/net/freeradius/ && make clean -.endif - @${CAT} ${PKGMESSAGE} -.if defined(WITH_CGI) - @${ECHO_MSG} "By default, CGI scripts are installed to ${WWWDIR}," - @${ECHO_MSG} "but web server NOT configured!!! You should do it = yourself according to" - @${ECHO_MSG} "example ${DATADIR}/httpd.conf." - @${ECHO_MSG} "" -.endif -.if defined(WITH_FREERADIUS) - @${ECHO_MSG} "Radius module has been installed. But you should = configure it yourself" - @${ECHO_MSG} "according to example ${DATADIR}/README.radius." - @${ECHO_MSG} "" -.endif - @${ECHO_MSG} "And PLEASE READ THE DOCUMENTATION FIRST!" - @${ECHO_MSG} "http://www.netams.com" - @${ECHO_MSG} "" - @${ECHO_MSG} = "------------------------------------------------------------------------= ----" - @${ECHO_MSG} "WARNING!" - @${ECHO_MSG} "From version 3.4.1 name of default netams configuration - @${ECHO_MSG} "file changed to netams.conf!" - @${ECHO_MSG} = "------------------------------------------------------------------------= ----" + @${SED} 's|%%PREFIX%%|${PREFIX}|g; s|%%DATADIR%%|${DATADIR}|g' \ + ${PKGMESSAGE} =20 .include <bsd.port.post.mk> diff -ruN /usr/ports/net-mgmt/netams/distinfo ./distinfo --- /usr/ports/net-mgmt/netams/distinfo 2008-05-08 14:16:03.000000000 = +0400 +++ ./distinfo 2010-01-31 18:27:26.000000000 +0300 @@ -1,3 +1,3 @@ -MD5 (netams-3.4.1rc1.tar.gz) =3D 72e7a145f39c89a4f6c5a4ff4121ac2f -SHA256 (netams-3.4.1rc1.tar.gz) =3D = 7b03914c1e07895282667ccff4f66dc023ec2760974eecc10efdbbc98edb1809 -SIZE (netams-3.4.1rc1.tar.gz) =3D 391192 +MD5 (netams-3.4.5.tar.gz) =3D adb19cfff7ecf33b25e865472118898b +SHA256 (netams-3.4.5.tar.gz) =3D = dc6522cc6cf14bfb29f38f09e5513bfe4dce275c0fce9f55ec8706cd300908b1 +SIZE (netams-3.4.5.tar.gz) =3D 408868 diff -ruN /usr/ports/net-mgmt/netams/files/netams.in ./files/netams.in --- /usr/ports/net-mgmt/netams/files/netams.in 2008-05-08 = 14:16:04.000000000 +0400 +++ ./files/netams.in 1970-01-01 03:00:00.000000000 +0300 @@ -1,37 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/net-mgmt/netams/files/netams.in,v 1.4 2008/05/08 = 10:16:04 beech Exp $ -# - -# PROVIDE: netams -# REQUIRE: NETWORKING -# KEYWORD: shutdown - -# Define these netams_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/netams -# -# netams_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable netams. -# netams_config (str): Custom configuration file to be passed -# to netams. -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# - -. %%RC_SUBR%% - -name=3D"netams" -rcvar=3D`set_rcvar` - -load_rc_config $name - -: ${netams_enable=3D"NO"} -: ${netams_config=3D"%%PREFIX%%/etc/netams.conf"} - -pidfile=3D"/var/run/netams.pid" -command=3D"%%PREFIX%%/libexec/netams" -command_args=3D"-lf ${netams_config} > /dev/null &" - -run_rc_command "$1" diff -ruN /usr/ports/net-mgmt/netams/files/netams.sh.in = ./files/netams.sh.in --- /usr/ports/net-mgmt/netams/files/netams.sh.in 1970-01-01 = 03:00:00.000000000 +0300 +++ ./files/netams.sh.in 2009-12-23 11:20:37.000000000 +0300 @@ -0,0 +1,38 @@ +#!/bin/sh +# $FreeBSD$ + +# PROVIDE: netams +# REQUIRE: NETWORKING +# KEYWORD: shutdown +# REQUIRE: mysql + +# Define these netams_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# /etc/rc.conf.d/netams +# +# netams_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable netams. +# netams_config (str): Custom configuration file to be passed +# to netams. +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# +netams_enable=3D${netams_enable-"NO"} +netams_config=3D${netams_config-"%%PREFIX%%/etc/netams/netams.conf"} + +netams_pidfile=3D"/var/run/netams.pid" + +. %%RC_SUBR%% + +name=3D"netams" +rcvar=3D`set_rcvar` +command=3D"%%PREFIX%%/libexec/netams" + +load_rc_config $name + +pidfile=3D"${netams_pidfile}" + +start_cmd=3D"echo \"Starting ${name}.\"; ${command} -lf = ${netams_config} > /dev/null" + +run_rc_command "$1" diff -ruN /usr/ports/net-mgmt/netams/files/pkg-message.in = ./files/pkg-message.in --- /usr/ports/net-mgmt/netams/files/pkg-message.in 2008-05-08 = 14:16:04.000000000 +0400 +++ ./files/pkg-message.in 1970-01-01 03:00:00.000000000 +0300 @@ -1,13 +0,0 @@ -------------------------------------------------------------------------= ---- - -The NeTAMS package has been successfully installed. - -Check %%DATADIR%% and http://www.netams.com for examples. - -A sample configuration file has been installed to %%PREFIX%%/etc as -"netams.conf.sample". This may be renamed to "netams.conf" and edited. - -In order to use the netamsctl programs,=20 -you may copy %%DATADIR%%/.netamsctl.rc to your=20 -home directory and edit it. - diff -ruN /usr/ports/net-mgmt/netams/pkg-descr ./pkg-descr --- /usr/ports/net-mgmt/netams/pkg-descr 2007-07-08 16:41:40.000000000 = +0400 +++ ./pkg-descr 2009-12-20 13:40:39.000000000 +0300 @@ -1,4 +1,4 @@ -NeTAMS stands for Network Traffic Accounting and Monitoring Software.=20 +NeTAMS - Network Traffic Accounting and Monitoring Software.=20 It is built for UNIX and works for networks with Cisco routers or PC = Unix=20 routers (Linux/FreeBSD/Solaris). Several methods of traffic gathering = are=20 supported (tee/divert/ip_queue/libpcap/netflow v5), database storage=20 diff -ruN /usr/ports/net-mgmt/netams/pkg-message ./pkg-message --- /usr/ports/net-mgmt/netams/pkg-message 1970-01-01 03:00:00.000000000 = +0300 +++ ./pkg-message 2009-12-20 13:40:39.000000000 +0300 @@ -0,0 +1,16 @@ +------------------------------------------------------------------------= -- + +The NeTAMS package has been successfully installed. + +Check %%DATADIR%% and http://www.netams.com for examples. + +A sample configuration file has been installed to %%PREFIX%%/etc as +"netams.conf.sample". It MUST be renamed to "netams.conf" and adjusted. + +In order to use the "netamsctl" utility, you may copy=20 +%%DATADIR%%/.netamsctl.rc to your home directory and adjust it too. + +PLEASE READ THE DOCUMENTATION! +http://www.netams.com + +------------------------------------------------------------------------= -- diff -ruN /usr/ports/net-mgmt/netams/pkg-plist ./pkg-plist --- /usr/ports/net-mgmt/netams/pkg-plist 1970-01-01 03:00:00.000000000 = +0300 +++ ./pkg-plist 2010-01-31 18:27:26.000000000 +0300 @@ -0,0 +1,70 @@ +libexec/netams +sbin/flowprobe +sbin/ipfw2netflow +sbin/ascii2netflow +bin/netamsctl +%%DATADIR%%/netams/ru-networks.txt.sample +%%DATADIR%%/netams/ua-networks.txt.sample +%%DATADIR%%/netams/netams.conf.sample +%%DATADIR%%/.netamsctl.rc +%%DATADIR%%/apache22/Includes/netams-apache-freebsd.conf +%%DATADIR%%/netams/mysql_rotate.pl +%%DATADIR%%/netams/snmp2netams.pl +%%DATADIR%%/netams/ua-networks-get.sh +%%DATADIR%%/netams/tools/cardtool_schema-Pg.sql +%%DATADIR%%/netams/tools/cardtool_schema.sql +%%DATADIR%%/netams/tools/billing_users_table.sql +%%DATADIR%%/netams/tools/oracle/netams.sh +%%DATADIR%%/netams/tools/oracle/netams_drop.sql +%%DATADIR%%/netams/tools/oracle/netams_tb.sql +%%DATADIR%%/netams/tools/oracle/netams_tg.sql +%%DATADIR%%/netams/tools/oracle/netams_ts.sql +%%WWWDIR%%/cgi-bin/.htaccess +%%WWWDIR%%/cgi-bin/config.cgi +%%WWWDIR%%/cgi-bin/netams_api.pl +%%WWWDIR%%/cgi-bin/russian.res +%%WWWDIR%%/cgi-bin/netams_example.cgi +%%WWWDIR%%/cgi-bin/usertool.cgi +%%WWWDIR%%/cgi-bin/admintool.cgi +%%WWWDIR%%/cgi-bin/login.cgi +%%WWWDIR%%/cgi-bin/netams_graph.cgi +%%WWWDIR%%/cgi-bin/activate.cgi +%%WWWDIR%%/cgi-bin/activate.tmpl +%%WWWDIR%%/cgi-bin/netams_html.cgi +%%WWWDIR%%/cgi-bin/statistic.pl +%%WWWDIR%%/cgi-bin/admin/.htaccess +%%WWWDIR%%/cgi-bin/admin/index.cgi +%%WWWDIR%%/cgi-bin/admin/policy.cgi +%%WWWDIR%%/cgi-bin/admin/showusercard.cgi +%%WWWDIR%%/cgi-bin/admin/user.cgi +%%WWWDIR%%/cgi-bin/admin/access.cgi +%%WWWDIR%%/cgi-bin/admin/login.cgi +%%WWWDIR%%/cgi-bin/admin/quota.cgi +%%WWWDIR%%/cgi-bin/admin/showusercard.tmpl +%%WWWDIR%%/cgi-bin/admin/view.cgi +%%WWWDIR%%/cgi-bin/admin/account.cgi +%%WWWDIR%%/cgi-bin/admin/netams.cgi +%%WWWDIR%%/cgi-bin/admin/radius.cgi +%%WWWDIR%%/cgi-bin/admin/subplan.cgi +%%WWWDIR%%/cgi-bin/admin/config.cgi +%%WWWDIR%%/cgi-bin/admin/plan.cgi +%%WWWDIR%%/cgi-bin/admin/russian.res +%%WWWDIR%%/cgi-bin/admin/unit.cgi +%%WWWDIR%%/cgi-bin/admin/cardtool.cgi +%%WWWDIR%%/cgi-bin/admin/graph.cgi +%%WWWDIR%%/cgi-bin/admin/monitor.cgi +%%WWWDIR%%/cgi-bin/admin/rrdgraph.cgi +%%WWWDIR%%/cgi-bin/admin/statistic.cgi +%%WWWDIR%%/images/admintool-logo.gif +%%WWWDIR%%/images/logo_sm.jpg +%%WWWDIR%%/images/showtable-logo.gif +%%WWWDIR%%/images/rrdgraph-logo.gif +%%WWWDIR%%/index.html +%%WWWDIR%%/netams.js +@dirrm %%WWWDIR%% +@dirrm %%WWWDIR%%/images +@dirrm %%WWWDIR%%/cgi-bin/admin +@dirrm %%WWWDIR%%/cgi-bin +@dirrm %%DATADIR%%/netams/tools/oracle +@dirrm %%DATADIR%%/netams/tools +@dirrm %%DATADIR%%/netams ------=_NextPart_000_008E_01CAA6A8.10B7D4C0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002051920.o15JK4BL038058>