1 |
pva 08/04/01 19:51:41 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: wireshark-1.0.0.ebuild |
5 |
Removed: wireshark-1.0.0_rc1.ebuild |
6 |
wireshark-1.0.0_rc1-r1.ebuild |
7 |
Log: |
8 |
Version bump, as usual security fixes, bug #215276, thank Robert Buchholz and Christian Faulhammer for report. |
9 |
(Portage version: 2.1.4.4) |
10 |
|
11 |
Revision Changes Path |
12 |
1.92 net-analyzer/wireshark/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.92&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.92&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.91&r2=1.92 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
21 |
retrieving revision 1.91 |
22 |
retrieving revision 1.92 |
23 |
diff -u -r1.91 -r1.92 |
24 |
--- ChangeLog 23 Mar 2008 14:06:28 -0000 1.91 |
25 |
+++ ChangeLog 1 Apr 2008 19:51:40 -0000 1.92 |
26 |
@@ -1,6 +1,16 @@ |
27 |
# ChangeLog for net-analyzer/wireshark |
28 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.91 2008/03/23 14:06:28 pva Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.92 2008/04/01 19:51:40 pva Exp $ |
31 |
+ |
32 |
+*wireshark-1.0.0 (01 Apr 2008) |
33 |
+ |
34 |
+ 01 Apr 2008; Peter Volkov <pva@g.o> |
35 |
+ -files/wireshark-1.0.0_rc1-fix-setcap-EPERM.patch, |
36 |
+ -files/wireshark-1.0.0_rc1-fix-stop-capture.patch, |
37 |
+ -wireshark-1.0.0_rc1.ebuild, -wireshark-1.0.0_rc1-r1.ebuild, |
38 |
+ +wireshark-1.0.0.ebuild: |
39 |
+ Version bump, as usual security fixes, bug #215276, thank Robert Buchholz |
40 |
+ and Christian Faulhammer for report. |
41 |
|
42 |
*wireshark-1.0.0_rc1-r1 (23 Mar 2008) |
43 |
|
44 |
|
45 |
|
46 |
|
47 |
1.1 net-analyzer/wireshark/wireshark-1.0.0.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.0.ebuild?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.0.ebuild?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: wireshark-1.0.0.ebuild |
53 |
=================================================================== |
54 |
# Copyright 1999-2008 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.0.0.ebuild,v 1.1 2008/04/01 19:51:40 pva Exp $ |
57 |
|
58 |
EAPI=1 |
59 |
WANT_AUTOMAKE="1.9" |
60 |
inherit autotools libtool flag-o-matic eutils toolchain-funcs |
61 |
|
62 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
63 |
HOMEPAGE="http://www.wireshark.org/" |
64 |
|
65 |
# _rc versions has different download location. |
66 |
[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && { |
67 |
SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz"; |
68 |
S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \ |
69 |
SRC_URI="http://www.wireshark.org/download/src/all-versions/${P}.tar.bz2" |
70 |
|
71 |
LICENSE="GPL-2" |
72 |
SLOT="0" |
73 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
74 |
IUSE="adns gtk ipv6 lua portaudio gnutls gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux" |
75 |
|
76 |
RDEPEND="zlib? ( sys-libs/zlib ) |
77 |
smi? ( net-libs/libsmi ) |
78 |
gtk? ( >=dev-libs/glib-2.0.4 |
79 |
=x11-libs/gtk+-2* |
80 |
x11-libs/pango |
81 |
dev-libs/atk ) |
82 |
!gtk? ( =dev-libs/glib-1.2* ) |
83 |
gnutls? ( net-libs/gnutls ) |
84 |
gcrypt? ( dev-libs/libgcrypt ) |
85 |
pcap? ( net-libs/libpcap ) |
86 |
pcre? ( dev-libs/libpcre ) |
87 |
caps? ( sys-libs/libcap ) |
88 |
adns? ( net-libs/adns ) |
89 |
kerberos? ( virtual/krb5 ) |
90 |
portaudio? ( media-libs/portaudio ) |
91 |
lua? ( >=dev-lang/lua-5.1 ) |
92 |
selinux? ( sec-policy/selinux-wireshark )" |
93 |
|
94 |
DEPEND="${RDEPEND} |
95 |
>=dev-util/pkgconfig-0.15.0 |
96 |
dev-lang/perl |
97 |
sys-devel/bison |
98 |
sys-devel/flex |
99 |
sys-apps/sed" |
100 |
|
101 |
pkg_setup() { |
102 |
if ! use gtk; then |
103 |
ewarn "USE=-gtk will mean no gui called wireshark will be created and" |
104 |
ewarn "only command line utils are available" |
105 |
fi |
106 |
|
107 |
# Add group for users allowed to sniff. |
108 |
enewgroup wireshark || die "Failed to create wireshark group" |
109 |
} |
110 |
|
111 |
src_unpack() { |
112 |
unpack ${A} |
113 |
|
114 |
cd "${S}" |
115 |
epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch |
116 |
epatch "${FILESDIR}"/${PN}-0.99.8-as-needed.patch |
117 |
|
118 |
cd "${S}"/epan |
119 |
epatch "${FILESDIR}"/wireshark-except-double-free.diff |
120 |
|
121 |
cd "${S}" |
122 |
AT_M4DIR="${S}/aclocal-fallback" |
123 |
eautoreconf |
124 |
} |
125 |
|
126 |
src_compile() { |
127 |
# optimization bug, see bug #165340, bug #40660 |
128 |
if [[ $(gcc-version) == 3.4 ]] ; then |
129 |
elog "Found gcc 3.4, forcing -O3 into CFLAGS" |
130 |
replace-flags -O? -O3 |
131 |
elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then |
132 |
elog "Found <=gcc-3.3, forcing -O into CFLAGS" |
133 |
replace-flags -O? -O |
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 |
local myconf |
141 |
if use gtk; then |
142 |
einfo "Building with gtk support" |
143 |
else |
144 |
einfo "Building without gtk support" |
145 |
myconf="${myconf} --disable-wireshark" |
146 |
fi |
147 |
|
148 |
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass |
149 |
# --with-ssl to ./configure. (Mimics code from acinclude.m4). |
150 |
if use kerberos; then |
151 |
case `krb5-config --libs` in |
152 |
*-lcrypto*) myconf="${myconf} --with-ssl" ;; |
153 |
esac |
154 |
fi |
155 |
|
156 |
# dumpcap requires libcap, setuid-install requires dumpcap |
157 |
econf $(use_enable gtk gtk2) \ |
158 |
$(use_enable profile profile-build) \ |
159 |
$(use_with gnutls) \ |
160 |
$(use_with gcrypt) \ |
161 |
$(use_enable gtk wireshark) \ |
162 |
$(use_enable ipv6) \ |
163 |
$(use_enable threads) \ |
164 |
$(use_with lua) \ |
165 |
$(use_with adns) \ |
166 |
$(use_with kerberos krb5) \ |
167 |
$(use_with smi libsmi) \ |
168 |
$(use_with pcap) \ |
169 |
$(use_with zlib) \ |
170 |
$(use_with pcre) \ |
171 |
$(use_with portaudio) \ |
172 |
$(use_with caps libcap) \ |
173 |
$(use_enable pcap setuid-install) \ |
174 |
--sysconfdir=/etc/wireshark \ |
175 |
${myconf} || die "econf failed" |
176 |
|
177 |
emake || die "emake failed" |
178 |
} |
179 |
|
180 |
src_install() { |
181 |
emake DESTDIR="${D}" install || die "emake install failed" |
182 |
|
183 |
fowners 0:wireshark /usr/bin/tshark |
184 |
fperms 6550 /usr/bin/tshark |
185 |
use pcap && fowners 0:wireshark /usr/bin/dumpcap |
186 |
use pcap && fperms 6550 /usr/bin/dumpcap |
187 |
|
188 |
insinto /usr/include/wiretap |
189 |
doins wiretap/wtap.h |
190 |
|
191 |
# FAQ is not required as is installed from help/faq.txt |
192 |
dodoc AUTHORS ChangeLog NEWS README{,bsd,linux,macos,vmware} doc/randpkt.txt |
193 |
|
194 |
if use gtk ; then |
195 |
insinto /usr/share/icons/hicolor/16x16/apps |
196 |
newins image/hi16-app-wireshark.png wireshark.png |
197 |
insinto /usr/share/icons/hicolor/32x32/apps |
198 |
newins image/hi32-app-wireshark.png wireshark.png |
199 |
insinto /usr/share/icons/hicolor/48x48/apps |
200 |
newins image/hi48-app-wireshark.png wireshark.png |
201 |
insinto /usr/share/applications |
202 |
doins wireshark.desktop |
203 |
fi |
204 |
} |
205 |
|
206 |
pkg_postinst() { |
207 |
echo |
208 |
ewarn "With version 0.99.7, all function calls that require elevated privileges" |
209 |
ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE" |
210 |
ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT." |
211 |
ewarn |
212 |
ewarn "NOTE: To run wireshark as normal user you have to add yourself into" |
213 |
ewarn "wireshark group. This security measure ensures that only trusted" |
214 |
ewarn "users allowed to sniff your traffic." |
215 |
echo |
216 |
if use caps && use gtk; then |
217 |
# http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2228 |
218 |
elog "Setting cap_kill on /usr/bin/wireshark" |
219 |
setcap cap_kill=ep /usr/bin/wireshark |
220 |
fi |
221 |
} |
222 |
|
223 |
|
224 |
|
225 |
-- |
226 |
gentoo-commits@l.g.o mailing list |