1 |
pva 10/05/08 07:24:21 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: wireshark-1.2.8-r1.ebuild |
5 |
Log: |
6 |
Fix failure to capture packets with newer zlib, bug #316835, thank Richard for report. |
7 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.223 net-analyzer/wireshark/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.223&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.223&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.222&r2=1.223 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
19 |
retrieving revision 1.222 |
20 |
retrieving revision 1.223 |
21 |
diff -u -r1.222 -r1.223 |
22 |
--- ChangeLog 6 May 2010 09:14:45 -0000 1.222 |
23 |
+++ ChangeLog 8 May 2010 07:24:21 -0000 1.223 |
24 |
@@ -1,6 +1,13 @@ |
25 |
# ChangeLog for net-analyzer/wireshark |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.222 2010/05/06 09:14:45 pva Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.223 2010/05/08 07:24:21 pva Exp $ |
29 |
+ |
30 |
+*wireshark-1.2.8-r1 (08 May 2010) |
31 |
+ |
32 |
+ 08 May 2010; Peter Volkov <pva@g.o> +wireshark-1.2.8-r1.ebuild, |
33 |
+ +files/wireshark-1.2.8-zlib-1.2.5-capture.patch: |
34 |
+ Fix failure to capture packets with newer zlib, bug #316835, thank Richard |
35 |
+ for report. |
36 |
|
37 |
*wireshark-1.2.8 (06 May 2010) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 net-analyzer/wireshark/wireshark-1.2.8-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.8-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.8-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: wireshark-1.2.8-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2010 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.8-r1.ebuild,v 1.1 2010/05/08 07:24:21 pva Exp $ |
52 |
|
53 |
EAPI=2 |
54 |
inherit autotools libtool flag-o-matic eutils toolchain-funcs |
55 |
|
56 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
57 |
HOMEPAGE="http://www.wireshark.org/" |
58 |
|
59 |
# _rc versions has different download location. |
60 |
[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && { |
61 |
SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz"; |
62 |
S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \ |
63 |
SRC_URI="http://www.wireshark.org/download/src/${P}.tar.gz" |
64 |
|
65 |
LICENSE="GPL-2" |
66 |
SLOT="0" |
67 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
68 |
IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux" |
69 |
|
70 |
RDEPEND=">=dev-libs/glib-2.4.0:2 |
71 |
zlib? ( sys-libs/zlib |
72 |
!=sys-libs/zlib-1.2.4 ) |
73 |
smi? ( net-libs/libsmi ) |
74 |
gtk? ( >=x11-libs/gtk+-2.4.0:2 |
75 |
x11-libs/pango |
76 |
dev-libs/atk ) |
77 |
gnutls? ( net-libs/gnutls ) |
78 |
gcrypt? ( dev-libs/libgcrypt ) |
79 |
pcap? ( net-libs/libpcap ) |
80 |
pcre? ( dev-libs/libpcre ) |
81 |
caps? ( sys-libs/libcap ) |
82 |
kerberos? ( virtual/krb5 ) |
83 |
portaudio? ( media-libs/portaudio ) |
84 |
ares? ( >=net-dns/c-ares-1.5 ) |
85 |
!ares? ( adns? ( net-libs/adns ) ) |
86 |
geoip? ( dev-libs/geoip ) |
87 |
lua? ( >=dev-lang/lua-5.1 ) |
88 |
selinux? ( sec-policy/selinux-wireshark )" |
89 |
|
90 |
DEPEND="${RDEPEND} |
91 |
>=dev-util/pkgconfig-0.15.0 |
92 |
dev-lang/perl |
93 |
sys-devel/bison |
94 |
sys-devel/flex" |
95 |
|
96 |
pkg_setup() { |
97 |
if ! use gtk; then |
98 |
ewarn "USE=-gtk will means no gui called wireshark will be created and" |
99 |
ewarn "only command line utils are available" |
100 |
fi |
101 |
|
102 |
# Add group for users allowed to sniff. |
103 |
enewgroup wireshark |
104 |
} |
105 |
|
106 |
src_prepare() { |
107 |
cd "${S}"/epan # our hardened toolchain bug... |
108 |
epatch "${FILESDIR}/wireshark-except-double-free.diff" |
109 |
|
110 |
cd "${S}" |
111 |
epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch" |
112 |
epatch "${FILESDIR}/${P}-zlib-1.2.5-capture.patch" |
113 |
eautoreconf |
114 |
} |
115 |
|
116 |
src_configure() { |
117 |
local myconf |
118 |
|
119 |
# optimization bug, see bug #165340, bug #40660 |
120 |
if [[ $(gcc-version) == 3.4 ]] ; then |
121 |
elog "Found gcc 3.4, forcing -O3 into CFLAGS" |
122 |
replace-flags -O? -O3 |
123 |
elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then |
124 |
elog "Found <=gcc-3.3, forcing -O into CFLAGS" |
125 |
replace-flags -O? -O |
126 |
fi |
127 |
|
128 |
if use ares && use adns; then |
129 |
einfo "You asked for both, ares and adns, but we can use only one of them." |
130 |
einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)." |
131 |
myconf="$(use_with ares c-ares) --without-adns" |
132 |
else |
133 |
myconf="$(use_with adns) $(use_with ares c-ares)" |
134 |
fi |
135 |
|
136 |
# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001 |
137 |
# our hardened toolchain bug |
138 |
filter-flags -fstack-protector |
139 |
|
140 |
# profile and pie are incompatible #215806, #292991 |
141 |
if use profile; then |
142 |
ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled." |
143 |
append-flags $(test-flags-CC -nopie) |
144 |
fi |
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*) myconf="${myconf} --with-ssl" ;; |
151 |
esac |
152 |
fi |
153 |
|
154 |
# dumpcap requires libcap, setuid-install requires dumpcap |
155 |
econf $(use_enable gtk wireshark) \ |
156 |
$(use_enable profile profile-build) \ |
157 |
$(use_with gnutls) \ |
158 |
$(use_with gcrypt) \ |
159 |
$(use_enable ipv6) \ |
160 |
$(use_enable threads) \ |
161 |
$(use_with lua) \ |
162 |
$(use_with kerberos krb5) \ |
163 |
$(use_with smi libsmi) \ |
164 |
$(use_with pcap) \ |
165 |
$(use_with zlib) \ |
166 |
$(use_with pcre) \ |
167 |
$(use_with geoip) \ |
168 |
$(use_with portaudio) \ |
169 |
$(use_with caps libcap) \ |
170 |
$(use_enable pcap setuid-install) \ |
171 |
--sysconfdir=/etc/wireshark \ |
172 |
${myconf} |
173 |
} |
174 |
|
175 |
src_install() { |
176 |
emake DESTDIR="${D}" install || die "emake install failed" |
177 |
|
178 |
use pcap && fowners 0:wireshark /usr/bin/dumpcap |
179 |
use pcap && fperms 6550 /usr/bin/dumpcap |
180 |
|
181 |
insinto /usr/include/wiretap |
182 |
doins wiretap/wtap.h |
183 |
|
184 |
# FAQ is not required as is installed from help/faq.txt |
185 |
dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt |
186 |
|
187 |
if use gtk; then |
188 |
for c in hi lo; do |
189 |
for d in 16 32 48; do |
190 |
insinto /usr/share/icons/${c}color/${d}x${d}/apps |
191 |
newins image/${c}${d}-app-wireshark.png wireshark.png |
192 |
done |
193 |
done |
194 |
insinto /usr/share/applications |
195 |
doins wireshark.desktop |
196 |
fi |
197 |
} |
198 |
|
199 |
pkg_postinst() { |
200 |
echo |
201 |
ewarn "NOTE: To run wireshark as normal user you have to add yourself into" |
202 |
ewarn "wireshark group. This security measure ensures that only trusted" |
203 |
ewarn "users allowed to sniff your traffic." |
204 |
echo |
205 |
} |