Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
Date: Mon, 26 Mar 2018 09:13:04
Message-Id: 1522055577.cddb32e60357a74e30d9184f33ff3ae7829e3ea6.jer@gentoo
1 commit: cddb32e60357a74e30d9184f33ff3ae7829e3ea6
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 25 22:32:30 2018 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 26 09:12:57 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cddb32e6
7
8 net-analyzer/wireshark: Old.
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 net-analyzer/wireshark/Manifest | 1 -
13 net-analyzer/wireshark/wireshark-2.4.4.ebuild | 293 --------------------------
14 2 files changed, 294 deletions(-)
15
16 diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
17 index 8ec16ef999e..7b3035e492f 100644
18 --- a/net-analyzer/wireshark/Manifest
19 +++ b/net-analyzer/wireshark/Manifest
20 @@ -1,6 +1,5 @@
21 DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
22 DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433
23 -DIST wireshark-2.4.4.tar.xz 28818372 BLAKE2B 1a28cabdc8dfbed16244c6906ef360c2d3edee3cd75a5134ea7b21b138c3be08de9327a1415cb308f7a01c382e0aa5cf14e4466b4c3762c29a7f7cbc4683890e SHA512 b6625f860a10e10babd686820680a5e169594f171e7e176fc96325255ec096481da2e8a0fdff10b42cead82011740714a4331003dda0d48bf3b419da37834bdc
24 DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
25 DIST wireshark-2.5.0.tar.xz 28197388 BLAKE2B 5d50d3752078a71d1d83f48a85ee564d14950efab39d5679430a61a266f9b93749278cd19d155036326753fbab86f83c5edb764adec5d68325730dbba19a920f SHA512 963c03dd363850cd0ad8a32a3e8c85410f2b23fadc081f00e4e3a2ad3a324a5f35626fbb7e490ec01c61260500363fef93c52bf7796b917e9490fff4044ee67f
26 DIST wireshark-2.5.1.tar.xz 28229472 BLAKE2B ac832e3d8727a20754153949d7dfba9cfbc359955e55c06a9181ecbd3c9d9ddac269a745a430c47907b3e205d1b593241e0908b5b6c232613cbd4d23c96c4f61 SHA512 c3e1abb1c8b6a035640d655c59bfb8a9a846c88f49035b8086ae81a6e74cb296419f15bc4969489208fdce6578d279663c6fbc8d6eebff1b6097d1dbd0e71b75
27
28 diff --git a/net-analyzer/wireshark/wireshark-2.4.4.ebuild b/net-analyzer/wireshark/wireshark-2.4.4.ebuild
29 deleted file mode 100644
30 index c566995b3bb..00000000000
31 --- a/net-analyzer/wireshark/wireshark-2.4.4.ebuild
32 +++ /dev/null
33 @@ -1,293 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
39 -
40 -DESCRIPTION="A network protocol analyzer formerly known as ethereal"
41 -HOMEPAGE="https://www.wireshark.org/"
42 -SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
43 -
44 -LICENSE="GPL-2"
45 -SLOT="0/${PV}"
46 -KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
47 -IUSE="
48 - adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
49 - +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
50 - lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
51 - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
52 - tfshark +tshark +udpdump zlib
53 -"
54 -REQUIRED_USE="
55 - ciscodump? ( libssh )
56 - sshdump? ( libssh )
57 -"
58 -
59 -S=${WORKDIR}/${P/_/}
60 -
61 -CDEPEND="
62 - >=dev-libs/glib-2.14:2
63 - dev-libs/libgcrypt:0
64 - netlink? ( dev-libs/libnl:3 )
65 - adns? ( >=net-dns/c-ares-1.5 )
66 - caps? ( sys-libs/libcap )
67 - geoip? ( dev-libs/geoip )
68 - gtk? (
69 - x11-libs/gdk-pixbuf
70 - x11-libs/gtk+:3
71 - x11-libs/pango
72 - x11-misc/xdg-utils
73 - )
74 - kerberos? ( virtual/krb5 )
75 - libssh? ( >=net-libs/libssh-0.6 )
76 - libxml2? ( dev-libs/libxml2 )
77 - lua? ( >=dev-lang/lua-5.1:* )
78 - lz4? ( app-arch/lz4 )
79 - nghttp2? ( net-libs/nghttp2 )
80 - pcap? ( net-libs/libpcap )
81 - portaudio? ( media-libs/portaudio )
82 - qt5? (
83 - dev-qt/qtcore:5
84 - dev-qt/qtgui:5
85 - dev-qt/qtmultimedia:5
86 - dev-qt/qtprintsupport:5
87 - dev-qt/qtwidgets:5
88 - || (
89 - media-libs/speexdsp
90 - <media-libs/speex-1.2.0
91 - )
92 - x11-misc/xdg-utils
93 - )
94 - sbc? ( media-libs/sbc )
95 - smi? ( net-libs/libsmi )
96 - snappy? ( app-arch/snappy )
97 - spandsp? ( media-libs/spandsp )
98 - ssl? ( net-libs/gnutls:= )
99 - zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
100 -"
101 -# We need perl for `pod2html`. The rest of the perl stuff is to block older
102 -# and broken installs. #455122
103 -DEPEND="
104 - ${CDEPEND}
105 - dev-lang/perl
106 - !<virtual/perl-Pod-Simple-3.170
107 - !<perl-core/Pod-Simple-3.170
108 - doc? (
109 - app-doc/doxygen
110 - app-text/asciidoc
111 - dev-libs/libxml2
112 - dev-libs/libxslt
113 - doc-pdf? ( dev-java/fop )
114 - www-client/lynx
115 - )
116 - qt5? (
117 - dev-qt/linguist-tools:5
118 - )
119 - sys-devel/bison
120 - sys-devel/flex
121 - virtual/pkgconfig
122 -"
123 -RDEPEND="
124 - ${CDEPEND}
125 - gtk? ( virtual/freedesktop-icon-theme )
126 - qt5? ( virtual/freedesktop-icon-theme )
127 - selinux? ( sec-policy/selinux-wireshark )
128 -"
129 -PATCHES=(
130 - "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
131 - "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
132 - "${FILESDIR}"/${PN}-2.4-androiddump.patch
133 - "${FILESDIR}"/${PN}-99999999-androiddump.patch
134 - "${FILESDIR}"/${PN}-2.4.3-libsmi.patch
135 -)
136 -
137 -pkg_setup() {
138 - enewgroup wireshark
139 -}
140 -
141 -src_prepare() {
142 - default
143 -
144 - eautoreconf
145 -}
146 -
147 -src_configure() {
148 - local myconf
149 -
150 - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
151 - # --with-ssl to ./configure. (Mimics code from acinclude.m4).
152 - if use kerberos; then
153 - case $(krb5-config --libs) in
154 - *-lcrypto*)
155 - ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
156 - ewarn "Note there are annoying license incompatibilities between the OpenSSL"
157 - ewarn "license and the GPL, so do your check before distributing such package."
158 - myconf+=( "--with-ssl" )
159 - ;;
160 - esac
161 - fi
162 -
163 - # Enable wireshark binary with any supported GUI toolkit (bug #473188)
164 - if use gtk || use qt5; then
165 - myconf+=( "--enable-wireshark" )
166 - else
167 - myconf+=( "--disable-wireshark" )
168 - fi
169 -
170 - if ! use qt5; then
171 - myconf+=( "--with-qt=no" )
172 - fi
173 -
174 - if use qt5; then
175 - export QT_MIN_VERSION=5.3.0
176 - append-cxxflags -fPIC -DPIC
177 - fi
178 -
179 - # Hack around inability to disable doxygen/fop doc generation
180 - use doc || export ac_cv_prog_HAVE_DOXYGEN=false
181 - use doc-pdf || export ac_cv_prog_HAVE_FOP=false
182 -
183 - econf \
184 - $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
185 - $(use dumpcap && use_with pcap dumpcap-group wireshark) \
186 - $(use_enable androiddump) \
187 - $(use_enable capinfos) \
188 - $(use_enable captype) \
189 - $(use_enable ciscodump) \
190 - $(use_enable dftest) \
191 - $(use_enable dumpcap) \
192 - $(use_enable editcap) \
193 - $(use_enable mergecap) \
194 - $(use_enable randpkt) \
195 - $(use_enable randpktdump) \
196 - $(use_enable reordercap) \
197 - $(use_enable sharkd) \
198 - $(use_enable sshdump) \
199 - $(use_enable text2pcap) \
200 - $(use_enable tfshark) \
201 - $(use_enable tshark) \
202 - $(use_enable udpdump) \
203 - $(use_with adns c-ares) \
204 - $(use_with caps libcap) \
205 - $(use_with geoip) \
206 - $(use_with gtk gtk 3) \
207 - $(use_with kerberos krb5) \
208 - $(use_with libssh) \
209 - $(use_with libxml2) \
210 - $(use_with lua) \
211 - $(use_with lz4) \
212 - $(use_with nghttp2) \
213 - $(use_with pcap) \
214 - $(use_with portaudio) \
215 - $(use_with sbc) \
216 - $(use_with smi libsmi) \
217 - $(use_with snappy) \
218 - $(use_with spandsp) \
219 - $(use_with ssl gnutls) \
220 - $(use_with zlib) \
221 - $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
222 - $(usex netlink --with-libnl=3 --without-libnl) \
223 - $(usex qt5 --with-qt=5 '') \
224 - $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
225 - $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
226 - $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
227 - $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
228 - --disable-profile-build \
229 - --disable-warnings-as-errors \
230 - --sysconfdir="${EPREFIX}"/etc/wireshark \
231 - ${myconf[@]}
232 -}
233 -
234 -src_compile() {
235 - default
236 -
237 - if use doc; then
238 - emake -j1 -C docbook
239 - if use doc-pdf; then
240 - addpredict "/root/.java"
241 - emake -C docbook all-pdf
242 - fi
243 - fi
244 -}
245 -
246 -src_install() {
247 - default
248 -
249 - # FAQ is not required as is installed from help/faq.txt
250 - dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
251 - doc/{randpkt.txt,README*}
252 -
253 - if use doc; then
254 - docinto /usr/share/doc/${PF}/html
255 - dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
256 - if use doc-pdf; then
257 - docinto /usr/share/doc/${PF}/pdf/
258 - dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
259 - fi
260 - fi
261 -
262 - # install headers
263 - local wsheader
264 - for wsheader in \
265 - config.h \
266 - epan/*.h \
267 - epan/crypt/*.h \
268 - epan/dfilter/*.h \
269 - epan/dissectors/*.h \
270 - epan/ftypes/*.h \
271 - epan/wmem/*.h \
272 - register.h \
273 - wiretap/*.h \
274 - ws_diag_control.h \
275 - ws_symbol_export.h \
276 - wsutil/*.h
277 - do
278 - insinto /usr/include/wireshark/$( dirname ${wsheader} )
279 - doins ${wsheader}
280 - done
281 -
282 - #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
283 - insinto /usr/include/wiretap
284 - doins wiretap/wtap.h
285 -
286 - if use gtk || use qt5; then
287 - local c d
288 - for c in hi lo; do
289 - for d in 16 32 48; do
290 - insinto /usr/share/icons/${c}color/${d}x${d}/apps
291 - newins image/${c}${d}-app-wireshark.png wireshark.png
292 - done
293 - done
294 - for d in 16 24 32 48 64 128 256 ; do
295 - insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
296 - newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
297 - done
298 - fi
299 -
300 - prune_libtool_files
301 -}
302 -
303 -pkg_postinst() {
304 - gnome2_icon_cache_update
305 - xdg_desktop_database_update
306 - xdg_mimeinfo_database_update
307 -
308 - # Add group for users allowed to sniff.
309 - enewgroup wireshark
310 -
311 - if use pcap; then
312 - fcaps -o 0 -g wireshark -m 4710 -M 0710 \
313 - cap_dac_read_search,cap_net_raw,cap_net_admin \
314 - "${EROOT}"/usr/bin/dumpcap
315 - fi
316 -
317 - ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
318 - ewarn "add yourself to the wireshark group. This security measure ensures"
319 - ewarn "that only trusted users are allowed to sniff your traffic."
320 -}
321 -
322 -pkg_postrm() {
323 - gnome2_icon_cache_update
324 - xdg_desktop_database_update
325 - xdg_mimeinfo_database_update
326 -}