From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C0D7B138350 for ; Wed, 11 Mar 2020 08:02:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC0F6E0903; Wed, 11 Mar 2020 08:02:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 929FCE0903 for ; Wed, 11 Mar 2020 08:02:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35F4E34F258 for ; Wed, 11 Mar 2020 08:01:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15F7D101 for ; Wed, 11 Mar 2020 08:01:57 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1583913712.f180e5bb44285605387096636a82d957472b7481.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/, net-analyzer/nfdump/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nfdump/Manifest net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch net-analyzer/nfdump/nfdump-1.6.19.ebuild X-VCS-Directories: net-analyzer/nfdump/files/ net-analyzer/nfdump/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: f180e5bb44285605387096636a82d957472b7481 X-VCS-Branch: master Date: Wed, 11 Mar 2020 08:01:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: edbb79aa-5c61-4c3f-bdb9-b05021100035 X-Archives-Hash: ffad672ab594eac64c324629b7d06f06 commit: f180e5bb44285605387096636a82d957472b7481 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Mar 11 07:59:29 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed Mar 11 08:01:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f180e5bb net-analyzer/nfdump: Version 1.6.19 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Closes: https://bugs.gentoo.org/show_bug.cgi?id=710314 Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/nfdump/Manifest | 1 + .../nfdump/files/nfdump-1.6.19-compiler.patch | 21 ++++++++ .../nfdump/files/nfdump-1.6.19-libft.patch | 17 ++++++ net-analyzer/nfdump/nfdump-1.6.19.ebuild | 63 ++++++++++++++++++++++ 4 files changed, 102 insertions(+) diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index 24d54d76b77..10dd429af90 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -2,3 +2,4 @@ DIST nfdump-1.6.14-security.patch 31579 BLAKE2B d747526f46837e99193bf761bceb853b 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.19-compiler.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch new file mode 100644 index 00000000000..8826c50c9dc --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch @@ -0,0 +1,21 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -9,8 +9,6 @@ + AM_INIT_AUTOMAKE([subdir-objects]) + + # Checks for programs. +-CFLAGS="-g -O3" +-AC_PROG_CC([clang gcc]) + AX_CHECK_C11 + CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing" + +--- 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 + output = output_util.h output_util.c output_raw.h output_raw.c diff --git a/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch new file mode 100644 index 00000000000..47953c77217 --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch @@ -0,0 +1,17 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -115,12 +115,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" -o -f "$WHERE_FTPATH/lib64/libft.a" -o -f "$WHERE_FTPATH/lib/libft.so" -o -f "$WHERE_FTPATH/lib64/libft.so"; then +- FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib" +- FT_LDFLAGS="-L$WHERE_FTPATH/lib" +- else +- 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)) + else + AC_MSG_ERROR(flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH) + fi diff --git a/net-analyzer/nfdump/nfdump-1.6.19.ebuild b/net-analyzer/nfdump/nfdump-1.6.19.ebuild new file mode 100644 index 00000000000..d866f89da5b --- /dev/null +++ b/net-analyzer/nfdump/nfdump-1.6.19.ebuild @@ -0,0 +1,63 @@ +# 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 +}