1 |
commit: d8672b21c202bbf417bc80daff260327057fa16f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 28 15:26:08 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 28 18:08:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8672b21 |
7 |
|
8 |
net-analyzer/pmacct: Drop 1.7.4 and 1.7.4_p1 |
9 |
|
10 |
Package-Manager: Portage-3.0.16, Repoman-3.0.2 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
net-analyzer/pmacct/Manifest | 2 - |
14 |
.../pmacct/files/pmacct-1.7.3-nDPI-3.0.patch | 28 ------ |
15 |
.../pmacct/files/pmacct-1.7.4-nDPI-3.2.patch | 47 ---------- |
16 |
net-analyzer/pmacct/metadata.xml | 1 - |
17 |
net-analyzer/pmacct/pmacct-1.7.4.ebuild | 101 -------------------- |
18 |
net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild | 103 --------------------- |
19 |
6 files changed, 282 deletions(-) |
20 |
|
21 |
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest |
22 |
index 7bf0be7cbf2..2fc46c924bd 100644 |
23 |
--- a/net-analyzer/pmacct/Manifest |
24 |
+++ b/net-analyzer/pmacct/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
-DIST pmacct-1.7.4.tar.gz 1581213 BLAKE2B 3835abc91947af083932e01b828c2324f90595c973fdde9d9f4034dc7d03e12fad6bbe6e91e1462ec36963ccb41a5a740159f531d7e1929f4cd8d994b89a58a1 SHA512 780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1 |
27 |
-DIST pmacct-1.7.4_p1.tar.gz 3200089 BLAKE2B 638983a92df0a46441ddddaefa78dc0f61fee94264870979f46674e851e3bf111ae71550f7e6b677d425fa4c688d4ed7735d82aae85a2e77155c1bfa050d8e76 SHA512 03553128975ced54ce08a1a543c794377c2b7a3c800de600a7b5e8aa483b1c3123dee536a361a47053233d60070cacaf269f1a16ad17b563fa9fc0ec7af6a467 |
28 |
DIST pmacct-1.7.5.tar.gz 3219384 BLAKE2B 9a9feb8a11222e54a018b37eaa387cfa43efcb6aa3da175ea6c367bc7b42d816cbe106431c8b8f69b17c8d0286514a80250bf28b15fcaad12a2ac5fb7af6ff27 SHA512 d52e3d749cf0e8a412a82051531c63f37aa6cf4e7cc435ebd185195040819d65dc2cf4d4b1aa64bae620a9f8d3d1b1a505992044fe45d57b91ba056cfa67609c |
29 |
|
30 |
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch |
31 |
deleted file mode 100644 |
32 |
index 9e6c618fe44..00000000000 |
33 |
--- a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch |
34 |
+++ /dev/null |
35 |
@@ -1,28 +0,0 @@ |
36 |
---- a/configure.ac |
37 |
-+++ b/configure.ac |
38 |
-@@ -955,6 +955,7 @@ |
39 |
- CFLAGS="$_save_CFLAGS" |
40 |
- ]) |
41 |
- PKG_CHECK_MODULES([NDPI26], [libndpi >= 2.6], [AC_DEFINE(WITH_NDPI26, 1)], [AC_DEFINE(WITH_NDPI, 1)]) |
42 |
-+ PKG_CHECK_MODULES([NDPI30], [libndpi >= 3.0], [AC_DEFINE(WITH_NDPI30, 1)], [AC_DEFINE(WITH_NDPI, 1)]) |
43 |
- ;; |
44 |
- no) |
45 |
- AC_MSG_RESULT(no) |
46 |
---- a/src/ndpi/ndpi.c |
47 |
-+++ b/src/ndpi/ndpi.c |
48 |
-@@ -374,10 +374,14 @@ |
49 |
- if (flow->detection_completed || flow->tcp_finished) { |
50 |
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) |
51 |
- #ifdef WITH_NDPI26 |
52 |
-+#ifdef WITH_NDPI30 |
53 |
-+ flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess); |
54 |
-+#else |
55 |
- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess); |
56 |
-+#endif /* WITH_NDPI30 */ |
57 |
- #else |
58 |
- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow); |
59 |
--#endif |
60 |
-+#endif /* WITH_NDPI26 */ |
61 |
- |
62 |
- if (workflow->prefs.protocol_guess) { |
63 |
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) { |
64 |
|
65 |
diff --git a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch b/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch |
66 |
deleted file mode 100644 |
67 |
index bcbdbc834ca..00000000000 |
68 |
--- a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch |
69 |
+++ /dev/null |
70 |
@@ -1,47 +0,0 @@ |
71 |
---- a/configure.ac |
72 |
-+++ b/configure.ac |
73 |
-@@ -900,7 +900,7 @@ |
74 |
- [ case "$enableval" in |
75 |
- yes) |
76 |
- AC_MSG_RESULT(yes) |
77 |
-- PKG_CHECK_MODULES([NDPI], [libndpi >= 2.4], [ |
78 |
-+ PKG_CHECK_MODULES([NDPI], [libndpi >= 3.2], [ |
79 |
- SUPPORTS="${SUPPORTS} ndpi" |
80 |
- USING_NDPI="yes" |
81 |
- |
82 |
---- a/src/ndpi/ndpi_util.c |
83 |
-+++ b/src/ndpi/ndpi_util.c |
84 |
-@@ -29,7 +29,8 @@ |
85 |
- |
86 |
- NDPI_PROTOCOL_BITMASK all; |
87 |
- |
88 |
-- struct ndpi_detection_module_struct *module = ndpi_init_detection_module(); |
89 |
-+ ndpi_init_prefs pm_ndpi_init_prefs = ndpi_no_prefs; |
90 |
-+ struct ndpi_detection_module_struct *module = ndpi_init_detection_module(pm_ndpi_init_prefs); |
91 |
- struct pm_ndpi_workflow *workflow = ndpi_calloc(1, sizeof(struct pm_ndpi_workflow)); |
92 |
- |
93 |
- log_notification_init(&log_notifications.ndpi_cache_full); |
94 |
-@@ -77,6 +78,8 @@ |
95 |
- NDPI_BITMASK_SET_ALL(all); |
96 |
- ndpi_set_protocol_detection_bitmask2(workflow->ndpi_struct, &all); |
97 |
- |
98 |
-+ ndpi_finalize_initalization(workflow->ndpi_struct); |
99 |
-+ |
100 |
- return workflow; |
101 |
- } |
102 |
- |
103 |
---- a/src/ndpi/ndpi.c |
104 |
-+++ b/src/ndpi/ndpi.c |
105 |
-@@ -373,11 +373,7 @@ |
106 |
- |
107 |
- if (flow->detection_completed || flow->tcp_finished) { |
108 |
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) |
109 |
--#ifdef WITH_NDPI26 |
110 |
-- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess); |
111 |
--#else |
112 |
-- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow); |
113 |
--#endif |
114 |
-+ flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess); |
115 |
- |
116 |
- if (workflow->prefs.protocol_guess) { |
117 |
- if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) { |
118 |
|
119 |
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml |
120 |
index a306c0fa503..79a9a515b96 100644 |
121 |
--- a/net-analyzer/pmacct/metadata.xml |
122 |
+++ b/net-analyzer/pmacct/metadata.xml |
123 |
@@ -6,7 +6,6 @@ |
124 |
<name>Gentoo network monitoring and analysis project</name> |
125 |
</maintainer> |
126 |
<use> |
127 |
-<flag name="64bit">Use 64bit counters instead of 32bit ones</flag> |
128 |
<flag name="bgp-bins">Link BGP daemon binaries</flag> |
129 |
<flag name="bmp-bins">Link BMP daemon binaries</flag> |
130 |
<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag> |
131 |
|
132 |
diff --git a/net-analyzer/pmacct/pmacct-1.7.4.ebuild b/net-analyzer/pmacct/pmacct-1.7.4.ebuild |
133 |
deleted file mode 100644 |
134 |
index 99560fad9a7..00000000000 |
135 |
--- a/net-analyzer/pmacct/pmacct-1.7.4.ebuild |
136 |
+++ /dev/null |
137 |
@@ -1,101 +0,0 @@ |
138 |
-# Copyright 1999-2020 Gentoo Authors |
139 |
-# Distributed under the terms of the GNU General Public License v2 |
140 |
- |
141 |
-EAPI=7 |
142 |
-inherit autotools flag-o-matic toolchain-funcs |
143 |
- |
144 |
-DESCRIPTION="A network tool to gather IP traffic information" |
145 |
-HOMEPAGE="http://www.pmacct.net/" |
146 |
-SRC_URI="http://www.pmacct.net/${P}.tar.gz" |
147 |
- |
148 |
-LICENSE="GPL-2" |
149 |
-SLOT="0" |
150 |
-KEYWORDS="~amd64 ~x86" |
151 |
-IUSE=" |
152 |
- 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql |
153 |
- ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq |
154 |
-" |
155 |
-REQUIRED_USE=" |
156 |
- ?? ( geoip geoipv2 ) |
157 |
- kafka? ( jansson ) |
158 |
- rabbitmq? ( jansson ) |
159 |
-" |
160 |
- |
161 |
-RDEPEND=" |
162 |
- net-libs/libpcap |
163 |
- geoip? ( dev-libs/geoip ) |
164 |
- geoipv2? ( dev-libs/libmaxminddb ) |
165 |
- jansson? ( dev-libs/jansson ) |
166 |
- kafka? ( dev-libs/librdkafka ) |
167 |
- mongodb? ( |
168 |
- >=dev-libs/mongo-c-driver-0.8.1-r1 |
169 |
- <dev-libs/mongo-c-driver-0.98 |
170 |
- ) |
171 |
- mysql? ( dev-db/mysql-connector-c:0= ) |
172 |
- ndpi? ( >=net-libs/nDPI-2.4:= ) |
173 |
- nflog? ( net-libs/libnetfilter_log ) |
174 |
- postgres? ( dev-db/postgresql:* ) |
175 |
- rabbitmq? ( net-libs/rabbitmq-c ) |
176 |
- sqlite? ( =dev-db/sqlite-3* ) |
177 |
- zmq? ( >=net-libs/zeromq-4.2.0:= ) |
178 |
-" |
179 |
-DEPEND=" |
180 |
- ${RDEPEND} |
181 |
- virtual/pkgconfig |
182 |
-" |
183 |
-PATCHES=( |
184 |
- "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch |
185 |
- "${FILESDIR}"/${PN}-1.7.4--Werror.patch |
186 |
-) |
187 |
- |
188 |
-DOCS=( |
189 |
- CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE |
190 |
- docs/INTERNALS docs/PLUGINS docs/SIGNALS |
191 |
-) |
192 |
- |
193 |
-src_prepare() { |
194 |
- default |
195 |
- eautoreconf |
196 |
-} |
197 |
- |
198 |
-src_configure() { |
199 |
- tc-export CC AR RANLIB |
200 |
- append-cflags -fcommon |
201 |
- |
202 |
- econf \ |
203 |
- $(use_enable 64bit) \ |
204 |
- $(use_enable bgp-bins) \ |
205 |
- $(use_enable bmp-bins) \ |
206 |
- $(use_enable geoip) \ |
207 |
- $(use_enable geoipv2) \ |
208 |
- $(use_enable jansson) \ |
209 |
- $(use_enable kafka) \ |
210 |
- $(use_enable l2) \ |
211 |
- $(use_enable plabel) \ |
212 |
- $(use_enable mongodb) \ |
213 |
- $(use_enable mysql) \ |
214 |
- $(use_enable ndpi) \ |
215 |
- $(use_enable nflog) \ |
216 |
- $(use_enable postgres pgsql) \ |
217 |
- $(use_enable rabbitmq) \ |
218 |
- $(use_enable sqlite sqlite3) \ |
219 |
- $(use_enable st-bins) \ |
220 |
- $(use_enable traffic-bins) \ |
221 |
- $(use_enable zmq) \ |
222 |
- --disable-debug |
223 |
-} |
224 |
- |
225 |
-src_install() { |
226 |
- default |
227 |
- |
228 |
- for dirname in examples sql telemetry; do |
229 |
- docinto ${dirname} |
230 |
- dodoc -r ${dirname}/* |
231 |
- done |
232 |
- |
233 |
- newinitd "${FILESDIR}"/pmacctd-init.d pmacctd |
234 |
- newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd |
235 |
- |
236 |
- insinto /etc/pmacctd |
237 |
- newins examples/pmacctd-imt.conf.example pmacctd.conf |
238 |
-} |
239 |
|
240 |
diff --git a/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild b/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild |
241 |
deleted file mode 100644 |
242 |
index 29e47d7219d..00000000000 |
243 |
--- a/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild |
244 |
+++ /dev/null |
245 |
@@ -1,103 +0,0 @@ |
246 |
-# Copyright 1999-2020 Gentoo Authors |
247 |
-# Distributed under the terms of the GNU General Public License v2 |
248 |
- |
249 |
-EAPI=7 |
250 |
-inherit autotools flag-o-matic toolchain-funcs |
251 |
- |
252 |
-DESCRIPTION="A network tool to gather IP traffic information" |
253 |
-HOMEPAGE="http://www.pmacct.net/" |
254 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_}.tar.gz -> ${P}.tar.gz" |
255 |
- |
256 |
-LICENSE="GPL-2" |
257 |
-SLOT="0" |
258 |
-KEYWORDS="~amd64 ~x86" |
259 |
-IUSE=" |
260 |
- 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql |
261 |
- ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq |
262 |
-" |
263 |
-REQUIRED_USE=" |
264 |
- ?? ( geoip geoipv2 ) |
265 |
- kafka? ( jansson ) |
266 |
- rabbitmq? ( jansson ) |
267 |
-" |
268 |
- |
269 |
-RDEPEND=" |
270 |
- net-libs/libpcap |
271 |
- geoip? ( dev-libs/geoip ) |
272 |
- geoipv2? ( dev-libs/libmaxminddb ) |
273 |
- jansson? ( dev-libs/jansson ) |
274 |
- kafka? ( dev-libs/librdkafka ) |
275 |
- mongodb? ( |
276 |
- >=dev-libs/mongo-c-driver-0.8.1-r1 |
277 |
- <dev-libs/mongo-c-driver-0.98 |
278 |
- ) |
279 |
- mysql? ( dev-db/mysql-connector-c:0= ) |
280 |
- ndpi? ( >=net-libs/nDPI-3.2:= ) |
281 |
- nflog? ( net-libs/libnetfilter_log ) |
282 |
- postgres? ( dev-db/postgresql:* ) |
283 |
- rabbitmq? ( net-libs/rabbitmq-c ) |
284 |
- sqlite? ( =dev-db/sqlite-3* ) |
285 |
- zmq? ( >=net-libs/zeromq-4.2.0:= ) |
286 |
-" |
287 |
-DEPEND=" |
288 |
- ${RDEPEND} |
289 |
- virtual/pkgconfig |
290 |
-" |
291 |
-PATCHES=( |
292 |
-# "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch |
293 |
- "${FILESDIR}"/${PN}-1.7.4--Werror.patch |
294 |
- "${FILESDIR}"/${PN}-1.7.4-nDPI-3.2.patch |
295 |
-) |
296 |
- |
297 |
-DOCS=( |
298 |
- CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE |
299 |
- docs/INTERNALS docs/PLUGINS docs/SIGNALS |
300 |
-) |
301 |
-S=${WORKDIR}/${P/_} |
302 |
- |
303 |
-src_prepare() { |
304 |
- default |
305 |
- eautoreconf |
306 |
-} |
307 |
- |
308 |
-src_configure() { |
309 |
- tc-export CC AR RANLIB |
310 |
- append-cflags -fcommon |
311 |
- |
312 |
- econf \ |
313 |
- $(use_enable 64bit) \ |
314 |
- $(use_enable bgp-bins) \ |
315 |
- $(use_enable bmp-bins) \ |
316 |
- $(use_enable geoip) \ |
317 |
- $(use_enable geoipv2) \ |
318 |
- $(use_enable jansson) \ |
319 |
- $(use_enable kafka) \ |
320 |
- $(use_enable l2) \ |
321 |
- $(use_enable plabel) \ |
322 |
- $(use_enable mongodb) \ |
323 |
- $(use_enable mysql) \ |
324 |
- $(use_enable ndpi) \ |
325 |
- $(use_enable nflog) \ |
326 |
- $(use_enable postgres pgsql) \ |
327 |
- $(use_enable rabbitmq) \ |
328 |
- $(use_enable sqlite sqlite3) \ |
329 |
- $(use_enable st-bins) \ |
330 |
- $(use_enable traffic-bins) \ |
331 |
- $(use_enable zmq) \ |
332 |
- --disable-debug |
333 |
-} |
334 |
- |
335 |
-src_install() { |
336 |
- default |
337 |
- |
338 |
- for dirname in examples sql telemetry; do |
339 |
- docinto ${dirname} |
340 |
- dodoc -r ${dirname}/* |
341 |
- done |
342 |
- |
343 |
- newinitd "${FILESDIR}"/pmacctd-init.d pmacctd |
344 |
- newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd |
345 |
- |
346 |
- insinto /etc/pmacctd |
347 |
- newins examples/pmacctd-imt.conf.example pmacctd.conf |
348 |
-} |