Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: wireshark-1.11.2-r1.ebuild wireshark-1.11.3_pre5537.ebuild ChangeLog wireshark-1.11.2.ebuild wireshark-1.11.3_pre54663.ebuild
Date: Thu, 06 Feb 2014 12:29:28
Message-Id: 20140206122924.1CFFA2004C@flycatcher.gentoo.org
1 jer 14/02/06 12:29:24
2
3 Modified: ChangeLog
4 Added: wireshark-1.11.2-r1.ebuild
5 wireshark-1.11.3_pre5537.ebuild
6 Removed: wireshark-1.11.2.ebuild
7 wireshark-1.11.3_pre54663.ebuild
8 Log:
9 Version bump. Set dumpcap-group again (bug #490956).
10
11 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
12
13 Revision Changes Path
14 1.585 net-analyzer/wireshark/ChangeLog
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.585&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.585&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.584&r2=1.585
19
20 Index: ChangeLog
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
23 retrieving revision 1.584
24 retrieving revision 1.585
25 diff -u -r1.584 -r1.585
26 --- ChangeLog 12 Jan 2014 13:31:25 -0000 1.584
27 +++ ChangeLog 6 Feb 2014 12:29:23 -0000 1.585
28 @@ -1,6 +1,14 @@
29 # ChangeLog for net-analyzer/wireshark
30 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
31 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.584 2014/01/12 13:31:25 jer Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.585 2014/02/06 12:29:23 jer Exp $
33 +
34 +*wireshark-1.11.3_pre5537 (06 Feb 2014)
35 +*wireshark-1.11.2-r1 (06 Feb 2014)
36 +
37 + 06 Feb 2014; Jeroen Roovers <jer@g.o> -wireshark-1.11.2.ebuild,
38 + +wireshark-1.11.2-r1.ebuild, +wireshark-1.11.3_pre5537.ebuild,
39 + -wireshark-1.11.3_pre54663.ebuild:
40 + Version bump. Set dumpcap-group again (bug #490956).
41
42 12 Jan 2014; Jeroen Roovers <jer@g.o> -wireshark-1.10.3.ebuild,
43 -wireshark-1.8.11.ebuild:
44
45
46
47 1.1 net-analyzer/wireshark/wireshark-1.11.2-r1.ebuild
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.2-r1.ebuild?rev=1.1&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.2-r1.ebuild?rev=1.1&content-type=text/plain
51
52 Index: wireshark-1.11.2-r1.ebuild
53 ===================================================================
54 # Copyright 1999-2014 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.2-r1.ebuild,v 1.1 2014/02/06 12:29:23 jer Exp $
57
58 EAPI=5
59 inherit autotools eutils fcaps user
60
61 [[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
62 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
63 HOMEPAGE="http://www.wireshark.org/"
64 SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2"
65
66 LICENSE="GPL-2"
67 SLOT="0/${PV}"
68 KEYWORDS=""
69 IUSE="
70 adns +caps crypt doc doc-pdf geoip gtk2 +gtk3 ipv6 kerberos libadns lua
71 +netlink +pcap portaudio +qt4 selinux smi ssl zlib
72 "
73 REQUIRED_USE="
74 ?? ( gtk2 gtk3 )
75 ssl? ( crypt )
76 "
77
78 GTK_COMMON_DEPEND="
79 x11-libs/gdk-pixbuf
80 x11-libs/pango
81 x11-misc/xdg-utils
82 "
83 RDEPEND="
84 >=dev-libs/glib-2.14:2
85 netlink? ( dev-libs/libnl )
86 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
87 crypt? ( dev-libs/libgcrypt:0 )
88 caps? ( sys-libs/libcap )
89 geoip? ( dev-libs/geoip )
90 gtk2? (
91 ${GTK_COMMON_DEPEND}
92 >=x11-libs/gtk+-2.4.0:2
93 )
94 gtk3? (
95 ${GTK_COMMON_DEPEND}
96 x11-libs/gtk+:3
97 )
98 kerberos? ( virtual/krb5 )
99 libadns? ( net-libs/adns )
100 lua? ( >=dev-lang/lua-5.1 )
101 pcap? ( net-libs/libpcap[-netlink] )
102 portaudio? ( media-libs/portaudio )
103 qt4? (
104 dev-qt/qtcore:4
105 dev-qt/qtgui:4
106 x11-misc/xdg-utils
107 )
108 selinux? ( sec-policy/selinux-wireshark )
109 smi? ( net-libs/libsmi )
110 ssl? ( net-libs/gnutls )
111 zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
112 "
113
114 DEPEND="
115 ${RDEPEND}
116 doc? (
117 app-doc/doxygen
118 app-text/asciidoc
119 dev-libs/libxml2
120 dev-libs/libxslt
121 doc-pdf? ( dev-java/fop )
122 www-client/lynx
123 )
124 >=virtual/perl-Pod-Simple-3.170.0
125 sys-devel/bison
126 sys-devel/flex
127 virtual/perl-Getopt-Long
128 virtual/perl-Time-Local
129 virtual/pkgconfig
130 "
131
132 S=${WORKDIR}/${MY_P}
133
134 src_prepare() {
135 epatch \
136 "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
137 "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
138 "${FILESDIR}"/${PN}-1.11.2-gtk-deprecated-warnings.patch
139
140 epatch_user
141
142 eautoreconf
143 }
144
145 src_configure() {
146 local myconf
147
148 if use adns; then
149 if use libadns; then
150 myconf+=( "--with-adns --without-c-ares" )
151 else
152 myconf+=( "--without-adns --with-c-ares" )
153 fi
154 else
155 if use libadns; then
156 myconf+=( "--with-adns --without-c-ares" )
157 else
158 myconf+=( "--without-adns --without-c-ares" )
159 fi
160 fi
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 myconf+=( "--with-ssl" )
171 ;;
172 esac
173 fi
174
175 # Enable wireshark binary with any supported GUI toolkit (bug #473188)
176 if use gtk2 || use gtk3 || use qt4 ; then
177 myconf+=( "--enable-wireshark" )
178 else
179 myconf+=( "--disable-wireshark" )
180 fi
181
182 # Hack around inability to disable doxygen/fop doc generation
183 use doc || export ac_cv_prog_HAVE_DOXYGEN=false
184 use doc-pdf || export ac_cv_prog_HAVE_FOP=false
185
186 # dumpcap requires libcap
187 # --disable-profile-build bugs #215806, #292991, #479602
188 econf \
189 $(use_enable ipv6) \
190 $(use_with caps libcap) \
191 $(use_with crypt gcrypt) \
192 $(use_with geoip) \
193 $(use_with gtk2) \
194 $(use_with gtk3) \
195 $(use_with kerberos krb5) \
196 $(use_with lua) \
197 $(use_with netlink libnl) \
198 $(use_with pcap dumpcap-group wireshark) \
199 $(use_with pcap) \
200 $(use_with portaudio) \
201 $(use_with qt4 qt) \
202 $(use_with smi libsmi) \
203 $(use_with ssl gnutls) \
204 $(use_with zlib) \
205 --disable-extra-gcc-checks \
206 --disable-profile-build \
207 --disable-usr-local \
208 --sysconfdir="${EPREFIX}"/etc/wireshark \
209 ${myconf[@]}
210 }
211
212 src_compile() {
213 default
214 use doc && emake -j1 -C docbook
215 }
216
217 src_install() {
218 default
219 if use doc; then
220 dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
221 if use doc-pdf; then
222 insinto /usr/share/doc/${PF}/pdf/
223 doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
224 fi
225 fi
226
227 # FAQ is not required as is installed from help/faq.txt
228 dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
229 doc/{randpkt.txt,README*}
230
231 # install headers
232 local wsheader
233 for wsheader in $( echo $(< debian/wireshark-dev.header-files ) ); do
234 insinto /usr/include/wireshark/$( dirname ${wsheader} )
235 doins ${wsheader}
236 done
237
238 #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
239 insinto /usr/include/wiretap
240 doins wiretap/wtap.h
241
242 if use gtk2 || use gtk3 || use qt4; then
243 local c d
244 for c in hi lo; do
245 for d in 16 32 48; do
246 insinto /usr/share/icons/${c}color/${d}x${d}/apps
247 newins image/${c}${d}-app-wireshark.png wireshark.png
248 done
249 done
250 fi
251
252 if use gtk2 || use gtk3; then
253 domenu wireshark.desktop
254 fi
255
256 if use qt4; then
257 sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
258 domenu wireshark-qt.desktop
259 fi
260
261 prune_libtool_files
262 }
263
264 pkg_postinst() {
265 # Add group for users allowed to sniff.
266 enewgroup wireshark
267
268 if use pcap; then
269 fcaps -o 0 -g wireshark -m 4710 -M 0710 \
270 cap_dac_read_search,cap_net_raw,cap_net_admin \
271 "${EROOT}"/usr/bin/dumpcap
272 fi
273
274 ewarn "NOTE: To run wireshark as normal user you have to add yourself to"
275 ewarn "the wireshark group. This security measure ensures that only trusted"
276 ewarn "users are allowed to sniff your traffic."
277 }
278
279
280
281 1.1 net-analyzer/wireshark/wireshark-1.11.3_pre5537.ebuild
282
283 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.3_pre5537.ebuild?rev=1.1&view=markup
284 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.3_pre5537.ebuild?rev=1.1&content-type=text/plain
285
286 Index: wireshark-1.11.3_pre5537.ebuild
287 ===================================================================
288 # Copyright 1999-2014 Gentoo Foundation
289 # Distributed under the terms of the GNU General Public License v2
290 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.11.3_pre5537.ebuild,v 1.1 2014/02/06 12:29:23 jer Exp $
291
292 EAPI=5
293 inherit autotools eutils fcaps qt4-r2 user
294
295 [[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
296 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
297 HOMEPAGE="http://www.wireshark.org/"
298 SRC_URI="http://www.wireshark.org/download/automated/src/${P/_pre*}-SVN-${PV/*_pre}.tar.bz2"
299
300 LICENSE="GPL-2"
301 SLOT="0/${PV}"
302 KEYWORDS=""
303 IUSE="
304 adns +caps crypt doc doc-pdf geoip gtk2 +gtk3 ipv6 kerberos libadns lua
305 +netlink +pcap portaudio +qt4 selinux smi ssl zlib
306 "
307 REQUIRED_USE="
308 ?? ( gtk2 gtk3 )
309 ssl? ( crypt )
310 "
311
312 GTK_COMMON_DEPEND="
313 x11-libs/gdk-pixbuf
314 x11-libs/pango
315 x11-misc/xdg-utils
316 "
317 RDEPEND="
318 >=dev-libs/glib-2.14:2
319 netlink? ( dev-libs/libnl )
320 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) )
321 crypt? ( dev-libs/libgcrypt:0 )
322 caps? ( sys-libs/libcap )
323 geoip? ( dev-libs/geoip )
324 gtk2? (
325 ${GTK_COMMON_DEPEND}
326 >=x11-libs/gtk+-2.4.0:2
327 )
328 gtk3? (
329 ${GTK_COMMON_DEPEND}
330 x11-libs/gtk+:3
331 )
332 kerberos? ( virtual/krb5 )
333 libadns? ( net-libs/adns )
334 lua? ( >=dev-lang/lua-5.1 )
335 pcap? ( net-libs/libpcap[-netlink] )
336 portaudio? ( media-libs/portaudio )
337 qt4? (
338 dev-qt/qtcore:4
339 dev-qt/qtgui:4
340 x11-misc/xdg-utils
341 )
342 selinux? ( sec-policy/selinux-wireshark )
343 smi? ( net-libs/libsmi )
344 ssl? ( net-libs/gnutls )
345 zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
346 "
347
348 DEPEND="
349 ${RDEPEND}
350 doc? (
351 app-doc/doxygen
352 app-text/asciidoc
353 dev-libs/libxml2
354 dev-libs/libxslt
355 doc-pdf? ( dev-java/fop )
356 www-client/lynx
357 )
358 >=virtual/perl-Pod-Simple-3.170.0
359 sys-devel/bison
360 sys-devel/flex
361 virtual/perl-Getopt-Long
362 virtual/perl-Time-Local
363 virtual/pkgconfig
364 "
365
366 S=${WORKDIR}/${P/_pre*}-SVN-${PV/*_pre}
367
368 src_prepare() {
369 epatch \
370 "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
371 "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
372 "${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch
373
374 # Qt5 support is broken since the build system does not determine
375 # which `moc' it ought to use
376 sed -i -e 's|Qt5||g' acinclude.m4 || die
377
378 epatch_user
379
380 eautoreconf
381 }
382
383 src_configure() {
384 local myconf
385
386 if use adns; then
387 if use libadns; then
388 myconf+=( "--with-adns --without-c-ares" )
389 else
390 myconf+=( "--without-adns --with-c-ares" )
391 fi
392 else
393 if use libadns; then
394 myconf+=( "--with-adns --without-c-ares" )
395 else
396 myconf+=( "--without-adns --without-c-ares" )
397 fi
398 fi
399
400 # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
401 # --with-ssl to ./configure. (Mimics code from acinclude.m4).
402 if use kerberos; then
403 case $(krb5-config --libs) in
404 *-lcrypto*)
405 ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
406 ewarn "Note there are annoying license incompatibilities between the OpenSSL"
407 ewarn "license and the GPL, so do your check before distributing such package."
408 myconf+=( "--with-ssl" )
409 ;;
410 esac
411 fi
412
413 # Enable wireshark binary with any supported GUI toolkit (bug #473188)
414 if use gtk2 || use gtk3 || use qt4 ; then
415 myconf+=( "--enable-wireshark" )
416 else
417 myconf+=( "--disable-wireshark" )
418 fi
419
420 # Hack around inability to disable doxygen/fop doc generation
421 use doc || export ac_cv_prog_HAVE_DOXYGEN=false
422 use doc-pdf || export ac_cv_prog_HAVE_FOP=false
423
424 # dumpcap requires libcap
425 # --disable-profile-build bugs #215806, #292991, #479602
426 econf \
427 $(use_enable ipv6) \
428 $(use_with caps libcap) \
429 $(use_with crypt gcrypt) \
430 $(use_with geoip) \
431 $(use_with gtk2) \
432 $(use_with gtk3) \
433 $(use_with kerberos krb5) \
434 $(use_with lua) \
435 $(use_with netlink libnl) \
436 $(use_with pcap dumpcap-group wireshark) \
437 $(use_with pcap) \
438 $(use_with portaudio) \
439 $(use_with qt4 qt) \
440 $(use_with smi libsmi) \
441 $(use_with ssl gnutls) \
442 $(use_with zlib) \
443 --disable-extra-gcc-checks \
444 --disable-profile-build \
445 --disable-usr-local \
446 --sysconfdir="${EPREFIX}"/etc/wireshark \
447 ${myconf[@]}
448 }
449
450 src_compile() {
451 default
452 use doc && emake -j1 -C docbook
453 }
454
455 src_install() {
456 default
457 if use doc; then
458 dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
459 if use doc-pdf; then
460 insinto /usr/share/doc/${PF}/pdf/
461 doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf
462 fi
463 fi
464
465 # FAQ is not required as is installed from help/faq.txt
466 dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
467 doc/{randpkt.txt,README*}
468
469 # install headers
470 local wsheader
471 for wsheader in $( echo $(< debian/wireshark-dev.header-files ) ); do
472 insinto /usr/include/wireshark/$( dirname ${wsheader} )
473 doins ${wsheader}
474 done
475
476 #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
477 insinto /usr/include/wiretap
478 doins wiretap/wtap.h
479
480 if use gtk2 || use gtk3 || use qt4; then
481 local c d
482 for c in hi lo; do
483 for d in 16 32 48; do
484 insinto /usr/share/icons/${c}color/${d}x${d}/apps
485 newins image/${c}${d}-app-wireshark.png wireshark.png
486 done
487 done
488 fi
489
490 if use gtk2 || use gtk3; then
491 domenu wireshark.desktop
492 fi
493
494 if use qt4; then
495 sed -e '/Exec=/s|wireshark|&-qt|g' wireshark.desktop > wireshark-qt.desktop || die
496 domenu wireshark-qt.desktop
497 fi
498
499 prune_libtool_files
500 }
501
502 pkg_postinst() {
503 # Add group for users allowed to sniff.
504 enewgroup wireshark
505
506 if use pcap; then
507 fcaps -o 0 -g wireshark -m 4710 -M 0710 \
508 cap_dac_read_search,cap_net_raw,cap_net_admin \
509 "${EROOT}"/usr/bin/dumpcap
510 fi
511
512 ewarn "NOTE: To run wireshark as normal user you have to add yourself to"
513 ewarn "the wireshark group. This security measure ensures that only trusted"
514 ewarn "users are allowed to sniff your traffic."
515 }
Report Message
Find on MARC Find on Google Groups