From ba93f617f3c070b56bc1de4b3022b7020fbc10da Mon Sep 17 00:00:00 2001 From: seb Date: Fri, 23 May 2003 07:19:41 +0000 Subject: Update to version 0.66. NOTE: The names of the default configuration files has changed. They now end in `.cfg' or `.sym'. Approved by MAINTAINER. Changes since last packaged version: * 4-3-2003 flow-tools-0.66 released * reapply flow-fanout linux patch, also infected flow-send * 4-3-2003 flow-tools-0.65 released * flow-send, flow-fanout: -s source IP address spoofing. * build: builddir != srcdir problems - noted by jos@catnook.com * build: All default config files installed by default. * build: config files end in .cfg, symbol files end in .sym. Note this changes the names of the default configuration files. * ftlib: ftfil.c - random sample filter - reqested by Edward Balas * ftlib: ftstat.c - ip-destination-address-source-count missing count - noted by Christian Cinetto * build: example tags file installed by default. * ftlib: ftstat.c - broken ip-source-address/ip-destination-port - noted by Gerhard.Haindl@t-systems.at * ftlib: ftstat.c - broken ip-destination-address/destination-as - noted by carsten.strahler@lambdanet.net * remove bin scripts (mostly historical OSU stuff) * upgrade to automake 1.7.3 and autoconf 2.57 * docs: flow-report.sgml missing ip-source/destination-address/ip-protocol/ip-tos/ip-source/destination-port noted by shane.dawalt@wright.edu * flow-fanout: will not compile under linux - patch from alex.shepard@gettyimages.com * ftlib: ftstat.c - use FMT_SYM_LEN instead of hard coded 32 byte length. increase len to 64 bytes. * ftlib: fmt.c - fmt_uint*s() did not properly null terminate when symbol strlen >= max - noted by jed@onenet.net * 2-23-2003 flow-tools-0.64 released * flow-fanout, flow-capture, flow-receive: add startup= to STAT: line * docs: flow-fanout - missing -f -F - noted by RAR@syssrc.com * flow-split: consuming too many resources, noted by fin@finseth.com * ftlib: ftstat.c - rec2: in summary-detail report missing time_real field - noted by shane.dawalt@wright.edu * build: strouq() -> strtoull(). Check if strtoul() is really strtoull() - noted by shane.dawalt@wright.edu * ftlib: ftstat.c - protect potential divide by 0 errors - noted by shane.dawalt@wright.edu * flow-split: stag not initialized - patch from fin@finseth.com * build: ftlib.h should not require ftconfig.h - noted by jan@kneschke.de * build: lib/ftconfig.h does not belong in dist - noted by jos@catnook.com * ftlib: ftlib.h - FT_SO_RCV_BUFSIZE default to 4MB * ftlib: suppport.c - bigsockbuf() - more agressive reduction on large buffers. Report size. * ftlib: ftmask.c - flow-mask: rn_deladdr(): failed. Missing masklen set - noted by nik.hinson@assurance-dynamics.com * ftlib: ftfil.c - invert option to filter-definition req by mhyde@escape.ca * ftlib: shadowed variable names - fumerola@yahoo-inc.com * flow-cat: exit status 1 if no streams processed - req by mhunter@ack.Berkeley.EDU * ftlib: ftstat.c - bucket_dump_1(): loop typo noted by nik.hinson@assurance-dynamics.com * flow-capture: reload tags and filters with SIGHUP * flow-import: format4 wire format. * ftlib: ftstat.c - tag mask option should not require local tagging - noted by clay@bloomcounty.org * flow-*: catch extra command line args - noted by rcarrara@augustmail.com * ftlib: fttag.c - fix ToS tagging, add ANY tagging. --- net/flow-tools/MESSAGE | 10 +++ net/flow-tools/Makefile | 27 ++------ net/flow-tools/PLIST | 24 +++---- net/flow-tools/distinfo | 26 +++---- net/flow-tools/patches/patch-aa | 21 +++--- net/flow-tools/patches/patch-ab | 145 +++++++++++++++++++++++++++++++++++----- net/flow-tools/patches/patch-ac | 4 +- net/flow-tools/patches/patch-ad | 16 ++--- net/flow-tools/patches/patch-ae | 8 +-- net/flow-tools/patches/patch-af | 80 ++++++++++++---------- net/flow-tools/patches/patch-ag | 48 +++++++------ net/flow-tools/patches/patch-ah | 6 +- net/flow-tools/patches/patch-ai | 8 +-- net/flow-tools/patches/patch-aj | 6 +- 14 files changed, 271 insertions(+), 158 deletions(-) create mode 100644 net/flow-tools/MESSAGE diff --git a/net/flow-tools/MESSAGE b/net/flow-tools/MESSAGE new file mode 100644 index 00000000000..28ef8be0aae --- /dev/null +++ b/net/flow-tools/MESSAGE @@ -0,0 +1,10 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2003/05/23 07:19:41 seb Exp $ + +This package expects its configuration files in directory +${PKG_SYSCONFDIR}/cfg. + +Example configuration files are installed in directory +${EGDIR}/cfg. + +=========================================================================== diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index feb7b2e4edf..51d9c238236 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2003/02/16 23:50:18 seb Exp $ +# $NetBSD: Makefile,v 1.4 2003/05/23 07:19:41 seb Exp $ -DISTNAME= flow-tools-0.63 +DISTNAME= flow-tools-0.66 CATEGORIES= net MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/ @@ -21,15 +21,11 @@ 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 +_SYM_FILES= ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym .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 +MESSAGE_SUBST+= EGDIR=${EGDIR} .include "../../mk/bsd.prefs.mk" @@ -60,21 +56,6 @@ post-patch: 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" .include "../../mk/bsd.pkg.mk" diff --git a/net/flow-tools/PLIST b/net/flow-tools/PLIST index 10c3f17de40..fe4e521755f 100644 --- a/net/flow-tools/PLIST +++ b/net/flow-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2003/02/16 23:50:18 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/05/23 07:19:41 seb Exp $ bin/flow-capture bin/flow-cat bin/flow-dscan @@ -49,19 +49,17 @@ 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 +share/examples/flow-tools/cfg/filter.cfg +share/examples/flow-tools/cfg/map.cfg +share/examples/flow-tools/cfg/mask.cfg +share/examples/flow-tools/cfg/stat.cfg +share/examples/flow-tools/cfg/tag.cfg +share/examples/flow-tools/sym/asn.sym +share/examples/flow-tools/sym/ip-prot.sym +share/examples/flow-tools/sym/ip-type.sym +share/examples/flow-tools/sym/tag.sym +share/examples/flow-tools/sym/tcp-port.sym @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 123741a450b..0f38f8e784a 100644 --- a/net/flow-tools/distinfo +++ b/net/flow-tools/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.2 2003/02/16 23:50:18 seb Exp $ +$NetBSD: distinfo,v 1.3 2003/05/23 07:19:42 seb Exp $ -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 +SHA1 (flow-tools-0.66.tar.gz) = a4d48a5d2ff9608fe4da3202362ee73774773be7 +Size (flow-tools-0.66.tar.gz) = 967711 bytes +SHA1 (patch-aa) = 349ffa4f5c61a52d3daf8996ac9085cf30eebd74 +SHA1 (patch-ab) = d39a4086ed7ee3f4e05093cfb3b011230ff388ff +SHA1 (patch-ac) = 86cd77dc3ede171e45e62fd4a050bac19643252b +SHA1 (patch-ad) = 4aad20509ced86cab8eb02b089e38ffa9cbb772f +SHA1 (patch-ae) = 1e5f151f3eba795f1ade4c016767bd4cd271565a +SHA1 (patch-af) = 4a461ee3b83c3eec4539c3244bb41428269b3190 +SHA1 (patch-ag) = 89ea92f1ea9f65cd8910c1500ca665caf34b6c03 +SHA1 (patch-ah) = 9daa1879c8f7fd7f1c00a0cb218bdd368e647a2c +SHA1 (patch-ai) = 5e0a5f3148e80c156198d74036ff2f1bf35ed779 +SHA1 (patch-aj) = d183dc3b360110a1a90165b0094e349d3a964a2e diff --git a/net/flow-tools/patches/patch-aa b/net/flow-tools/patches/patch-aa index 1585987f7db..fac34985fed 100644 --- a/net/flow-tools/patches/patch-aa +++ b/net/flow-tools/patches/patch-aa @@ -1,10 +1,15 @@ -$NetBSD: patch-aa,v 1.1 2003/02/16 23:50:19 seb Exp $ +$NetBSD: patch-aa,v 1.2 2003/05/23 07:19:42 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 +--- configs/Makefile.am.orig 2003-04-03 16:44:53.000000000 +0000 ++++ configs/Makefile.am +@@ -1,6 +1,6 @@ +-ftsymdir=$(localstatedir)/sym +-ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym ++egftsymdir=$(prefix)/share/examples/@PACKAGE@/sym ++egftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym + +-ftcfgdir=$(localstatedir)/cfg +-ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg ++egftcfgdir=$(prefix)/share/examples/@PACKAGE@/cfg ++egftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg - 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 index ddf79db469e..ff820dbd1d1 100644 --- a/net/flow-tools/patches/patch-ab +++ b/net/flow-tools/patches/patch-ab @@ -1,31 +1,140 @@ -$NetBSD: patch-ab,v 1.1 2003/02/16 23:50:19 seb Exp $ +$NetBSD: patch-ab,v 1.2 2003/05/23 07:19:43 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 +--- configs/Makefile.in.orig 2003-05-22 14:47:44.000000000 +0000 ++++ configs/Makefile.in +@@ -114,17 +114,19 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-ftsymdir = $(localstatedir)/sym +-ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym ++egftsymdir = $(prefix)/share/examples/@PACKAGE@/sym ++egftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym + +-ftcfgdir = $(localstatedir)/cfg +-ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg ++egftcfgdir = $(prefix)/share/examples/@PACKAGE@/cfg ++egftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg + subdir = configs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/lib/ftconfig.h CONFIG_CLEAN_FILES = +depcomp = +am__depfiles_maybe = DIST_SOURCES = +-DATA = $(ftcfg_DATA) $(ftsym_DATA) ++DATA = $(egftcfg_DATA) $(egftsym_DATA) - RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ -@@ -107,7 +109,7 @@ all: all-recursive + DIST_COMMON = Makefile.am Makefile.in + all: all-am +@@ -132,45 +134,45 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu Makefile -+ $(AUTOMAKE) --gnu --ignore-deps Makefile +- $(AUTOMAKE) --gnu configs/Makefile ++ $(AUTOMAKE) --foreign --ignore-deps configs/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + uninstall-info-am: +-ftcfgDATA_INSTALL = $(INSTALL_DATA) +-install-ftcfgDATA: $(ftcfg_DATA) ++egftcfgDATA_INSTALL = $(INSTALL_DATA) ++install-egftcfgDATA: $(egftcfg_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(ftcfgdir) +- @list='$(ftcfg_DATA)'; for p in $$list; do \ ++ $(mkinstalldirs) $(DESTDIR)$(egftcfgdir) ++ @list='$(egftcfg_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(ftcfgDATA_INSTALL) $$d$$p $(DESTDIR)$(ftcfgdir)/$$f"; \ +- $(ftcfgDATA_INSTALL) $$d$$p $(DESTDIR)$(ftcfgdir)/$$f; \ ++ echo " $(egftcfgDATA_INSTALL) $$d$$p $(DESTDIR)$(egftcfgdir)/$$f"; \ ++ $(egftcfgDATA_INSTALL) $$d$$p $(DESTDIR)$(egftcfgdir)/$$f; \ + done + +-uninstall-ftcfgDATA: ++uninstall-egftcfgDATA: + @$(NORMAL_UNINSTALL) +- @list='$(ftcfg_DATA)'; for p in $$list; do \ ++ @list='$(egftcfg_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(ftcfgdir)/$$f"; \ +- rm -f $(DESTDIR)$(ftcfgdir)/$$f; \ ++ echo " rm -f $(DESTDIR)$(egftcfgdir)/$$f"; \ ++ rm -f $(DESTDIR)$(egftcfgdir)/$$f; \ + done +-ftsymDATA_INSTALL = $(INSTALL_DATA) +-install-ftsymDATA: $(ftsym_DATA) ++egftsymDATA_INSTALL = $(INSTALL_DATA) ++install-egftsymDATA: $(egftsym_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(ftsymdir) +- @list='$(ftsym_DATA)'; for p in $$list; do \ ++ $(mkinstalldirs) $(DESTDIR)$(egftsymdir) ++ @list='$(egftsym_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(ftsymDATA_INSTALL) $$d$$p $(DESTDIR)$(ftsymdir)/$$f"; \ +- $(ftsymDATA_INSTALL) $$d$$p $(DESTDIR)$(ftsymdir)/$$f; \ ++ echo " $(egftsymDATA_INSTALL) $$d$$p $(DESTDIR)$(egftsymdir)/$$f"; \ ++ $(egftsymDATA_INSTALL) $$d$$p $(DESTDIR)$(egftsymdir)/$$f; \ + done + +-uninstall-ftsymDATA: ++uninstall-egftsymDATA: + @$(NORMAL_UNINSTALL) +- @list='$(ftsym_DATA)'; for p in $$list; do \ ++ @list='$(egftsym_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(ftsymdir)/$$f"; \ +- rm -f $(DESTDIR)$(ftsymdir)/$$f; \ ++ echo " rm -f $(DESTDIR)$(egftsymdir)/$$f"; \ ++ rm -f $(DESTDIR)$(egftsymdir)/$$f; \ + done + tags: TAGS + TAGS: +@@ -215,7 +217,7 @@ check: check-am + all-am: Makefile $(DATA) + + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(ftcfgdir) $(DESTDIR)$(ftsymdir) ++ $(mkinstalldirs) $(DESTDIR)$(egftcfgdir) $(DESTDIR)$(egftsymdir) + + install: install-am + install-exec: install-exec-am +@@ -257,7 +259,7 @@ info: info-am + + info-am: + +-install-data-am: install-ftcfgDATA install-ftsymDATA ++install-data-am: install-egftcfgDATA install-egftsymDATA + + install-exec-am: + +@@ -283,17 +285,18 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-ftcfgDATA uninstall-ftsymDATA uninstall-info-am ++uninstall-am: uninstall-egftcfgDATA uninstall-egftsymDATA \ ++ uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-ftcfgDATA install-ftsymDATA \ +- install-info install-info-am install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ install-am install-data install-data-am install-egftcfgDATA \ ++ install-egftsymDATA install-exec install-exec-am install-info \ ++ install-info-am install-man install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-ftcfgDATA \ +- uninstall-ftsymDATA uninstall-info-am ++ pdf-am ps ps-am uninstall uninstall-am uninstall-egftcfgDATA \ ++ uninstall-egftsymDATA uninstall-info-am + # 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-ac b/net/flow-tools/patches/patch-ac index c64b0cf1233..f5429de296a 100644 --- a/net/flow-tools/patches/patch-ac +++ b/net/flow-tools/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.1 2003/02/16 23:50:20 seb Exp $ +$NetBSD: patch-ac,v 1.2 2003/05/23 07:19:43 seb Exp $ ---- docs/Makefile.am.orig Sun Dec 1 04:11:10 2002 +--- docs/Makefile.am.orig 2003-02-23 23:58:11.000000000 +0000 +++ docs/Makefile.am @@ -23,6 +23,3 @@ SUFFIXES = .sgml .1 .html .1.in .html.in diff --git a/net/flow-tools/patches/patch-ad b/net/flow-tools/patches/patch-ad index 4f9faba4cad..db46227c8b2 100644 --- a/net/flow-tools/patches/patch-ad +++ b/net/flow-tools/patches/patch-ad @@ -1,26 +1,26 @@ -$NetBSD: patch-ad,v 1.1 2003/02/16 23:50:20 seb Exp $ +$NetBSD: patch-ad,v 1.2 2003/05/23 07:19:43 seb Exp $ ---- docs/Makefile.in.orig Thu Dec 12 17:37:43 2002 +--- docs/Makefile.in.orig 2003-05-22 13:31:50.000000000 +0000 +++ 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 \ +@@ -135,6 +135,8 @@ CONFIG_CLEAN_FILES = flow-capture.1 flow flow-report.html flow-receive.1 flow-receive.html flow-tag.1 \ - flow-tag.html flow-mask.1 flow-mask.html + flow-tag.html flow-mask.1 flow-mask.html flow-fanout.1 \ + flow-fanout.html +depcomp = +am__depfiles_maybe = DIST_SOURCES = NROFF = nroff -@@ -118,7 +120,7 @@ all: all-am +@@ -151,7 +153,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 ++ $(AUTOMAKE) --foreign --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 +@@ -370,8 +372,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 diff --git a/net/flow-tools/patches/patch-ae b/net/flow-tools/patches/patch-ae index f66196fd543..37f986fe2ea 100644 --- a/net/flow-tools/patches/patch-ae +++ b/net/flow-tools/patches/patch-ae @@ -1,10 +1,10 @@ -$NetBSD: patch-ae,v 1.1 2003/02/16 23:50:20 seb Exp $ +$NetBSD: patch-ae,v 1.2 2003/05/23 07:19:43 seb Exp $ ---- lib/Makefile.am.orig Tue Dec 3 07:34:22 2002 +--- lib/Makefile.am.orig 2003-03-12 03:31:23.000000000 +0000 +++ lib/Makefile.am -@@ -6,7 +6,7 @@ CFLAGS=-g -Wall +@@ -6,7 +6,7 @@ AM_CFLAGS=-g -Wall - DEFS=-I. + DEFS=-I. -I$(srcdir)/lib -include_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h +pkginclude_HEADERS = ftlib.h ftqueue.h radix.h ftpaths.h ftconfig.h diff --git a/net/flow-tools/patches/patch-af b/net/flow-tools/patches/patch-af index 67016598af8..ed213195c1d 100644 --- a/net/flow-tools/patches/patch-af +++ b/net/flow-tools/patches/patch-af @@ -1,20 +1,20 @@ -$NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ +$NetBSD: patch-af,v 1.2 2003/05/23 07:19:44 seb Exp $ ---- lib/Makefile.in.orig Thu Dec 12 17:37:40 2002 +--- lib/Makefile.in.orig 2003-05-22 13:32:03.000000000 +0000 +++ lib/Makefile.in -@@ -89,7 +89,7 @@ CFLAGS = -g -Wall - - DEFS = -I. +@@ -120,7 +120,7 @@ target_alias = @target_alias@ + #AM_CFLAGS=-O2 + AM_CFLAGS = -g -Wall -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@ +@@ -149,30 +149,17 @@ am_libft_a_OBJECTS = ftio.$(OBJEXT) ftsw + libft_a_OBJECTS = $(am_libft_a_OBJECTS) + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/strerror.Po $(DEPDIR)/strsep.Po \ @@ -47,16 +47,16 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ SOURCES = $(libft_a_SOURCES) all: ftconfig.h -@@ -153,7 +140,7 @@ all: ftconfig.h +@@ -182,7 +169,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 ++ $(AUTOMAKE) --foreign --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: +@@ -247,75 +234,29 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -91,17 +91,28 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ - -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)/'`$< +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++ $(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@ +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` uninstall-info-am: -includeHEADERS_INSTALL = $(INSTALL_HEADER) -install-includeHEADERS: $(include_HEADERS) @@ -133,7 +144,7 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ done ETAGS = etags -@@ -346,7 +296,7 @@ check: check-am +@@ -408,7 +349,7 @@ check: check-am all-am: Makefile $(LIBRARIES) $(HEADERS) ftconfig.h installdirs: @@ -142,7 +153,7 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ install: install-am install-exec: install-exec-am -@@ -378,8 +328,8 @@ clean-am: clean-generic clean-libLIBRARI +@@ -440,8 +381,8 @@ clean-am: clean-generic clean-libLIBRARI distclean: distclean-am @@ -153,7 +164,7 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ dvi: dvi-am -@@ -389,7 +339,7 @@ info: info-am +@@ -451,7 +392,7 @@ info: info-am info-am: @@ -162,32 +173,33 @@ $NetBSD: patch-af,v 1.1 2003/02/16 23:50:20 seb Exp $ install-exec-am: install-libLIBRARIES -@@ -407,21 +357,21 @@ mostlyclean: mostlyclean-am +@@ -477,21 +418,21 @@ ps: ps-am - mostlyclean-am: mostlyclean-compile mostlyclean-generic + ps-am: -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 \ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLIBRARIES ctags distclean distclean-compile \ +- distclean-depend 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 \ ++ 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-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 \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-includeHEADERS uninstall-info-am \ - uninstall-libLIBRARIES -+ uninstall-info-am uninstall-libLIBRARIES \ ++ uninstall-am uninstall-info-am uninstall-libLIBRARIES \ + uninstall-pkgincludeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/net/flow-tools/patches/patch-ag b/net/flow-tools/patches/patch-ag index adc87837382..944bc789952 100644 --- a/net/flow-tools/patches/patch-ag +++ b/net/flow-tools/patches/patch-ag @@ -1,33 +1,31 @@ -$NetBSD: patch-ag,v 1.1 2003/02/16 23:50:20 seb Exp $ +$NetBSD: patch-ag,v 1.2 2003/05/23 07:19:44 seb Exp $ ---- lib/ftpaths.h.in.orig Tue Nov 26 03:00:13 2002 +--- lib/ftpaths.h.in.orig 2003-04-03 16:26:39.000000000 +0000 +++ lib/ftpaths.h.in -@@ -29,17 +29,17 @@ +@@ -29,16 +29,16 @@ #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_CFG_MAP "@localstatedir@/cfg/map.cfg" +-#define FT_PATH_CFG_TAG "@localstatedir@/cfg/tag.cfg" +-#define FT_PATH_CFG_FILTER "@localstatedir@/cfg/filter.cfg" +-#define FT_PATH_CFG_STAT "@localstatedir@/cfg/stat.cfg" +-#define FT_PATH_CFG_MASK "@localstatedir@/cfg/mask.cfg" ++#define FT_PATH_CFG_MAP "@sysconfdir@/cfg/map.cfg" ++#define FT_PATH_CFG_TAG "@sysconfdir@/cfg/tag.cfg" ++#define FT_PATH_CFG_FILTER "@sysconfdir@/cfg/filter.cfg" ++#define FT_PATH_CFG_STAT "@sysconfdir@/cfg/stat.cfg" ++#define FT_PATH_CFG_MASK "@sysconfdir@/cfg/mask.cfg" --#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" +-#define FT_PATH_SYM_IP_PROT "@localstatedir@/sym/ip-prot.sym" +-#define FT_PATH_SYM_IP_TYPE "@localstatedir@/sym/ip-type.sym" +-#define FT_PATH_SYM_TCP_PORT "@localstatedir@/sym/tcp-port.sym" +-#define FT_PATH_SYM_ASN "@localstatedir@/sym/asn.sym" +-#define FT_PATH_SYM_TAG "@localstatedir@/sym/tag.sym" ++#define FT_PATH_SYM_IP_PROT "@sysconfdir@/sym/ip-prot.sym" ++#define FT_PATH_SYM_IP_TYPE "@sysconfdir@/sym/ip-type.sym" ++#define FT_PATH_SYM_TCP_PORT "@sysconfdir@/sym/tcp-port.sym" ++#define FT_PATH_SYM_ASN "@sysconfdir@/sym/asn.sym" ++#define FT_PATH_SYM_TAG "@sysconfdir@/sym/tag.sym" #endif /* FTPATHS_H */ diff --git a/net/flow-tools/patches/patch-ah b/net/flow-tools/patches/patch-ah index bb2a7bb86ea..893a53e4efd 100644 --- a/net/flow-tools/patches/patch-ah +++ b/net/flow-tools/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1 2003/02/16 23:50:21 seb Exp $ +$NetBSD: patch-ah,v 1.2 2003/05/23 07:19:44 seb Exp $ ---- src/flow-capture.c.orig Thu Dec 12 00:15:39 2002 +--- src/flow-capture.c.orig 2003-04-02 18:03:01.000000000 +0000 +++ src/flow-capture.c -@@ -443,8 +443,9 @@ char **argv; +@@ -431,8 +431,9 @@ char **argv; exit (0); /* parent */ } diff --git a/net/flow-tools/patches/patch-ai b/net/flow-tools/patches/patch-ai index 966ed973bb5..2857f3ca50c 100644 --- a/net/flow-tools/patches/patch-ai +++ b/net/flow-tools/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1 2003/02/16 23:50:21 seb Exp $ +$NetBSD: patch-ai,v 1.2 2003/05/23 07:19:44 seb Exp $ ---- src/flow-dscan.c.orig Sat Jun 15 21:57:01 2002 +--- src/flow-dscan.c.orig 2003-04-02 18:03:01.000000000 +0000 +++ src/flow-dscan.c -@@ -228,8 +228,9 @@ int main(int argc, char **argv) +@@ -233,8 +233,9 @@ int main(int argc, char **argv) } else if (pid) exit (0); /* parent */ @@ -10,7 +10,7 @@ $NetBSD: patch-ai,v 1.1 2003/02/16 23:50:21 seb Exp $ - setsid(); + /* umask(0022); */ + if (setsid() == -1) -+ fterr_err(1, "setsid()"); ++ 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 index 25e11a03199..a12368c7ac1 100644 --- a/net/flow-tools/patches/patch-aj +++ b/net/flow-tools/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2003/02/16 23:50:21 seb Exp $ +$NetBSD: patch-aj,v 1.2 2003/05/23 07:19:44 seb Exp $ ---- src/flow-fanout.c.orig Wed Oct 23 18:08:52 2002 +--- src/flow-fanout.c.orig 2003-04-04 02:24:40.000000000 +0000 +++ src/flow-fanout.c -@@ -252,8 +252,9 @@ int main(int argc, char **argv) +@@ -287,8 +287,9 @@ int main(int argc, char **argv) } chdir ("/"); -- cgit v1.2.3