pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/nfdump Initial import of nfdump version 1.5.2 into...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/056c2fbda49f
branches:  trunk
changeset: 531408:056c2fbda49f
user:      seb <seb%pkgsrc.org@localhost>
date:      Sun Jul 29 21:33:42 2007 +0000

description:
Initial import of nfdump version 1.5.2 into The NetBSD Packages Collection.

The nfdump tools collect and process netflow data on the command line.
Nfdump tools:
nfcapd     - netflow collector daemon
nfdump     - netflow dump
nfprofile  - netflow profiler
nfreplay   - netflow replay
nfclean.pl - cleanup old data - installed as example
ft2nfdump  - read flow-tools format - optional tool
sfcapd     - sflow collector daemon - optional tool

diffstat:

 net/nfdump/DESCR            |   9 +++++++++
 net/nfdump/Makefile         |  40 ++++++++++++++++++++++++++++++++++++++++
 net/nfdump/PLIST            |  11 +++++++++++
 net/nfdump/PLIST.ftconv     |   3 +++
 net/nfdump/PLIST.sflow      |   3 +++
 net/nfdump/distinfo         |   9 +++++++++
 net/nfdump/patches/patch-aa |  25 +++++++++++++++++++++++++
 net/nfdump/patches/patch-ab |  15 +++++++++++++++
 net/nfdump/patches/patch-ac |  13 +++++++++++++
 net/nfdump/patches/patch-ad |  27 +++++++++++++++++++++++++++
 10 files changed, 155 insertions(+), 0 deletions(-)

diffs (195 lines):

