1 |
pva 08/07/03 09:51:17 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: wireshark-1.0.1.ebuild |
5 |
Removed: wireshark-0.99.8.ebuild |
6 |
Log: |
7 |
Version bump, bug #230411, thank 7v5w7go9ub0o for report. |
8 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.22-ovz005 i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.101 net-analyzer/wireshark/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.101&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.101&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.100&r2=1.101 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
20 |
retrieving revision 1.100 |
21 |
retrieving revision 1.101 |
22 |
diff -u -r1.100 -r1.101 |
23 |
--- ChangeLog 10 Apr 2008 05:54:31 -0000 1.100 |
24 |
+++ ChangeLog 3 Jul 2008 09:51:16 -0000 1.101 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for net-analyzer/wireshark |
27 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.100 2008/04/10 05:54:31 pva Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.101 2008/07/03 09:51:16 pva Exp $ |
30 |
+ |
31 |
+*wireshark-1.0.1 (03 Jul 2008) |
32 |
+ |
33 |
+ 03 Jul 2008; Peter Volkov <pva@g.o> |
34 |
+ -files/wireshark-0.99.8-libpcap-compile.patch, -wireshark-0.99.8.ebuild, |
35 |
+ +wireshark-1.0.1.ebuild: |
36 |
+ Version bump, bug #230411, thank 7v5w7go9ub0o for report. |
37 |
|
38 |
10 Apr 2008; Peter Volkov <pva@g.o> wireshark-1.0.0.ebuild: |
39 |
cap_kill is not required in wireshark-1.0.0, bug #217061, thank Justin |
40 |
|
41 |
|
42 |
|
43 |
1.1 net-analyzer/wireshark/wireshark-1.0.1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.1.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.0.1.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: wireshark-1.0.1.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2008 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.0.1.ebuild,v 1.1 2008/07/03 09:51:16 pva Exp $ |
53 |
|
54 |
EAPI=1 |
55 |
WANT_AUTOMAKE="1.9" |
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/all-versions/${P}.tar.bz2" |
66 |
|
67 |
LICENSE="GPL-2" |
68 |
SLOT="0" |
69 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
70 |
IUSE="adns gtk ipv6 lua portaudio gnutls gcrypt zlib kerberos threads profile smi +pcap pcre +caps selinux" |
71 |
|
72 |
RDEPEND="zlib? ( sys-libs/zlib ) |
73 |
smi? ( net-libs/libsmi ) |
74 |
gtk? ( >=dev-libs/glib-2.0.4 |
75 |
=x11-libs/gtk+-2* |
76 |
x11-libs/pango |
77 |
dev-libs/atk ) |
78 |
!gtk? ( =dev-libs/glib-1.2* ) |
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 |
adns? ( net-libs/adns ) |
85 |
kerberos? ( virtual/krb5 ) |
86 |
portaudio? ( media-libs/portaudio ) |
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 |
sys-apps/sed" |
96 |
|
97 |
pkg_setup() { |
98 |
if ! use gtk; then |
99 |
ewarn "USE=-gtk will mean no gui called wireshark will be created and" |
100 |
ewarn "only command line utils are available" |
101 |
fi |
102 |
|
103 |
# Add group for users allowed to sniff. |
104 |
enewgroup wireshark || die "Failed to create wireshark group" |
105 |
} |
106 |
|
107 |
src_unpack() { |
108 |
unpack ${A} |
109 |
|
110 |
# Try to drop --as-needed patches for 1.0.1. All problems are supposed to be |
111 |
# fixed there... |
112 |
cd "${S}" |
113 |
epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch |
114 |
epatch "${FILESDIR}"/${PN}-0.99.8-as-needed.patch |
115 |
|
116 |
cd "${S}"/epan |
117 |
epatch "${FILESDIR}"/wireshark-except-double-free.diff |
118 |
|
119 |
cd "${S}" |
120 |
eautoreconf |
121 |
} |
122 |
|
123 |
src_compile() { |
124 |
# optimization bug, see bug #165340, bug #40660 |
125 |
if [[ $(gcc-version) == 3.4 ]] ; then |
126 |
elog "Found gcc 3.4, forcing -O3 into CFLAGS" |
127 |
replace-flags -O? -O3 |
128 |
elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then |
129 |
elog "Found <=gcc-3.3, forcing -O into CFLAGS" |
130 |
replace-flags -O? -O |
131 |
fi |
132 |
|
133 |
# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001 |
134 |
# our hardened toolchain bug |
135 |
filter-flags -fstack-protector |
136 |
|
137 |
# profile and -fomit-frame-pointer are incompatible, bug #215806 |
138 |
use profile && filter-flags -fomit-frame-pointer |
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 |
} |
217 |
|
218 |
|
219 |
|
220 |
-- |
221 |
gentoo-commits@l.g.o mailing list |