* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-1.2.6-r1.ebuild
@ 2010-03-26 10:54 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-03-26 10:54 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/03/26 10:54:12
Modified: ChangeLog
Added: wireshark-1.2.6-r1.ebuild
Log:
Revision bump to -r1 preventing zlib downgrade for ~arch users wrt #311241.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.217 net-analyzer/wireshark/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.217&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.217&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.216&r2=1.217
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- ChangeLog 26 Mar 2010 09:10:58 -0000 1.216
+++ ChangeLog 26 Mar 2010 10:54:12 -0000 1.217
@@ -1,6 +1,13 @@
# ChangeLog for net-analyzer/wireshark
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.216 2010/03/26 09:10:58 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.217 2010/03/26 10:54:12 ssuominen Exp $
+
+*wireshark-1.2.6-r1 (26 Mar 2010)
+
+ 26 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+ +wireshark-1.2.6-r1.ebuild:
+ Revision bump to -r1 preventing zlib downgrade for ~arch users wrt
+ #311241.
26 Mar 2010; Peter Volkov <pva@gentoo.org> wireshark-1.2.6.ebuild:
Require <zlib-1.2.4, bug #311241 thank Kristian for report.
1.1 net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild?rev=1.1&content-type=text/plain
Index: wireshark-1.2.6-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild,v 1.1 2010/03/26 10:54:12 ssuominen Exp $
EAPI=2
inherit autotools libtool flag-o-matic eutils toolchain-funcs
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="http://www.wireshark.org/"
# _rc versions has different download location.
[[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && {
SRC_URI="http://www.wireshark.org/download/prerelease/${PN}-${PV/_rc/pre}.tar.gz";
S=${WORKDIR}/${PN}-${PV/_rc/pre} ; } || \
SRC_URI="http://www.wireshark.org/download/src/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux"
RDEPEND=">=dev-libs/glib-2.4.0:2
zlib? ( >=sys-libs/zlib-1.2.3 )
smi? ( net-libs/libsmi )
gtk? ( >=x11-libs/gtk+-2.4.0:2
x11-libs/pango
dev-libs/atk )
gnutls? ( net-libs/gnutls )
gcrypt? ( dev-libs/libgcrypt )
pcap? ( net-libs/libpcap )
pcre? ( dev-libs/libpcre )
caps? ( sys-libs/libcap )
kerberos? ( virtual/krb5 )
portaudio? ( media-libs/portaudio )
ares? ( >=net-dns/c-ares-1.5 )
!ares? ( adns? ( net-libs/adns ) )
geoip? ( dev-libs/geoip )
lua? ( >=dev-lang/lua-5.1 )
selinux? ( sec-policy/selinux-wireshark )"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.15.0
dev-lang/perl
sys-devel/bison
sys-devel/flex"
pkg_setup() {
if ! use gtk; then
ewarn "USE=-gtk will means no gui called wireshark will be created and"
ewarn "only command line utils are available"
fi
# Add group for users allowed to sniff.
enewgroup wireshark
}
src_prepare() {
cd "${S}"/epan # our hardened toolchain bug...
epatch "${FILESDIR}/wireshark-except-double-free.diff"
cd "${S}"
epatch "${FILESDIR}/${PN}-1.1.2--as-needed.patch"
eautoreconf
}
src_configure() {
local myconf
# optimization bug, see bug #165340, bug #40660
if [[ $(gcc-version) == 3.4 ]] ; then
elog "Found gcc 3.4, forcing -O3 into CFLAGS"
replace-flags -O? -O3
elif [[ $(gcc-version) == 3.3 || $(gcc-version) == 3.2 ]] ; then
elog "Found <=gcc-3.3, forcing -O into CFLAGS"
replace-flags -O? -O
fi
if use ares && use adns; then
einfo "You asked for both, ares and adns, but we can use only one of them."
einfo "c-ares supersedes adns resolver thus using c-ares (ares USE flag)."
myconf="$(use_with ares c-ares) --without-adns"
else
myconf="$(use_with adns) $(use_with ares c-ares)"
fi
# see bug #133092; bugs.wireshark.org/bugzilla/show_bug.cgi?id=1001
# our hardened toolchain bug
filter-flags -fstack-protector
# profile and pie are incompatible #215806, #292991
if use profile; then
ewarn "You've enabled the 'profile' USE flag, building PIE binaries is disabled."
append-flags $(test-flags-CC -nopie)
fi
# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
# --with-ssl to ./configure. (Mimics code from acinclude.m4).
if use kerberos; then
case `krb5-config --libs` in
*-lcrypto*) myconf="${myconf} --with-ssl" ;;
esac
fi
# dumpcap requires libcap, setuid-install requires dumpcap
econf $(use_enable gtk wireshark) \
$(use_enable profile profile-build) \
$(use_with gnutls) \
$(use_with gcrypt) \
$(use_enable ipv6) \
$(use_enable threads) \
$(use_with lua) \
$(use_with kerberos krb5) \
$(use_with smi libsmi) \
$(use_with pcap) \
$(use_with zlib) \
$(use_with pcre) \
$(use_with geoip) \
$(use_with portaudio) \
$(use_with caps libcap) \
$(use_enable pcap setuid-install) \
--sysconfdir=/etc/wireshark \
${myconf}
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
use pcap && fowners 0:wireshark /usr/bin/dumpcap
use pcap && fperms 6550 /usr/bin/dumpcap
insinto /usr/include/wiretap
doins wiretap/wtap.h
# FAQ is not required as is installed from help/faq.txt
dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} doc/randpkt.txt
if use gtk; then
for c in hi lo; do
for d in 16 32 48; do
insinto /usr/share/icons/${c}color/${d}x${d}/apps
newins image/${c}${d}-app-wireshark.png wireshark.png
done
done
insinto /usr/share/applications
doins wireshark.desktop
fi
}
pkg_postinst() {
echo
ewarn "NOTE: To run wireshark as normal user you have to add yourself into"
ewarn "wireshark group. This security measure ensures that only trusted"
ewarn "users allowed to sniff your traffic."
echo
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-1.2.6-r1.ebuild
@ 2010-03-28 15:33 Peter Volkov (pva)
0 siblings, 0 replies; 2+ messages in thread
From: Peter Volkov (pva) @ 2010-03-28 15:33 UTC (permalink / raw
To: gentoo-commits
pva 10/03/28 15:33:09
Modified: ChangeLog wireshark-1.2.6-r1.ebuild
Log:
Disable zlib, bug #311241
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.218 net-analyzer/wireshark/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.218&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.218&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.217&r2=1.218
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- ChangeLog 26 Mar 2010 10:54:12 -0000 1.217
+++ ChangeLog 28 Mar 2010 15:33:08 -0000 1.218
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/wireshark
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.217 2010/03/26 10:54:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.218 2010/03/28 15:33:08 pva Exp $
+
+ 28 Mar 2010; Peter Volkov <pva@gentoo.org> wireshark-1.2.6-r1.ebuild:
+ Disable zlib, bug #311241
*wireshark-1.2.6-r1 (26 Mar 2010)
1.2 net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild?r1=1.1&r2=1.2
Index: wireshark-1.2.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wireshark-1.2.6-r1.ebuild 26 Mar 2010 10:54:12 -0000 1.1
+++ wireshark-1.2.6-r1.ebuild 28 Mar 2010 15:33:08 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild,v 1.1 2010/03/26 10:54:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.2.6-r1.ebuild,v 1.2 2010/03/28 15:33:08 pva Exp $
EAPI=2
inherit autotools libtool flag-o-matic eutils toolchain-funcs
@@ -17,10 +17,9 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip zlib kerberos threads profile smi +pcap pcre +caps selinux"
+IUSE="adns ares gtk ipv6 lua portaudio gnutls gcrypt geoip kerberos threads profile smi +pcap pcre +caps selinux"
RDEPEND=">=dev-libs/glib-2.4.0:2
- zlib? ( >=sys-libs/zlib-1.2.3 )
smi? ( net-libs/libsmi )
gtk? ( >=x11-libs/gtk+-2.4.0:2
x11-libs/pango
@@ -112,7 +111,7 @@
$(use_with kerberos krb5) \
$(use_with smi libsmi) \
$(use_with pcap) \
- $(use_with zlib) \
+ --without-zlib \
$(use_with pcre) \
$(use_with geoip) \
$(use_with portaudio) \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-28 15:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-26 10:54 [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-1.2.6-r1.ebuild Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2010-03-28 15:33 Peter Volkov (pva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox