1 |
commit: 378bb3556692362ea71f268bfcc1131ad90d66da |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 30 09:21:42 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 30 09:21:42 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378bb355 |
7 |
|
8 |
net-analyzer/wireshark: Add more USE flags, update live ebuild. |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
net-analyzer/wireshark/metadata.xml | 11 +++++++++++ |
13 |
net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild | 20 ++++++++++++++++---- |
14 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 21 +++++++++++++++++---- |
15 |
3 files changed, 44 insertions(+), 8 deletions(-) |
16 |
|
17 |
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml |
18 |
index 461d8656cff..e88111bc335 100644 |
19 |
--- a/net-analyzer/wireshark/metadata.xml |
20 |
+++ b/net-analyzer/wireshark/metadata.xml |
21 |
@@ -30,21 +30,32 @@ |
22 |
<use> |
23 |
<flag name="adns">Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag> |
24 |
<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag> |
25 |
+ <flag name="capinfos">Install capinfos, to print information about capture files</flag> |
26 |
+ <flag name="captype">Install captype, to print the file types of capture files</flag> |
27 |
<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag> |
28 |
<flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag> |
29 |
+ <flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag> |
30 |
<flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag> |
31 |
+ <flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag> |
32 |
+ <flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag> |
33 |
<flag name="libssh">Use <pkg>net-libs/libssh</pkg> (for sshdump)</flag> |
34 |
<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag> |
35 |
+ <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag> |
36 |
<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag> |
37 |
<flag name="nghttp2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag> |
38 |
<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag> |
39 |
<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag> |
40 |
<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag> |
41 |
+ <flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag> |
42 |
<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag> |
43 |
+ <flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag> |
44 |
<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag> |
45 |
<flag name="snappy">Use <pkg>app-arch/snappy</pkg> for snappy compression and decompression</flag> |
46 |
<flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag> |
47 |
<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag> |
48 |
+ <flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag> |
49 |
<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag> |
50 |
+ <flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag> |
51 |
+ <flag name="udpdump">Install udpdumpi, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag> |
52 |
</use> |
53 |
</pkgmetadata> |
54 |
|
55 |
diff --git a/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild b/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild |
56 |
index 69dc87248c6..566d8052d7e 100644 |
57 |
--- a/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild |
58 |
+++ b/net-analyzer/wireshark/wireshark-2.4.0_rc2.ebuild |
59 |
@@ -12,10 +12,11 @@ LICENSE="GPL-2" |
60 |
SLOT="0/${PV}" |
61 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd" |
62 |
IUSE=" |
63 |
- adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 doc doc-pdf |
64 |
- geoip gtk kerberos lua +netlink nghttp2 +pcap portaudio +qt5 sbc selinux |
65 |
- smi libssh libxml2 randpkt randpktdump snappy spandsp sshdump ssl tfshark |
66 |
- zlib |
67 |
+ adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 |
68 |
+ +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua |
69 |
+ +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump |
70 |
+ +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap |
71 |
+ tfshark +tshark +udpdump zlib |
72 |
" |
73 |
REQUIRED_USE=" |
74 |
ciscodump? ( libssh ) |
75 |
@@ -146,11 +147,22 @@ src_configure() { |
76 |
econf \ |
77 |
$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ |
78 |
$(use_enable androiddump) \ |
79 |
+ $(use_enable capinfos) \ |
80 |
+ $(use_enable captype) \ |
81 |
$(use_enable ciscodump) \ |
82 |
+ $(use_enable dftest) \ |
83 |
+ $(use_enable dumpcap) \ |
84 |
+ $(use_enable editcap) \ |
85 |
+ $(use_enable mergecap) \ |
86 |
$(use_enable randpkt) \ |
87 |
$(use_enable randpktdump) \ |
88 |
+ $(use_enable reordercap) \ |
89 |
+ $(use_enable sharkd) \ |
90 |
$(use_enable sshdump) \ |
91 |
+ $(use_enable text2pcap) \ |
92 |
$(use_enable tfshark) \ |
93 |
+ $(use_enable tshark) \ |
94 |
+ $(use_enable udpdump) \ |
95 |
$(use_with adns c-ares) \ |
96 |
$(use_with caps libcap) \ |
97 |
$(use_with geoip) \ |
98 |
|
99 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
100 |
index 68d8ab35815..7304f25144e 100644 |
101 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
102 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
103 |
@@ -12,10 +12,11 @@ LICENSE="GPL-2" |
104 |
SLOT="0/${PV}" |
105 |
KEYWORDS="" |
106 |
IUSE=" |
107 |
- adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 doc doc-pdf |
108 |
- geoip gtk kerberos lua +netlink nghttp2 +pcap portaudio +qt5 sbc selinux |
109 |
- smi libssh libxml2 randpkt randpktdump snappy spandsp sshdump ssl tfshark |
110 |
- zlib |
111 |
+ adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 |
112 |
+ +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua |
113 |
+ +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump |
114 |
+ +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap |
115 |
+ tfshark +tshark +udpdump zlib |
116 |
" |
117 |
REQUIRED_USE=" |
118 |
ciscodump? ( libssh ) |
119 |
@@ -91,6 +92,7 @@ RDEPEND=" |
120 |
PATCHES=( |
121 |
"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch |
122 |
"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch |
123 |
+ "${FILESDIR}"/${PN}-2.4-androiddump.patch |
124 |
"${FILESDIR}"/${PN}-99999999-androiddump.patch |
125 |
) |
126 |
|
127 |
@@ -149,11 +151,22 @@ src_configure() { |
128 |
econf \ |
129 |
$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ |
130 |
$(use_enable androiddump) \ |
131 |
+ $(use_enable capinfos) \ |
132 |
+ $(use_enable captype) \ |
133 |
$(use_enable ciscodump) \ |
134 |
+ $(use_enable dftest) \ |
135 |
+ $(use_enable dumpcap) \ |
136 |
+ $(use_enable editcap) \ |
137 |
+ $(use_enable mergecap) \ |
138 |
$(use_enable randpkt) \ |
139 |
$(use_enable randpktdump) \ |
140 |
+ $(use_enable reordercap) \ |
141 |
+ $(use_enable sharkd) \ |
142 |
$(use_enable sshdump) \ |
143 |
+ $(use_enable text2pcap) \ |
144 |
$(use_enable tfshark) \ |
145 |
+ $(use_enable tshark) \ |
146 |
+ $(use_enable udpdump) \ |
147 |
$(use_with adns c-ares) \ |
148 |
$(use_with caps libcap) \ |
149 |
$(use_with geoip) \ |