Update to version 0.63. Lots of changes and new features, see below.

Note: include files installed in $PREFIX/include/flow-tools,
examples configuration files and scripts installed in
$PREFIX/share/examples/flow-tools, configuration files are expected in
$PKG_SYSCONFDIR/flow-tools.


* 12-12-2002 flow-tools-0.63 released

* ftlib: ftstat.c - More informative error message when invalid field -
  patch from wyu@ateneo.edu

* docs: flow-capture - hosts.allow requires flow-capture-client, not
  flow-capture - noted by stewart@net.ohio-state.edu

* flow-capture: TCP client port should be same as UDP netflow port - noted
  by stewart@net.ohio-state.edu

* ftlib: ftfil.c: moved primitive initialization code to
  parse_primitive_type() to avoid state loss when 'default'
  or 'mask' keyword used before a permit/deny.

* ftlib: ftfil.c: tos, marked_tos, tcp_flags mask applied to flow not
  to a copy - noted by nik.hinson@assurance-dynamics.com

* flow-export -f4 wire format - requested by mikeh@ncsa.uiuc.edu

* docs: flow-print.sgml - document column headers.

* flow-report / ftstat.c - added runtime variable binding and output
  path substitution support, ie run with -v ROUTER=NYCM and use
  output path '/report/@ROUTER/report-out'

* ftlib: ftvar.c - variable binding functions.

* ftlib: ftstat.c - summary-detail report will produce core if no flows
  are processed - noted by rjd@merit.edu

* docs: not all targets included in distribution - noted by
  Jeje <jeje@jeje.org>

* ftlib: ftio.c byte order of output not always in synch with flags -
  noted by mikeh@ncsa.uiuc.edu

* docs: flow-filter port correction - mhunter@ack.Berkeley.EDU

* ftlib: ftstat.c names option works with IP addresses -- DNS lookups.
  req by nik.hinson@assurance-dynamics.com

* ftlib: ftstat.c: min_pps,max_pps,min_bps,max_bps calculations,
  reduce memory and CPU footprint if *ps calculations are not selected.
  req by nik.hinson@assurance-dynamics.com

* ftlib: ftstat.c: linear-interpolated-flows-octets-packets,first,last,
  duration,ip-source-address/source-tag,ip-source-address/destination-tag,
  ip-destination-address/source-tag,ip-destination-address/destination-tag,
  ip-source/destination-address/source/destination-tag,
  ip-source/destination-address/ip-protocol/ip-tos reports.
  req by nik.hinson@assurance-dynamics.com

* ftlib: ftstat.c: new fields, index,first,last
  req by nik.hinson@assurance-dynamics.com

* ftlib: ftstat.c: integrated mask eval
  req by nik.hinson@assurance-dynamics.com

* flow-mask: new - replace mask length based on prefix.
  req by nik.hinson@assurance-dynamics.com

* ftlib: fttag.c: tag on tcp-src-port, tcp-dst-port, tcp-port, udp-src-port,
  udp-dst-port, udp-port, tos.
  req by nik.hinson@assurance-dynamics.com

* ftlib: fttag.c: rework to use jump tables to support more match types
  w/o performance impact.

* flow-stat: -f32 did not have symbol lookups enabled, noted by
  Michael Redinger <Michael.Redinger@uibk.ac.at

* docs: flow-tag man page example does not work - noted by
  Michael.Redinger@uibk.ac.at

* flow-fanout: -V does not work, noted by gritzko@dcn.ru

* 10-15-2002 flow-tools-0.62 released

* ftlib: ftstat.c: fcount displayed (flows counted in pps and bbs calcs)

* build: localstatedir no longer hardcoded to /var/ft.  man and html pages
  have localstatedir substitution.

* ftlib: ftstat.c: multiple output per report, output to a pipe,
  source/destination address format, source/destination address count
  report.

* flow-import: -m allows ascii input.  #:<fields> in ascii output
  automatically parsed as -m option.

* flow-export: fix -m, -m now allows ascii input, ie -m unix_secs,dpkts,doctets

* ftlib: ftstat.c masked tag not restored if filter evaluated to DENY.

* ftlib: ftstat.c bucket record count in header not correct.

* ftlib: ftstat.c ip-address and ip-port to pick up flow-stat -f7 and -f11
  style reports.  noted by acidic@apricot.fruit.org

* flow-cat / flow-receive: Pay closer attention to FT_FIELD_CAP_START and
  FT_FIELD_CAP_END so a bogus capture period is not displayed on
  output from flow-receive > file.  noted by  ylee@net2phone.com

* flow-print: Missing leading 0's on msec formats, noted by
  ertoz@cs.umn.edu

* ftlib: ftfil.c: use consistent naming with flow-report

* flow-fanout, flow-receive, flow-capture: handle interrupted recvmsg()
  syscall which happens on some linux MP configurations.

* ftlib: ftfil.c - pps/bps not handled correctly - patch from jon@pdx.edu

* flow-print - format 24 from Christian.Bauer@NEFonline.de

* flow-import - Cisco NFC format from torppa@polykoira.megabaud.fi

* flow-capture - more informative err message on bind() failure - noted by
  stewart@net.ohio-state.edu

* docs: flow-capture.sgml - no -o option - noted by stewart@net.ohio-state.edu

* flow-search - remove hard coded path, noted by stewart@net.ohio-state.edu

* ftlib: ftdecode.c - ftpdu_verify() can segv on invalid packets < 4 bytes
  noted by Eric Stewart stewart@net.ohio-state.edu

* ftlib: ftfil.c - PERMIT/DENY reversed for many when default PERMIT --
  noted by Gerhard.Haindl@t-systems.at

