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

13 files changed, 478 insertions, 14 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"
diff --git a/net/flow-tools/PLIST b/net/flow-tools/PLIST
index afcc30cde97..10c3f17de40 100644
--- a/net/flow-tools/PLIST
+++ b/net/flow-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/23 11:46:32 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/16 23:50:18 seb Exp $
 bin/flow-capture
 bin/flow-cat
 bin/flow-dscan
@@ -9,20 +9,22 @@ bin/flow-filter
 bin/flow-gen
 bin/flow-header
 bin/flow-import
+bin/flow-mask
 bin/flow-merge
 bin/flow-nfilter
 bin/flow-print
 bin/flow-receive
+bin/flow-report
 bin/flow-send
 bin/flow-split
 bin/flow-stat
 bin/flow-tag
 bin/flow-xlate
-include/ftconfig.h
-include/ftlib.h
-include/ftpaths.h
-include/ftqueue.h
-include/radix.h
+include/flow-tools/ftconfig.h
+include/flow-tools/ftlib.h
+include/flow-tools/ftpaths.h
+include/flow-tools/ftqueue.h
+include/flow-tools/radix.h
 lib/libft.a
 man/man1/flow-capture.1
 man/man1/flow-cat.1
@@ -34,10 +36,12 @@ man/man1/flow-filter.1
 man/man1/flow-gen.1
 man/man1/flow-header.1
 man/man1/flow-import.1
+man/man1/flow-mask.1
 man/man1/flow-merge.1
 man/man1/flow-nfilter.1
 man/man1/flow-print.1
 man/man1/flow-receive.1
+man/man1/flow-report.1
 man/man1/flow-send.1
 man/man1/flow-split.1
 man/man1/flow-stat.1
@@ -45,3 +49,19 @@ man/man1/flow-tag.1
 man/man1/flow-tools-examples.1
 man/man1/flow-tools.1
 man/man1/flow-xlate.1
+share/examples/flow-tools/bin/flow-mirror
+share/examples/flow-tools/bin/flow-rsync
+share/examples/flow-tools/bin/flow-search
+share/examples/flow-tools/cfg/filter
+share/examples/flow-tools/cfg/flow.acl
+share/examples/flow-tools/cfg/map
+share/examples/flow-tools/cfg/stats
+share/examples/flow-tools/sym/asn
+share/examples/flow-tools/sym/ip-prot
+share/examples/flow-tools/sym/ip-type
+share/examples/flow-tools/sym/tcp-port
+@dirrm share/examples/flow-tools/sym
+@dirrm share/examples/flow-tools/cfg
+@dirrm share/examples/flow-tools/bin
+@dirrm share/examples/flow-tools
+@dirrm include/flow-tools
diff --git a/net/flow-tools/distinfo b/net/flow-tools/distinfo
index 18bbf285d67..123741a450b 100644
--- a/net/flow-tools/distinfo
+++ b/net/flow-tools/distinfo
@@ -1,4 +1,14 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/23 11:46:32 agc Exp $
+$NetBSD: distinfo,v 1.2 2003/02/16 23:50:18 seb Exp $
 
