1 |
jer 13/05/23 15:49:03 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: wireshark-1.10.0_rc2.ebuild |
5 |
Removed: wireshark-1.10.0_rc1.ebuild |
6 |
Log: |
7 |
Version bump. |
8 |
|
9 |
(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
10 |
|
11 |
Revision Changes Path |
12 |
1.493 net-analyzer/wireshark/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.493&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.493&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.492&r2=1.493 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
21 |
retrieving revision 1.492 |
22 |
retrieving revision 1.493 |
23 |
diff -u -r1.492 -r1.493 |
24 |
--- ChangeLog 20 May 2013 12:52:26 -0000 1.492 |
25 |
+++ ChangeLog 23 May 2013 15:49:03 -0000 1.493 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for net-analyzer/wireshark |
28 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.492 2013/05/20 12:52:26 ago Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.493 2013/05/23 15:49:03 jer Exp $ |
31 |
+ |
32 |
+*wireshark-1.10.0_rc2 (23 May 2013) |
33 |
+ |
34 |
+ 23 May 2013; Jeroen Roovers <jer@g.o> -wireshark-1.10.0_rc1.ebuild, |
35 |
+ +wireshark-1.10.0_rc2.ebuild, -files/wireshark-1.10.0-pkg-config.patch: |
36 |
+ Version bump. |
37 |
|
38 |
20 May 2013; Agostino Sarubbo <ago@g.o> wireshark-1.6.15.ebuild, |
39 |
wireshark-1.8.7.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.1 net-analyzer/wireshark/wireshark-1.10.0_rc2.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.0_rc2.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.0_rc2.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: wireshark-1.10.0_rc2.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2013 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.0_rc2.ebuild,v 1.1 2013/05/23 15:49:03 jer Exp $ |
53 |
|
54 |
EAPI=5 |
55 |
PYTHON_COMPAT=( python2_5 python2_6 python2_7 ) |
56 |
inherit autotools eutils fcaps flag-o-matic python-single-r1 user |
57 |
|
58 |
[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P} |
59 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
60 |
HOMEPAGE="http://www.wireshark.org/" |
61 |
SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2" |
62 |
|
63 |
LICENSE="GPL-2" |
64 |
SLOT="0/${PV}" |
65 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
66 |
IUSE=" |
67 |
adns +caps crypt doc doc-pdf geoip gtk ipv6 kerberos libadns lua |
68 |
+netlink +pcap portaudio profile python selinux smi ssl zlib |
69 |
" |
70 |
REQUIRED_USE=" |
71 |
ssl? ( crypt ) |
72 |
" |
73 |
|
74 |
RDEPEND=" |
75 |
>=dev-libs/glib-2.14:2 |
76 |
netlink? ( dev-libs/libnl ) |
77 |
adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) |
78 |
crypt? ( dev-libs/libgcrypt ) |
79 |
caps? ( sys-libs/libcap ) |
80 |
geoip? ( dev-libs/geoip ) |
81 |
gtk? ( |
82 |
>=x11-libs/gtk+-2.4.0:2 |
83 |
dev-libs/atk |
84 |
x11-libs/pango |
85 |
x11-misc/xdg-utils |
86 |
) |
87 |
kerberos? ( virtual/krb5 ) |
88 |
libadns? ( net-libs/adns ) |
89 |
lua? ( >=dev-lang/lua-5.1 ) |
90 |
pcap? ( net-libs/libpcap[-netlink] ) |
91 |
portaudio? ( media-libs/portaudio ) |
92 |
python? ( ${PYTHON_DEPS} ) |
93 |
selinux? ( sec-policy/selinux-wireshark ) |
94 |
smi? ( net-libs/libsmi ) |
95 |
ssl? ( net-libs/gnutls ) |
96 |
zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) |
97 |
" |
98 |
|
99 |
DEPEND=" |
100 |
${RDEPEND} |
101 |
doc? ( |
102 |
app-doc/doxygen |
103 |
app-text/asciidoc |
104 |
dev-libs/libxml2 |
105 |
dev-libs/libxslt |
106 |
doc-pdf? ( dev-java/fop ) |
107 |
www-client/lynx |
108 |
) |
109 |
>=virtual/perl-Pod-Simple-3.170.0 |
110 |
sys-apps/sed |
111 |
sys-devel/bison |
112 |
sys-devel/flex |
113 |
virtual/perl-Getopt-Long |
114 |
virtual/perl-Time-Local |
115 |
virtual/pkgconfig |
116 |
" |
117 |
|
118 |
S=${WORKDIR}/${MY_P} |
119 |
|
120 |
pkg_setup() { |
121 |
if ! use gtk; then |
122 |
ewarn "USE=-gtk disables gtk-based gui called wireshark." |
123 |
ewarn "Only command line utils will be built available" |
124 |
fi |
125 |
|
126 |
if use python; then |
127 |
python-single-r1_pkg_setup |
128 |
fi |
129 |
} |
130 |
|
131 |
src_prepare() { |
132 |
epatch \ |
133 |
"${FILESDIR}"/${PN}-1.6.13-ldflags.patch |
134 |
|
135 |
sed -i \ |
136 |
-e '/^Icon/s|.png||g' \ |
137 |
-e '/^MimeType.*[[:alnum:]]$/s|$|;|g' \ |
138 |
${PN}.desktop || die |
139 |
|
140 |
eautoreconf |
141 |
} |
142 |
|
143 |
src_configure() { |
144 |
local myconf |
145 |
|
146 |
# profile and pie are incompatible #215806, #292991 |
147 |
if use profile; then |
148 |
ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled." |
149 |
ewarn "Also ignore \"unrecognized option '-nopie'\" gcc warning #358101." |
150 |
append-flags $(test-flags-CC -nopie) |
151 |
fi |
152 |
|
153 |
if use adns; then |
154 |
if use libadns; then |
155 |
myconf+=( "--with-adns --without-c-ares" ) |
156 |
else |
157 |
myconf+=( "--without-adns --with-c-ares" ) |
158 |
fi |
159 |
else |
160 |
if use libadns; then |
161 |
myconf+=( "--with-adns --without-c-ares" ) |
162 |
else |
163 |
myconf+=( "--without-adns --without-c-ares" ) |
164 |
fi |
165 |
fi |
166 |
|
167 |
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass |
168 |
# --with-ssl to ./configure. (Mimics code from acinclude.m4). |
169 |
if use kerberos; then |
170 |
case $(krb5-config --libs) in |
171 |
*-lcrypto*) |
172 |
ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." |
173 |
ewarn "Note there are annoying license incompatibilities between the OpenSSL" |
174 |
ewarn "license and the GPL, so do your check before distributing such package." |
175 |
myconf+=( "--with-ssl" ) |
176 |
;; |
177 |
esac |
178 |
fi |
179 |
|
180 |
# Hack around inability to disable doxygen/fop doc generation |
181 |
use doc || export ac_cv_prog_HAVE_DOXYGEN=false |
182 |
use doc-pdf || export ac_cv_prog_HAVE_FOP=false |
183 |
|
184 |
# dumpcap requires libcap, setuid-install requires dumpcap |
185 |
econf \ |
186 |
$(use pcap && use_enable !caps setuid-install) \ |
187 |
$(use pcap && use_enable caps setcap-install) \ |
188 |
$(use_enable gtk wireshark) \ |
189 |
$(use_enable ipv6) \ |
190 |
$(use_enable profile profile-build) \ |
191 |
$(use_with netlink libnl) \ |
192 |
$(use_with crypt gcrypt) \ |
193 |
$(use_with caps libcap) \ |
194 |
$(use_with geoip) \ |
195 |
$(use_with kerberos krb5) \ |
196 |
$(use_with lua) \ |
197 |
$(use_with pcap dumpcap-group wireshark) \ |
198 |
$(use_with pcap) \ |
199 |
$(use_with portaudio) \ |
200 |
$(use_with python) \ |
201 |
$(use_with smi libsmi) \ |
202 |
$(use_with ssl gnutls) \ |
203 |
$(use_with zlib) \ |
204 |
--disable-extra-gcc-checks \ |
205 |
--disable-usr-local \ |
206 |
--sysconfdir="${EPREFIX}"/etc/wireshark \ |
207 |
${myconf[@]} |
208 |
} |
209 |
|
210 |
src_compile() { |
211 |
default |
212 |
use doc && emake -j1 -C docbook |
213 |
} |
214 |
|
215 |
src_install() { |
216 |
default |
217 |
if use doc; then |
218 |
dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}} |
219 |
if use doc-pdf; then |
220 |
insinto /usr/share/doc/${PF}/pdf/ |
221 |
doins docbook/{{developer,user}-guide,release-notes}-{a4,us}.pdf |
222 |
fi |
223 |
fi |
224 |
|
225 |
# FAQ is not required as is installed from help/faq.txt |
226 |
dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \ |
227 |
doc/{randpkt.txt,README*} |
228 |
|
229 |
# install headers |
230 |
local wsheader |
231 |
for wsheader in $( echo $(< debian/wireshark-dev.header-files ) ); do |
232 |
insinto /usr/include/wireshark/$( dirname ${wsheader} ) |
233 |
doins ${wsheader} |
234 |
done |
235 |
|
236 |
#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/ |
237 |
insinto /usr/include/wiretap |
238 |
doins wiretap/wtap.h |
239 |
|
240 |
if use gtk; then |
241 |
for c in hi lo; do |
242 |
for d in 16 32 48; do |
243 |
insinto /usr/share/icons/${c}color/${d}x${d}/apps |
244 |
newins image/${c}${d}-app-wireshark.png wireshark.png |
245 |
done |
246 |
done |
247 |
domenu wireshark.desktop |
248 |
fi |
249 |
|
250 |
use pcap && chmod o-x "${ED}"/usr/bin/dumpcap #357237 |
251 |
|
252 |
if use python; then |
253 |
python_optimize "${ED}"/usr/lib*/wireshark/python |
254 |
fi |
255 |
} |
256 |
|
257 |
pkg_postinst() { |
258 |
# Add group for users allowed to sniff. |
259 |
enewgroup wireshark |
260 |
|
261 |
if use pcap; then |
262 |
fcaps -o 0 -g wireshark -m 4550 -M 0750 \ |
263 |
cap_dac_read_search,cap_net_raw,cap_net_admin \ |
264 |
"${EROOT}"/usr/bin/dumpcap |
265 |
fi |
266 |
|
267 |
ewarn "NOTE: To run wireshark as normal user you have to add yourself to" |
268 |
ewarn "the wireshark group. This security measure ensures that only trusted" |
269 |
ewarn "users are allowed to sniff your traffic." |
270 |
} |