Version bump. Added missed USE flags, bug #279455, thank Ronny Boesger and Alexander Zubkov for report/job.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 66 insertions, 3 deletions

diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 7053167c42df..52e477a1c840 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nfdump
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.8 2009/07/09 15:10:29 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.9 2010/05/06 09:10:36 pva Exp $
+
+*nfdump-1.6.1 (06 May 2010)
+
+  06 May 2010; Peter Volkov <pva@gentoo.org> +nfdump-1.6.1.ebuild:
+  Version bump. Added missed USE flags, bug #279455, thank Ronny Boesger and
+  Alexander Zubkov for report/job.
 
   09 Jul 2009; Peter Volkov <pva@gentoo.org>
   files/nfdump-1.5.8-parallel.patch:
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index d28a55c1db65..194d2b1f16ce 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/metadata.xml
@@ -2,5 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<use>
+  <flag name='ftconv'>Build the flow-tools to nfdump converter</flag>
+  <flag name='nfprofile'>Build nfprofile used by NfSen</flag>
+  <!--<flag name='readpcap'>Build nfcapd collector to read from pcap file instead ofnetwork data</flag>-->
+  <flag name='sflow'>Build sflow collector sfcpad</flag>
+</use>
 <longdescription>The nfdump tools collect and process netflow data on the command line</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/nfdump/nfdump-1.6.1.ebuild b/net-analyzer/nfdump/nfdump-1.6.1.ebuild
new file mode 100644
index 000000000000..59d1798a0fb6
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.1.ebuild,v 1.1 2010/05/06 09:10:36 pva Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="http://nfdump.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nfdump/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Fails to build readpcap:
+# https://sourceforge.net/tracker/?func=detail&aid=2996582&group_id=119350&atid=683752
+IUSE="ftconv nfprofile sflow"
+
+CDEPEND="
+	ftconv? ( sys-libs/zlib
+		net-analyzer/flow-tools )
+	nfprofile? ( net-analyzer/rrdtool )"
+#	readpcap? ( net-libs/libpcap )"
+DEPEND="${CDEPEND}
+	sys-devel/flex"
+RDEPEND=${CDEPEND}"
+	dev-lang/perl"
+
+src_prepare() {
+	if use ftconv; then
+		sed '/ftbuild.h/d' -i bin/ft2nfdump.c || die
+		sed 's:lib\(/ftlib.h\):include\1:' -i configure.in || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	#	$(use_enable readpcap) \
+	econf \
+		$(use_enable ftconv) \
+		$(use_with ftconv ftpath="/usr") \
+		$(use_enable nfprofile) \
+		$(use_enable sflow)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 12c1d0e82321..a478ec78afe6 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,8 +6,10 @@ AUX wireshark-1.1.2--as-needed.patch 830 RMD160 fd192d107147c65ef52625b51b59a2bf
 AUX wireshark-except-double-free.diff 664 RMD160 2b61f03f5148975f6438351c11de18a500deabc5 SHA1 0239e19ba0ebd2cfb4ab4987a8a4c56646cd9250 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369
 DIST wireshark-1.2.6.tar.gz 19381295 RMD160 271a05afbf1701630a6070ecabeabcb842715b12 SHA1 62f5571e4786d3fa0cfc3d528f69a5c431e42d75 SHA256 0788f3424f056c8cbb94fb0eef49cc92ac63a67b122153e3b920cfce8d6e95ab
 DIST wireshark-1.2.7.tar.gz 19417531 RMD160 44f1eb9ba209a83592ac636f7c1d97003a51ca5c SHA1 068e27540f56f4dec384422fb6258909b0426d6e SHA256 12ed3bce40033da2f4560149b3542fb2b00fb2aa27fc58580ee81bea6bb99242
+DIST wireshark-1.2.8.tar.gz 19434341 RMD160 1affc20a741c1a452dac8fcf26ff337bff05e50f SHA1 709e4d272de3f92914e17a65ee58d1a0e19852e9 SHA256 d83158be1cdad86f95fc6ddf513f673ea928de5cc796fa21306b99778a6dfb97
 EBUILD wireshark-1.2.6.ebuild 4551 RMD160 bc94cd69950fa308f550258e151958a5990ca765 SHA1 2953e180f76351c86c9dcd3f0fd96805a088cce5 SHA256 1ffa24ac2dfec46d4496bd1090b47c31d6e4352b99d896559b3457b7cc24cdcd
 EBUILD wireshark-1.2.7-r1.ebuild 4523 RMD160 9f765bd26a3bb1aaf43d52b615d3feb6213fcdc5 SHA1 47bff0b550bfcf18d336a9c89b366b191635dc38 SHA256 7238717706295710b5a89372753be1d4271d3b9bf9e1b14b0d0d663c7df33126
 EBUILD wireshark-1.2.7.ebuild 4582 RMD160 ef886b3ac3f938b2ace6103d8e8bc63cbb89db15 SHA1 0f1ef572f137614acc87fbf50050a2b7a1a18f4a SHA256 624b86cef6639e9a1a2d9e21531efa451f68dc3c9c5dd363958618df7999b838
-MISC ChangeLog 32820 RMD160 c99b3da571778ed010b63cd0f5b35ac40cc87937 SHA1 b6937ffd9388df198d0db97219c6fcf2751f5a7f SHA256 a681c875dd4c5b900e21265e0edf90ee5a3fe6e8c60645084afc80abeebe79ac
+EBUILD wireshark-1.2.8.ebuild 4520 RMD160 86fb45634304b58b1c13eaa6ec9871f4b6c4146e SHA1 13831d2840eb2c177058dc7cdd3a89c22e85f513 SHA256 3ff217d4ad11a418b61c2a617fa04cc4b2d3be8799aacf33a671a24cbdf2e8e4
+MISC ChangeLog 32939 RMD160 f6c9f35565de642a8c9934878d4fa5bfaa106bb0 SHA1 d64d20e2b361dc56aa71ecd55a46a182c25eb292 SHA256 b1b54d47612f5a461df99af217af553f449edf306b0370069c301b0f62bf4037
 MISC metadata.xml 2154 RMD160 01af8905d25e6c387902d30766daedcd37d94e0e SHA1 d68e79d413654ce72c553d508d7aa96f27fe85b5 SHA256 48c540fcec9cf1e5eebe132d7f90e8330b413f4eb6469761a88720eaa6a2233a