Gentoo Archives: gentoo-commits

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