1 |
commit: 38dc7a9478ce7f84b9a3553f44187b493b73d405 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 9 12:13:35 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 9 12:13:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38dc7a94 |
7 |
|
8 |
net-analyzer/wireshark: Version 2.6.6 |
9 |
|
10 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
11 |
Bug: https://bugs.gentoo.org/674980 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
net-analyzer/wireshark/Manifest | 1 + |
15 |
.../files/wireshark-2.6.6-androiddump-wsutil.patch | 18 ++ |
16 |
net-analyzer/wireshark/wireshark-2.6.6.ebuild | 240 +++++++++++++++++++++ |
17 |
3 files changed, 259 insertions(+) |
18 |
|
19 |
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest |
20 |
index ea58cc3f377..ef6b8f0b406 100644 |
21 |
--- a/net-analyzer/wireshark/Manifest |
22 |
+++ b/net-analyzer/wireshark/Manifest |
23 |
@@ -2,4 +2,5 @@ DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d |
24 |
DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80 |
25 |
DIST wireshark-2.6.4.tar.xz 28218232 BLAKE2B d54d7661801667f78f0c3248f4099c77ef016222ae942dc7a5776af2c5c18f7b00305556ac84df6afd19cf3d2bd59e78365067dd9402f978ae0a7db76c1730ca SHA512 bc740548901b30f2e44c2b0933717288615fa38edc5e092607a8b12c60ecfacaa5aa7c59d7644cf29238d0d636fbe03d85559a0f2de81a3bf8ceac55fcf9ff07 |
26 |
DIST wireshark-2.6.5.tar.xz 28390292 BLAKE2B f9847ef113b0c63e739be305603b42c5112da2e94b3110b9b104325af97801bd2b3d9d89cd334b59d460433520069cc2ba726e96aa9f22af112a28a653b9e29c SHA512 fed2d08bb0ba06496c22a5d45946faf2ff4ca19c59faf758c668c583193faeec3c4379b64750478469fede91562891e9b6991591a09a3da8d2193cb64718d02f |
27 |
+DIST wireshark-2.6.6.tar.xz 28407404 BLAKE2B 5135789d345b675814a6394d5ba1469585b9eab917885730125b8a007aecd9cb48a510fc9e7479148cadf625807bac9017b854797e4bb2e562d7dc7f76140826 SHA512 b781c3b34dc76a3d8e60dc2b9b4e46a11994440b8df7b56134521ea9a77b27b0719a600db60d7f3d65f15972a5db2a7e85a8bf60d7217fce498fb5668de8fe56 |
28 |
DIST wireshark-2.9.0.tar.xz 29438416 BLAKE2B 17bbffe6e079133c4319a49a3672a4359b9e8eed1493b7440a2924c4bd57c45a1cbeee2ee50d4f3d96cbda436fa48eb6ba66bc61061f5fdbf71d1711c5467b43 SHA512 f24d873d75510488e0e60f75abce5820457786ff540ede3fb19fd45fea269527323ef5b5157ff83d2aaeabd60d03bac0a3dfc14495468d9478a8e5d7a30ad47b |
29 |
|
30 |
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..654c2c82db1 |
33 |
--- /dev/null |
34 |
+++ b/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch |
35 |
@@ -0,0 +1,18 @@ |
36 |
+--- a/CMakeLists.txt |
37 |
++++ b/CMakeLists.txt |
38 |
+@@ -2843,6 +2843,7 @@ |
39 |
+ if(HAVE_LIBPCAP) |
40 |
+ set(androiddump_LIBS |
41 |
+ ui |
42 |
++ wsutil |
43 |
+ ${GLIB2_LIBRARIES} |
44 |
+ ${PCAP_LIBRARIES} |
45 |
+ ) |
46 |
+@@ -2853,6 +2854,7 @@ |
47 |
+ set(androiddump_LIBS |
48 |
+ ui |
49 |
+ wiretap |
50 |
++ wsutil |
51 |
+ ${GLIB2_LIBRARIES} |
52 |
+ ${ZLIB_LIBRARIES} |
53 |
+ ${CMAKE_DL_LIBS} |
54 |
|
55 |
diff --git a/net-analyzer/wireshark/wireshark-2.6.6.ebuild b/net-analyzer/wireshark/wireshark-2.6.6.ebuild |
56 |
new file mode 100644 |
57 |
index 00000000000..852878b84a7 |
58 |
--- /dev/null |
59 |
+++ b/net-analyzer/wireshark/wireshark-2.6.6.ebuild |
60 |
@@ -0,0 +1,240 @@ |
61 |
+# Copyright 1999-2019 Gentoo Authors |
62 |
+# Distributed under the terms of the GNU General Public License v2 |
63 |
+ |
64 |
+EAPI=6 |
65 |
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils |
66 |
+ |
67 |
+DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
68 |
+HOMEPAGE="https://www.wireshark.org/" |
69 |
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" |
70 |
+ |
71 |
+LICENSE="GPL-2" |
72 |
+SLOT="0/${PV}" |
73 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86" |
74 |
+IUSE=" |
75 |
+ adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc |
76 |
+ +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink |
77 |
+ nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux |
78 |
+ +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump |
79 |
+ zlib |
80 |
+" |
81 |
+ |
82 |
+S=${WORKDIR}/${P/_/} |
83 |
+ |
84 |
+CDEPEND=" |
85 |
+ >=dev-libs/glib-2.14:2 |
86 |
+ dev-libs/libgcrypt:0 |
87 |
+ netlink? ( dev-libs/libnl:3 ) |
88 |
+ adns? ( >=net-dns/c-ares-1.5 ) |
89 |
+ bcg729? ( media-libs/bcg729 ) |
90 |
+ filecaps? ( sys-libs/libcap ) |
91 |
+ gtk? ( |
92 |
+ x11-libs/gdk-pixbuf |
93 |
+ x11-libs/gtk+:3 |
94 |
+ x11-libs/pango |
95 |
+ x11-misc/xdg-utils |
96 |
+ ) |
97 |
+ kerberos? ( virtual/krb5 ) |
98 |
+ sshdump? ( >=net-libs/libssh-0.6 ) |
99 |
+ ciscodump? ( >=net-libs/libssh-0.6 ) |
100 |
+ libxml2? ( dev-libs/libxml2 ) |
101 |
+ lua? ( >=dev-lang/lua-5.1:* ) |
102 |
+ lz4? ( app-arch/lz4 ) |
103 |
+ maxminddb? ( dev-libs/libmaxminddb ) |
104 |
+ nghttp2? ( net-libs/nghttp2 ) |
105 |
+ pcap? ( net-libs/libpcap ) |
106 |
+ portaudio? ( media-libs/portaudio ) |
107 |
+ qt5? ( |
108 |
+ dev-qt/qtcore:5 |
109 |
+ dev-qt/qtgui:5 |
110 |
+ dev-qt/qtmultimedia:5 |
111 |
+ dev-qt/qtprintsupport:5 |
112 |
+ dev-qt/qtwidgets:5 |
113 |
+ x11-misc/xdg-utils |
114 |
+ ) |
115 |
+ sbc? ( media-libs/sbc ) |
116 |
+ smi? ( net-libs/libsmi ) |
117 |
+ snappy? ( app-arch/snappy ) |
118 |
+ spandsp? ( media-libs/spandsp ) |
119 |
+ ssl? ( net-libs/gnutls:= ) |
120 |
+ zlib? ( sys-libs/zlib ) |
121 |
+" |
122 |
+# We need perl for `pod2html`. The rest of the perl stuff is to block older |
123 |
+# and broken installs. #455122 |
124 |
+DEPEND=" |
125 |
+ ${CDEPEND} |
126 |
+ dev-lang/perl |
127 |
+ !<virtual/perl-Pod-Simple-3.170 |
128 |
+ !<perl-core/Pod-Simple-3.170 |
129 |
+ doc? ( |
130 |
+ app-doc/doxygen |
131 |
+ dev-ruby/asciidoctor |
132 |
+ ) |
133 |
+ qt5? ( |
134 |
+ dev-qt/linguist-tools:5 |
135 |
+ ) |
136 |
+ sys-devel/bison |
137 |
+ sys-devel/flex |
138 |
+ virtual/pkgconfig |
139 |
+" |
140 |
+RDEPEND=" |
141 |
+ ${CDEPEND} |
142 |
+ gtk? ( virtual/freedesktop-icon-theme ) |
143 |
+ qt5? ( virtual/freedesktop-icon-theme ) |
144 |
+ selinux? ( sec-policy/selinux-wireshark ) |
145 |
+" |
146 |
+PATCHES=( |
147 |
+ "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch |
148 |
+ "${FILESDIR}"/${PN}-2.4-androiddump.patch |
149 |
+ "${FILESDIR}"/${PN}-2.6.0-redhat.patch |
150 |
+ "${FILESDIR}"/${PN}-2.6.2-qtsvg.patch |
151 |
+ "${FILESDIR}"/${PN}-2.6.6-androiddump-wsutil.patch |
152 |
+ "${FILESDIR}"/${PN}-99999999-androiddump.patch |
153 |
+) |
154 |
+ |
155 |
+pkg_setup() { |
156 |
+ enewgroup wireshark |
157 |
+} |
158 |
+ |
159 |
+src_configure() { |
160 |
+ local mycmakeargs |
161 |
+ |
162 |
+ # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass |
163 |
+ # --with-ssl to ./configure. (Mimics code from acinclude.m4). |
164 |
+ if use kerberos; then |
165 |
+ case $(krb5-config --libs) in |
166 |
+ *-lcrypto*) |
167 |
+ ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." |
168 |
+ ewarn "Note there are annoying license incompatibilities between the OpenSSL" |
169 |
+ ewarn "license and the GPL, so do your check before distributing such package." |
170 |
+ mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) |
171 |
+ ;; |
172 |
+ esac |
173 |
+ fi |
174 |
+ |
175 |
+ if use qt5; then |
176 |
+ export QT_MIN_VERSION=5.3.0 |
177 |
+ append-cxxflags -fPIC -DPIC |
178 |
+ fi |
179 |
+ |
180 |
+ mycmakeargs+=( |
181 |
+ $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) |
182 |
+ $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') |
183 |
+ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') |
184 |
+ $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') |
185 |
+ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') |
186 |
+ -DBUILD_androiddump=$(usex androiddump) |
187 |
+ -DBUILD_capinfos=$(usex capinfos) |
188 |
+ -DBUILD_captype=$(usex captype) |
189 |
+ -DBUILD_ciscodump=$(usex ciscodump) |
190 |
+ -DBUILD_dftest=$(usex dftest) |
191 |
+ -DBUILD_dumpcap=$(usex dumpcap) |
192 |
+ -DBUILD_editcap=$(usex editcap) |
193 |
+ -DBUILD_mergecap=$(usex mergecap) |
194 |
+ -DBUILD_mmdbresolve=$(usex maxminddb) |
195 |
+ -DBUILD_randpkt=$(usex randpkt) |
196 |
+ -DBUILD_randpktdump=$(usex randpktdump) |
197 |
+ -DBUILD_reordercap=$(usex reordercap) |
198 |
+ -DBUILD_sharkd=$(usex sharkd) |
199 |
+ -DBUILD_sshdump=$(usex sshdump) |
200 |
+ -DBUILD_text2pcap=$(usex text2pcap) |
201 |
+ -DBUILD_tfshark=$(usex tfshark) |
202 |
+ -DBUILD_tshark=$(usex tshark) |
203 |
+ -DBUILD_udpdump=$(usex udpdump) |
204 |
+ -DBUILD_wireshark=$(usex qt5) |
205 |
+ -DBUILD_wireshark_gtk=$(usex gtk) |
206 |
+ -DDISABLE_WERROR=yes |
207 |
+ -DENABLE_BCG729=$(usex bcg729) |
208 |
+ -DENABLE_CAP=no |
209 |
+ -DENABLE_CARES=$(usex adns) |
210 |
+ -DENABLE_GNUTLS=$(usex ssl) |
211 |
+ -DENABLE_KERBEROS=$(usex kerberos) |
212 |
+ -DENABLE_LIBXML2=$(usex libxml2) |
213 |
+ -DENABLE_LUA=$(usex lua) |
214 |
+ -DENABLE_LZ4=$(usex lz4) |
215 |
+ -DENABLE_NETLINK=$(usex netlink) |
216 |
+ -DENABLE_NGHTTP2=$(usex nghttp2) |
217 |
+ -DENABLE_PCAP=$(usex pcap) |
218 |
+ -DENABLE_PORTAUDIO=$(usex portaudio) |
219 |
+ -DENABLE_SBC=$(usex sbc) |
220 |
+ -DENABLE_SMI=$(usex smi) |
221 |
+ -DENABLE_SNAPPY=$(usex snappy) |
222 |
+ -DENABLE_SPANDSP=$(usex spandsp) |
223 |
+ -DENABLE_ZLIB=$(usex zlib) |
224 |
+ ) |
225 |
+ |
226 |
+ cmake-utils_src_configure |
227 |
+} |
228 |
+ |
229 |
+src_install() { |
230 |
+ cmake-utils_src_install |
231 |
+ |
232 |
+ # FAQ is not required as is installed from help/faq.txt |
233 |
+ dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* |
234 |
+ |
235 |
+ # install headers |
236 |
+ insinto /usr/include/wireshark |
237 |
+ doins ws_diag_control.h ws_symbol_export.h \ |
238 |
+ "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h |
239 |
+ |
240 |
+ local dir dirs=( |
241 |
+ epan |
242 |
+ epan/crypt |
243 |
+ epan/dfilter |
244 |
+ epan/dissectors |
245 |
+ epan/ftypes |
246 |
+ epan/wmem |
247 |
+ wiretap |
248 |
+ wsutil |
249 |
+ ) |
250 |
+ for dir in "${dirs[@]}" |
251 |
+ do |
252 |
+ insinto /usr/include/wireshark/${dir} |
253 |
+ doins ${dir}/*.h |
254 |
+ done |
255 |
+ |
256 |
+ #with the above this really shouldn't be needed, but things may be looking |
257 |
+ # in wiretap/ instead of wireshark/wiretap/ |
258 |
+ insinto /usr/include/wiretap |
259 |
+ doins wiretap/wtap.h |
260 |
+ |
261 |
+ if use gtk || use qt5; then |
262 |
+ local s |
263 |
+ for s in 16 32 48 64 128 256 512 1024; do |
264 |
+ insinto /usr/share/icons/hicolor/${s}x${s}/apps |
265 |
+ newins image/wsicon${s}.png wireshark.png |
266 |
+ done |
267 |
+ for s in 16 24 32 48 64 128 256 ; do |
268 |
+ insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes |
269 |
+ newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png |
270 |
+ done |
271 |
+ fi |
272 |
+ |
273 |
+ prune_libtool_files |
274 |
+} |
275 |
+ |
276 |
+pkg_postinst() { |
277 |
+ gnome2_icon_cache_update |
278 |
+ xdg_desktop_database_update |
279 |
+ xdg_mimeinfo_database_update |
280 |
+ |
281 |
+ # Add group for users allowed to sniff. |
282 |
+ enewgroup wireshark |
283 |
+ chgrp wireshark "${EROOT}"/usr/bin/dumpcap |
284 |
+ |
285 |
+ if use dumpcap && use pcap; then |
286 |
+ fcaps -o 0 -g wireshark -m 4710 -M 0710 \ |
287 |
+ cap_dac_read_search,cap_net_raw,cap_net_admin \ |
288 |
+ "${EROOT}"/usr/bin/dumpcap |
289 |
+ fi |
290 |
+ |
291 |
+ ewarn "NOTE: To capture traffic with wireshark as normal user you have to" |
292 |
+ ewarn "add yourself to the wireshark group. This security measure ensures" |
293 |
+ ewarn "that only trusted users are allowed to sniff your traffic." |
294 |
+} |
295 |
+ |
296 |
+pkg_postrm() { |
297 |
+ gnome2_icon_cache_update |
298 |
+ xdg_desktop_database_update |
299 |
+ xdg_mimeinfo_database_update |
300 |
+} |