commit: 01fb67c3b70674a3ff75d11f9c9dfd8f73ec6e08 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Aug 13 00:35:55 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Aug 13 00:35:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01fb67c3
net-analyzer/nfdump: drop 1.6.22-r1 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/nfdump/Manifest | 1 - .../nfdump-1.6.22-libtool-archives-slibtool.patch | 111 --------------------- net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild | 82 --------------- 3 files changed, 194 deletions(-) diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index a5942d524cc..32325041d89 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -1,2 +1 @@ -DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61 DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168 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 0a0048120ea..00000000000 --- 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 <[email protected]> -Date: Sat, 27 Mar 2021 07:23:12 -0700 -Subject: [PATCH] bin: Use the libtool archives to link. - -Signed-off-by: orbea <[email protected]> ---- - 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 4b6ed40bdb2..00000000000 --- 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 -}
