From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- net-analyzer/nfdump/Manifest | 7 +- .../nfdump-1.6.22-libtool-archives-slibtool.patch | 111 +++++++++++++++++++++ net-analyzer/nfdump/nfdump-1.6.19.ebuild | 63 ------------ net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild | 2 +- net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild | 7 +- 5 files changed, 119 insertions(+), 71 deletions(-) create mode 100644 net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch delete mode 100644 net-analyzer/nfdump/nfdump-1.6.19.ebuild (limited to 'net-analyzer/nfdump') diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index 6cf66145f33c..ea5c9efc03eb 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -3,10 +3,9 @@ AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e 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.21-remove-strict-rfc-7011-handling.patch 1726 BLAKE2B 6f2d2c0ebb336eafba60aabec9bc2eb120c61b67401704786ed105eaeba090d893004ea4c8be4e40b360cf91c2b306c4cbb9ef9f60dc6b5c3b92fe1c5c5d904f SHA512 e7ca0512b01a0838ec9a6d52710da23ce6db5021af19a354bc59cbaf7c6b246fee50e7c3ae9b71eb34e94396cffba7f1069140c0f476c8a2b61fa9a06113f425 -DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e +AUX nfdump-1.6.22-libtool-archives-slibtool.patch 3503 BLAKE2B 1118f50a17b134dfbd93cbb66e54c3228906782fabc6e0df174c912569120c588a03170a8bfd715389611b0dcc5b469415d2932f610f8b5398b8424f6e0c5342 SHA512 646606077ef1771b8f4c776939773ab7b2875c4f28710f44df826b7d8d5e5b8a163fff60eb6869ee4dfab8a7edc0f277e19ed88511719d2455b9bc5133e81124 DIST nfdump-1.6.21.tar.gz 561617 BLAKE2B 61a52cb7ee724c47f93e0ce8dd0515306c16b94d8b351f9543deecc2b28c813f09f0e4ba621f2561760924af683ffd527d00936fbc5f91f83d6f727d6cf9e5d9 SHA512 c9162b7a6653267cd4d66a2d75bb2c3d65c431bb29ee549bac2a208fe7f2bc871bb91dfa6d89d6f18cd69f1d435dd25ba1c5dfe6e10b0efc4a582f2e67913a34 DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61 -EBUILD nfdump-1.6.19.ebuild 1390 BLAKE2B ccd3bc87b5f005bd5e5767090f41b7380bfb39224c1f5d31007004e171483e18bb293f9cc157f887f30749a8f694fbc25418a883ebeace04f4a3dbf90a88c662 SHA512 e0e772dae0a2550fd14808e2132a83587508684fe57136754db314add1c55857e5b8d6787eadcb066c73f48522157c2bf414b6cfbd028977adc63c99a6f42035 -EBUILD nfdump-1.6.21-r1.ebuild 1536 BLAKE2B 6174400853f6e976b9092b99610ef4b7795e1edad71b43b1a302390fdf94767d8616342ecd055278d329cc5f9a81ca1dca908a1720b34842bb159feff986b75c SHA512 f75118237418884d494e4c3ad3e6accef30a004c4688c2b2b303776fc0ec59459e4ca8e7918682dea7787706758481e9b1bb997a8cfdf5f2ed9c2574de874c80 -EBUILD nfdump-1.6.22-r1.ebuild 1682 BLAKE2B f55767f172e9d8dc112079f2a3aef7df3ed9f824c19438ee2c33634fd7882f3b3ca154c9de7aad3b04a922f87efcf0034c55b45a6a76c293778b50ea90591219 SHA512 fb4438500d299741164ca77004db9bb8bfed3a4a16225b8e835870b5fa8f8a76523f4b091dda393742c8e905899aad3a3e73dc27c569cb97faa98b591450b605 +EBUILD nfdump-1.6.21-r1.ebuild 1534 BLAKE2B c56602c05b7dcf8bc53076a140bda37026f85377f43ceec13447a240a3bfe45cb0bdc060eac7d0b6d0ba6c3c5b79bac04f7cd138650f8231e1ab895b6c23b69c SHA512 23e2444d93ff39358fd3647fd10ea8efcb15e83b317149bdc6e006cdc04d150678bf9049120affb7faa36b36f1525ec0d61cf4512e340d482d49f0692699f4b6 +EBUILD nfdump-1.6.22-r1.ebuild 1720 BLAKE2B e0d274c34ddf13ea1c7de9e6010641f11a564ca3cd35c87cc4a2557f7beae27e183de37734d51f1e785053acd7ba729eeda55fc83c0ffa949cee17cd7740890d SHA512 426138c255976b081d91fc0640974e4fff47b0438acb617bc7bc469f84a1b1f54d3fa6b1b562e0efe8fbe556d839cb3633c9801eeac8eed2a5c4c768c1534829 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 new file mode 100644 index 000000000000..0a0048120ea4 --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch @@ -0,0 +1,111 @@ +https://bugs.gentoo.org/778704 +https://github.com/phaag/nfdump/pull/282 + +From 44b6854a7e67bec438659452993a517b9ec3e753 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Sat, 27 Mar 2021 07:23:12 -0700 +Subject: [PATCH] bin: Use the libtool archives to link. + +Signed-off-by: orbea +--- + 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.19.ebuild b/net-analyzer/nfdump/nfdump-1.6.19.ebuild deleted file mode 100644 index 3c3245ff7c29..000000000000 --- a/net-analyzer/nfdump/nfdump-1.6.19.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 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.15" -KEYWORDS="amd64 x86" -IUSE="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} - app-doc/doxygen - sys-devel/flex - virtual/yacc -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl -" -PATCHES=( - "${FILESDIR}"/${PN}-1.6.19-compiler.patch - "${FILESDIR}"/${PN}-1.6.19-libft.patch -) -DOCS=( AUTHORS ChangeLog README.md ) - -src_prepare() { - default - - eautoreconf - - doxygen -u doc/Doxyfile.in || die -} - -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 debug devel) \ - $(use_enable readpcap) \ - $(use_enable sflow) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild index f6000c763cbd..84ebe03aee28 100644 --- a/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild @@ -10,7 +10,7 @@ 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" +KEYWORDS="amd64 x86" IUSE="debug doc ftconv nfprofile nftrack readpcap sflow static-libs" COMMON_DEPEND=" diff --git a/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild index 67db70201342..4b6ed40bdb2a 100644 --- a/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild @@ -11,9 +11,9 @@ 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 - static-libs" +KEYWORDS="amd64 x86" +IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow" + REQUIRED_USE="?? ( jnat nsel )" RDEPEND=" @@ -38,6 +38,7 @@ BDEPEND=" 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 ) -- cgit v1.2.3