From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3E9DE138252 for ; Thu, 12 May 2016 10:45:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C835C21C01D; Thu, 12 May 2016 10:45:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54F6A21C01D for ; Thu, 12 May 2016 10:45:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BC6C340662 for ; Thu, 12 May 2016 10:45:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B381D33E for ; Thu, 12 May 2016 10:45:38 +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: <1463049936.510cad8bf3ea06d59d771b0f056df8884061d3fb.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.14-libft.patch net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch net-analyzer/nfdump/nfdump-1.6.14.ebuild X-VCS-Directories: net-analyzer/nfdump/ net-analyzer/nfdump/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 510cad8bf3ea06d59d771b0f056df8884061d3fb X-VCS-Branch: master Date: Thu, 12 May 2016 10:45:38 +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-Archives-Salt: 4a14b4fc-ad1d-49b9-a355-5e40791484f0 X-Archives-Hash: cb474a412f40f6505a146b25e3a83e7c commit: 510cad8bf3ea06d59d771b0f056df8884061d3fb Author: Jeroen Roovers gentoo org> AuthorDate: Thu May 12 10:45:19 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu May 12 10:45:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510cad8b net-analyzer/nfdump: Version bump. Package-Manager: portage-2.2.28 net-analyzer/nfdump/Manifest | 1 + .../nfdump/files/nfdump-1.6.14-libft.patch | 14 ++++ .../nfdump/files/nfdump-1.6.14-libnfdump.patch | 87 ++++++++++++++++++++++ net-analyzer/nfdump/nfdump-1.6.14.ebuild | 57 ++++++++++++++ 4 files changed, 159 insertions(+) diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index 984951a..125d03f 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -1,3 +1,4 @@ DIST minilzo-2.07.tar.gz 60009 SHA256 b706cf02e8af2716a56830ca067cf2d7c0e305c776cb26bd760cd157ce73c928 SHA512 ff1604ab6e273208aa72218367c7acd6f262965ee8fa62091346851099df237af9e9fe61c29638b922ce020d5d6463a18b93a899299c0d96745135aad839c816 WHIRLPOOL 66ec8d7a87a75e218f052a30fc7afcd05f906a91641b85b83bcda79356819c390a71ceb9d71f1015e82791e1bd62f4f69cce68f3e4250dd6323a7a7d47b3c72a DIST nfdump-1.6.12.tar.gz 733604 SHA256 4b597c3c948b2ac1a4b0b11ffbdc5c8bab8835f14718ad0f7896daeaf7b89204 SHA512 4ff61c14746f34f47588545e58e4e2fa679cc107192cb81d4ece1b7e18ad9ae1d3ce7663b90a302a64a3cc72cdd55718a446c5323ac100ed5fc3601931d866ad WHIRLPOOL 7acbc624868802e73f1d67f0984bdbfd67e9c3d14679fde360be7fefbeeac18d884930802abb156b2a283796f690588c4a46bc12a3287f791b9c6e87f04b02ed DIST nfdump-1.6.13.tar.gz 662006 SHA256 251533c316c9fe595312f477cdb051e9c667517f49fb7ac5b432495730e45693 SHA512 92c21462cddc69b3551d0ed5c20c7b87e5b4e6438efcbc16aac0e8af45b8ec7e5a361c6e514effcf78c1e78fd892959e8f39bb08915d4daedf4b6e932303688d WHIRLPOOL a412164ff29d9e7a2864033a320ecc60789138097fb3c237b413a953cb7136330a0989f5402ac74c2261c6279675eea3bbf1450b4c6c03475e8ad2fe97cafefd +DIST nfdump-1.6.14.tar.gz 1834355 SHA256 7bf1b17cdcf81c399c6aaf87e0a8cbe12d81a9e33831629eb3a792878d5f80b1 SHA512 c5e5540526dfce3798728930576e4c7930c3ff80893a94d7f9e65c7c577d1e78bdc47a99c47cee837327ad202197afc378d2408b1b9b847044d0110146055ffe WHIRLPOOL ac7929fdc76b2980a464e1253e24832ad8abc153917d5290655a7fd5b29562b769f1120b29960624b5f73aa16bfab0593efb051af350ba3aacfed3aeeee1bb00 diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch new file mode 100644 index 0000000..3699fa2 --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch @@ -0,0 +1,14 @@ +--- 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 new file mode 100644 index 0000000..38482c4 --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch @@ -0,0 +1,87 @@ +--- 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/nfdump-1.6.14.ebuild b/net-analyzer/nfdump/nfdump-1.6.14.ebuild new file mode 100644 index 0000000..7cb8f24 --- /dev/null +++ b/net-analyzer/nfdump/nfdump-1.6.14.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils + +DESCRIPTION="A set of tools to collect and process netflow data" +HOMEPAGE="https://github.com/phaag/nfdump" +SRC_URI=" + ${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz +" + +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 + + 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) +}