1 |
commit: 5307d10e7404a0d3b7d6ad4a02d4e8023ee39bc1 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 29 23:21:52 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 29 23:21:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5307d10e |
7 |
|
8 |
net-analyzer/wireshark: in tree version works |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
|
12 |
net-analyzer/wireshark/Manifest | 1 - |
13 |
.../files/wireshark-1.99.8-qtchooser.patch | 10 - |
14 |
.../files/wireshark-2.1.0-sse4_2-r1.patch | 21 -- |
15 |
.../files/wireshark-2.4-androiddump.patch | 27 -- |
16 |
.../wireshark/files/wireshark-2.4.3-libsmi.patch | 233 ---------------- |
17 |
.../files/wireshark-99999999-androiddump.patch | 10 - |
18 |
.../files/wireshark-includes-fix-musl.patch | 15 -- |
19 |
net-analyzer/wireshark/metadata.xml | 62 ----- |
20 |
net-analyzer/wireshark/wireshark-2.4.5.ebuild | 292 --------------------- |
21 |
9 files changed, 671 deletions(-) |
22 |
|
23 |
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest |
24 |
deleted file mode 100644 |
25 |
index 79e10ce..0000000 |
26 |
--- a/net-analyzer/wireshark/Manifest |
27 |
+++ /dev/null |
28 |
@@ -1 +0,0 @@ |
29 |
-DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3 |
30 |
|
31 |
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch |
32 |
deleted file mode 100644 |
33 |
index 4745951..0000000 |
34 |
--- a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch |
35 |
+++ /dev/null |
36 |
@@ -1,10 +0,0 @@ |
37 |
---- a/acinclude.m4 |
38 |
-+++ b/acinclude.m4 |
39 |
-@@ -2149,7 +2149,6 @@ |
40 |
- # -qt={version} argument, otherwise we look for particular |
41 |
- # tool versions using tool name suffixes. |
42 |
- # |
43 |
-- AC_PATH_PROG(QTCHOOSER, qtchooser) |
44 |
- if test ! -z "$QTCHOOSER"; then |
45 |
- # |
46 |
- # We found qtchooser; we assume that means that |
47 |
|
48 |
diff --git a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch |
49 |
deleted file mode 100644 |
50 |
index 8efe5af..0000000 |
51 |
--- a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2-r1.patch |
52 |
+++ /dev/null |
53 |
@@ -1,21 +0,0 @@ |
54 |
---- a/configure.ac |
55 |
-+++ b/configure.ac |
56 |
-@@ -818,6 +818,7 @@ |
57 |
- AC_SUBST(PIE_CFLAGS) |
58 |
- AC_SUBST(PIE_LDFLAGS) |
59 |
- |
60 |
-+AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[ |
61 |
- WS_CFLAGS_saved="$WS_CFLAGS" |
62 |
- AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C) |
63 |
- if test "x$can_add_to_cflags" = "xyes" |
64 |
-@@ -844,6 +845,10 @@ |
65 |
- ac_sse4_2_flag=-xarch=sse4_2 |
66 |
- fi |
67 |
- fi |
68 |
-+],[ |
69 |
-+AC_MSG_RESULT(no) |
70 |
-+]) |
71 |
-+ |
72 |
- WS_CFLAGS="$WS_CFLAGS_saved" |
73 |
- |
74 |
- if test "x$ac_sse4_2_flag" != x; then |
75 |
|
76 |
diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch |
77 |
deleted file mode 100644 |
78 |
index e67ab21..0000000 |
79 |
--- a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch |
80 |
+++ /dev/null |
81 |
@@ -1,27 +0,0 @@ |
82 |
---- a/extcap/androiddump.c |
83 |
-+++ b/extcap/androiddump.c |
84 |
-@@ -363,13 +363,13 @@ |
85 |
- pcap = pcap_open_dead_with_tstamp_precision(encap_ext, PACKET_LENGTH, PCAP_TSTAMP_PRECISION_NANO); |
86 |
- extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo); |
87 |
- if (!extcap_dumper.dumper.pcap) { |
88 |
-- g_warning("Can't open %s for saving packets: %s", pcap_geterr(pcap)); |
89 |
-+ g_warning("Can't open %s for saving packets: %s", fifo, pcap_geterr(pcap)); |
90 |
- pcap_close(pcap); |
91 |
- exit(EXIT_CODE_CANNOT_SAVE_LIBPCAP_DUMP); |
92 |
- } |
93 |
- extcap_dumper.encap = encap; |
94 |
- if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) { |
95 |
-- g_warning("Write to %s failed: %s", g_strerror(errno)); |
96 |
-+ g_warning("Write to %s failed: %s", fifo, g_strerror(errno)); |
97 |
- } |
98 |
- #else |
99 |
- int err = 0; |
100 |
-@@ -416,7 +416,7 @@ |
101 |
- |
102 |
- pcap_dump((u_char *) extcap_dumper.dumper.pcap, &pcap_header, buffer); |
103 |
- if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) { |
104 |
-- g_warning("Write to %s failed: %s", g_strerror(errno)); |
105 |
-+ g_warning("Write to %s failed: %s", fifo, g_strerror(errno)); |
106 |
- } |
107 |
- #else |
108 |
- int err = 0; |
109 |
|
110 |
diff --git a/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch b/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch |
111 |
deleted file mode 100644 |
112 |
index 288efb7..0000000 |
113 |
--- a/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch |
114 |
+++ /dev/null |
115 |
@@ -1,233 +0,0 @@ |
116 |
-From 72c2e53981a204d746737d8c01c4ad3738cd4880 Mon Sep 17 00:00:00 2001 |
117 |
-From: =?utf8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@×××××××××××××××.pt> |
118 |
-Date: Sun, 5 Nov 2017 12:05:43 +0000 |
119 |
-Subject: [PATCH 1/1] autotools: Use pkg-config to configure Libsmi |
120 |
-MIME-Version: 1.0 |
121 |
-Content-Type: text/plain; charset=utf8 |
122 |
-Content-Transfer-Encoding: 8bit |
123 |
- |
124 |
-Change-Id: Icecea743739aa7e1a65753f623f311514260d373 |
125 |
-Reviewed-on: https://code.wireshark.org/review/24252 |
126 |
-Petri-Dish: João Valverde <j@×××.pt> |
127 |
-Tested-by: Petri Dish Buildbot |
128 |
-Reviewed-by: João Valverde <j@×××.pt> |
129 |
---- |
130 |
- Makefile.am | 2 +- |
131 |
- configure.ac | 27 +++++++++--- |
132 |
- epan/Makefile.am | 2 +- |
133 |
- m4/libsmi.m4 | 125 ------------------------------------------------------- |
134 |
- 4 files changed, 24 insertions(+), 132 deletions(-) |
135 |
- delete mode 100644 m4/libsmi.m4 |
136 |
- |
137 |
-diff --git a/Makefile.am b/Makefile.am |
138 |
-index a2851e0..e6ed5eb 100644 |
139 |
---- a/Makefile.am |
140 |
-+++ b/Makefile.am |
141 |
-@@ -422,7 +422,7 @@ EPAN_EXTRA_LIBS = \ |
142 |
- @KRB5_LIBS@ \ |
143 |
- @LIBGCRYPT_LIBS@ \ |
144 |
- @LIBGNUTLS_LIBS@ \ |
145 |
-- @LIBSMI_LDFLAGS@ |
146 |
-+ @LIBSMI_LIBS@ |
147 |
- |
148 |
- # Libraries and plugin flags with which to link wireshark. |
149 |
- # |
150 |
-diff --git a/configure.ac b/configure.ac |
151 |
-index 3b3475b..326561c 100644 |
152 |
---- a/configure.ac |
153 |
-+++ b/configure.ac |
154 |
-@@ -432,10 +432,6 @@ linux*) |
155 |
- fi |
156 |
- esac |
157 |
- |
158 |
--# libsmi |
159 |
--# FIXME: currently the path argument to with-libsmi is being ignored |
160 |
--AX_LIBSMI |
161 |
-- |
162 |
- # |
163 |
- # Check if we should build the Wireshark User's Guide |
164 |
- # |
165 |
-@@ -2427,6 +2423,27 @@ else |
166 |
- fi |
167 |
- AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes") |
168 |
- |
169 |
-+# |
170 |
-+# Libsmi check |
171 |
-+# |
172 |
-+AC_ARG_WITH(libsmi, |
173 |
-+ AC_HELP_STRING([--with-libsmi=@<:@yes/no@:>@], |
174 |
-+ [use libsmi MIB/PIB library @<:@default=yes, if available@:>@]), |
175 |
-+ [], [with_libsmi="if_available"]) |
176 |
-+ |
177 |
-+have_libsmi=no |
178 |
-+if test "x$with_libsmi" != "xno"; then |
179 |
-+ PKG_CHECK_MODULES(LIBSMI, libsmi, |
180 |
-+ [have_libsmi=yes |
181 |
-+ AC_DEFINE(HAVE_LIBSMI, 1, [Define if you have libsmi]) |
182 |
-+ ], |
183 |
-+ [if test "x$with_libsmi" = "xyes"; then |
184 |
-+ # Error out if the user explicitly requested libsmi |
185 |
-+ AC_MSG_ERROR([Libsmi was requested, but is not installed for development]) |
186 |
-+ fi |
187 |
-+ ] |
188 |
-+ ) |
189 |
-+fi |
190 |
- |
191 |
- dnl |
192 |
- dnl check whether plugins should be enabled |
193 |
-@@ -3012,7 +3029,7 @@ echo " Use pcap library : $want_pcap" |
194 |
- echo " Use zlib library : $zlib_message" |
195 |
- echo " Use kerberos library : $krb5_message" |
196 |
- echo " Use c-ares library : $c_ares_message" |
197 |
--echo " Use SMI MIB library : $libsmi_message" |
198 |
-+echo " Use SMI MIB library : $have_libsmi" |
199 |
- echo " Use GNU gcrypt library : yes" |
200 |
- echo " Use GnuTLS library : $tls_message" |
201 |
- echo " Use POSIX capabilities library : $libcap_message" |
202 |
-diff --git a/epan/Makefile.am b/epan/Makefile.am |
203 |
-index 9f7de62..e85f97b 100644 |
204 |
---- a/epan/Makefile.am |
205 |
-+++ b/epan/Makefile.am |
206 |
-@@ -330,7 +330,7 @@ libwireshark_la_LIBADD = \ |
207 |
- @KRB5_LIBS@ \ |
208 |
- @LIBGCRYPT_LIBS@ \ |
209 |
- @LIBGNUTLS_LIBS@ \ |
210 |
-- @LIBSMI_LDFLAGS@ \ |
211 |
-+ @LIBSMI_LIBS@ \ |
212 |
- @LZ4_LIBS@ \ |
213 |
- @NGHTTP2_LIBS@ \ |
214 |
- @SNAPPY_LIBS@ \ |
215 |
-diff --git a/m4/libsmi.m4 b/m4/libsmi.m4 |
216 |
-deleted file mode 100644 |
217 |
-index d719438..0000000 |
218 |
---- a/m4/libsmi.m4 |
219 |
-+++ /dev/null |
220 |
-@@ -1,125 +0,0 @@ |
221 |
--# Configure paths for libsmi |
222 |
--# Shamelessly stolen from http://autoconf-archive.cryp.to/ax_lib_sqlite3.html |
223 |
-- |
224 |
--# Synopsis: AX_LIBSMI([minimum library version]) |
225 |
--# The default minimum library version is 2 |
226 |
-- |
227 |
--# This macro sets/substitutes the following: |
228 |
--# AC_DEFINE(HAVE_LIBSMI) |
229 |
--# AC_SUBST(LIBSMI_CFLAGS) |
230 |
--# AC_SUBST(LIBSMI_LDFLAGS) |
231 |
--# AC_SUBST(LIBSMI_VERSION) |
232 |
--# $libsmi_message is set to "yes" or "no" |
233 |
-- |
234 |
--AC_DEFUN([AX_LIBSMI], |
235 |
--[ |
236 |
-- AC_ARG_WITH([libsmi], |
237 |
-- AC_HELP_STRING( |
238 |
-- [--with-libsmi=@<:@DIR@:>@], |
239 |
-- [use libsmi MIB/PIB library @<:@default=yes@:>@, optionally specify the prefix for libsmi] |
240 |
-- ), |
241 |
-- [ |
242 |
-- if test "$withval" = "no"; then |
243 |
-- WANT_LIBSMI="no" |
244 |
-- elif test "$withval" = "yes"; then |
245 |
-- WANT_LIBSMI="yes" |
246 |
-- ac_libsmi_path="" |
247 |
-- else |
248 |
-- WANT_LIBSMI="yes" |
249 |
-- ac_libsmi_path="$withval" |
250 |
-- fi |
251 |
-- ], |
252 |
-- [WANT_LIBSMI="yes"] |
253 |
-- ) |
254 |
-- |
255 |
-- libsmi_message="no" |
256 |
-- LIBSMI_CFLAGS="" |
257 |
-- LIBSMI_LDFLAGS="" |
258 |
-- LIBSMI_VERSION="" |
259 |
-- |
260 |
-- if test "x$WANT_LIBSMI" = "xyes"; then |
261 |
-- |
262 |
-- ac_libsmi_header="smi.h" |
263 |
-- |
264 |
-- libsmi_version_req=ifelse([$1], [], [2], [$1]) |
265 |
-- |
266 |
-- AC_MSG_CHECKING([for libsmi >= $libsmi_version_req]) |
267 |
-- |
268 |
-- if test "$ac_libsmi_path" != ""; then |
269 |
-- ac_libsmi_ldflags="-L$ac_libsmi_path/lib" |
270 |
-- ac_libsmi_cflags="-I$ac_libsmi_path/include" |
271 |
-- else |
272 |
-- for ac_libsmi_path_tmp in /usr /usr/local /opt $prefix; do |
273 |
-- if test -f "$ac_libsmi_path_tmp/include/$ac_libsmi_header" \ |
274 |
-- && test -r "$ac_libsmi_path_tmp/include/$ac_libsmi_header"; then |
275 |
-- ac_libsmi_path=$ac_libsmi_path_tmp |
276 |
-- ac_libsmi_ldflags="-L$ac_libsmi_path_tmp/lib" |
277 |
-- ac_libsmi_cflags="-I$ac_libsmi_path_tmp/include" |
278 |
-- break; |
279 |
-- fi |
280 |
-- done |
281 |
-- fi |
282 |
-- |
283 |
-- ac_libsmi_ldflags="$ac_libsmi_ldflags -lsmi" |
284 |
-- |
285 |
-- saved_CFLAGS="$CFLAGS" |
286 |
-- CFLAGS="$CFLAGS $ac_libsmi_cflags" |
287 |
-- |
288 |
-- AC_LANG_PUSH(C) |
289 |
-- AC_COMPILE_IFELSE( |
290 |
-- [ |
291 |
-- AC_LANG_PROGRAM([[@%:@include <smi.h>]], |
292 |
-- [[ |
293 |
-- int current, revision, age, n; |
294 |
-- const int required = $libsmi_version_req; |
295 |
-- if (smiInit("")) |
296 |
-- exit(1); |
297 |
-- if (strcmp(SMI_LIBRARY_VERSION, smi_library_version)) |
298 |
-- exit(2); |
299 |
-- n = sscanf(smi_library_version, "%d:%d:%d", ¤t, &revision, &age); |
300 |
-- if (n != 3) |
301 |
-- exit(3); |
302 |
-- if (required < current - age || required > current) |
303 |
-- exit(4); |
304 |
-- ]] |
305 |
-- ) |
306 |
-- ], |
307 |
-- [ |
308 |
-- AC_MSG_RESULT([yes]) |
309 |
-- libsmi_message="yes" |
310 |
-- ], |
311 |
-- [ |
312 |
-- AC_MSG_RESULT([not found]) |
313 |
-- libsmi_message="no" |
314 |
-- ] |
315 |
-- ) |
316 |
-- AC_LANG_POP([C]) |
317 |
-- |
318 |
-- CFLAGS="$saved_CFLAGS" |
319 |
-- |
320 |
-- if test "$libsmi_message" = "yes"; then |
321 |
-- |
322 |
-- LIBSMI_CFLAGS="$ac_libsmi_cflags" |
323 |
-- LIBSMI_LDFLAGS="$ac_libsmi_ldflags" |
324 |
-- |
325 |
-- ac_libsmi_header_path="$ac_libsmi_path/include/$ac_libsmi_header" |
326 |
-- |
327 |
-- dnl Retrieve libsmi release version |
328 |
-- if test "x$ac_libsmi_header_path" != "x"; then |
329 |
-- ac_libsmi_version=`cat $ac_libsmi_header_path \ |
330 |
-- | grep '#define.*SMI_LIBRARY_VERSION.*\"' | sed -e 's/.* "//' \ |
331 |
-- | sed -e 's/"//'` |
332 |
-- if test $ac_libsmi_version != ""; then |
333 |
-- LIBSMI_VERSION=$ac_libsmi_version |
334 |
-- else |
335 |
-- AC_MSG_WARN([Can not find SMI_LIBRARY_VERSION macro in smi.h header to retrieve libsmi version!]) |
336 |
-- fi |
337 |
-- fi |
338 |
-- |
339 |
-- AC_SUBST(LIBSMI_CFLAGS) |
340 |
-- AC_SUBST(LIBSMI_LDFLAGS) |
341 |
-- AC_SUBST(LIBSMI_VERSION) |
342 |
-- AC_DEFINE(HAVE_LIBSMI, 1, [Define to 1 if you have the `smi' library (-lsmi).]) |
343 |
-- fi |
344 |
-- fi |
345 |
--]) |
346 |
--- |
347 |
-2.7.4 |
348 |
- |
349 |
|
350 |
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch |
351 |
deleted file mode 100644 |
352 |
index db1c560..0000000 |
353 |
--- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch |
354 |
+++ /dev/null |
355 |
@@ -1,10 +0,0 @@ |
356 |
---- a/extcap/Makefile.am |
357 |
-+++ b/extcap/Makefile.am |
358 |
-@@ -32,6 +32,7 @@ |
359 |
- ../ui/libui.a \ |
360 |
- ../wiretap/libwiretap.la \ |
361 |
- ../wsutil/libwsutil.la \ |
362 |
-+ @PCAP_LIBS@ \ |
363 |
- @GLIB_LIBS@ |
364 |
- |
365 |
- randpktdump_SOURCES = \ |
366 |
|
367 |
diff --git a/net-analyzer/wireshark/files/wireshark-includes-fix-musl.patch b/net-analyzer/wireshark/files/wireshark-includes-fix-musl.patch |
368 |
deleted file mode 100644 |
369 |
index d00cac4..0000000 |
370 |
--- a/net-analyzer/wireshark/files/wireshark-includes-fix-musl.patch |
371 |
+++ /dev/null |
372 |
@@ -1,15 +0,0 @@ |
373 |
-diff --git a/extcap/udpdump.c b/extcap/udpdump.c |
374 |
-index 44cc24e1db..1310e37e61 100644 |
375 |
---- a/extcap/udpdump.c |
376 |
-+++ b/extcap/udpdump.c |
377 |
-@@ -38,6 +38,10 @@ |
378 |
- #include <unistd.h> |
379 |
- #endif |
380 |
- |
381 |
-+#ifdef HAVE_SYS_TIME_H |
382 |
-+ #include <sys/time.h> |
383 |
-+#endif |
384 |
-+ |
385 |
- #ifdef HAVE_ARPA_INET_H |
386 |
- #include <arpa/inet.h> |
387 |
- #endif |
388 |
|
389 |
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml |
390 |
deleted file mode 100644 |
391 |
index cf871ba..0000000 |
392 |
--- a/net-analyzer/wireshark/metadata.xml |
393 |
+++ /dev/null |
394 |
@@ -1,62 +0,0 @@ |
395 |
-<?xml version="1.0" encoding="UTF-8"?> |
396 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
397 |
-<pkgmetadata> |
398 |
- <maintainer type="project"> |
399 |
- <email>netmon@g.o</email> |
400 |
- <name>Gentoo network monitoring and analysis project</name> |
401 |
- </maintainer> |
402 |
- <longdescription> |
403 |
- Wireshark is the world's foremost network protocol analyzer, and is the de |
404 |
- facto (and often de jure) standard across many industries and educational |
405 |
- institutions. Wireshark has a rich feature set which includes 1) deep |
406 |
- inspection of hundreds of protocols, with more being added all the time, 2) |
407 |
- live capture and offline analysis, 3) standard three-pane packet browser, 4) |
408 |
- captured network data can be browsed via a GUI, or via the TTY-mode TShark |
409 |
- utility, 5) the most powerful display filters in the industry, 6) rich VoIP |
410 |
- analysis, 7) read/write many different capture file formats: tcpdump |
411 |
- (libpcap), Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network |
412 |
- Monitor, Network General Sniffer® (compressed and uncompressed), Sniffer® |
413 |
- Pro, and NetXray®, Network Instruments Observer, Novell LANalyzer, RADCOM |
414 |
- WAN/LAN Analyzer, Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks |
415 |
- Visual UpTime, WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8) |
416 |
- capture files compressed with gzip can be decompressed on the fly, 9) live |
417 |
- data can be read from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB, |
418 |
- Token Ring, Frame Relay, FDDI, and others, 10) decryption support for many |
419 |
- protocols, including IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and |
420 |
- WPA/WPA2, 11) coloring rules can be applied to the packet list for quick, |
421 |
- intuitive analysis, 12) output can be exported to XML, PostScript®, CSV, or |
422 |
- plain text |
423 |
-</longdescription> |
424 |
- <use> |
425 |
- <flag name="adns">Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag> |
426 |
- <flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag> |
427 |
- <flag name="capinfos">Install capinfos, to print information about capture files</flag> |
428 |
- <flag name="captype">Install captype, to print the file types of capture files</flag> |
429 |
- <flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag> |
430 |
- <!--flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag--> |
431 |
- <flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag> |
432 |
- <flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag> |
433 |
- <flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag> |
434 |
- <flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag> |
435 |
- <flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag> |
436 |
- <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag> |
437 |
- <flag name="lz4">Use <pkg>app-arch/lz4</pkg> for compression/decompression</flag> |
438 |
- <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag> |
439 |
- <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag> |
440 |
- <flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag> |
441 |
- <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag> |
442 |
- <flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag> |
443 |
- <flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag> |
444 |
- <flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag> |
445 |
- <flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag> |
446 |
- <flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag> |
447 |
- <flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag> |
448 |
- <flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag> |
449 |
- <flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag> |
450 |
- <flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag> |
451 |
- <flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag> |
452 |
- <flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag> |
453 |
- <flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag> |
454 |
- <flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag> |
455 |
- </use> |
456 |
-</pkgmetadata> |
457 |
|
458 |
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild |
459 |
deleted file mode 100644 |
460 |
index bc16846..0000000 |
461 |
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild |
462 |
+++ /dev/null |
463 |
@@ -1,292 +0,0 @@ |
464 |
-# Copyright 1999-2018 Gentoo Foundation |
465 |
-# Distributed under the terms of the GNU General Public License v2 |
466 |
- |
467 |
-EAPI=6 |
468 |
-inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils |
469 |
- |
470 |
-DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
471 |
-HOMEPAGE="https://www.wireshark.org/" |
472 |
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" |
473 |
- |
474 |
-LICENSE="GPL-2" |
475 |
-SLOT="0/${PV}" |
476 |
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~x86-fbsd" |
477 |
-IUSE=" |
478 |
- adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 |
479 |
- +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua |
480 |
- lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump |
481 |
- +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap |
482 |
- tfshark +tshark +udpdump zlib |
483 |
-" |
484 |
-REQUIRED_USE=" |
485 |
- ciscodump? ( libssh ) |
486 |
- sshdump? ( libssh ) |
487 |
-" |
488 |
- |
489 |
-S=${WORKDIR}/${P/_/} |
490 |
- |
491 |
-CDEPEND=" |
492 |
- >=dev-libs/glib-2.14:2 |
493 |
- dev-libs/libgcrypt:0 |
494 |
- netlink? ( dev-libs/libnl:3 ) |
495 |
- adns? ( >=net-dns/c-ares-1.5 ) |
496 |
- caps? ( sys-libs/libcap ) |
497 |
- geoip? ( dev-libs/geoip ) |
498 |
- gtk? ( |
499 |
- x11-libs/gdk-pixbuf |
500 |
- x11-libs/gtk+:3 |
501 |
- x11-libs/pango |
502 |
- x11-misc/xdg-utils |
503 |
- ) |
504 |
- kerberos? ( virtual/krb5 ) |
505 |
- libssh? ( >=net-libs/libssh-0.6 ) |
506 |
- libxml2? ( dev-libs/libxml2 ) |
507 |
- lua? ( >=dev-lang/lua-5.1:* ) |
508 |
- lz4? ( app-arch/lz4 ) |
509 |
- nghttp2? ( net-libs/nghttp2 ) |
510 |
- pcap? ( net-libs/libpcap ) |
511 |
- portaudio? ( media-libs/portaudio ) |
512 |
- qt5? ( |
513 |
- dev-qt/qtcore:5 |
514 |
- dev-qt/qtgui:5 |
515 |
- dev-qt/qtmultimedia:5 |
516 |
- dev-qt/qtprintsupport:5 |
517 |
- dev-qt/qtwidgets:5 |
518 |
- >=media-libs/speex-1.2.0 |
519 |
- media-libs/speexdsp |
520 |
- x11-misc/xdg-utils |
521 |
- ) |
522 |
- sbc? ( media-libs/sbc ) |
523 |
- smi? ( net-libs/libsmi ) |
524 |
- snappy? ( app-arch/snappy ) |
525 |
- spandsp? ( media-libs/spandsp ) |
526 |
- ssl? ( net-libs/gnutls:= ) |
527 |
- zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) |
528 |
-" |
529 |
-# We need perl for `pod2html`. The rest of the perl stuff is to block older |
530 |
-# and broken installs. #455122 |
531 |
-DEPEND=" |
532 |
- ${CDEPEND} |
533 |
- dev-lang/perl |
534 |
- !<virtual/perl-Pod-Simple-3.170 |
535 |
- !<perl-core/Pod-Simple-3.170 |
536 |
- doc? ( |
537 |
- app-doc/doxygen |
538 |
- app-text/asciidoc |
539 |
- dev-libs/libxml2 |
540 |
- dev-libs/libxslt |
541 |
- doc-pdf? ( dev-java/fop ) |
542 |
- www-client/lynx |
543 |
- ) |
544 |
- qt5? ( |
545 |
- dev-qt/linguist-tools:5 |
546 |
- ) |
547 |
- sys-devel/bison |
548 |
- sys-devel/flex |
549 |
- virtual/pkgconfig |
550 |
-" |
551 |
-RDEPEND=" |
552 |
- ${CDEPEND} |
553 |
- gtk? ( virtual/freedesktop-icon-theme ) |
554 |
- qt5? ( virtual/freedesktop-icon-theme ) |
555 |
- selinux? ( sec-policy/selinux-wireshark ) |
556 |
-" |
557 |
-PATCHES=( |
558 |
- "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch |
559 |
- "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch |
560 |
- "${FILESDIR}"/${PN}-2.4-androiddump.patch |
561 |
- "${FILESDIR}"/${PN}-99999999-androiddump.patch |
562 |
- "${FILESDIR}"/${PN}-2.4.3-libsmi.patch |
563 |
- "${FILESDIR}"/${PN}-includes-fix-musl.patch |
564 |
-) |
565 |
- |
566 |
-pkg_setup() { |
567 |
- enewgroup wireshark |
568 |
-} |
569 |
- |
570 |
-src_prepare() { |
571 |
- default |
572 |
- |
573 |
- eautoreconf |
574 |
-} |
575 |
- |
576 |
-src_configure() { |
577 |
- local myconf |
578 |
- |
579 |
- # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass |
580 |
- # --with-ssl to ./configure. (Mimics code from acinclude.m4). |
581 |
- if use kerberos; then |
582 |
- case $(krb5-config --libs) in |
583 |
- *-lcrypto*) |
584 |
- ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." |
585 |
- ewarn "Note there are annoying license incompatibilities between the OpenSSL" |
586 |
- ewarn "license and the GPL, so do your check before distributing such package." |
587 |
- myconf+=( "--with-ssl" ) |
588 |
- ;; |
589 |
- esac |
590 |
- fi |
591 |
- |
592 |
- # Enable wireshark binary with any supported GUI toolkit (bug #473188) |
593 |
- if use gtk || use qt5; then |
594 |
- myconf+=( "--enable-wireshark" ) |
595 |
- else |
596 |
- myconf+=( "--disable-wireshark" ) |
597 |
- fi |
598 |
- |
599 |
- if ! use qt5; then |
600 |
- myconf+=( "--with-qt=no" ) |
601 |
- fi |
602 |
- |
603 |
- if use qt5; then |
604 |
- export QT_MIN_VERSION=5.3.0 |
605 |
- append-cxxflags -fPIC -DPIC |
606 |
- fi |
607 |
- |
608 |
- # Hack around inability to disable doxygen/fop doc generation |
609 |
- use doc || export ac_cv_prog_HAVE_DOXYGEN=false |
610 |
- use doc-pdf || export ac_cv_prog_HAVE_FOP=false |
611 |
- |
612 |
- econf \ |
613 |
- $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ |
614 |
- $(use dumpcap && use_with pcap dumpcap-group wireshark) \ |
615 |
- $(use_enable androiddump) \ |
616 |
- $(use_enable capinfos) \ |
617 |
- $(use_enable captype) \ |
618 |
- $(use_enable ciscodump) \ |
619 |
- $(use_enable dftest) \ |
620 |
- $(use_enable dumpcap) \ |
621 |
- $(use_enable editcap) \ |
622 |
- $(use_enable mergecap) \ |
623 |
- $(use_enable randpkt) \ |
624 |
- $(use_enable randpktdump) \ |
625 |
- $(use_enable reordercap) \ |
626 |
- $(use_enable sharkd) \ |
627 |
- $(use_enable sshdump) \ |
628 |
- $(use_enable text2pcap) \ |
629 |
- $(use_enable tfshark) \ |
630 |
- $(use_enable tshark) \ |
631 |
- $(use_enable udpdump) \ |
632 |
- $(use_with adns c-ares) \ |
633 |
- $(use_with caps libcap) \ |
634 |
- $(use_with geoip) \ |
635 |
- $(use_with gtk gtk 3) \ |
636 |
- $(use_with kerberos krb5) \ |
637 |
- $(use_with libssh) \ |
638 |
- $(use_with libxml2) \ |
639 |
- $(use_with lua) \ |
640 |
- $(use_with lz4) \ |
641 |
- $(use_with nghttp2) \ |
642 |
- $(use_with pcap) \ |
643 |
- $(use_with portaudio) \ |
644 |
- $(use_with sbc) \ |
645 |
- $(use_with smi libsmi) \ |
646 |
- $(use_with snappy) \ |
647 |
- $(use_with spandsp) \ |
648 |
- $(use_with ssl gnutls) \ |
649 |
- $(use_with zlib) \ |
650 |
- $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \ |
651 |
- $(usex netlink --with-libnl=3 --without-libnl) \ |
652 |
- $(usex qt5 --with-qt=5 '') \ |
653 |
- $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \ |
654 |
- $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ |
655 |
- $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \ |
656 |
- $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \ |
657 |
- --disable-profile-build \ |
658 |
- --disable-warnings-as-errors \ |
659 |
- --sysconfdir="${EPREFIX}"/etc/wireshark \ |
660 |
- ${myconf[@]} |
661 |
-} |
662 |
- |
663 |
-src_compile() { |
664 |
- default |
665 |
- |
666 |
- if use doc; then |
667 |
- emake -j1 -C docbook |
668 |
- if use doc-pdf; then |
669 |
- addpredict "/root/.java" |
670 |
- emake -C docbook all-pdf |
671 |
- fi |
672 |
- fi |
673 |
-} |
674 |
- |
675 |
-src_install() { |
676 |
- default |
677 |
- |
678 |
- # FAQ is not required as is installed from help/faq.txt |
679 |
- dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \ |
680 |
- doc/{randpkt.txt,README*} |
681 |
- |
682 |
- if use doc; then |
683 |
- docinto /usr/share/doc/${PF}/html |
684 |
- dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}} |
685 |
- if use doc-pdf; then |
686 |
- docinto /usr/share/doc/${PF}/pdf/ |
687 |
- dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf |
688 |
- fi |
689 |
- fi |
690 |
- |
691 |
- # install headers |
692 |
- local wsheader |
693 |
- for wsheader in \ |
694 |
- config.h \ |
695 |
- epan/*.h \ |
696 |
- epan/crypt/*.h \ |
697 |
- epan/dfilter/*.h \ |
698 |
- epan/dissectors/*.h \ |
699 |
- epan/ftypes/*.h \ |
700 |
- epan/wmem/*.h \ |
701 |
- register.h \ |
702 |
- wiretap/*.h \ |
703 |
- ws_diag_control.h \ |
704 |
- ws_symbol_export.h \ |
705 |
- wsutil/*.h |
706 |
- do |
707 |
- insinto /usr/include/wireshark/$( dirname ${wsheader} ) |
708 |
- doins ${wsheader} |
709 |
- done |
710 |
- |
711 |
- #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/ |
712 |
- insinto /usr/include/wiretap |
713 |
- doins wiretap/wtap.h |
714 |
- |
715 |
- if use gtk || use qt5; then |
716 |
- local c d |
717 |
- for c in hi lo; do |
718 |
- for d in 16 32 48; do |
719 |
- insinto /usr/share/icons/${c}color/${d}x${d}/apps |
720 |
- newins image/${c}${d}-app-wireshark.png wireshark.png |
721 |
- done |
722 |
- done |
723 |
- for d in 16 24 32 48 64 128 256 ; do |
724 |
- insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes |
725 |
- newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png |
726 |
- done |
727 |
- fi |
728 |
- |
729 |
- prune_libtool_files |
730 |
-} |
731 |
- |
732 |
-pkg_postinst() { |
733 |
- gnome2_icon_cache_update |
734 |
- xdg_desktop_database_update |
735 |
- xdg_mimeinfo_database_update |
736 |
- |
737 |
- # Add group for users allowed to sniff. |
738 |
- enewgroup wireshark |
739 |
- |
740 |
- if use dumpcap && use pcap; then |
741 |
- fcaps -o 0 -g wireshark -m 4710 -M 0710 \ |
742 |
- cap_dac_read_search,cap_net_raw,cap_net_admin \ |
743 |
- "${EROOT}"/usr/bin/dumpcap |
744 |
- fi |
745 |
- |
746 |
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to" |
747 |
- ewarn "add yourself to the wireshark group. This security measure ensures" |
748 |
- ewarn "that only trusted users are allowed to sniff your traffic." |
749 |
-} |
750 |
- |
751 |
-pkg_postrm() { |
752 |
- gnome2_icon_cache_update |
753 |
- xdg_desktop_database_update |
754 |
- xdg_mimeinfo_database_update |
755 |
-} |