Gentoo Archives: gentoo-commits

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