[gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-0.99.7-r1.ebuild wireshark-0.99.6.ebuild wireshark-0.99.6-r1.ebuild

[Peter Volkov (pva)]

pva         08/01/10 18:36:34

  Modified:             ChangeLog
  Added:                wireshark-0.99.7-r1.ebuild
  Removed:              wireshark-0.99.6.ebuild wireshark-0.99.6-r1.ebuild
  Log:
  Fixed crash on bad bLength. Fixed crash if user is not in wireshark group, thank you M. Edward Borasky <znmeb AT cesmail.net> for report and Kevin Pyle <kevin.pyle AT bluecoat.com> for investigation and work with upstream to make this fixed. Removed old and vulnerable.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.76                 net-analyzer/wireshark/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.75&r2=1.76

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog	26 Dec 2007 10:56:55 -0000	1.75
+++ ChangeLog	10 Jan 2008 18:36:34 -0000	1.76
@@ -1,6 +1,22 @@
 # ChangeLog for net-analyzer/wireshark
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.75 2007/12/26 10:56:55 welp Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.76 2008/01/10 18:36:34 pva Exp $
+
+*wireshark-0.99.7-r1 (10 Jan 2008)
+
+  10 Jan 2008; <pva@g.o> -files/wireshark-0.99.6-asneeded.patch,
+  -files/wireshark-0.99.6-asneeded-r1.patch,
+  -files/wireshark-0.99.6-gint64-warnings.patch,
+  -files/wireshark-0.99.6-libgcrypt.patch, -files/wireshark-0.99.6-lm.patch,
+  +files/wireshark-0.99.7-crash-emem.c.patch,
+  +files/wireshark-0.99.7-exit.patch,
+  -files/wireshark-epan_dissectors_packet-diameter.diff,
+  -wireshark-0.99.6.ebuild, -wireshark-0.99.6-r1.ebuild,
+  +wireshark-0.99.7-r1.ebuild:
+  Fixed crash on bad bLength. Fixed crash if user is not in wireshark group,
+  thank you M. Edward Borasky <znmeb AT cesmail.net> for report and Kevin Pyle
+  <kevin.pyle AT bluecoat.com> for investigation and work with upstream to
+  make this fixed. Removed old and vulnerable.
 
   26 Dec 2007; Peter Weller <welp@g.o> wireshark-0.99.7.ebuild:
   Stable on amd64; bug 199958



1.1                  net-analyzer/wireshark/wireshark-0.99.7-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.7-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.7-r1.ebuild?rev=1.1&content-type=text/plain

Index: wireshark-0.99.7-r1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.7-r1.ebuild,v 1.1 2008/01/10 18:36:34 pva Exp $

WANT_AUTOMAKE="1.9"
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/all-versions/${P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="adns gtk ipv6 portaudio snmp ssl kerberos threads selinux"

RDEPEND="sys-libs/zlib
	snmp? ( net-analyzer/net-snmp )
	gtk? ( >=dev-libs/glib-2.0.4
		=x11-libs/gtk+-2*
		x11-libs/pango
		dev-libs/atk )
	!gtk? ( =dev-libs/glib-1.2* )
	ssl? ( dev-libs/openssl )
	!ssl? (	net-libs/gnutls )
	net-libs/libpcap
	dev-libs/libpcre
	sys-libs/libcap
	adns? ( net-libs/adns )
	kerberos? ( virtual/krb5 )
	portaudio? ( media-libs/portaudio )
	selinux? ( sec-policy/selinux-wireshark )"

DEPEND="${RDEPEND}
	>=dev-util/pkgconfig-0.15.0
	dev-lang/perl
	sys-devel/bison
	sys-devel/flex
	sys-apps/sed"

pkg_setup() {
	# bug 119208
	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
		ewarn "wireshark will not build if dev-lang/perl is compiled with"
		ewarn "USE=minimal. Rebuild dev-lang/perl with USE=-minimal and try again."
		ebeep 5
		die "dev-lang/perl compiled with USE=minimal"
	fi

	if ! use gtk; then
		ewarn "USE=-gtk will mean 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 || die "Failed to create wireshark group"
}

src_unpack() {
	unpack ${A}
	cd "${S}"
	epatch "${FILESDIR}"/${PN}-0.99.7-libgcrypt.patch
	epatch "${FILESDIR}"/${PN}-0.99.7-asneeded.patch

	cd "${S}"/epan
	epatch "${FILESDIR}"/wireshark-except-double-free.diff

	cd "${S}"
	# http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2012
	epatch "${FILESDIR}"/${P}-crash-emem.c.patch
	# http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2177
	epatch "${FILESDIR}"/${P}-exit.patch
	AT_M4DIR="${S}/aclocal-fallback"
	eautoreconf
}

src_compile() {
	# 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

	# see bug #133092
	filter-flags -fstack-protector

	local myconf

	if use gtk; then
		einfo "Building with gtk support"
	else
		einfo "Building without gtk support"
		myconf="${myconf} --disable-wireshark --disable-warnings-as-errors"
		# the asn1 plugin needs gtk
		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
	fi

	#	$(use_with lua) \
	econf $(use_with ssl) \
		$(use_enable ipv6) \
		$(use_with adns) \
		$(use_with kerberos krb5) \
		$(use_with snmp net-snmp) \
		$(use_with portaudio) \
		$(use_enable gtk gtk2) \
		$(use_enable threads) \
		--with-libcap \
		--enable-setuid-install \
		--without-ucd-snmp \
		--enable-dftest \
		--enable-randpkt \
		--sysconfdir=/etc/wireshark \
		--enable-editcap \
		--enable-capinfos \
		--enable-text2pcap \
		${myconf} || die "econf failed"

	# fixes an access violation caused by libnetsnmp - see bug 79068
	use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"

	emake || die "emake failed"
}

src_install() {
	emake DESTDIR="${D}" install || die "emake install failed"

	for file in /usr/bin/tshark /usr/bin/dumpcap
	do
		fowners 0:wireshark ${file}
		fperms 6550 ${file}
	done

	insinto /usr/include/wiretap
	doins wiretap/wtap.h

	dodoc AUTHORS ChangeLog NEWS README*

	if use gtk ; then
		insinto /usr/share/icons/hicolor/16x16/apps
		newins image/hi16-app-wireshark.png wireshark.png
		insinto /usr/share/icons/hicolor/32x32/apps
		newins image/hi32-app-wireshark.png wireshark.png
		insinto /usr/share/icons/hicolor/48x48/apps
		newins image/hi48-app-wireshark.png wireshark.png
		insinto /usr/share/applications
		# Wireshark should not be ran as root in KDE.
		# Bug: http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2127
		sed -i '/X-KDE-SubstituteUID/d' wireshark.desktop
		doins wireshark.desktop
	fi
}

pkg_postinst() {
	echo
	ewarn "With version 0.99.7, all function calls that require elevated privileges"
	ewarn "have been moved out of the GUI to dumpcap. WIRESHARK CONTAINS OVER ONE"
	ewarn "POINT FIVE MILLION LINES OF SOURCE CODE. DO NOT RUN THEM AS ROOT."
	ewarn
	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
}



-- 
gentoo-commits@l.g.o mailing list