diff -r f60cba7bd881 -r 056c2fbda49f net/nfdump/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nfdump/DESCR  Sun Jul 29 21:33:42 2007 +0000
@@ -0,0 +1,9 @@
+The nfdump tools collect and process netflow data on the command line.
+Nfdump tools:
+nfcapd     - netflow collector daemon
+nfdump     - netflow dump
+nfprofile  - netflow profiler
+nfreplay   - netflow replay
+nfclean.pl - cleanup old data - installed as example
+ft2nfdump  - read flow-tools format - optional tool
+sfcapd     - sflow collector daemon - optional tool
diff -r f60cba7bd881 -r 056c2fbda49f net/nfdump/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nfdump/Makefile       Sun Jul 29 21:33:42 2007 +0000
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+#
+
+DISTNAME=      nfdump-1.5.2
+CATEGORIES=    net
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nfdump/}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://nfdump.sourceforge.net/
+COMMENT=       Tools to collect and process netflow data
+
+GNU_CONFIGURE= yes
+TEST_TARGET=   test
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.nfdump
+PKG_SUPPORTED_OPTIONS= nfdump-ftconv nfdump-sflow
+.include "../../mk/bsd.options.mk"
+
+PLIST_SRC=             ${PKGDIR}/PLIST
+
+.if !empty(PKG_OPTIONS:Mnfdump-ftconv)
+CONFIGURE_ARGS+=       --enable-ftconv
+CONFIGURE_ARGS+=       --with-ftpath=${BUILDLINK_PREFIX.flow-tools}
+PLIST_SRC+=            ${PKGDIR}/PLIST.ftconv
+.  include "../../net/flow-tools/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mnfdump-sflow)
+CONFIGURE_ARGS+=       --enable-sflow
+PLIST_SRC+=            ${PKGDIR}/PLIST.sflow
+.endif
+
+EGDIR=                 ${PREFIX}/share/examples/nfdump
+INSTALLATION_DIRS=     share/examples/nfdump
+REPLACE_PERL+=         nfclean.pl
+
+post-install:
+       ${INSTALL_SCRIPT} ${WRKSRC}/nfclean.pl ${EGDIR}/nfclean.pl
+
+.include "../../mk/bsd.pkg.mk"
diff -r f60cba7bd881 -r 056c2fbda49f net/nfdump/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nfdump/PLIST  Sun Jul 29 21:33:42 2007 +0000
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+bin/nfcapd
+bin/nfdump
+bin/nfprofile
+bin/nfreplay
+man/man1/nfcapd.1
+man/man1/nfdump.1
+man/man1/nfprofile.1
+man/man1/nfreplay.1
+share/examples/nfdump/nfclean.pl
+@dirrm share/examples/nfdump
diff -r f60cba7bd881 -r 056c2fbda49f net/nfdump/PLIST.ftconv
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nfdump/PLIST.ftconv   Sun Jul 29 21:33:42 2007 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.ftconv,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+bin/ft2nfdump
+man/man1/ft2nfdump.1
diff -r f60cba7bd881 -r 056c2fbda49f net/nfdump/PLIST.sflow
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nfdump/PLIST.sflow    Sun Jul 29 21:33:42 2007 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.sflow,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+bin/sfcapd
+man/man1/sfcapd.1
diff -r f60cba7bd881 -r 056c2fbda49f net/nfdump/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nfdump/distinfo       Sun Jul 29 21:33:42 2007 +0000
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+
+SHA1 (nfdump-1.5.2.tar.gz) = 180a3b8b2315b5c4d0beb07e5b17817f4bdbb454
+RMD160 (nfdump-1.5.2.tar.gz) = 0fac8ba1dc75163b7d906453581e345e037b3730
+Size (nfdump-1.5.2.tar.gz) = 224287 bytes
+SHA1 (patch-aa) = eb506648e2539092a51df964cd8096b74b4b940d
+SHA1 (patch-ab) = 3b5a57e3384208d5aee2a6741d664ec5b31640ab
+SHA1 (patch-ac) = bba19ce3e28b0d74d06ae694790e7aaeb73bfc6b
+SHA1 (patch-ad) = e9aee08cb58dd541c2d2ca23c0a544f8c8645421
diff -r f60cba7bd881 -r 056c2fbda49f net/nfdump/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nfdump/patches/patch-aa       Sun Jul 29 21:33:42 2007 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+
+The source to the configure script is not in the distribution
+tarball.
+
+--- configure.orig     2006-05-21 16:30:10.000000000 +0000
++++ configure
+@@ -3927,7 +3927,7 @@ echo "$as_me: error: Link with \"-lz\" f
+ fi
+ 
+ if test -d "$WHERE_FTPATH"; then
+-      if test ! -f "$WHERE_FTPATH/lib/ftlib.h"; then
++      if test ! -f "$WHERE_FTPATH/include/flow-tools/ftlib.h"; then
+               { { echo "$as_me:$LINENO: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&5
+ echo "$as_me: error: ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -3937,7 +3937,7 @@ echo "$as_me: error: ftlib.h file not fo
+ echo "$as_me: error: libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first" >&2;}
+    { (exit 1); exit 1; }; }
+       fi
+-      FT_INCLUDES="-I$WHERE_FTPATH/src -I$WHERE_FTPATH/lib"
++      FT_INCLUDES="-I$WHERE_FTPATH/include/flow-tools"
+       FT_LDFLAGS="-L$WHERE_FTPATH/lib"
+ else
+       { { echo "$as_me:$LINENO: error: flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH" >&5
diff -r f60cba7bd881 -r 056c2fbda49f net/nfdump/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nfdump/patches/patch-ab       Sun Jul 29 21:33:42 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+
+There is nothing really useful in flow-tools' ftbuild.h.
+
+--- ft2nfdump.c.orig   2006-07-14 06:09:03.000000000 +0000
++++ ft2nfdump.c
+@@ -64,7 +64,7 @@
+ #endif
+ 
+ #include "version.h"
+-#include "ftbuild.h"
++/* #include "ftbuild.h" */
+ #include "nf_common.h"
+ #include "nffile.h"
+ #include "launch.h"
diff -r f60cba7bd881 -r 056c2fbda49f net/nfdump/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nfdump/patches/patch-ac       Sun Jul 29 21:33:42 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+
+--- test.sh.orig       2006-05-21 16:30:10.000000000 +0000
++++ test.sh
+@@ -38,6 +38,8 @@
+ 
+ set -e
+ 
++export TZ=CET
++
+ # run filter and type tests
+ ./nftest
+ 
diff -r f60cba7bd881 -r 056c2fbda49f net/nfdump/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nfdump/patches/patch-ad       Sun Jul 29 21:33:42 2007 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-ad,v 1.1.1.1 2007/07/29 21:33:42 seb Exp $
+
+--- Makefile.in.orig   2006-05-21 16:30:10.000000000 +0000
++++ Makefile.in
+@@ -98,13 +98,13 @@ install: $(OBJECTS)
+       test -d $(PREFIX)/bin || install -d -o root -g bin -m 755 $(PREFIX)/bin
+       test -d $(MANDIR) || install -d -o root -g bin -m 755 $(MANDIR)
+       test -d $(MANDIR)/man1 || install -d -o root -g bin -m 755 $(MANDIR)/man1
++      test -d $(EGDIR)/man1 || install -d -o root -g bin -m 755 $(MANDIR)/man1
+       for file in $(OBJECTS); do \
+               if [ -f $$file.1 ]; then \
+                       $(INSTALL) -o root -g bin -m 755 $$file $(PREFIX)/bin ; \
+                       $(INSTALL) -o root -g bin -m 644 $$file.1 $(MANDIR)/man1 ; \
+               fi \
+       done;
+-      test -f $(PREFIX)/bin/nfclean.pl || $(INSTALL) -o root -g bin -m 755 nfclean.pl $(PREFIX)/bin
+ 
+ uninstall:
+       for file in $(OBJECTS); do \
+@@ -113,7 +113,6 @@ uninstall:
+                       /bin/rm -f  $(MANDIR)/man1/$$file.1 ; \
+               fi \
+       done;
+-      /bin/rm -f  $(PREFIX)/bin/nfclean.pl
+ 
+ test: nftest
+       ./test.sh



Home | Main Index | Thread Index | Old Index