-SHA1 (flow-tools-0.59.tar.gz) = b72f15e435ec1b1a87005eaa49e4e92da99164aa
-Size (flow-tools-0.59.tar.gz) = 810540 bytes
+SHA1 (flow-tools-0.63.tar.gz) = 1d0cc05f682ae86713c02c38b306faf27b4ab332
+Size (flow-tools-0.63.tar.gz) = 956050 bytes
+SHA1 (patch-aa) = ed4c55200e985630314e81586c6279f0667bfb35
+SHA1 (patch-ab) = 10348ca4d3f352a9d157437330d7fa7c351c8b23
+SHA1 (patch-ac) = 36fae36e7c64cf65bd727b8f88c6292c79d8efdf
+SHA1 (patch-ad) = 5772f3fe52743ff143ae8b7bfc28bf68ef9809f0
+SHA1 (patch-ae) = dec8539a2e0fc43a7f77f819222e109709ec6d5f
+SHA1 (patch-af) = 25064ba522b5522bfb3d5bfda3445a6e72ed73b3
+SHA1 (patch-ag) = 02024f30170a51b592504b72bbb29b8d996517f9
+SHA1 (patch-ah) = 356aa3af45838b607f1df6a8024935a2245c098a
+SHA1 (patch-ai) = d36c3a5f4f8143ad628c99f7fb808f7c0951d7be
+SHA1 (patch-aj) = a2e6fcff41f7092e2c40b1449fe82e74748bc4f4
diff --git a/net/flow-tools/patches/patch-aa b/net/flow-tools/patches/patch-aa
new file mode 100644
index 00000000000..1585987f7db
--- /dev/null
+++ b/net/flow-tools/patches/patch-aa
@@ -0,0 +1,10 @@
+$NetBSD: patch-aa,v 1.1 2003/02/16 23:50:19 seb Exp $
+
+--- Makefile.am.orig	Thu Aug  8 07:32:32 2002
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = lib src docs configs bin
++SUBDIRS = lib src docs
+ 
+ EXTRA_DIST = bin/flow-mirror bin/flow-rsync bin/flow-search utils/* \
+  SECURITY contrib/* configs/*
diff --git a/net/flow-tools/patches/patch-ab b/net/flow-tools/patches/patch-ab
new file mode 100644
index 00000000000..ddf79db469e
--- /dev/null
+++ b/net/flow-tools/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 2003/02/16 23:50:19 seb Exp $
+
+--- Makefile.in.orig	Thu Dec 12 17:37:29 2002
++++ Makefile.in
+@@ -82,7 +82,7 @@ YLIB = @YLIB@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+-SUBDIRS = lib src docs configs bin
++SUBDIRS = lib src docs
+ 
+ EXTRA_DIST = bin/flow-mirror bin/flow-rsync bin/flow-search utils/* \
+  SECURITY contrib/* configs/*
+@@ -92,6 +92,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/lib/ftconfig.h
+ CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
+ DIST_SOURCES =
+ 
+ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+@@ -107,7 +109,7 @@ all: all-recursive
+ .SUFFIXES:
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  Makefile
++	  $(AUTOMAKE) --gnu  --ignore-deps Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+ 
diff --git a/net/flow-tools/patches/patch-ac b/net/flow-tools/patches/patch-ac
new file mode 100644
index 00000000000..c64b0cf1233
--- /dev/null
+++ b/net/flow-tools/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.1 2003/02/16 23:50:20 seb Exp $
+
+--- docs/Makefile.am.orig	Sun Dec  1 04:11:10 2002
++++ docs/Makefile.am
+@@ -23,6 +23,3 @@ SUFFIXES = .sgml .1 .html .1.in .html.in
+ 
+ .sgml.html.in:
+ 	jade -V nochunks -c /usr/local/share/sgml/docbook/dsssl/modular/catalog -c /usr/local/share/sgml/docbook/catalog -c /usr/local/share/sgml/jade/catalog -d /usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl -t sgml $*.sgml > $*.html.in
+-
+-all-am: Makefile $(man_MANSIN) $(man_HTMLS)
+-
diff --git a/net/flow-tools/patches/patch-ad b/net/flow-tools/patches/patch-ad
new file mode 100644
index 00000000000..4f9faba4cad
--- /dev/null
+++ b/net/flow-tools/patches/patch-ad
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.1 2003/02/16 23:50:20 seb Exp $
+
+--- docs/Makefile.in.orig	Thu Dec 12 17:37:43 2002
++++ docs/Makefile.in
+@@ -102,6 +102,8 @@ CONFIG_CLEAN_FILES = flow-capture.1 flow
+ 	flow-nfilter.html flow-print.1 flow-print.html flow-report.1 \
+ 	flow-report.html flow-receive.1 flow-receive.html flow-tag.1 \
+ 	flow-tag.html flow-mask.1 flow-mask.html
++depcomp =
++am__depfiles_maybe =
+ DIST_SOURCES =
+ 
+ NROFF = nroff
+@@ -118,7 +120,7 @@ all: all-am
+ .SUFFIXES: .sgml .1 .html .1.in .html.in
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  docs/Makefile
++	  $(AUTOMAKE) --gnu  --ignore-deps docs/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ flow-capture.1: $(top_builddir)/config.status flow-capture.1.in
+@@ -308,8 +310,6 @@ uninstall-man: uninstall-man1
+ 
+ .sgml.html.in:
+ 	jade -V nochunks -c /usr/local/share/sgml/docbook/dsssl/modular/catalog -c /usr/local/share/sgml/docbook/catalog -c /usr/local/share/sgml/jade/catalog -d /usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl -t sgml $*.sgml > $*.html.in
+-
+-all-am: Makefile $(man_MANSIN) $(man_HTMLS)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net/flow-tools/patches/patch-ae b/net/flow-tools/patches/patch-ae
new file mode 100644
index 00000000000..f66196fd543
--- /dev/null
+++ b/net/flow-tools/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/02/16 23:50:20 seb Exp $
+
+--- lib/Makefile.am.orig	Tue Dec  3 07:34:22 2002
++++ lib/Makefile.am
+@@ -6,7 +6,7 @@ CFLAGS=-g -Wall
+ 
+ DEFS=-I.
+ 
+-include_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h
++pkginclude_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h
+ lib_LIBRARIES = libft.a
+ 
+ libft_a_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
diff --git a/net/flow-tools/patches/patch-af b/net/flow-tools/patches/patch-af
new file mode 100644
index 00000000000..67016598af8
--- /dev/null
+++ b/net/flow-tools/patches/patch-af
@@ -0,0 +1,194 @@
+$NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $
+
+--- lib/Makefile.in.orig	Thu Dec 12 17:37:40 2002
++++ lib/Makefile.in
+@@ -89,7 +89,7 @@ CFLAGS = -g -Wall
+ 
+ DEFS = -I.
+ 
+-include_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h
++pkginclude_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h
+ lib_LIBRARIES = libft.a
+ 
+ libft_a_SOURCES = ftio.c ftswap.c ftencode.c ftdecode.c ftprof.c bit1024.c \
+@@ -120,30 +120,17 @@ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/strerror.Po $(DEPDIR)/strsep.Po \
+-@AMDEP_TRUE@	$(DEPDIR)/strtoull.Po ./$(DEPDIR)/bit1024.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/fmt.Po ./$(DEPDIR)/ftchash.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/ftdecode.Po ./$(DEPDIR)/ftencode.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/fterr.Po ./$(DEPDIR)/ftfil.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/ftfile.Po ./$(DEPDIR)/ftio.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/ftmap.Po ./$(DEPDIR)/ftmask.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/ftprof.Po ./$(DEPDIR)/ftrec.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/ftstat.Po ./$(DEPDIR)/ftswap.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/ftsym.Po ./$(DEPDIR)/fttag.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/fttlv.Po ./$(DEPDIR)/ftvar.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/ftxfield.Po ./$(DEPDIR)/getdate.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/radix.Po ./$(DEPDIR)/support.Po
++depcomp =
++am__depfiles_maybe =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(libft_a_SOURCES)
+-HEADERS = $(include_HEADERS)
++HEADERS = $(pkginclude_HEADERS)
+ 
+-DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in ftconfig.h.in \
+-	ftpaths.h.in strerror.c strsep.c strtoull.c
++DIST_COMMON = $(pkginclude_HEADERS) Makefile.am Makefile.in \
++	ftconfig.h.in ftpaths.h.in strerror.c strsep.c strtoull.c
+ SOURCES = $(libft_a_SOURCES)
+ 
+ all: ftconfig.h
+@@ -153,7 +140,7 @@ all: ftconfig.h
+ .SUFFIXES: .c .o .obj
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  lib/Makefile
++	  $(AUTOMAKE) --gnu  --ignore-deps lib/Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+@@ -218,66 +205,29 @@ mostlyclean-compile:
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strsep.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoull.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit1024.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftchash.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftdecode.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftencode.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fterr.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftfil.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftfile.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftio.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftmap.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftmask.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftprof.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftrec.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftstat.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftswap.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftsym.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fttag.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fttlv.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftvar.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftxfield.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radix.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support.Po@am__quote@
+-
+-distclean-depend:
+-	-rm -rf $(DEPDIR) ./$(DEPDIR)
+-
+ .c.o:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(COMPILE) -c `cygpath -w $<`
+-CCDEPMODE = @CCDEPMODE@
+ uninstall-info-am:
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-install-includeHEADERS: $(include_HEADERS)
++pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
++install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(includedir)
+-	@list='$(include_HEADERS)'; for p in $$list; do \
++	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
++	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
+-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
++	  echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \
++	  $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
+ 	done
+ 
+-uninstall-includeHEADERS:
++uninstall-pkgincludeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(include_HEADERS)'; for p in $$list; do \
++	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
+-	  rm -f $(DESTDIR)$(includedir)/$$f; \
++	  echo " rm -f $(DESTDIR)$(pkgincludedir)/$$f"; \
++	  rm -f $(DESTDIR)$(pkgincludedir)/$$f; \
+ 	done
+ 
+ ETAGS = etags
+@@ -346,7 +296,7 @@ check: check-am
+ all-am: Makefile $(LIBRARIES) $(HEADERS) ftconfig.h
+ 
+ installdirs:
+-	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgincludedir)
+ 
+ install: install-am
+ install-exec: install-exec-am
+@@ -378,8 +328,8 @@ clean-am: clean-generic clean-libLIBRARI
+ 
+ distclean: distclean-am
+ 
+-distclean-am: clean-am distclean-compile distclean-depend \
+-	distclean-generic distclean-hdr distclean-tags
++distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
++	distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -389,7 +339,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-includeHEADERS
++install-data-am: install-pkgincludeHEADERS
+ 
+ install-exec-am: install-libLIBRARIES
+ 
+@@ -407,21 +357,21 @@ mostlyclean: mostlyclean-am
+ 
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic
+ 
+-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLIBRARIES
++uninstall-am: uninstall-info-am uninstall-libLIBRARIES \
++	uninstall-pkgincludeHEADERS
+ 
+ .PHONY: GTAGS all all-am check check-am clean clean-generic \
+-	clean-libLIBRARIES distclean distclean-compile distclean-depend \
++	clean-libLIBRARIES distclean distclean-compile \
+ 	distclean-generic distclean-hdr distclean-tags distdir dvi \
+ 	dvi-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am \
+-	install-includeHEADERS install-info install-info-am \
+-	install-libLIBRARIES install-man install-strip installcheck \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-libLIBRARIES install-man \
++	install-pkgincludeHEADERS install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic tags uninstall uninstall-am \
+-	uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLIBRARIES
++	uninstall-info-am uninstall-libLIBRARIES \
++	uninstall-pkgincludeHEADERS
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/net/flow-tools/patches/patch-ag b/net/flow-tools/patches/patch-ag
new file mode 100644
index 00000000000..adc87837382
--- /dev/null
+++ b/net/flow-tools/patches/patch-ag
@@ -0,0 +1,33 @@
+$NetBSD: patch-ag,v 1.1 2003/02/16 23:50:20 seb Exp $
+
+--- lib/ftpaths.h.in.orig	Tue Nov 26 03:00:13 2002
++++ lib/ftpaths.h.in
+@@ -29,17 +29,17 @@
+ #ifndef FTPATHS_H
+ #define FTPATHS_H
+ 
+-#define FT_PATH_CFG_MAP             "@localstatedir@/cfg/map"
+-#define FT_PATH_CFG_TAG             "@localstatedir@/cfg/tag"
+-#define FT_PATH_CFG_FILTER          "@localstatedir@/cfg/filter"
+-#define FT_PATH_CFG_STAT            "@localstatedir@/cfg/stat"
+-#define FT_PATH_CFG_MASK            "@localstatedir@/cfg/mask"
++#define FT_PATH_CFG_MAP             "@sysconfdir@/cfg/map"
++#define FT_PATH_CFG_TAG             "@sysconfdir@/cfg/tag"
++#define FT_PATH_CFG_FILTER          "@sysconfdir@/cfg/filter"
++#define FT_PATH_CFG_STAT            "@sysconfdir@/cfg/stat"
++#define FT_PATH_CFG_MASK            "@sysconfdir@/cfg/mask"
+ 
+-#define FT_PATH_SYM_IP_PROT         "@localstatedir@/sym/ip-prot"
+-#define FT_PATH_SYM_IP_CLASS        "@localstatedir@/sym/ip-class"
+-#define FT_PATH_SYM_IP_TYPE         "@localstatedir@/sym/ip-type"
+-#define FT_PATH_SYM_TCP_PORT        "@localstatedir@/sym/tcp-port"
+-#define FT_PATH_SYM_ASN             "@localstatedir@/sym/asn"
+-#define FT_PATH_SYM_TAG             "@localstatedir@/sym/tag"
++#define FT_PATH_SYM_IP_PROT         "@sysconfdir@/sym/ip-prot"
++#define FT_PATH_SYM_IP_CLASS        "@sysconfdir@/sym/ip-class"
++#define FT_PATH_SYM_IP_TYPE         "@sysconfdir@/sym/ip-type"
++#define FT_PATH_SYM_TCP_PORT        "@sysconfdir@/sym/tcp-port"
++#define FT_PATH_SYM_ASN             "@sysconfdir@/sym/asn"
++#define FT_PATH_SYM_TAG             "@sysconfdir@/sym/tag"
+ 
+ #endif /* FTPATHS_H */
diff --git a/net/flow-tools/patches/patch-ah b/net/flow-tools/patches/patch-ah
new file mode 100644
index 00000000000..bb2a7bb86ea
--- /dev/null
+++ b/net/flow-tools/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1 2003/02/16 23:50:21 seb Exp $
+
+--- src/flow-capture.c.orig	Thu Dec 12 00:15:39 2002
++++ src/flow-capture.c
+@@ -443,8 +443,9 @@ char **argv;
+       exit (0); /* parent */
+     }
+ 
+-    umask(0022);
+-    setsid();
++    /* umask(0022); */
++    if (setsid() == -1)
++      fterr_err(1, "setsid()");
+     for (n = 0; n < 16; ++n)
+       close (n);
+ 
diff --git a/net/flow-tools/patches/patch-ai b/net/flow-tools/patches/patch-ai
new file mode 100644
index 00000000000..966ed973bb5
--- /dev/null
+++ b/net/flow-tools/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1 2003/02/16 23:50:21 seb Exp $
+
+--- src/flow-dscan.c.orig	Sat Jun 15 21:57:01 2002
++++ src/flow-dscan.c
+@@ -228,8 +228,9 @@ int main(int argc, char **argv)
+     } else if (pid)
+       exit (0); /* parent */
+ 
+-    umask(0022);
+-    setsid();
++    /* umask(0022); */
++    if (setsid() == -1)
++	fterr_err(1, "setsid()");
+     for (i = 1; i < 16; ++i) /* XXX dynamically get NOFILE */
+       close (i);
+ 
diff --git a/net/flow-tools/patches/patch-aj b/net/flow-tools/patches/patch-aj
new file mode 100644
index 00000000000..25e11a03199
--- /dev/null
+++ b/net/flow-tools/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.1 2003/02/16 23:50:21 seb Exp $
+
+--- src/flow-fanout.c.orig	Wed Oct 23 18:08:52 2002
++++ src/flow-fanout.c
+@@ -252,8 +252,9 @@ int main(int argc, char **argv)
+     }
+    
+     chdir ("/"); 
+-    umask(0022);
+-    setsid();
++    /* umask(0022); */
++    if (setsid() == -1)
++      fterr_err(1, "setsid()");
+     for (n = 0; n < 16; ++n) /* XXX dynamically get NOFILE */
+       close (n);
+