1 |
commit: f180e5bb44285605387096636a82d957472b7481 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 11 07:59:29 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 11 08:01:52 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f180e5bb |
7 |
|
8 |
net-analyzer/nfdump: Version 1.6.19 |
9 |
|
10 |
Package-Manager: Portage-2.3.93, Repoman-2.3.20 |
11 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=710314 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
net-analyzer/nfdump/Manifest | 1 + |
15 |
.../nfdump/files/nfdump-1.6.19-compiler.patch | 21 ++++++++ |
16 |
.../nfdump/files/nfdump-1.6.19-libft.patch | 17 ++++++ |
17 |
net-analyzer/nfdump/nfdump-1.6.19.ebuild | 63 ++++++++++++++++++++++ |
18 |
4 files changed, 102 insertions(+) |
19 |
|
20 |
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest |
21 |
index 24d54d76b77..10dd429af90 100644 |
22 |
--- a/net-analyzer/nfdump/Manifest |
23 |
+++ b/net-analyzer/nfdump/Manifest |
24 |
@@ -2,3 +2,4 @@ DIST nfdump-1.6.14-security.patch 31579 BLAKE2B d747526f46837e99193bf761bceb853b |
25 |
DIST nfdump-1.6.14.tar.gz 1834355 BLAKE2B be92ec6c6eb60c883863a21e7d203c487f176e862f6227bf21d17ade2a04815095c5c119719a18c106401519d7976a2b82e46a11b7f207494abef3e0f73d2716 SHA512 c5e5540526dfce3798728930576e4c7930c3ff80893a94d7f9e65c7c577d1e78bdc47a99c47cee837327ad202197afc378d2408b1b9b847044d0110146055ffe |
26 |
DIST nfdump-1.6.15.tar.gz 1834855 BLAKE2B 1892cfbd1d1299c44b14a39b55c766d3dd411d7410a66b8ecbebe590c9da595c79764966ef1c91adb91b936ee3c052ad14bca27c6bcb98472011eb2c67dff60f SHA512 a6bb4f2293ad85d8f16025e7272b889d3814cea2e9255dbd315ee92754675e4ee925c3ebe4e1350f2d5452d69d1d3c13ddeb656324a409c4744da1d4927fe1f2 |
27 |
DIST nfdump-1.6.16.tar.gz 1814857 BLAKE2B cd50680adbb6023915232bb780daf2bcc4319348444a28c89fc4fdfd19225bdf243bb42179a6bd545c06ab6fafa50091401b7a286527d1863c888a96c0b0a2eb SHA512 c1af3cf984c7eaaf1012c71c061e00f12dbcdf276306096436eb707552932c65b9f03e7a22b4cc0989d951c433f32c5c927600a8248826227f10b4fb2d906a32 |
28 |
+DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e |
29 |
|
30 |
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..8826c50c9dc |
33 |
--- /dev/null |
34 |
+++ b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch |
35 |
@@ -0,0 +1,21 @@ |
36 |
+--- a/configure.ac |
37 |
++++ b/configure.ac |
38 |
+@@ -9,8 +9,6 @@ |
39 |
+ AM_INIT_AUTOMAKE([subdir-objects]) |
40 |
+ |
41 |
+ # Checks for programs. |
42 |
+-CFLAGS="-g -O3" |
43 |
+-AC_PROG_CC([clang gcc]) |
44 |
+ AX_CHECK_C11 |
45 |
+ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing" |
46 |
+ |
47 |
+--- a/bin/Makefile.am |
48 |
++++ b/bin/Makefile.am |
49 |
+@@ -30,7 +30,6 @@ |
50 |
+ LDADD = $(DEPS_LIBS) |
51 |
+ |
52 |
+ #Add extra debug info for gdb |
53 |
+-AM_CFLAGS = -ggdb |
54 |
+ |
55 |
+ # libnfdump sources |
56 |
+ output = output_util.h output_util.c output_raw.h output_raw.c |
57 |
|
58 |
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch |
59 |
new file mode 100644 |
60 |
index 00000000000..47953c77217 |
61 |
--- /dev/null |
62 |
+++ b/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch |
63 |
@@ -0,0 +1,17 @@ |
64 |
+--- a/configure.ac |
65 |
++++ b/configure.ac |
66 |
+@@ -115,12 +115,8 @@ |
67 |
+ if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then |
68 |
+ AC_MSG_ERROR(ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH) |
69 |
+ fi |
70 |
+- 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 |
71 |
+- FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib" |
72 |
+- FT_LDFLAGS="-L$WHERE_FTPATH/lib" |
73 |
+- else |
74 |
+- AC_MSG_ERROR(libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first) |
75 |
+- fi |
76 |
++ AC_CHECK_LIB([ft], [main],, |
77 |
++ AC_MSG_ERROR(libft not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first)) |
78 |
+ else |
79 |
+ AC_MSG_ERROR(flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH) |
80 |
+ fi |
81 |
|
82 |
diff --git a/net-analyzer/nfdump/nfdump-1.6.19.ebuild b/net-analyzer/nfdump/nfdump-1.6.19.ebuild |
83 |
new file mode 100644 |
84 |
index 00000000000..d866f89da5b |
85 |
--- /dev/null |
86 |
+++ b/net-analyzer/nfdump/nfdump-1.6.19.ebuild |
87 |
@@ -0,0 +1,63 @@ |
88 |
+# Copyright 1999-2020 Gentoo Authors |
89 |
+# Distributed under the terms of the GNU General Public License v2 |
90 |
+ |
91 |
+EAPI=7 |
92 |
+inherit autotools |
93 |
+ |
94 |
+DESCRIPTION="A set of tools to collect and process netflow data" |
95 |
+HOMEPAGE="https://github.com/phaag/nfdump" |
96 |
+SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
97 |
+ |
98 |
+LICENSE="BSD" |
99 |
+SLOT="0/1.6.15" |
100 |
+KEYWORDS="~amd64 ~x86" |
101 |
+IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs" |
102 |
+ |
103 |
+COMMON_DEPEND=" |
104 |
+ app-arch/bzip2 |
105 |
+ sys-libs/zlib |
106 |
+ ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) |
107 |
+ nfprofile? ( net-analyzer/rrdtool ) |
108 |
+ nftrack? ( net-analyzer/rrdtool ) |
109 |
+ readpcap? ( net-libs/libpcap ) |
110 |
+" |
111 |
+DEPEND=" |
112 |
+ ${COMMON_DEPEND} |
113 |
+ app-doc/doxygen |
114 |
+ sys-devel/flex |
115 |
+ virtual/yacc |
116 |
+" |
117 |
+RDEPEND=" |
118 |
+ ${COMMON_DEPEND} |
119 |
+ dev-lang/perl |
120 |
+" |
121 |
+PATCHES=( |
122 |
+ "${FILESDIR}"/${PN}-1.6.19-compiler.patch |
123 |
+ "${FILESDIR}"/${PN}-1.6.19-libft.patch |
124 |
+) |
125 |
+DOCS=( AUTHORS ChangeLog README.md ) |
126 |
+ |
127 |
+src_prepare() { |
128 |
+ default |
129 |
+ |
130 |
+ eautoreconf |
131 |
+ |
132 |
+ doxygen -u doc/Doxyfile.in || die |
133 |
+} |
134 |
+ |
135 |
+src_configure() { |
136 |
+ # --without-ftconf is not handled well #322201 |
137 |
+ econf \ |
138 |
+ $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ |
139 |
+ $(use nfprofile && echo --enable-nfprofile) \ |
140 |
+ $(use nftrack && echo --enable-nftrack) \ |
141 |
+ $(use_enable debug devel) \ |
142 |
+ $(use_enable readpcap) \ |
143 |
+ $(use_enable sflow) \ |
144 |
+ $(use_enable static-libs static) |
145 |
+} |
146 |
+ |
147 |
+src_install() { |
148 |
+ default |
149 |
+ find "${ED}" -name '*.la' -delete || die |
150 |
+} |