[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/, net-analyzer/nfdump/files/

[Jeroen Roovers]

commit:     175b39fadecfecad356642d900b720fe9041f88c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 12:29:35 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 12:38:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=175b39fa

net-analyzer/nfdump: Old

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/nfdump/Manifest                       |   4 -
 .../nfdump/files/nfdump-1.6.14-libft.patch         |  14 ---
 .../nfdump/files/nfdump-1.6.14-libnfdump.patch     |  87 -----------------
 .../nfdump/files/nfdump-1.6.16-DEVEL.patch         | 104 ---------------------
 .../nfdump/files/nfdump-1.6.16-libnfdump.patch     |  10 --
 net-analyzer/nfdump/metadata.xml                   |   1 -
 net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild        |  58 ------------
 net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild        |  63 -------------
 net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild        |  63 -------------
 9 files changed, 404 deletions(-)

diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 10dd429af90..fb7111a4d53 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,5 +1 @@
-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
 DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e

diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch
deleted file mode 100644
index 3699fa2a5d0..00000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 38482c4bdb1..00000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- 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/files/nfdump-1.6.16-DEVEL.patch b/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch
deleted file mode 100644
index 21aeb6f0e34..00000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- 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
deleted file mode 100644
index a748969da2e..00000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/metadata.xml b/net-analyzer/nfdump/metadata.xml
index f6dc8af136a..435ade18773 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/metadata.xml
@@ -7,7 +7,6 @@
   </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>

diff --git a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
deleted file mode 100644
index 64b2478d5f8..00000000000
--- a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="
-	https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/phaag/nfdump/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-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild
deleted file mode 100644
index 1bc02e2ad82..00000000000
--- a/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune
-
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="https://github.com/phaag/nfdump"
-SRC_URI="https://github.com/phaag/nfdump/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 README.md )
-
-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
-}

diff --git a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild
deleted file mode 100644
index 1c1536dcf58..00000000000
--- a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune
-
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="https://github.com/phaag/nfdump"
-SRC_URI="https://github.com/phaag/nfdump/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
-}