summaryrefslogtreecommitdiff
path: root/net-analyzer/nfdump
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-08-14 10:30:13 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-08-14 10:30:13 +0100
commit616579b5d773c50af31ee56f00105d96ce641ca2 (patch)
tree2ad4d3ba1429bd93a36ab99a2f5ec3490412115e /net-analyzer/nfdump
parent068424b26532f3551a81421a9be67ed206e5c11a (diff)
gentoo resync : 14.08.2021
Diffstat (limited to 'net-analyzer/nfdump')
-rw-r--r--net-analyzer/nfdump/Manifest3
-rw-r--r--net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch111
-rw-r--r--net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild82
3 files changed, 0 insertions, 196 deletions
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 0894db4461d2..ee358321c60a 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -2,9 +2,6 @@ AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2
AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab
AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8
AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
-AUX nfdump-1.6.22-libtool-archives-slibtool.patch 3503 BLAKE2B 1118f50a17b134dfbd93cbb66e54c3228906782fabc6e0df174c912569120c588a03170a8bfd715389611b0dcc5b469415d2932f610f8b5398b8424f6e0c5342 SHA512 646606077ef1771b8f4c776939773ab7b2875c4f28710f44df826b7d8d5e5b8a163fff60eb6869ee4dfab8a7edc0f277e19ed88511719d2455b9bc5133e81124
-DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61
DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168
-EBUILD nfdump-1.6.22-r1.ebuild 1720 BLAKE2B e0d274c34ddf13ea1c7de9e6010641f11a564ca3cd35c87cc4a2557f7beae27e183de37734d51f1e785053acd7ba729eeda55fc83c0ffa949cee17cd7740890d SHA512 426138c255976b081d91fc0640974e4fff47b0438acb617bc7bc469f84a1b1f54d3fa6b1b562e0efe8fbe556d839cb3633c9801eeac8eed2a5c4c768c1534829
EBUILD nfdump-1.6.23.ebuild 1672 BLAKE2B 4d0b88c5592b18da7579e01047b4986984627d3668b09271d5a792cedad3bb9334317026d3cbaf70449262d425c8984a1cd5be2de2b15aa2e8c57b80cb93d539 SHA512 754513ceb76ba46f7a7cf48ef6cba87f060af153c671d56d08bbcb17f4988061c3524d28deed0d32fd30a1023dc4d994e61bed5d45468b434e0d9cf349fff856
MISC metadata.xml 1277 BLAKE2B 627dfd7acef2f5734027131342b29bfc3307fa8e462896b9a08870768aa3c452c41e32289cde6aa84967ae64ffafba8a0390d342e0363d30ccd0a81fb536575e SHA512 bd88e71c62abaf83eea07bf97441f9d66061d459c44785e382ea760fd4f8a706b6bd089ead6ade13a381066355c12070839ec2c9a6d6477397055e7fb3b1b089
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch b/net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch
deleted file mode 100644
index 0a0048120ea4..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-https://bugs.gentoo.org/778704
-https://github.com/phaag/nfdump/pull/282
-
-From 44b6854a7e67bec438659452993a517b9ec3e753 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Sat, 27 Mar 2021 07:23:12 -0700
-Subject: [PATCH] bin: Use the libtool archives to link.
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- bin/Makefile.am | 40 ++++++++++++++--------------------------
- 1 file changed, 14 insertions(+), 26 deletions(-)
-
-diff --git a/bin/Makefile.am b/bin/Makefile.am
-index 0f8e787..456cda4 100755
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -68,37 +68,31 @@ libnfdump_la_LDFLAGS = -release 1.6.22
-
- nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \
- $(nflowcache) $(nfprof)
--nfdump_LDADD = -lnfdump
--nfdump_DEPENDENCIES = libnfdump.la
-+nfdump_LDADD = libnfdump.la
-
- nfreplay_SOURCES = nfreplay.c $(nfprof) \
- $(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix)
--nfreplay_LDADD = -lnfdump
--nfreplay_DEPENDENCIES = libnfdump.la
-+nfreplay_LDADD = libnfdump.la
-
- nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile)
--nfprofile_LDADD = -lnfdump -lrrd
--nfprofile_DEPENDENCIES = libnfdump.la
-+nfprofile_LDADD = libnfdump.la -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_LDADD = -lnfdump -lrrd
--nftrack_DEPENDENCIES = libnfdump.la
-+nftrack_LDADD = libnfdump.la -lrrd
-
- nfcapd_SOURCES = nfcapd.c \
- $(nfstatfile) $(launch) \
- $(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire)
--nfcapd_LDADD = -lnfdump
--nfcapd_DEPENDENCIES = libnfdump.la
-+nfcapd_LDADD = libnfdump.la
-
- nfpcapd_SOURCES = nfpcapd.c \
- $(pcaproc) $(netflow_pcap) \
- $(nfstatfile) $(launch) \
- $(nfnet) $(collector) $(bookkeeper) $(expire) $(content)
--nfpcapd_LDADD = -lnfdump
--nfpcapd_DEPENDENCIES = libnfdump.la
-+nfpcapd_LDADD = libnfdump.la
-
- if READPCAP
- nfcapd_CFLAGS = -DPCAP
-@@ -116,8 +110,7 @@ endif
- sfcapd_SOURCES = sfcapd.c sflow_nfdump.c sflow_nfdump.h sflow.h sflow_v2v4.h sflow_process.c sflow_process.h\
- $(nfstatfile) $(launch) \
- $(nfnet) $(collector) $(bookkeeper) $(expire)
--sfcapd_LDADD = -lnfdump
--sfcapd_DEPENDENCIES = libnfdump.la
-+sfcapd_LDADD = libnfdump.la
-
- if READPCAP
- sfcapd_CFLAGS = -DPCAP
-@@ -126,32 +119,27 @@ sfcapd_LDADD += -lpcap
- endif
-
- nfreader_SOURCES = nfreader.c
--nfreader_LDADD = -lnfdump
--nfreader_DEPENDENCIES = libnfdump.la
-+nfreader_LDADD = libnfdump.la
-
- nfanon_SOURCES = nfanon.c $(anon)
--nfanon_LDADD = -lnfdump
--nfanon_DEPENDENCIES = libnfdump.la
-+nfanon_LDADD = libnfdump.la
-
- nfgen_SOURCES = nfgen.c
--nfgen_LDADD = -lnfdump
--nfgen_DEPENDENCIES = libnfdump.la
-+nfgen_LDADD = libnfdump.la
-
- nfexpire_SOURCES = nfexpire.c \
- $(bookkeeper) $(expire) $(nfstatfile)
--nfexpire_LDADD = -lnfdump @FTS_OBJ@
--nfexpire_DEPENDENCIES = libnfdump.la
-+nfexpire_LDADD = libnfdump.la @FTS_OBJ@
-
- nftest_SOURCES = nftest.c
--nftest_LDADD = -lnfdump
--nftest_DEPENDENCIES = nfgen libnfdump.la
-+nftest_LDADD = libnfdump.la
-+nftest_DEPENDENCIES = nfgen
-
- if FT2NFDUMP
- ft2nfdump_SOURCES = ft2nfdump.c
- ft2nfdump_CFLAGS = @FT_INCLUDES@
--ft2nfdump_LDADD = -lnfdump -lft -lz
-+ft2nfdump_LDADD = libnfdump.la -lft -lz
- ft2nfdump_LDADD += @FT_LDFLAGS@
--ft2nfdump_DEPENDENCIES = libnfdump.la
- endif
-
- check_DIST = inline.c collector_inline.c nffile_inline.c nfdump_inline.c heapsort_inline.c applybits_inline.c
diff --git a/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild
deleted file mode 100644
index 4b6ed40bdb2a..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-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.22"
-KEYWORDS="amd64 x86"
-IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow"
-
-REQUIRED_USE="?? ( jnat nsel )"
-
-RDEPEND="
- app-arch/bzip2
- sys-libs/zlib
- ftconv? ( net-analyzer/flow-tools )
- nfpcapd? ( net-libs/libpcap )
- nfprofile? ( net-analyzer/rrdtool )
- nftrack? ( net-analyzer/rrdtool )
- readpcap? ( net-libs/libpcap )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/flex
- virtual/yacc
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.19-compiler.patch
- "${FILESDIR}"/${PN}-1.6.19-libft.patch
- "${FILESDIR}"/${P}-libtool-archives-slibtool.patch
-)
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_prepare() {
- default
-
- eautoreconf
-
- if use doc; then
- doxygen -u doc/Doxyfile.in || die
- fi
-}
-
-src_configure() {
- # --without-ftconf is not handled well #322201
- econf \
- $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
- $(use nfpcapd && echo --enable-nfpcapd) \
- $(use nfprofile && echo --enable-nfprofile) \
- $(use nftrack && echo --enable-nftrack) \
- $(use_enable debug devel) \
- $(use_enable jnat) \
- $(use_enable nsel) \
- $(use_enable readpcap) \
- $(use_enable sflow) \
- --disable-static
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}"/nfcapd.initd nfcapd
- newconfd "${FILESDIR}"/nfcapd.confd nfcapd
-
- if use doc; then
- dodoc -r doc/html
- fi
-}