gentoo resync : 15.12.2017

5 files changed, 189 insertions, 6 deletions

diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index d0e622e5f705..779b87853d55 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,8 +1,12 @@
 AUX nfdump-1.6.14-libft.patch 709 BLAKE2B c24a246e36dd99d61a5ba04ef50bb3509a7a6ec4add1e1690f9635a17998deb13a4b4b336686a00c1aba556ae4d75667f68c3878148a8b093bcaeabe5fdfed40 SHA512 2a1e3559ae3f1d1ad1a17305888469852211c984324c56c0f58f510ff1a6fb1d85f5b5367b3e325d932f20be6832ed98d56b8e85e220da948aa6a28ecd9d0cdd
 AUX nfdump-1.6.14-libnfdump.patch 2439 BLAKE2B cb714491b19a70cc6f458167d8dfed619026d2ef7600d1413a32d15717e7fbfe9db3a794eb5aa922bb9afa53a3cc5d8d3c8cb5ada20ef5c9dc8eebf1331bd4a5 SHA512 09746329df3ad517875d907c16842c8b8ee31f06de649217cc3650cf566e0b059563df93eaf48a60595d2ada41fd43d1279f5bcb400122d9d60fdcb0b813ef46
-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
+AUX nfdump-1.6.16-DEVEL.patch 3694 BLAKE2B 09d5f15aa3ff4a6a9536bca05db5f425b894582347c27bc5b9a9c1497cf9304a0e7cd6c53264de2397977ba3e2b9b1d4f60e560984c0e9e480fd8a6e62d7e3ef SHA512 fd5c3e0aa804eeb7ff1dd7cd2122043308e925b0ac0782a107edb96f7cffe9c5ec60df3ebd8a8f15431d62b412dcf338ee56c24c70a0fde5cd96254fb3e64ca9
+AUX nfdump-1.6.16-libnfdump.patch 196 BLAKE2B 2c97bd45eb810f67f1bcf5d62fee19fd3617cb4ac7d3d085d0031869a398b9d905b7f47043e9b0626e5069145778d85a6aa7e8278428c6f05a75127f6e5853ab SHA512 4c5a7c4deec55ffd66165dbf8dc4229a6288f628f4decd7a6142e34c604ff07a6546796afba9b1e05cb4420858e83a71bf1e0eaeeb6619c741eb3136d5e07c15
+DIST nfdump-1.6.14-security.patch 31579 BLAKE2B d747526f46837e99193bf761bceb853bb44ea54bc6ca2a9977565742e1485b706f3f33370005ccf5c854429635de01f5cf594fd43122d4a6f8912e2a457d8caf SHA512 ee3b82f1283f3dceb36cf60abcee7f5a8fb6c8fe257e2233c3fbb9a34b3c5608dfa101fd473c8b839356a9d1c294a37b9e65657ff1b2d5c015015ff90b2d2c97
+DIST nfdump-1.6.14.tar.gz 1834355 BLAKE2B be92ec6c6eb60c883863a21e7d203c487f176e862f6227bf21d17ade2a04815095c5c119719a18c106401519d7976a2b82e46a11b7f207494abef3e0f73d2716 SHA512 c5e5540526dfce3798728930576e4c7930c3ff80893a94d7f9e65c7c577d1e78bdc47a99c47cee837327ad202197afc378d2408b1b9b847044d0110146055ffe
+DIST nfdump-1.6.15.tar.gz 1834855 BLAKE2B 1892cfbd1d1299c44b14a39b55c766d3dd411d7410a66b8ecbebe590c9da595c79764966ef1c91adb91b936ee3c052ad14bca27c6bcb98472011eb2c67dff60f SHA512 a6bb4f2293ad85d8f16025e7272b889d3814cea2e9255dbd315ee92754675e4ee925c3ebe4e1350f2d5452d69d1d3c13ddeb656324a409c4744da1d4927fe1f2
+DIST nfdump-1.6.16.tar.gz 1814857 BLAKE2B cd50680adbb6023915232bb780daf2bcc4319348444a28c89fc4fdfd19225bdf243bb42179a6bd545c06ab6fafa50091401b7a286527d1863c888a96c0b0a2eb SHA512 c1af3cf984c7eaaf1012c71c061e00f12dbcdf276306096436eb707552932c65b9f03e7a22b4cc0989d951c433f32c5c927600a8248826227f10b4fb2d906a32
 EBUILD nfdump-1.6.14-r1.ebuild 1370 BLAKE2B ee1e4341ddb76c23ca8efe3f7e37f8ad9f8600ab29067de7d0b567389792b46c975d4d44408a79f40e0e6f59172d314fe9e066601a4662462c71db2579cc6f4b SHA512 b3ffa1d9324be60cb95a7ba73b0769903617fca1b193044ac677b415414b77c31f479973221a42151c63d03a6a23bb988e41315b8890c1f6001c79d8ff65c48e
-EBUILD nfdump-1.6.15.ebuild 1358 BLAKE2B 31e94cd2dccde451e7f677c9449647f0542c00d98ad1e9bca50aaa5be64416d2eebb081428f22de3c2f6620dcb65191f5fd180f2e37fa1f466248509fc67c476 SHA512 a310bd247156236eed002aae8f26dcc19cca712a43a28ea998f51d684013b9617ffbfde554b9f103bba8c634193e79db9befc80e1106f3bdc60c7f12cf1cbf35
+EBUILD nfdump-1.6.15-r1.ebuild 1356 BLAKE2B 384c6b291de716ea4363854d2645295ac9bb4707622db6bcdc06f29be740807fe907eba6d836bfe92064659eb32ff508dcb661729c5551a2ebb8e967da6811c3 SHA512 607d60696466c40694feff8f2b044acb44c49b4f9a701abccd957d9d5e0f9bfbfd0c64cb46603950ad66b39355cfe288645345ae0c5789404f202f5403e96982
+EBUILD nfdump-1.6.16-r1.ebuild 1389 BLAKE2B 47d4a9383d02607e98f27896320cf4a2c42a2f01b116149fa1a0c9126d4082f76bc3984440a2a072d37ad6e57b0276e0202fc131bc2df364548b5ef4c6016b62 SHA512 7a54e68d1bd2c7e58879efd8a55abc5f1b83868dba8c858754870160a538a83dcd8a69736fe4cbc15ebb302640c8fc6ae225908697a5faf114c4c3dc8240b536
 MISC metadata.xml 1010 BLAKE2B 0f80dce100cf4a9b5b6011b0690b928d149e9430e894cceaf2ae18a37588f8edb81477b2fc70bd2ba1101bb3b4e225dfc7a82d60513dcb5273b7f230727db9d6 SHA512 81abafe5f8da7c40612127765d5b62532168b16d93bd0f0414e8e6c4e86339c8fd77e7ecb4a5b406cf5f33c087f8d2ecd971fdf065c7be0430bd8a095a503c67
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch b/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch
new file mode 100644
index 000000000000..21aeb6f0e343
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch
@@ -0,0 +1,104 @@
+--- a/bin/flowtree.c
++++ b/bin/flowtree.c
+@@ -467,9 +467,8 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) {
+ 	NodeList->last = node;
+ 	NodeList->length++;
+ #ifdef DEVEL
+-	int proto = node->proto;
+ 	printf("pushed node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n", 
+-		(unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
++		(unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
+ 	ListCheck(NodeList);
+ #endif
+ 	if ( NodeList->waiting ) {
+@@ -483,7 +482,6 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) {
+ 
+ struct FlowNode *Pop_Node(NodeList_t *NodeList, int *done) {
+ struct FlowNode *node;
+-int proto;
+ 
+ 	GetTreeLock(NodeList);
+     while ( NodeList->length == 0 && !*done ) {
+@@ -522,12 +520,11 @@ int proto;
+ 
+ 	node->left = NULL;
+ 	node->right = NULL;
+-	proto = node->proto;
+ 
+ 	NodeList->length--;
+ #ifdef DEVEL
+ 	printf("popped node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n", 
+-		(unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
++		(unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
+ 
+ 	ListCheck(NodeList);
+ #endif
+--- a/bin/nfexpire.c
++++ b/bin/nfexpire.c
+@@ -212,12 +212,12 @@ int main( int argc, char **argv ) {
+ struct stat fstat;
+ int 		c, err, maxsize_set, maxlife_set;
+ int			do_rescan, do_expire, do_list, print_stat, do_update_param, print_books, is_profile, nfsen_format;
+-char		*maxsize_string, *lifetime_string, *datadir;
++char		*lifetime_string, *datadir;
+ uint64_t	maxsize, lifetime, low_water;
+ uint32_t	runtime;
+ channel_t	*channel, *current_channel;
+ 
+-	maxsize_string = lifetime_string = NULL;
++	lifetime_string = NULL;
+ 	datadir = NULL;
+ 	maxsize = lifetime = 0;
+ 	do_rescan  		= 0;
+--- a/bin/nfstat.c
++++ b/bin/nfstat.c
+@@ -1670,7 +1670,7 @@ uint32_t			maxindex, c;
+ 					else
+ 						printf("Top flows ordered by %s:\n", order_mode[order_index].string);
+ 				}
+-				if ( !record_header ) 
++				if ( record_header ) 
+ 					printf("%s\n", record_header);
+ 			}
+ 			PrintSortedFlowcache(SortList, maxindex, topN, 0, print_record, tag, DESCENDING, extension_map_list);
+--- a/bin/sflow.c
++++ b/bin/sflow.c
+@@ -515,11 +515,17 @@ static inline void readCountersSample_v2v4(SFSample *sample, FlowSource_t *fs);
+ 
+ static inline void StoreSflowRecord(SFSample *sample, FlowSource_t *fs);
+ 
++extern int verbose;
++
+ #ifdef DEVEL
+ static inline char *printTag(uint32_t tag, char *buf, int bufLen);
+-#endif
+ 
+-extern int verbose;
++static inline char *printTag(uint32_t tag, char *buf, int bufLen) {
++    snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
++    return buf;
++} // End of printTag
++
++#endif
+ 
+ 
+ /*_________________---------------------------__________________
+@@ -1410,15 +1416,11 @@ static inline uint32_t getAddress(SFSample *sample, SFLAddress *address) {
+ static inline void skipTLVRecord(SFSample *sample, uint32_t tag, uint32_t len, char *description) {
+ 
+ #ifdef DEVEL
+-static inline char *printTag(uint32_t tag, char *buf, int bufLen) {
+-	snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
+-	return buf;
+-} // End of printTag
+-
+-char buf[51];
++	char buf[51];
++	snprintf(buf, 50, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
++	printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, buf, len);
+ #endif
+ 
+-	dbg_printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, printTag(tag, buf, 50), len);
+ 	skipBytes(sample, len);
+ } // End of skipTLVRecord
+ 
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch b/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch
new file mode 100644
index 000000000000..a748969da2e7
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch
@@ -0,0 +1,10 @@
+--- 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 
diff --git a/net-analyzer/nfdump/nfdump-1.6.15.ebuild b/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild
index baa417bf4173..86fcde96ecd3 100644
--- a/net-analyzer/nfdump/nfdump-1.6.15.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ RDEPEND="
 	dev-lang/perl
 "
 
-DOCS=( AUTHORS ChangeLog NEWS README )
+DOCS=( AUTHORS ChangeLog README.md )
 
 src_prepare() {
 	eapply \
diff --git a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild
new file mode 100644
index 000000000000..f76dd9f58c52
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 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/1.6.15"
+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 README.md )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.14-libft.patch
+	"${FILESDIR}"/${PN}-1.6.16-libnfdump.patch
+	"${FILESDIR}"/${PN}-1.6.16-DEVEL.patch
+)
+
+src_prepare() {
+	default
+
+	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
+}