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