1 |
jer 13/07/30 14:20:09 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: wireshark-1.10.1.ebuild wireshark-1.8.9.ebuild |
5 |
Removed: wireshark-1.10.0-r1.ebuild wireshark-1.6.16.ebuild |
6 |
wireshark-1.10.0.ebuild |
7 |
Log: |
8 |
Version bump (bug #478694). |
9 |
|
10 |
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
11 |
|
12 |
Revision Changes Path |
13 |
1.519 net-analyzer/wireshark/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.519&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.519&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.518&r2=1.519 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
22 |
retrieving revision 1.518 |
23 |
retrieving revision 1.519 |
24 |
diff -u -r1.518 -r1.519 |
25 |
--- ChangeLog 13 Jun 2013 14:00:05 -0000 1.518 |
26 |
+++ ChangeLog 30 Jul 2013 14:20:09 -0000 1.519 |
27 |
@@ -1,6 +1,14 @@ |
28 |
# ChangeLog for net-analyzer/wireshark |
29 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.518 2013/06/13 14:00:05 jer Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.519 2013/07/30 14:20:09 jer Exp $ |
32 |
+ |
33 |
+*wireshark-1.10.1 (30 Jul 2013) |
34 |
+*wireshark-1.8.9 (30 Jul 2013) |
35 |
+ |
36 |
+ 30 Jul 2013; Jeroen Roovers <jer@g.o> -wireshark-1.6.16.ebuild, |
37 |
+ +wireshark-1.8.9.ebuild, -wireshark-1.10.0.ebuild, |
38 |
+ -wireshark-1.10.0-r1.ebuild, +wireshark-1.10.1.ebuild: |
39 |
+ Version bump (bug #478694). |
40 |
|
41 |
13 Jun 2013; Jeroen Roovers <jer@g.o> wireshark-1.10.0-r1.ebuild: |
42 |
Fix building with USE="gtk -qt4" by Lars Wendler (bug #473188 by Nikita |
43 |
|
44 |
|
45 |
|
46 |
1.1 net-analyzer/wireshark/wireshark-1.10.1.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1.ebuild?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1.ebuild?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: wireshark-1.10.1.ebuild |
52 |
=================================================================== |
53 |
# Copyright 1999-2013 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1.ebuild,v 1.1 2013/07/30 14:20:09 jer Exp $ |
56 |
|
57 |
EAPI=5 |
58 |
inherit autotools eutils fcaps flag-o-matic user |
59 |
|
60 |
[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P} |
61 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
62 |
HOMEPAGE="http://www.wireshark.org/" |
63 |
SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2" |
64 |
|
65 |
LICENSE="GPL-2" |
66 |
SLOT="0/${PV}" |
67 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
68 |
IUSE=" |
69 |
adns +caps crypt doc doc-pdf geoip +gtk ipv6 kerberos libadns lua |
70 |
+netlink +pcap portaudio profile qt4 selinux smi ssl zlib |
71 |
" |
72 |
REQUIRED_USE=" |
73 |
ssl? ( crypt ) |
74 |
gtk? ( !qt4 ) |
75 |
" |
76 |
|
77 |
RDEPEND=" |
78 |
>=dev-libs/glib-2.14:2 |
79 |
netlink? ( dev-libs/libnl ) |
80 |
adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) |
81 |
crypt? ( dev-libs/libgcrypt ) |
82 |
caps? ( sys-libs/libcap ) |
83 |
geoip? ( dev-libs/geoip ) |
84 |
gtk? ( |
85 |
>=x11-libs/gtk+-2.4.0:2 |
86 |
dev-libs/atk |
87 |
x11-libs/pango |
88 |
x11-misc/xdg-utils |
89 |
) |
90 |
kerberos? ( virtual/krb5 ) |
91 |
libadns? ( net-libs/adns ) |
92 |
lua? ( >=dev-lang/lua-5.1 ) |
93 |
pcap? ( net-libs/libpcap[-netlink] ) |
94 |
portaudio? ( media-libs/portaudio ) |
95 |
qt4? ( |
96 |
dev-qt/qtcore:4 |
97 |
dev-qt/qtgui:4 |
98 |
x11-misc/xdg-utils |
99 |
) |
100 |
selinux? ( sec-policy/selinux-wireshark ) |
101 |
smi? ( net-libs/libsmi ) |
102 |
ssl? ( net-libs/gnutls ) |
103 |
zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) |
104 |
" |
105 |
|
106 |
DEPEND=" |
107 |
${RDEPEND} |
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 |
>=virtual/perl-Pod-Simple-3.170.0 |
117 |
sys-devel/bison |
118 |
sys-devel/flex |
119 |
virtual/perl-Getopt-Long |
120 |
virtual/perl-Time-Local |
121 |
virtual/pkgconfig |
122 |
" |
123 |
|
124 |
S=${WORKDIR}/${MY_P} |
125 |
|
126 |
pkg_setup() { |
127 |
# Add group for users allowed to sniff. |
128 |
enewgroup wireshark |
129 |
} |
130 |
|
131 |
src_prepare() { |
132 |
epatch \ |
133 |
"${FILESDIR}"/${PN}-1.6.13-ldflags.patch |
134 |
|
135 |
eautoreconf |
136 |
} |
137 |
|
138 |
src_configure() { |
139 |
local myconf |
140 |
|
141 |
# profile and pie are incompatible #215806, #292991 |
142 |
if use profile; then |
143 |
ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled." |
144 |
ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101." |
145 |
append-flags $(test-flags-CC -nopie) |
146 |
fi |
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 gtk || 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, setuid-install requires dumpcap |
187 |
econf \ |
188 |
$(use pcap && use_enable !caps setuid-install) \ |
189 |
$(use pcap && use_enable caps setcap-install) \ |
190 |
$(use_enable ipv6) \ |
191 |
$(use_enable profile profile-build) \ |
192 |
$(use_with caps libcap) \ |
193 |
$(use_with crypt gcrypt) \ |
194 |
$(use_with geoip) \ |
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-usr-local \ |
207 |
--sysconfdir="${EPREFIX}"/etc/wireshark \ |
208 |
${myconf[@]} |
209 |
} |
210 |
|
211 |
src_compile() { |
212 |
default |
213 |
use doc && emake -j1 -C docbook |
214 |
} |
215 |
|
216 |
src_install() { |
217 |
default |
218 |
if use doc; then |
219 |
dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}} |
220 |
if use doc-pdf; then |
221 |
insinto /usr/share/doc/${PF}/pdf/ |
222 |
doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf |
223 |
fi |
224 |
fi |
225 |
|
226 |
# FAQ is not required as is installed from help/faq.txt |
227 |
dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \ |
228 |
doc/{randpkt.txt,README*} |
229 |
|
230 |
# install headers |
231 |
local wsheader |
232 |
for wsheader in $( echo $(< debian/wireshark-dev.header-files ) ); do |
233 |
insinto /usr/include/wireshark/$( dirname ${wsheader} ) |
234 |
doins ${wsheader} |
235 |
done |
236 |
|
237 |
#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/ |
238 |
insinto /usr/include/wiretap |
239 |
doins wiretap/wtap.h |
240 |
|
241 |
if use gtk || use qt4; then |
242 |
for c in hi lo; do |
243 |
for d in 16 32 48; do |
244 |
insinto /usr/share/icons/${c}color/${d}x${d}/apps |
245 |
newins image/${c}${d}-app-wireshark.png wireshark.png |
246 |
done |
247 |
done |
248 |
domenu wireshark.desktop |
249 |
fi |
250 |
|
251 |
use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237 |
252 |
} |
253 |
|
254 |
pkg_postinst() { |
255 |
# Add group for users allowed to sniff. |
256 |
enewgroup wireshark |
257 |
|
258 |
if use pcap; then |
259 |
fcaps -o 0 -g wireshark -m 4550 -M 0750 \ |
260 |
cap_dac_read_search,cap_net_raw,cap_net_admin \ |
261 |
"${EROOT}"/usr/bin/dumpcap |
262 |
fi |
263 |
|
264 |
ewarn "NOTE: To run wireshark as normal user you have to add yourself to" |
265 |
ewarn "the wireshark group. This security measure ensures that only trusted" |
266 |
ewarn "users are allowed to sniff your traffic." |
267 |
} |
268 |
|
269 |
|
270 |
|
271 |
1.1 net-analyzer/wireshark/wireshark-1.8.9.ebuild |
272 |
|
273 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.9.ebuild?rev=1.1&view=markup |
274 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.9.ebuild?rev=1.1&content-type=text/plain |
275 |
|
276 |
Index: wireshark-1.8.9.ebuild |
277 |
=================================================================== |
278 |
# Copyright 1999-2013 Gentoo Foundation |
279 |
# Distributed under the terms of the GNU General Public License v2 |
280 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.9.ebuild,v 1.1 2013/07/30 14:20:09 jer Exp $ |
281 |
|
282 |
EAPI=5 |
283 |
PYTHON_COMPAT=( python2_5 python2_6 python2_7 ) |
284 |
inherit autotools eutils fcaps flag-o-matic python-single-r1 user |
285 |
|
286 |
[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P} |
287 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
288 |
HOMEPAGE="http://www.wireshark.org/" |
289 |
SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2" |
290 |
|
291 |
LICENSE="GPL-2" |
292 |
SLOT="0/${PV}" |
293 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
294 |
IUSE=" |
295 |
adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua +pcap |
296 |
portaudio profile python selinux smi ssl zlib |
297 |
" |
298 |
REQUIRED_USE=" |
299 |
ssl? ( crypt ) |
300 |
" |
301 |
RDEPEND=" |
302 |
>=dev-libs/glib-2.14:2 |
303 |
adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) |
304 |
caps? ( sys-libs/libcap ) |
305 |
crypt? ( dev-libs/libgcrypt ) |
306 |
geoip? ( dev-libs/geoip ) |
307 |
gtk? ( |
308 |
>=x11-libs/gtk+-2.4.0:2 |
309 |
dev-libs/atk |
310 |
x11-libs/pango |
311 |
x11-misc/xdg-utils |
312 |
) |
313 |
kerberos? ( virtual/krb5 ) |
314 |
libadns? ( net-libs/adns ) |
315 |
lua? ( <dev-lang/lua-5.2 ) |
316 |
pcap? ( net-libs/libpcap ) |
317 |
portaudio? ( media-libs/portaudio ) |
318 |
python? ( ${PYTHON_DEPS} ) |
319 |
selinux? ( sec-policy/selinux-wireshark ) |
320 |
smi? ( net-libs/libsmi ) |
321 |
ssl? ( net-libs/gnutls ) |
322 |
zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) |
323 |
" |
324 |
|
325 |
DEPEND=" |
326 |
${RDEPEND} |
327 |
doc? ( |
328 |
app-doc/doxygen |
329 |
dev-libs/libxml2 |
330 |
dev-libs/libxslt |
331 |
doc-pdf? ( dev-java/fop ) |
332 |
) |
333 |
>=virtual/perl-Pod-Simple-3.170.0 |
334 |
sys-devel/bison |
335 |
sys-devel/flex |
336 |
virtual/perl-Getopt-Long |
337 |
virtual/perl-Time-Local |
338 |
virtual/pkgconfig |
339 |
" |
340 |
|
341 |
S=${WORKDIR}/${MY_P} |
342 |
|
343 |
pkg_setup() { |
344 |
if ! use gtk; then |
345 |
ewarn "USE=-gtk disables gtk-based gui called wireshark." |
346 |
ewarn "Only command line utils will be built available" |
347 |
fi |
348 |
|
349 |
if use python; then |
350 |
python-single-r1_pkg_setup |
351 |
fi |
352 |
|
353 |
# Add group for users allowed to sniff. |
354 |
enewgroup wireshark |
355 |
} |
356 |
|
357 |
src_prepare() { |
358 |
epatch "${FILESDIR}"/${PN}-1.6.13-ldflags.patch |
359 |
|
360 |
sed -i -e '/^Icon/s|.png||g' ${PN}.desktop || die |
361 |
|
362 |
eautoreconf |
363 |
} |
364 |
|
365 |
src_configure() { |
366 |
local myconf |
367 |
|
368 |
# profile and pie are incompatible #215806, #292991 |
369 |
if use profile; then |
370 |
ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled." |
371 |
ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101." |
372 |
append-flags $(test-flags-CC -nopie) |
373 |
fi |
374 |
|
375 |
if use adns; then |
376 |
if use libadns; then |
377 |
myconf+=( "--with-adns --without-c-ares" ) |
378 |
else |
379 |
myconf+=( "--without-adns --with-c-ares" ) |
380 |
fi |
381 |
else |
382 |
if use libadns; then |
383 |
myconf+=( "--with-adns --without-c-ares" ) |
384 |
else |
385 |
myconf+=( "--without-adns --without-c-ares" ) |
386 |
fi |
387 |
fi |
388 |
|
389 |
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass |
390 |
# --with-ssl to ./configure. (Mimics code from acinclude.m4). |
391 |
if use kerberos; then |
392 |
case `krb5-config --libs` in |
393 |
*-lcrypto*) |
394 |
ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." |
395 |
ewarn "Note there are annoying license incompatibilities between the OpenSSL" |
396 |
ewarn "license and the GPL, so do your check before distributing such package." |
397 |
myconf+=( "--with-ssl" ) |
398 |
;; |
399 |
esac |
400 |
fi |
401 |
|
402 |
# Hack around inability to disable doxygen/fop doc generation |
403 |
use doc || export ac_cv_prog_HAVE_DOXYGEN=false |
404 |
use doc-pdf || export ac_cv_prog_HAVE_FOP=false |
405 |
|
406 |
# dumpcap requires libcap, setuid-install requires dumpcap |
407 |
econf \ |
408 |
$(use pcap && use_enable !caps setuid-install) \ |
409 |
$(use pcap && use_enable caps setcap-install) \ |
410 |
$(use_enable gtk wireshark) \ |
411 |
$(use_enable ipv6) \ |
412 |
$(use_enable profile profile-build) \ |
413 |
$(use_with crypt gcrypt) \ |
414 |
$(use_with caps libcap) \ |
415 |
$(use_with geoip) \ |
416 |
$(use_with kerberos krb5) \ |
417 |
$(use_with lua) \ |
418 |
$(use_with pcap dumpcap-group wireshark) \ |
419 |
$(use_with pcap) \ |
420 |
$(use_with portaudio) \ |
421 |
$(use_with python) \ |
422 |
$(use_with smi libsmi) \ |
423 |
$(use_with ssl gnutls) \ |
424 |
$(use_with zlib) \ |
425 |
--disable-extra-gcc-checks \ |
426 |
--disable-usr-local \ |
427 |
--sysconfdir="${EPREFIX}"/etc/wireshark \ |
428 |
${myconf[@]} |
429 |
} |
430 |
|
431 |
src_compile() { |
432 |
default |
433 |
use doc && emake -C docbook |
434 |
} |
435 |
|
436 |
src_install() { |
437 |
default |
438 |
if use doc; then |
439 |
dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}} |
440 |
if use doc-pdf; then |
441 |
insinto /usr/share/doc/${PF}/pdf/ |
442 |
doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf |
443 |
fi |
444 |
fi |
445 |
|
446 |
# FAQ is not required as is installed from help/faq.txt |
447 |
dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \ |
448 |
doc/{randpkt.txt,README*} |
449 |
|
450 |
# install headers |
451 |
local wsheader |
452 |
for wsheader in $( echo $(< debian/wireshark-dev.header-files ) ); do |
453 |
insinto /usr/include/wireshark/$( dirname ${wsheader} ) |
454 |
doins ${wsheader} |
455 |
done |
456 |
|
457 |
#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/ |
458 |
insinto /usr/include/wiretap |
459 |
doins wiretap/wtap.h |
460 |
|
461 |
if use gtk; then |
462 |
for c in hi lo; do |
463 |
for d in 16 32 48; do |
464 |
insinto /usr/share/icons/${c}color/${d}x${d}/apps |
465 |
newins image/${c}${d}-app-wireshark.png wireshark.png |
466 |
done |
467 |
done |
468 |
domenu wireshark.desktop |
469 |
fi |
470 |
|
471 |
use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237 |
472 |
|
473 |
if use python; then |
474 |
python_optimize "${ED}"/usr/lib*/wireshark/python |
475 |
fi |
476 |
} |
477 |
|
478 |
pkg_postinst() { |
479 |
# Add group for users allowed to sniff. |
480 |
enewgroup wireshark |
481 |
|
482 |
if use pcap; then |
483 |
fcaps -o 0 -g wireshark -m 4550 -M 0750 \ |
484 |
cap_dac_read_search,cap_net_raw,cap_net_admin \ |
485 |
"${EROOT}"/usr/bin/dumpcap |
486 |
fi |
487 |
|
488 |
ewarn "NOTE: To run wireshark as normal user you have to add yourself to" |
489 |
ewarn "the wireshark group. This security measure ensures that only trusted" |
490 |
ewarn "users are allowed to sniff your traffic." |
491 |
} |