Date: Thu, 21 Mar 2019 21:55:31 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496516 - in head/net-mgmt/flow-tools: . files Message-ID: <201903212155.x2LLtVsD032666@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Thu Mar 21 21:55:31 2019 New Revision: 496516 URL: https://svnweb.freebsd.org/changeset/ports/496516 Log: net-mgmt/flow-tools: Update version 0.68=>0.68.6 - The original development has stalled. After tthatt Andrew tried to work on this project but I believe that has also stalled. Hence I have created a git repo applied some FreeBSD patches and released a new version. PR: 224840 Deleted: head/net-mgmt/flow-tools/files/patch-configs_Makefile head/net-mgmt/flow-tools/files/patch-configure head/net-mgmt/flow-tools/files/patch-flow-header.c head/net-mgmt/flow-tools/files/patch-ftpaths.h head/net-mgmt/flow-tools/files/patch-lib-ftfile.c head/net-mgmt/flow-tools/files/patch-lib_ftchash.c head/net-mgmt/flow-tools/files/patch-lib_ftio.c head/net-mgmt/flow-tools/files/patch-lib_ftlib.h head/net-mgmt/flow-tools/files/patch-lib_ftsym.c head/net-mgmt/flow-tools/files/patch-lib_fttlv.c head/net-mgmt/flow-tools/files/patch-lib_support.c head/net-mgmt/flow-tools/files/patch-src_flow-export.c head/net-mgmt/flow-tools/files/patch-src_flow-fanout.c head/net-mgmt/flow-tools/files/pkg-deinstall.in head/net-mgmt/flow-tools/files/pkg-install.in Modified: head/net-mgmt/flow-tools/Makefile head/net-mgmt/flow-tools/distinfo head/net-mgmt/flow-tools/files/flow_capture.in head/net-mgmt/flow-tools/files/flow_fanout.in head/net-mgmt/flow-tools/pkg-descr head/net-mgmt/flow-tools/pkg-plist Modified: head/net-mgmt/flow-tools/Makefile ============================================================================== --- head/net-mgmt/flow-tools/Makefile Thu Mar 21 21:33:19 2019 (r496515) +++ head/net-mgmt/flow-tools/Makefile Thu Mar 21 21:55:31 2019 (r496516) @@ -2,56 +2,44 @@ # $FreeBSD$ PORTNAME= flow-tools -PORTVERSION= 0.68 -PORTREVISION= 10 +PORTVERSION= 0.68.6 +DISTVERSIONPREFIX= v CATEGORIES= net-mgmt -MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/ MAINTAINER= bofh@FreeBSD.org COMMENT= Suite of tools and library to work with netflow data -PORTSCOUT= skipv:0.411 +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man + +USES= autoreconf libtool:keepla python:run shebangfix + OPTIONS_DEFINE= MYSQL OPENSSL PGSQL +PGSQL_CONFIGURE_ON= --with-postgresql +PGSQL_USES= pgsql +MYSQL_CONFIGURE_ON= --with-mysql="${LOCALBASE}" +MYSQL_USES= mysql +OPENSSL_CONFIGURE_ON= --with-openssl="${OPENSSLBASE}" +OPENSSL_USES= ssl -USES= python:run shebangfix SHEBANG_FILES= bin/flow-* -USE_CSTD= gnu89 GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--localstatedir="${PREFIX}" -MAKE_ARGS= AM_CFLAGS="${CFLAGS}" +USE_LDCONFIG= yes -SUB_FILES= pkg-install pkg-deinstall +USE_GITHUB= yes +GH_ACCOUNT= 5u623l20 +GH_TAGNAME= 6e7c849 SUB_LIST= FLOW_CAPTURE_SPOOL="${FLOW_CAPTURE_SPOOL}" \ - FLOW_CAPTURE_USER="${FLOW_CAPTURE_USER}" \ - FLOW_CAPTURE_GROUP="${FLOW_CAPTURE_GROUP}" \ - FLOW_CAPTURE_UID="${FLOW_CAPTURE_UID}" \ - FLOW_CAPTURE_GID="${FLOW_CAPTURE_GID}" \ FLOW_CAPTURE_PIDDIR="${FLOW_CAPTURE_PIDDIR}" USE_RC_SUBR= flow_capture flow_fanout VARDIR?= /var FLOW_CAPTURE_SPOOL= ${VARDIR}/db/flows -FLOW_CAPTURE_USER= flowtools -FLOW_CAPTURE_GROUP= flowtools -FLOW_CAPTURE_UID= 174 -FLOW_CAPTURE_GID= 174 FLOW_CAPTURE_PIDDIR= ${VARDIR}/run/flow-capture -PGSQL_CONFIGURE_ON= --with-pgsql="${LOCALBASE}" -PGSQL_USES= pgsql -MYSQL_CONFIGURE_ON= --with-mysql="${LOCALBASE}" -MYSQL_USES= mysql -OPENSSL_CONFIGURE_ON= --with-openssl="${OPENSSLBASE}" -OPENSSL_USES= ssl - -post-patch: - ${REINPLACE_CMD}\ - -e 's|@localstatedir@/sym/|${PREFIX}/share/flow-tools/|' \ - -e 's|@localstatedir@/cfg/|${PREFIX}/etc/flow-tools/|' \ - ${WRKSRC}/docs/flow-*.1.in ${WRKSRC}/docs/flow-*.html.in - -post-install: - ${INSTALL_MAN} ${WRKSRC}/docs/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ +USERS= flowtools +GROUPS= flowtools .include <bsd.port.mk> Modified: head/net-mgmt/flow-tools/distinfo ============================================================================== --- head/net-mgmt/flow-tools/distinfo Thu Mar 21 21:33:19 2019 (r496515) +++ head/net-mgmt/flow-tools/distinfo Thu Mar 21 21:55:31 2019 (r496516) @@ -1,2 +1,3 @@ -SHA256 (flow-tools-0.68.tar.gz) = 69d5353b339f917fc141919db042b007d5c8d31c9ad1bc2f989a41aa41d629df -SIZE (flow-tools-0.68.tar.gz) = 987151 +TIMESTAMP = 1553203482 +SHA256 (5u623l20-flow-tools-v0.68.6-6e7c849_GH0.tar.gz) = cea67317e205d1f52f9b8aeb980a1cda9ebbbb1886489fc4d56a61f948ecd72e +SIZE (5u623l20-flow-tools-v0.68.6-6e7c849_GH0.tar.gz) = 1078840 Modified: head/net-mgmt/flow-tools/files/flow_capture.in ============================================================================== --- head/net-mgmt/flow-tools/files/flow_capture.in Thu Mar 21 21:33:19 2019 (r496515) +++ head/net-mgmt/flow-tools/files/flow_capture.in Thu Mar 21 21:55:31 2019 (r496516) @@ -14,9 +14,9 @@ # flow_capture_datadir (str): Base flow data directory. # Default is "/var/db/flows" # flow_capture_localip (str): IP address to bind to -# Default to "0.0.0.0" +# Default is "0.0.0.0" # flow_capture_remoteip (str): IP address to accept flows from -# Default to "0.0.0.0" or all IPs +# Default is "0.0.0.0" or all IPs # flow_capture_port (int): Port to accept flow data on # Default is "8787" # flow_capture_flags (str): Custom additional arguments to be passed @@ -39,7 +39,7 @@ # with parameters taken from appropriate # flow_capture_PROFILENAME_xxx variables. For # unspecified parameters flow_capture_xxx -# varialbes will be used. +# variables will be used. . /etc/rc.subr @@ -78,6 +78,15 @@ stop_profiles() done } +status_profiles() +{ + unset status_cmd + for _profile in ${flow_capture_profiles}; do + setup_profile_vars $_profile + run_rc_command "${rc_arg}" + done +} + load_rc_config $name : ${flow_capture_enable="NO"} @@ -105,6 +114,7 @@ fi if [ "${flow_capture_profiles}" ]; then start_cmd="start_profiles" stop_cmd="stop_profiles" + status_cmd="status_profiles" fi run_rc_command "$cmd" Modified: head/net-mgmt/flow-tools/files/flow_fanout.in ============================================================================== --- head/net-mgmt/flow-tools/files/flow_fanout.in Thu Mar 21 21:33:19 2019 (r496515) +++ head/net-mgmt/flow-tools/files/flow_fanout.in Thu Mar 21 21:55:31 2019 (r496516) @@ -12,9 +12,9 @@ # flow_fanout_enable (bool): Set it to "YES" to enable flow-fanout daemon. # Set to "NO" by default. # flow_fanout_ip (str): IP address to bind to -# Default to "0.0.0.0" +# Default is "0.0.0.0" # flow_fanout_remoteip (str): IP address to accept flows from -# Default to "0.0.0.0" or all IPs +# Default is "0.0.0.0" or all IPs # flow_fanout_port (int): Port to accept flow data on # Default is "8787" # flow_fanout_export (str): Where to send flows to. Default is "0/0/8788" @@ -36,7 +36,7 @@ # with parameters taken from appropriate # flow_fanout_PROFILENAME_xxx variables. For # unspecified parameters flow_fanout_xxx -# varialbes will be used. +# variables will be used. . /etc/rc.subr @@ -73,6 +73,15 @@ stop_profiles() done } +status_profiles() +{ + unset status_cmd + for _profile in ${flow_fanout_profiles}; do + setup_profile_vars $_profile + run_rc_command "${rc_arg}" + done +} + load_rc_config $name : ${flow_fanout_enable="NO"} @@ -99,6 +108,7 @@ fi if [ "${flow_fanout_profiles}" ]; then start_cmd="start_profiles" stop_cmd="stop_profiles" + status_cmd="status_profiles" fi run_rc_command "$cmd" Modified: head/net-mgmt/flow-tools/pkg-descr ============================================================================== --- head/net-mgmt/flow-tools/pkg-descr Thu Mar 21 21:33:19 2019 (r496515) +++ head/net-mgmt/flow-tools/pkg-descr Thu Mar 21 21:55:31 2019 (r496516) @@ -1,4 +1,4 @@ Tools to capture, replicate, print, filter, send and other works on Cisco's NetFlow Export. -WWW: http://www.splintered.net/sw/flow-tools/ +WWW: https://github.com/5u623l20/flow-tools/ Modified: head/net-mgmt/flow-tools/pkg-plist ============================================================================== --- head/net-mgmt/flow-tools/pkg-plist Thu Mar 21 21:33:19 2019 (r496515) +++ head/net-mgmt/flow-tools/pkg-plist Thu Mar 21 21:55:31 2019 (r496516) @@ -22,18 +22,24 @@ bin/flow-split bin/flow-stat bin/flow-tag bin/flow-xlate -etc/flow-tools/filter.cfg -etc/flow-tools/map.cfg -etc/flow-tools/mask.cfg -etc/flow-tools/stat.cfg -etc/flow-tools/tag.cfg -etc/flow-tools/xlate.cfg -include/ftconfig.h +%%ETCDIR%%/asn.sym +%%ETCDIR%%/filter.cfg +%%ETCDIR%%/ip-prot.sym +%%ETCDIR%%/ip-type.sym +%%ETCDIR%%/map.cfg +%%ETCDIR%%/mask.cfg +%%ETCDIR%%/stat.cfg +%%ETCDIR%%/tag.cfg +%%ETCDIR%%/tag.sym +%%ETCDIR%%/tcp-port.sym +%%ETCDIR%%/xlate.cfg include/ftlib.h -include/ftpaths.h include/ftqueue.h -include/radix.h lib/libft.a +lib/libft.la +lib/libft.so +lib/libft.so.0 +lib/libft.so.0.0.0 man/man1/flow-capture.1.gz man/man1/flow-cat.1.gz man/man1/flow-dscan.1.gz @@ -60,8 +66,7 @@ man/man1/flow-xlate.1.gz man/man1/flow-rptfmt.1.gz man/man1/flow-log2rrd.1.gz man/man1/flow-rpt2rrd.1.gz -%%DATADIR%%/asn.sym -%%DATADIR%%/ip-prot.sym -%%DATADIR%%/ip-type.sym -%%DATADIR%%/tag.sym -%%DATADIR%%/tcp-port.sym +%%DATADIR%%/asn2c +%%DATADIR%%/gasn +%%DATADIR%%/gprot +%%DATADIR%%/gserv
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903212155.x2LLtVsD032666>