reinit the tree, so we can have metadata

6 files changed, 255 insertions, 0 deletions

diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
new file mode 100644
index 000000000000..580e65ae597e
--- /dev/null
+++ b/net-analyzer/nfdump/Manifest
@@ -0,0 +1,10 @@
+AUX nfdump-1.6.14-libft.patch 709 SHA256 d69dab7c37d8aadf01b8576e4fe93335fae2cf5c3c3d3cdf65c61b930d69acab SHA512 2a1e3559ae3f1d1ad1a17305888469852211c984324c56c0f58f510ff1a6fb1d85f5b5367b3e325d932f20be6832ed98d56b8e85e220da948aa6a28ecd9d0cdd WHIRLPOOL 33e74fcc7db3ed422b6dcff92b12222a812675e41f894c24615e447e8a26e5f84dd27d4b91cb1fbbb2b964700b0b9b91720398962ce1b1dfba0201274c15b3f4
+AUX nfdump-1.6.14-libnfdump.patch 2439 SHA256 2a51145a8380385223f84e3ed7aca300df3f25b276e7a2288f3b84a49ad84b56 SHA512 09746329df3ad517875d907c16842c8b8ee31f06de649217cc3650cf566e0b059563df93eaf48a60595d2ada41fd43d1279f5bcb400122d9d60fdcb0b813ef46 WHIRLPOOL f9c98c9c3e7063c8088cb4e368ce36cb6b1e8d7e6bdd2f15846984c5b25cf799c606380bc20b4e80149797f2591d2e303139f420252c729e3814135f8509df06
+DIST nfdump-1.6.14-security.patch 31579 SHA256 39d1f37abee626863ad589439235d4e182eb9faf90bcbd0a75582aacee63a185 SHA512 ee3b82f1283f3dceb36cf60abcee7f5a8fb6c8fe257e2233c3fbb9a34b3c5608dfa101fd473c8b839356a9d1c294a37b9e65657ff1b2d5c015015ff90b2d2c97 WHIRLPOOL 0f074599b318ab7fc4e7444d17e9ab2f7adb3834e4ddd16ad2af06a343e4df2dd402afc87a1d6d3d743af116055c1e59dc8953f2de32742f1afd856eefe0cb69
+DIST nfdump-1.6.14.tar.gz 1834355 SHA256 7bf1b17cdcf81c399c6aaf87e0a8cbe12d81a9e33831629eb3a792878d5f80b1 SHA512 c5e5540526dfce3798728930576e4c7930c3ff80893a94d7f9e65c7c577d1e78bdc47a99c47cee837327ad202197afc378d2408b1b9b847044d0110146055ffe WHIRLPOOL ac7929fdc76b2980a464e1253e24832ad8abc153917d5290655a7fd5b29562b769f1120b29960624b5f73aa16bfab0593efb051af350ba3aacfed3aeeee1bb00
+DIST nfdump-1.6.15.tar.gz 1834855 SHA256 9505c0511d273b9aa3f87a5e664425689a3c7370c6ae3bbc05ff4bdb41bfd457 SHA512 a6bb4f2293ad85d8f16025e7272b889d3814cea2e9255dbd315ee92754675e4ee925c3ebe4e1350f2d5452d69d1d3c13ddeb656324a409c4744da1d4927fe1f2 WHIRLPOOL 40f1d5360c745d72ec6ddebb488de979ba45ad3a88b4d8489eb2925e3d20c3a1b228373bcec9a3f1f63e13705bea4fec6ceb121d72b9fb2487838691e5c8e6f9
+EBUILD nfdump-1.6.14-r1.ebuild 1370 SHA256 65376ca701d3ee0c80d4448d08afbf6fdb33bf16b6697a7c0d56d0629883eec7 SHA512 b3ffa1d9324be60cb95a7ba73b0769903617fca1b193044ac677b415414b77c31f479973221a42151c63d03a6a23bb988e41315b8890c1f6001c79d8ff65c48e WHIRLPOOL bed41aae4981a02136c7af87f194b90a236a8182efe1ba15ebb0c47493944f1851a2e06ff6e4743cd89311367bb9eac9144cfdb4ea23424a7fa4139afacb0d93
+EBUILD nfdump-1.6.15.ebuild 1358 SHA256 e43402e7a2572df3426b6b22e31e94910c24795df3fc8d93c4233b0ba9f6cd94 SHA512 a310bd247156236eed002aae8f26dcc19cca712a43a28ea998f51d684013b9617ffbfde554b9f103bba8c634193e79db9befc80e1106f3bdc60c7f12cf1cbf35 WHIRLPOOL abf49afa9d796baf2c42060f0549b11903a2eb467dc4b1b026797dbee50a4fa0059cc6561938c0c0803d18b2f3bf304c70343cda09065f9d7c37511c8ee8ee69
+MISC ChangeLog 3813 SHA256 f44a5240e687aecac2be1aa7768ae86d9d85e126ed3dd265c9c32968f280ddf2 SHA512 677d4310e909a0b2c5987077d2f1063defe0aefc2c4b59a6303079f426dc97767446cd7b857a3bb5b07df2d4964ae80370182bc298e2b2b491fba99ecea37e80 WHIRLPOOL bff9af2e047c5c7483d7dd58f73fb9f9802c18fcf8d9b26a1d9bc9d406b6e4c6a9c3de26bb1ab8381fb9e5a8d8e2542153a85bbe2a546db7c2ae8d434f85b393
+MISC ChangeLog-2015 5984 SHA256 422799f211c29595bfec831b53e8e7677aac8c9a0583a2813ece39e6eb1c1335 SHA512 f32e1ac23824b9eecb22021b1b6b82d1a88da868ad01ccaaf04890a6aafa63adab197323c0a2a56945d7ec39901b10f5a34ca62cbf4140c83f20293b212aab0d WHIRLPOOL 026ea9e368308b0d29f448a3b51ef80b3f4e8e7136b29d63de004a18f9aafe18039a32f457de95eb1179aded3cda98c4c126d3bceb10b294fac5277a1736b8b0
+MISC metadata.xml 1010 SHA256 03a6f930856d3a597d7aa404a87856c0ddab9f362920ca5dea1697c7aaa9939b SHA512 81abafe5f8da7c40612127765d5b62532168b16d93bd0f0414e8e6c4e86339c8fd77e7ecb4a5b406cf5f33c087f8d2ecd971fdf065c7be0430bd8a095a503c67 WHIRLPOOL fecff53117e6e830f6a30e39ef7b2964bb64613a0eb1d25cb5960450b2201712de725247c1c72a5a77ef63988369edb1d6e26e98a0729c7f35b957f62f7ec67e
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch
new file mode 100644
index 000000000000..3699fa2a5d01
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,9 +125,8 @@
+ 	if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then
+ 		AC_MSG_ERROR(ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH)
+ 	fi
+-	if test ! -f "$WHERE_FTPATH/lib/libft.a" -a -f "$WHERE_FTPATH/lib64/libft.a" ! -f "$WHERE_FTPATH/lib/libft.so" -a -f "$WHERE_FTPATH/lib64/libft.so"; then
+-		AC_MSG_ERROR(libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first)
+-	fi
++	AC_CHECK_LIB([ft], [main],,
++		AC_MSG_ERROR(libft not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first))
+ 	FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib"
+ 	FT_LDFLAGS="-L$WHERE_FTPATH/lib"
+ else
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch
new file mode 100644
index 000000000000..38482c4bdb1a
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch
@@ -0,0 +1,87 @@
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -30,7 +30,6 @@
+ LDADD = $(DEPS_LIBS)
+ 
+ #Add extra debug info for gdb
+-AM_CFLAGS = -ggdb 
+ 
+ # libnfdump sources
+ common =  nf_common.c nf_common.h 
+@@ -65,30 +64,36 @@
+ 
+ nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h  \
+ 	$(nflowcache) $(nfprof)
++nfdump_DEPENDENCIES = libnfdump.la
+ nfdump_LDADD = -lnfdump
+ 
+ nfreplay_SOURCES = nfreplay.c $(nfprof) \
+ 	$(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix)
++nfreplay_DEPENDENCIES = libnfdump.la
+ nfreplay_LDADD = -lnfdump
+ 
+ nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile) 
++nfprofile_DEPENDENCIES = libnfdump.la
+ nfprofile_LDADD = -lnfdump -lrrd
+ 
+ nftrack_SOURCES = ../extra/nftrack/nftrack.c \
+ 	../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \
+ 	../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h 
+ nftrack_CFLAGS = -I ../extra/nftrack
++nftrack_DEPENDENCIES = libnfdump.la
+ nftrack_LDADD = -lnfdump -lrrd
+ 
+ nfcapd_SOURCES = nfcapd.c \
+ 	$(nfstatfile) $(launch) \
+ 	$(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire)
++nfcapd_DEPENDENCIES = libnfdump.la
+ nfcapd_LDADD = -lnfdump 
+ 
+ nfpcapd_SOURCES = nfpcapd.c \
+ 	$(pcaproc) $(netflow_pcap) \
+ 	$(nfstatfile) $(launch) \
+ 	$(nfnet) $(collector) $(bookkeeper) $(expire) $(content)
++nfpcapd_DEPENDENCIES = libnfdump.la
+ nfpcapd_LDADD = -lnfdump 
+ 
+ if READPCAP
+@@ -107,6 +112,7 @@
+ sfcapd_SOURCES = sfcapd.c sflow.c sflow.h sflow_proto.h \
+ 	$(nfstatfile) $(launch) \
+ 	$(nfnet) $(collector) $(bookkeeper) $(expire)
++sfcapd_DEPENDENCIES = libnfdump.la
+ sfcapd_LDADD = -lnfdump 
+ 
+ if READPCAP
+@@ -116,25 +122,31 @@
+ endif
+ 
+ nfreader_SOURCES = nfreader.c 
++nfreader_DEPENDENCIES = libnfdump.la
+ nfreader_LDADD = -lnfdump 
+ 
+ nfanon_SOURCES = nfanon.c $(anon)
++nfanon_DEPENDENCIES = libnfdump.la
+ nfanon_LDADD = -lnfdump 
+ 
+ nfgen_SOURCES = nfgen.c 
++nfgen_DEPENDENCIES = libnfdump.la
+ nfgen_LDADD = -lnfdump 
+ 
+ nfexpire_SOURCES = nfexpire.c \
+ 	$(bookkeeper) $(expire) $(nfstatfile)
++nfexpire_DEPENDENCIES = libnfdump.la
+ nfexpire_LDADD = -lnfdump @FTS_OBJ@
+ 
+ nftest_SOURCES = nftest.c 
++nftest_DEPENDENCIES = libnfdump.la
+ nftest_LDADD = -lnfdump 
+ nftest_DEPENDENCIES = nfgen
+ 
+ if FT2NFDUMP
+ ft2nfdump_SOURCES = ft2nfdump.c 
+ ft2nfdump_CFLAGS = @FT_INCLUDES@
++ft2nfdump_DEPENDENCIES = libnfdump.la
+ ft2nfdump_LDADD = -lnfdump -lft -lz
+ ft2nfdump_LDADD += @FT_LDFLAGS@
+ endif
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
new file mode 100644
index 000000000000..f6dc8af136ae
--- /dev/null
+++ b/net-analyzer/nfdump/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <use>
+    <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag>
+    <flag name="compat15">Enable read support for nfdump data files created with nfdump 1.5.x</flag>
+    <flag name="ftconv">Build the flow-tools to nfdump converter</flag>
+    <flag name="nfprofile">Build nfprofile used by NfSen</flag>
+    <flag name="nftrack">Build nfprofile used by PortTracker</flag>
+    <flag name="sflow">Build sflow collector sfcpad</flag>
+  </use>
+  <longdescription>The nfdump tools collect and process netflow data on the command line</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">nfdump</remote-id>
+    <remote-id type="github">phaag/nfdump</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
new file mode 100644
index 000000000000..134e2b4a8757
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="
+	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${HOMEPAGE}/commit/ff0e855bd1f51bed9fc5d8559c64d3cfb475a5d8.patch -> ${P}-security.patch
+"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	readpcap? ( net-libs/libpcap )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-devel/flex
+	virtual/yacc
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.6.14-libft.patch \
+		"${FILESDIR}"/${PN}-1.6.14-libnfdump.patch \
+		"${DISTDIR}"/${P}-security.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# --without-ftconf is not handled well #322201
+	econf \
+		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfprofile && echo --enable-nfprofile) \
+		$(use nftrack && echo --enable-nftrack) \
+		$(use_enable compat15) \
+		$(use_enable debug devel) \
+		$(use_enable readpcap) \
+		$(use_enable sflow)
+}
diff --git a/net-analyzer/nfdump/nfdump-1.6.15.ebuild b/net-analyzer/nfdump/nfdump-1.6.15.ebuild
new file mode 100644
index 000000000000..baa417bf4173
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.15.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="
+	${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow static-libs"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	readpcap? ( net-libs/libpcap )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-devel/flex
+	virtual/yacc
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${PN}-1.6.14-libft.patch \
+		"${FILESDIR}"/${PN}-1.6.14-libnfdump.patch
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	# --without-ftconf is not handled well #322201
+	econf \
+		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfprofile && echo --enable-nfprofile) \
+		$(use nftrack && echo --enable-nftrack) \
+		$(use_enable compat15) \
+		$(use_enable debug devel) \
+		$(use_enable readpcap) \
+		$(use_enable sflow) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+}