* ftlib: ftstat.c - tag mask before filter - noted by wyu@ateneo.edu

* 8-27-2002 flow-tools-0.61 released

* ftlib: strtoull.c - missing ULLONG_MAX - noted by papaleonardos.3@osu.edu

* build: --with-mysql allows path, ie --with-mysql=/usr/local

* ftlib: ftstat.c - don't require FT_XFIELD_SRC_MASK / FT_XFIELD_DST_MASK -
  dynamically add the requirement when FT_STAT_OPT_PREFIX_* is set -
  noted by mw@uk.yahoo-inc.com

* ftlib: ftio.c - more informative warning when trying to process non
  flow-tools files.

* ftlib: ftfile.c - more informative warning when ignoring files.

* ftlib: fttag.c - parser requires 'type' for a match and 'term' in a
  definition.

* ftlib: ftdecode.c - allow padded Cat 6K packets.

* flow-receive, flow-capture: no longer need ftio_set_xip() - noted by
  mw@uk.yahoo-inc.com

* flow-tag, ftstat: allow retagging - noted by clay@opus.bloomcounty.org

* flow-cat: cleanup error message

* flow-export: len = 0, mysql typo

* ftlib: ftstat.c missed a few , - noted by nik.hinson@assurance-dynamics.com

* 8-15-2002 flow-tools-0.60 released

* flow-capture,flow-receive,flow-fanout: add filter option.

* flow-export: MySQL support based on patch from wyu@ateneo.edu

* ftlib: ftfil.c pps and bps filter.

* build: scripts in bin directory get installed

* build/ftlib: added BSD strtoull.c for DEC portability - noted by
  shane.dawalt@wright.edu

* flow-report: future replacement for flow-stat

* ftlib: added ftstat.c - stats and report library

* ftlib:  FT_RECGET_* macros

* docs: updated documentation.

* configs: updated asn.txt and asn symbol file

* ftlib: fmt.c - fmt_ipv4prefix() was not processing 0/0 correctly.

* ftlib: ftfil.c - fix memory leak with ftd->name and ftfil->name

* ftlib: ftfil.c - delay primitive resolution until file is parsed
  -- a filter-definition can precede a filter-primitive

* ftlib: ftfil.c - time only primitive implemented.  Req by wyu@ateneo.edu

1 files changed, 68 insertions, 5 deletions

diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index 8ff8b81a56d..feb7b2e4edf 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2002/10/10 11:49:40 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/02/16 23:50:18 seb Exp $
 
-DISTNAME=	flow-tools-0.59
+DISTNAME=	flow-tools-0.63
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.eng.oar.net/pub/flow-tools/
 
@@ -8,9 +8,72 @@ MAINTAINER=	cjs@netbsd.org
 HOMEPAGE=	http://www.splintered.net/sw/flow-tools/
 COMMENT=	Collect and store NetFlow data
 
-GNU_CONFIGURE=	yes
-USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+GNU_CONFIGURE=	YES
+USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
+
+PKG_SYSCONFSUBDIR=	flow-tools
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+EGDIR=		${PREFIX}/share/examples/flow-tools
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/sym
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/cfg
+
+# These files are config files that are unlikely to be modified in most cases
+# so we install them via SUPPORT_FILES.
+_SYM_FILES=	asn ip-prot ip-type tcp-port
+.for _f_ in ${_SYM_FILES}
+SUPPORT_FILES+=	${EGDIR}/sym/${_f_} ${PKG_SYSCONFDIR}/sym/${_f_}
+.endfor
+
+# These files are example config files that we should not blindly install
+# so we stuff them in EGDIR and we're done.
+# note: filter-acl and flow.acl are nearly the same files
+_CFG_FILES=	filter flow.acl map stats # filter-acl
+
+.include "../../mk/bsd.prefs.mk"
+
+# MySQL support
+.if defined(FLOW_TOOLS_USE_MYSQL) && ${FLOW_TOOLS_USE_MYSQL} == "YES"
+.include "../../databases/mysql-client/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
+LDFLAGS+= -Wl,${_OPSYS_RPATH_NAME}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
+.endif
+
+# Touch these or else config.status being touched the manpages
+# generated by it will be made twice
+AUTOMAKE_POST_PATTERNS+=	*.1
+
+# To avoid providing more patch files we do the following...
+# Order is important here or else dependencies requiring docbook-to-man/jade
+# will be triggered
+post-patch:
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	cd ${WRKSRC}/docs &&						\
+	for m in flow-*.1.in; do					\
+		h=`${BASENAME} $${m} .1.in`.html.in;			\
+		s=`${BASENAME} $${m} .1.in`.sgml;			\
+		for f in $${s} $${h} $${m}; do				\
+			${MV} $${f} $${f}.bak &&			\
+			${SED} -e 's,@localstatedir@,@sysconfdir@,g'	\
+		   < $${f}.bak > $${f};					\
+		done;							\
+	done
+
+post-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${EGDIR}/sym
+	${INSTALL_DATA_DIR} ${EGDIR}/cfg
+	${INSTALL_DATA_DIR} ${EGDIR}/bin
+.for _f_ in ${_SYM_FILES}
+	${INSTALL_DATA} ${WRKSRC}/configs/${_f_} ${EGDIR}/sym/${_f_}
+.endfor
+.for _f_ in ${_CFG_FILES}
+	${INSTALL_DATA} ${WRKSRC}/configs/${_f_} ${EGDIR}/cfg/${_f_}
+.endfor
+.for _f_ in flow-mirror flow-rsync flow-search
+	${INSTALL_DATA} ${WRKSRC}/bin/${_f_} ${EGDIR}/bin/${_f_}
+.endfor
 
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"