* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/, net-analyzer/nfdump/files/
@ 2016-05-12 10:45 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2016-05-12 10:45 UTC (permalink / raw
To: gentoo-commits
commit: 510cad8bf3ea06d59d771b0f056df8884061d3fb
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 10:45:19 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> 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)
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/, net-analyzer/nfdump/files/
@ 2016-05-15 6:57 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2016-05-15 6:57 UTC (permalink / raw
To: gentoo-commits
commit: 4c9c3d4f0266be323810007f6999c50adf346a61
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 06:57:43 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun May 15 06:57:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c9c3d4f
net-analyzer/nfdump: Old.
Package-Manager: portage-2.2.28
net-analyzer/nfdump/Manifest | 3 -
.../nfdump/files/nfdump-1.6.12-test-dep.patch | 11 ----
.../nfdump/files/nfdump-1.6.13-libft.patch | 14 -----
net-analyzer/nfdump/nfdump-1.6.12.ebuild | 68 ----------------------
net-analyzer/nfdump/nfdump-1.6.13.ebuild | 58 ------------------
5 files changed, 154 deletions(-)
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 68f8d06..cd15608 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,5 +1,2 @@
DIST ff0e855bd1f51bed9fc5d8559c64d3cfb475a5d8.patch 31579 SHA256 39d1f37abee626863ad589439235d4e182eb9faf90bcbd0a75582aacee63a185 SHA512 ee3b82f1283f3dceb36cf60abcee7f5a8fb6c8fe257e2233c3fbb9a34b3c5608dfa101fd473c8b839356a9d1c294a37b9e65657ff1b2d5c015015ff90b2d2c97 WHIRLPOOL 0f074599b318ab7fc4e7444d17e9ab2f7adb3834e4ddd16ad2af06a343e4df2dd402afc87a1d6d3d743af116055c1e59dc8953f2de32742f1afd856eefe0cb69
-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.12-test-dep.patch b/net-analyzer/nfdump/files/nfdump-1.6.12-test-dep.patch
deleted file mode 100644
index 312809a..0000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.12-test-dep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -5,6 +5,8 @@
- check_PROGRAMMS = test.sh
- TESTS = nftest test.sh
-
-+test.sh: nfgen
-+
- if SFLOW
- bin_PROGRAMS += sfcapd
- endif
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.13-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.13-libft.patch
deleted file mode 100644
index f657150..0000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.13-libft.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -109,9 +109,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"; 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/nfdump-1.6.12.ebuild b/net-analyzer/nfdump/nfdump-1.6.12.ebuild
deleted file mode 100644
index b26d8d2..0000000
--- a/net-analyzer/nfdump/nfdump-1.6.12.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-MY_P="${P/_/}"
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="http://nfdump.sourceforge.net/"
-SRC_URI="
- mirror://sourceforge/nfdump/${MY_P}.tar.gz
- http://www.oberhumer.com/opensource/lzo/download/minilzo-2.07.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
-
-CDEPEND="
- ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
- nfprofile? ( net-analyzer/rrdtool )
- nftrack? ( net-analyzer/rrdtool )
- readpcap? ( net-libs/libpcap )
-"
-DEPEND="
- ${CDEPEND}
- sys-devel/flex
- virtual/yacc
-"
-RDEPEND="
- ${CDEPEND}
- dev-lang/perl
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-test-dep.patch
-
- # bug #515278
- cp "${WORKDIR}"/minilzo-2.07/*.{c,h} "${S}"/bin || die
-
- if use ftconv; then
- sed -e '/ftbuild.h/d' -i bin/ft2nfdump.c || die
- sed \
- -e 's:lib\(/ftlib.h\):include\1:' \
- -e 's:libft.a:libft.so:' \
- \-i configure.in || die
- fi
- sed -i bin/Makefile.am -e '/^AM_CFLAGS/d' || die
- 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)
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.13.ebuild b/net-analyzer/nfdump/nfdump-1.6.13.ebuild
deleted file mode 100644
index 4e2f707..0000000
--- a/net-analyzer/nfdump/nfdump-1.6.13.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-MY_P="${P/_/}"
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="http://nfdump.sourceforge.net/"
-SRC_URI="
- mirror://sourceforge/nfdump/${MY_P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
-
-COMMON_DEPEND="
- 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 )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-libft.patch
-
- sed -i bin/Makefile.am -e '/^AM_CFLAGS/d' || die
-
- 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)
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/, net-analyzer/nfdump/files/
@ 2020-03-11 8:01 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2020-03-11 8:01 UTC (permalink / raw
To: gentoo-commits
commit: f180e5bb44285605387096636a82d957472b7481
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 07:59:29 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> 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 <jer <AT> 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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/, net-analyzer/nfdump/files/
@ 2020-03-29 12:38 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2020-03-29 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 175b39fadecfecad356642d900b720fe9041f88c
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 12:29:35 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 12:38:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=175b39fa
net-analyzer/nfdump: Old
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/nfdump/Manifest | 4 -
.../nfdump/files/nfdump-1.6.14-libft.patch | 14 ---
.../nfdump/files/nfdump-1.6.14-libnfdump.patch | 87 -----------------
.../nfdump/files/nfdump-1.6.16-DEVEL.patch | 104 ---------------------
.../nfdump/files/nfdump-1.6.16-libnfdump.patch | 10 --
net-analyzer/nfdump/metadata.xml | 1 -
net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild | 58 ------------
net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild | 63 -------------
net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild | 63 -------------
9 files changed, 404 deletions(-)
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 10dd429af90..fb7111a4d53 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,5 +1 @@
-DIST nfdump-1.6.14-security.patch 31579 BLAKE2B d747526f46837e99193bf761bceb853bb44ea54bc6ca2a9977565742e1485b706f3f33370005ccf5c854429635de01f5cf594fd43122d4a6f8912e2a457d8caf SHA512 ee3b82f1283f3dceb36cf60abcee7f5a8fb6c8fe257e2233c3fbb9a34b3c5608dfa101fd473c8b839356a9d1c294a37b9e65657ff1b2d5c015015ff90b2d2c97
-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.14-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch
deleted file mode 100644
index 3699fa2a5d0..00000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 38482c4bdb1..00000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- 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/files/nfdump-1.6.16-DEVEL.patch b/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch
deleted file mode 100644
index 21aeb6f0e34..00000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- a/bin/flowtree.c
-+++ b/bin/flowtree.c
-@@ -467,9 +467,8 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) {
- NodeList->last = node;
- NodeList->length++;
- #ifdef DEVEL
-- int proto = node->proto;
- printf("pushed node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n",
-- (unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
-+ (unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
- ListCheck(NodeList);
- #endif
- if ( NodeList->waiting ) {
-@@ -483,7 +482,6 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) {
-
- struct FlowNode *Pop_Node(NodeList_t *NodeList, int *done) {
- struct FlowNode *node;
--int proto;
-
- GetTreeLock(NodeList);
- while ( NodeList->length == 0 && !*done ) {
-@@ -522,12 +520,11 @@ int proto;
-
- node->left = NULL;
- node->right = NULL;
-- proto = node->proto;
-
- NodeList->length--;
- #ifdef DEVEL
- printf("popped node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n",
-- (unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
-+ (unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
-
- ListCheck(NodeList);
- #endif
---- a/bin/nfexpire.c
-+++ b/bin/nfexpire.c
-@@ -212,12 +212,12 @@ int main( int argc, char **argv ) {
- struct stat fstat;
- int c, err, maxsize_set, maxlife_set;
- int do_rescan, do_expire, do_list, print_stat, do_update_param, print_books, is_profile, nfsen_format;
--char *maxsize_string, *lifetime_string, *datadir;
-+char *lifetime_string, *datadir;
- uint64_t maxsize, lifetime, low_water;
- uint32_t runtime;
- channel_t *channel, *current_channel;
-
-- maxsize_string = lifetime_string = NULL;
-+ lifetime_string = NULL;
- datadir = NULL;
- maxsize = lifetime = 0;
- do_rescan = 0;
---- a/bin/nfstat.c
-+++ b/bin/nfstat.c
-@@ -1670,7 +1670,7 @@ uint32_t maxindex, c;
- else
- printf("Top flows ordered by %s:\n", order_mode[order_index].string);
- }
-- if ( !record_header )
-+ if ( record_header )
- printf("%s\n", record_header);
- }
- PrintSortedFlowcache(SortList, maxindex, topN, 0, print_record, tag, DESCENDING, extension_map_list);
---- a/bin/sflow.c
-+++ b/bin/sflow.c
-@@ -515,11 +515,17 @@ static inline void readCountersSample_v2v4(SFSample *sample, FlowSource_t *fs);
-
- static inline void StoreSflowRecord(SFSample *sample, FlowSource_t *fs);
-
-+extern int verbose;
-+
- #ifdef DEVEL
- static inline char *printTag(uint32_t tag, char *buf, int bufLen);
--#endif
-
--extern int verbose;
-+static inline char *printTag(uint32_t tag, char *buf, int bufLen) {
-+ snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
-+ return buf;
-+} // End of printTag
-+
-+#endif
-
-
- /*_________________---------------------------__________________
-@@ -1410,15 +1416,11 @@ static inline uint32_t getAddress(SFSample *sample, SFLAddress *address) {
- static inline void skipTLVRecord(SFSample *sample, uint32_t tag, uint32_t len, char *description) {
-
- #ifdef DEVEL
--static inline char *printTag(uint32_t tag, char *buf, int bufLen) {
-- snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
-- return buf;
--} // End of printTag
--
--char buf[51];
-+ char buf[51];
-+ snprintf(buf, 50, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
-+ printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, buf, len);
- #endif
-
-- dbg_printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, printTag(tag, buf, 50), len);
- skipBytes(sample, len);
- } // End of skipTLVRecord
-
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch b/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch
deleted file mode 100644
index a748969da2e..00000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index f6dc8af136a..435ade18773 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag>
- <flag name="compat15">Enable read support for nfdump data files created with nfdump 1.5.x</flag>
<flag name="ftconv">Build the flow-tools to nfdump converter</flag>
<flag name="nfprofile">Build nfprofile used by NfSen</flag>
<flag name="nftrack">Build nfprofile used by PortTracker</flag>
diff --git a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
deleted file mode 100644
index 64b2478d5f8..00000000000
--- a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-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
- https://github.com/phaag/nfdump/commit/ff0e855bd1f51bed9fc5d8559c64d3cfb475a5d8.patch -> ${P}-security.patch
-"
-
-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 \
- "${DISTDIR}"/${P}-security.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)
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild
deleted file mode 100644
index 1bc02e2ad82..00000000000
--- a/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune
-
-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/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="compat15 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}
- sys-devel/flex
- virtual/yacc
-"
-RDEPEND="
- ${COMMON_DEPEND}
- dev-lang/perl
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_prepare() {
- eapply \
- "${FILESDIR}"/${PN}-1.6.14-libft.patch \
- "${FILESDIR}"/${PN}-1.6.14-libnfdump.patch
-
- eapply_user
-
- 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) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- prune_libtool_files
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild
deleted file mode 100644
index 1c1536dcf58..00000000000
--- a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune
-
-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="compat15 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}
- sys-devel/flex
- virtual/yacc
-"
-RDEPEND="
- ${COMMON_DEPEND}
- dev-lang/perl
-"
-DOCS=( AUTHORS ChangeLog README.md )
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.14-libft.patch
- "${FILESDIR}"/${PN}-1.6.16-libnfdump.patch
- "${FILESDIR}"/${PN}-1.6.16-DEVEL.patch
-)
-
-src_prepare() {
- default
-
- 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) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/, net-analyzer/nfdump/files/
@ 2022-03-24 23:03 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-03-24 23:03 UTC (permalink / raw
To: gentoo-commits
commit: 295836b2ebe44f18f8c06fcb56e1e22e96da1a55
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 23:00:22 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 23:02:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=295836b2
net-analyzer/nfdump: add additional autoconf 2.69+ patches
Let's do a new revision for the more comprehensive upstream
autoconf 2.69+ patches (and throwing in the upstream-sent
variant of the automake patch given the previous version added
to 1.6.23 was partly done upstream already).
Could affect installed files and such too of course with
major build system changes.
Closes: https://bugs.gentoo.org/832420
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../nfdump/files/nfdump-1.6.23-autotools.patch | 216 +++++++++++++++++++++
.../files/nfdump-1.6.23-m4-dir-automake.patch | 23 +++
net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild | 84 ++++++++
3 files changed, 323 insertions(+)
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
new file mode 100644
index 000000000000..65558bbe7dfa
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
@@ -0,0 +1,216 @@
+https://github.com/phaag/nfdump/commit/e6261098570f69ad973a7a4ea7aaebb1663712e8
+https://github.com/phaag/nfdump/commit/67da975f20076751bce49caf57c89ed21ed92ad0
+https://github.com/phaag/nfdump/commit/4652c2014012a81438f53cb590687c8c93419140
+
+From: Peter Haag <flow-dev@pyxis.ch>
+Date: Tue, 22 Feb 2022 10:54:19 +0100
+Subject: [PATCH] Fix issue #304 - accept CFLAGS
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,8 +8,11 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
+ AC_CONFIG_HEADER([config.h])
+ AM_INIT_AUTOMAKE([subdir-objects])
+
++if test "x$CFLAGS" = "x"; then
++ CFLAGS="-g -O3"
++fi
++
+ # 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"
+
+From: Peter Haag <peter@people.ops-trust.net>
+Date: Fri, 25 Feb 2022 09:12:27 +0100
+Subject: [PATCH] Cleanup automake files. Fixes #304.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,12 +1,13 @@
+ # -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+
+-AC_PREREQ(2.59)
++AC_PREREQ([2.71])
+ AC_REVISION($Revision: 244 $)dnl
+-AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
++AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
+
+-AC_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([subdir-objects])
++AC_CONFIG_MACRO_DIRS([m4])
+
+ if test "x$CFLAGS" = "x"; then
+ CFLAGS="-g -O3"
+@@ -15,7 +16,12 @@ fi
+ # Checks for programs.
+ AC_PROG_CC([clang gcc])
+ AX_CHECK_C11
+-CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
++AX_APPEND_FLAG([-Wall], [CFLAGS])
++AX_APPEND_FLAG([-Wstrict-prototypes], [CFLAGS])
++AX_APPEND_FLAG([-Wmissing-prototypes], [CFLAGS])
++AX_APPEND_FLAG([-Wmissing-declarations], [CFLAGS])
++AX_APPEND_FLAG([-Wmissing-noreturn], [CFLAGS])
++AX_APPEND_FLAG([-fno-strict-aliasing], [CFLAGS])
+
+ LT_INIT
+
+@@ -59,7 +65,7 @@ if test "${enable_fixtimebug}" = "yes" ; then
+ fi
+
+ AC_PROG_YACC
+-AC_PROG_LEX
++AC_PROG_LEX(yywrap)
+ which $LEX > /dev/null 2>&1
+ if test $? = 1; then
+ AC_MSG_ERROR(No lex or flex found on system)
+@@ -312,7 +318,11 @@ AC_LINK_IFELSE(
+
+ # Checks for header files.
+ AC_HEADER_DIRENT
+-AC_HEADER_STDC
++# Autoupdate added the next two lines to ensure that your configure
++# script's behavior did not change. They are probably safe to remove.
++AC_CHECK_INCLUDES_DEFAULT
++AC_PROG_EGREP
++
+ AC_CHECK_HEADERS(stdio_ext.h)
+ AC_CHECK_HEADERS([nameser8_compat.h])
+ AC_CHECK_HEADERS([features.h arpa/inet.h fcntl.h netinet/in.h fts.h stdint.h stdlib.h stddef.h string.h sys/socket.h syslog.h unistd.h iso/limits_iso.h])
+@@ -404,17 +414,14 @@ AC_CHECK_FUNCS(memcmp memcpy memmove memset)
+ AC_MSG_CHECKING([for union semun])
+ AC_CACHE_VAL(ac_cv_struct_semun,
+ [
+- AC_TRY_COMPILE(
+- [
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <sys/types.h>
+ #include <sys/ipc.h>
+ #include <sys/sem.h>;
+- ],
+- [
++ ]], [[
+ union semun semdat;
+- ],
+- ac_cv_struct_semun=yes, ac_cv_struct_semun=no
+- )
++ ]])],[ac_cv_struct_semun=yes],[ac_cv_struct_semun=no
++ ])
+ ]
+ )
+
+@@ -424,7 +431,7 @@ if test "$ac_cv_struct_semun" = "yes"; then
+ fi
+
+ AC_MSG_CHECKING(for the %z format string in printf())
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <sys/types.h>
+
+@@ -438,28 +445,38 @@ char string[16];
+
+ return i == 5 ? 0 : 1;
+ }
+-],
+-[
++]])],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
+ [Define to 1 if you have a printf() that supports the %z format string.])
+-],
+-[
++],[
+ AC_MSG_RESULT(no)
+-],
+-[
++],[
+ AC_MSG_RESULT(no)
+-]
+-)
+
++])
++
++AC_CONFIG_FILES([Makefile bin/Makefile man/Makefile])
++AC_CONFIG_FILES([doc/Makefile])
+ AC_PATH_PROG([DOXYGEN], [doxygen], [])
+ AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
+ AM_COND_IF([HAVE_DOXYGEN], AC_CONFIG_FILES([doc/Doxyfile]))
+-AC_OUTPUT(doc/Makefile)
+-
+-#AC_CONFIG_FILES([Makefile])
+-AC_OUTPUT(Makefile bin/Makefile man/Makefile)
++AC_OUTPUT
+
++echo ""
++echo "----------------------------------"
++echo " Build Settings for ${PACKAGE_TARNAME} v${PACKAGE_VERSION}"
++echo "----------------------------------"
++echo " host type = $host_os"
++echo " install dir = $prefix"
++echo " CC = $CC"
++echo " CFLAGS = $AM_CFLAGS $CFLAGS"
++echo " CPPFLAGS = $AM_CPPFLAGS $CPPFLAGS"
++echo " LDFLAGS = $AM_LDFLAGS $LDFLAGS"
++echo " LIBS = $LIBS"
++echo "----------------------------------"
++echo ""
++echo " You can run ./make now."
+ echo ""
+ echo "* Many thanks for using nfdump tools"
+ echo "* Please send bug reports back to me: peter@people.ops-trust.net"
+
+From: Peter Haag <peter@people.ops-trust.net>
+Date: Thu, 3 Mar 2022 09:25:15 +0100
+Subject: [PATCH] Make configure.ac autoconf 2.69 compatible
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,7 +1,7 @@
+ # -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+
+-AC_PREREQ([2.71])
++AC_PREREQ([2.69])
+ AC_REVISION($Revision: 244 $)dnl
+ AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
+
+@@ -47,7 +47,7 @@ if test "${enable_jnat}" = "yes" ; then
+ fi
+
+ if test "${enable_nsel}" = "yes" -a "${enable_jnat}" = "yes"; then
+- AC_MSG_ERROR(You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.)
++ AC_MSG_ERROR([You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.])
+ fi
+
+ AC_ARG_ENABLE(nel,
+@@ -287,7 +287,6 @@ AC_SUBST(FT_INCLUDES)
+ AC_SUBST(FT_LDFLAGS)
+ AC_SUBST(LFLAGS)
+
+-
+ # Checks for libraries.
+ AC_CHECK_FUNCS(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname,,[AC_CHECK_LIB(socket,gethostbyname)])])
+ AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
+@@ -447,8 +446,7 @@ char string[16];
+ }
+ ]])],[
+ AC_MSG_RESULT(yes)
+- AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
+- [Define to 1 if you have a printf() that supports the %z format string.])
++ AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1], [Define to 1 if you have a printf() that supports the %z format string.])
+ ],[
+ AC_MSG_RESULT(no)
+ ],[
+--- /dev/null
++++ b/m4/extensions.m4
+@@ -0,0 +1,4 @@
++dnl Define to empty for the benefit of Autoconf 2.69
++dnl AC_USE_SYSTEM_EXTENSIONS (below) can be used unchanged from Autoconf 2.70+.
++m4_ifndef([AC_CHECK_INCLUDES_DEFAULT],
++ [AC_DEFUN([AC_CHECK_INCLUDES_DEFAULT], [])])
+
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
new file mode 100644
index 000000000000..755db8b7cf5d
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
@@ -0,0 +1,23 @@
+https://github.com/phaag/nfdump/pull/336
+
+From e882722e4e006d0440fb5a37fb051d4747e4f225 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 24 Mar 2022 22:50:13 +0000
+Subject: [PATCH] Makefile.am: add ACLOCAL_AMFLAGS
+
+Per autoconf docs [0], if using automake and AC_CONFIG_MACRO_DIR,
+we need to include ACLOCAL_AMFLAGS in Makefile.am.
+
+So, let's set ACLOCAL_AMFLAGS = -I m4.
+
+This sorts out an automake warning.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,4 @@
++ACLOCAL_AMFLAGS = -I m4
+
+ SUBDIRS = . bin man doc
+
+
diff --git a/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild
new file mode 100644
index 000000000000..198f7e8eb909
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+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/${PV}"
+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}"/${P}-autotools.patch
+ "${FILESDIR}"/${P}-m4-dir-automake.patch
+ "${FILESDIR}"/${PN}-1.6.19-libft.patch
+)
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ if use doc; then
+ doxygen -u doc/Doxyfile.in || die
+ fi
+}
+
+src_configure() {
+ tc-export CC
+
+ # --without-ftconf is not handled well, bug #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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/, net-analyzer/nfdump/files/
@ 2022-10-01 0:34 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-10-01 0:34 UTC (permalink / raw
To: gentoo-commits
commit: f5374dba40cb6dbd24accfae7f9a07c6a58a7d61
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 00:34:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 00:34:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5374dba
net-analyzer/nfdump: drop 1.6.23, 1.6.23-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/nfdump/Manifest | 1 -
.../nfdump/files/nfdump-1.6.19-compiler.patch | 21 --
.../nfdump/files/nfdump-1.6.23-autotools.patch | 216 ---------------------
.../files/nfdump-1.6.23-m4-dir-automake.patch | 23 ---
.../nfdump/files/nfdump-1.6.23-m4-dir.patch | 19 --
net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild | 83 --------
net-analyzer/nfdump/nfdump-1.6.23.ebuild | 82 --------
7 files changed, 445 deletions(-)
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index b3729d0617ac..2e99529dd136 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,3 +1,2 @@
-DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168
DIST nfdump-1.6.24.tar.gz 647945 BLAKE2B 6f054c7ccdbc6c5052d1c4655509414b9acc7de320152e932dd31d6cc9eb915b73efa29e42a212ea206c4619c9e025bfd751762808fd8136c38d4edb72f4fabf SHA512 b1e092663ce245247af721565139eb0a264918747e6c0695c59f0b70a99049e92d79674d75c248f60aa832949d7e13027887cc825e393fce7dc5571771bce1d7
DIST nfdump-1.7.0.1.tar.gz 740435 BLAKE2B dd3d3e63aa076b32e0c9e897b40d3ee8368990792b1a483b69a448dadd7389c23df9800910baad0c5a241a480c5961616c70040fdce992b2a67e3be6680e715b SHA512 5b5da57016dc826650ba80a80a881ab89034778316f47c6797dbc902ed6af6d77cfb722356c3a1d92a4239a934178df56ff4c6cb3bf77e029232e02b905ec1a8
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch
deleted file mode 100644
index 8826c50c9dc2..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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.23-autotools.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
deleted file mode 100644
index 65558bbe7dfa..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-https://github.com/phaag/nfdump/commit/e6261098570f69ad973a7a4ea7aaebb1663712e8
-https://github.com/phaag/nfdump/commit/67da975f20076751bce49caf57c89ed21ed92ad0
-https://github.com/phaag/nfdump/commit/4652c2014012a81438f53cb590687c8c93419140
-
-From: Peter Haag <flow-dev@pyxis.ch>
-Date: Tue, 22 Feb 2022 10:54:19 +0100
-Subject: [PATCH] Fix issue #304 - accept CFLAGS
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,8 +8,11 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
- AC_CONFIG_HEADER([config.h])
- AM_INIT_AUTOMAKE([subdir-objects])
-
-+if test "x$CFLAGS" = "x"; then
-+ CFLAGS="-g -O3"
-+fi
-+
- # 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"
-
-From: Peter Haag <peter@people.ops-trust.net>
-Date: Fri, 25 Feb 2022 09:12:27 +0100
-Subject: [PATCH] Cleanup automake files. Fixes #304.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,12 +1,13 @@
- # -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
-
--AC_PREREQ(2.59)
-+AC_PREREQ([2.71])
- AC_REVISION($Revision: 244 $)dnl
--AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
-+AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
-
--AC_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE([subdir-objects])
-+AC_CONFIG_MACRO_DIRS([m4])
-
- if test "x$CFLAGS" = "x"; then
- CFLAGS="-g -O3"
-@@ -15,7 +16,12 @@ fi
- # Checks for programs.
- AC_PROG_CC([clang gcc])
- AX_CHECK_C11
--CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
-+AX_APPEND_FLAG([-Wall], [CFLAGS])
-+AX_APPEND_FLAG([-Wstrict-prototypes], [CFLAGS])
-+AX_APPEND_FLAG([-Wmissing-prototypes], [CFLAGS])
-+AX_APPEND_FLAG([-Wmissing-declarations], [CFLAGS])
-+AX_APPEND_FLAG([-Wmissing-noreturn], [CFLAGS])
-+AX_APPEND_FLAG([-fno-strict-aliasing], [CFLAGS])
-
- LT_INIT
-
-@@ -59,7 +65,7 @@ if test "${enable_fixtimebug}" = "yes" ; then
- fi
-
- AC_PROG_YACC
--AC_PROG_LEX
-+AC_PROG_LEX(yywrap)
- which $LEX > /dev/null 2>&1
- if test $? = 1; then
- AC_MSG_ERROR(No lex or flex found on system)
-@@ -312,7 +318,11 @@ AC_LINK_IFELSE(
-
- # Checks for header files.
- AC_HEADER_DIRENT
--AC_HEADER_STDC
-+# Autoupdate added the next two lines to ensure that your configure
-+# script's behavior did not change. They are probably safe to remove.
-+AC_CHECK_INCLUDES_DEFAULT
-+AC_PROG_EGREP
-+
- AC_CHECK_HEADERS(stdio_ext.h)
- AC_CHECK_HEADERS([nameser8_compat.h])
- AC_CHECK_HEADERS([features.h arpa/inet.h fcntl.h netinet/in.h fts.h stdint.h stdlib.h stddef.h string.h sys/socket.h syslog.h unistd.h iso/limits_iso.h])
-@@ -404,17 +414,14 @@ AC_CHECK_FUNCS(memcmp memcpy memmove memset)
- AC_MSG_CHECKING([for union semun])
- AC_CACHE_VAL(ac_cv_struct_semun,
- [
-- AC_TRY_COMPILE(
-- [
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
- #include <sys/ipc.h>
- #include <sys/sem.h>;
-- ],
-- [
-+ ]], [[
- union semun semdat;
-- ],
-- ac_cv_struct_semun=yes, ac_cv_struct_semun=no
-- )
-+ ]])],[ac_cv_struct_semun=yes],[ac_cv_struct_semun=no
-+ ])
- ]
- )
-
-@@ -424,7 +431,7 @@ if test "$ac_cv_struct_semun" = "yes"; then
- fi
-
- AC_MSG_CHECKING(for the %z format string in printf())
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- #include <sys/types.h>
-
-@@ -438,28 +445,38 @@ char string[16];
-
- return i == 5 ? 0 : 1;
- }
--],
--[
-+]])],[
- AC_MSG_RESULT(yes)
- AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
- [Define to 1 if you have a printf() that supports the %z format string.])
--],
--[
-+],[
- AC_MSG_RESULT(no)
--],
--[
-+],[
- AC_MSG_RESULT(no)
--]
--)
-
-+])
-+
-+AC_CONFIG_FILES([Makefile bin/Makefile man/Makefile])
-+AC_CONFIG_FILES([doc/Makefile])
- AC_PATH_PROG([DOXYGEN], [doxygen], [])
- AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
- AM_COND_IF([HAVE_DOXYGEN], AC_CONFIG_FILES([doc/Doxyfile]))
--AC_OUTPUT(doc/Makefile)
--
--#AC_CONFIG_FILES([Makefile])
--AC_OUTPUT(Makefile bin/Makefile man/Makefile)
-+AC_OUTPUT
-
-+echo ""
-+echo "----------------------------------"
-+echo " Build Settings for ${PACKAGE_TARNAME} v${PACKAGE_VERSION}"
-+echo "----------------------------------"
-+echo " host type = $host_os"
-+echo " install dir = $prefix"
-+echo " CC = $CC"
-+echo " CFLAGS = $AM_CFLAGS $CFLAGS"
-+echo " CPPFLAGS = $AM_CPPFLAGS $CPPFLAGS"
-+echo " LDFLAGS = $AM_LDFLAGS $LDFLAGS"
-+echo " LIBS = $LIBS"
-+echo "----------------------------------"
-+echo ""
-+echo " You can run ./make now."
- echo ""
- echo "* Many thanks for using nfdump tools"
- echo "* Please send bug reports back to me: peter@people.ops-trust.net"
-
-From: Peter Haag <peter@people.ops-trust.net>
-Date: Thu, 3 Mar 2022 09:25:15 +0100
-Subject: [PATCH] Make configure.ac autoconf 2.69 compatible
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,7 +1,7 @@
- # -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
-
--AC_PREREQ([2.71])
-+AC_PREREQ([2.69])
- AC_REVISION($Revision: 244 $)dnl
- AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
-
-@@ -47,7 +47,7 @@ if test "${enable_jnat}" = "yes" ; then
- fi
-
- if test "${enable_nsel}" = "yes" -a "${enable_jnat}" = "yes"; then
-- AC_MSG_ERROR(You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.)
-+ AC_MSG_ERROR([You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.])
- fi
-
- AC_ARG_ENABLE(nel,
-@@ -287,7 +287,6 @@ AC_SUBST(FT_INCLUDES)
- AC_SUBST(FT_LDFLAGS)
- AC_SUBST(LFLAGS)
-
--
- # Checks for libraries.
- AC_CHECK_FUNCS(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname,,[AC_CHECK_LIB(socket,gethostbyname)])])
- AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
-@@ -447,8 +446,7 @@ char string[16];
- }
- ]])],[
- AC_MSG_RESULT(yes)
-- AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
-- [Define to 1 if you have a printf() that supports the %z format string.])
-+ AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1], [Define to 1 if you have a printf() that supports the %z format string.])
- ],[
- AC_MSG_RESULT(no)
- ],[
---- /dev/null
-+++ b/m4/extensions.m4
-@@ -0,0 +1,4 @@
-+dnl Define to empty for the benefit of Autoconf 2.69
-+dnl AC_USE_SYSTEM_EXTENSIONS (below) can be used unchanged from Autoconf 2.70+.
-+m4_ifndef([AC_CHECK_INCLUDES_DEFAULT],
-+ [AC_DEFUN([AC_CHECK_INCLUDES_DEFAULT], [])])
-
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
deleted file mode 100644
index 755db8b7cf5d..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/phaag/nfdump/pull/336
-
-From e882722e4e006d0440fb5a37fb051d4747e4f225 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 24 Mar 2022 22:50:13 +0000
-Subject: [PATCH] Makefile.am: add ACLOCAL_AMFLAGS
-
-Per autoconf docs [0], if using automake and AC_CONFIG_MACRO_DIR,
-we need to include ACLOCAL_AMFLAGS in Makefile.am.
-
-So, let's set ACLOCAL_AMFLAGS = -I m4.
-
-This sorts out an automake warning.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I m4
-
- SUBDIRS = . bin man doc
-
-
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
deleted file mode 100644
index ac25ee094653..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Variant sent upstream (configure.ac hunk irrelevant now): https://github.com/phaag/nfdump/pull/336
-https://bugs.gentoo.org/832420
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I m4
-
- SUBDIRS = . bin man doc
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,6 +7,7 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
-
- AC_CONFIG_HEADER([config.h])
- AM_INIT_AUTOMAKE([subdir-objects])
-+AC_CONFIG_MACRO_DIR([m4])
-
- # Checks for programs.
- AX_CHECK_C11
diff --git a/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild
deleted file mode 100644
index 34bb2bd90adb..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-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/${PV}"
-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}"/${P}-autotools.patch
- "${FILESDIR}"/${P}-m4-dir-automake.patch
- "${FILESDIR}"/${PN}-1.6.19-libft.patch
-)
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_prepare() {
- default
-
- eautoreconf
-
- if use doc; then
- doxygen -u doc/Doxyfile.in || die
- fi
-}
-
-src_configure() {
- tc-export CC
-
- # --without-ftconf is not handled well, bug #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)
-}
-
-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
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.23.ebuild b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
deleted file mode 100644
index dca53c21054e..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.23.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 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/${PV}"
-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}"/${PN}-1.6.23-m4-dir.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, bug #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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-10-01 0:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-12 10:45 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/, net-analyzer/nfdump/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2016-05-15 6:57 Jeroen Roovers
2020-03-11 8:01 Jeroen Roovers
2020-03-29 12:38 Jeroen Roovers
2022-03-24 23:03 Sam James
2022-10-01 0:34 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox