Version bump for another batch of Ethereal vulnerabilities; bug #51022.

4 files changed, 104 insertions, 9 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index d2957ace23dc..456a165c6552 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.60 2004/04/28 06:47:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.61 2004/05/31 15:58:40 plasmaroo Exp $
 
-  28 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+*ethereal-0.10.4 (31 May 2004)
+
+  31 May 2004; <plasmaroo@gentoo.org> +ethereal-0.10.4.ebuild:
+  Version bump for the Ethereal vulnerabilities; please see bug #51022.
+
+  28 Apr 2004; Mike Frysinger <vapier@gentoo.org>:
   Add gcc-3.4 patch #49238 by Robert Moss.
 
   31 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> ethereal-0.10.2.ebuild:
@@ -12,7 +17,7 @@
   Stable on alpha and ia64
 
   28 Mar 2004; Kurt Lieber <klieber@gentoo.org> ethereal-0.10.3.ebuild:
-  marking stable on x86 to fix 45543
+  Marking stable on x86 to fix bug #45543.
 
   28 Mar 2004; Luca Barbato <lu_zero@gentoo.org> ethereal-0.10.3.ebuild:
   Marked ppc to solve a security issue, see bug #45543
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 2164b2c30b6a..7642d69f1927 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,13 +1,15 @@
-MD5 d38d0919065afa1b9f3da67b38fbc322 ethereal-0.10.3.ebuild 2296
-MD5 9792459970168c25996cffe6e3e7d1c3 ethereal-0.10.2.ebuild 2225
+MD5 a4d1f045af96a1fbcaf8fb37630185f5 ChangeLog 9032
+MD5 1736bd94cb042fbc6b748d3d1584fc7c ethereal-0.10.4.ebuild 2302
 MD5 6e0f276d66f2643937ae994414254992 ethereal-0.9.14.ebuild 2123
-MD5 8d8af38d2491bad0b33736747f125a68 ChangeLog 8856
+MD5 d38d0919065afa1b9f3da67b38fbc322 ethereal-0.10.3.ebuild 2296
 MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
 MD5 77d374070619f1af75c642ff37146586 ethereal-0.9.16.ebuild 2264
 MD5 2493f6faf3700233d6ed0d22f5dc7d3a ethereal-0.9.16-r1.ebuild 2340
-MD5 3ce13570e210d6dc1669b91936d2f051 files/digest-ethereal-0.9.16-r1 69
-MD5 5a73274ec255373b4e618388cd057275 files/0.10.3-gcc34.patch 458
-MD5 653a02c3d271542800810a5cf407af28 files/digest-ethereal-0.10.2 69
+MD5 9792459970168c25996cffe6e3e7d1c3 ethereal-0.10.2.ebuild 2225
 MD5 923bd4108aa5e66d0f86506ef47d5132 files/digest-ethereal-0.10.3 69
 MD5 380524e1a6116898080fe64bed810144 files/digest-ethereal-0.9.14 69
+MD5 5a73274ec255373b4e618388cd057275 files/0.10.3-gcc34.patch 458
 MD5 3ce13570e210d6dc1669b91936d2f051 files/digest-ethereal-0.9.16 69
+MD5 3ce13570e210d6dc1669b91936d2f051 files/digest-ethereal-0.9.16-r1 69
+MD5 c972f5f4b83ea84388e31267193e96d7 files/digest-ethereal-0.10.4 69
+MD5 653a02c3d271542800810a5cf407af28 files/digest-ethereal-0.10.2 69
diff --git a/net-analyzer/ethereal/ethereal-0.10.4.ebuild b/net-analyzer/ethereal/ethereal-0.10.4.ebuild
new file mode 100644
index 000000000000..66d6e2969f1f
--- /dev/null
+++ b/net-analyzer/ethereal/ethereal-0.10.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.4.ebuild,v 1.1 2004/05/31 15:58:40 plasmaroo Exp $
+
+inherit libtool flag-o-matic gcc eutils
+
+DESCRIPTION="A commercial-quality network protocol analyzer"
+HOMEPAGE="http://www.ethereal.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~amd64 ~ia64"
+IUSE="adns gtk ipv6 snmp ssl gtk2"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	snmp? ( virtual/snmp )
+	>=dev-util/pkgconfig-0.15.0
+	gtk? (
+		gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
+		!gtk2? ( =x11-libs/gtk+-1.2* )
+	)
+	!gtk? ( =dev-libs/glib-1.2* )
+	ssl? ( >=dev-libs/openssl-0.9.6e )
+	>=net-libs/libpcap-0.7.1
+	>=dev-libs/libpcre-4.2
+	adns? ( net-libs/adns )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	replace-flags -O3 -O
+	replace-flags -O2 -O
+	# Fix gcc-3.4 segfault #49238
+	[ "`gcc-fullversion`" == "3.4" ] && epatch ${FILESDIR}/${PV}-gcc34.patch
+
+	# running a full elibtoolize seems to break things in this
+	# package... see bug 41831 (17 Feb 2004 agriffis)
+	elibtoolize --patch-only
+}
+
+src_compile() {
+	local myconf="
+		$(use_with ssl)
+		$(use_enable ipv6)
+		$(use_with adns)"
+
+	if use gtk; then
+		myconf="${myconf} $(use_enable gtk2)"
+	else
+		myconf="${myconf} --disable-ethereal"
+		# 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
+
+	# if USE=snmp, then one of the snmp libraries will be available,
+	# thanks to virtual/snmp.  In that case, let Ethereal use
+	# whichever it finds.
+	if ! use snmp; then
+		myconf="${myconf} --without-ucd-snmp --without-net-snmp"
+	fi
+
+	econf \
+		--enable-dftest \
+		--enable-randpkt \
+		--sysconfdir=/etc/ethereal \
+		${myconf} || die "bad ./configure"
+
+	addwrite "/usr/share/snmp/mibs/.index"
+	emake || die "compile problem"
+}
+
+src_install() {
+	addwrite "/usr/share/snmp/mibs/.index"
+	dodir /usr/lib/ethereal/plugins/${PV}
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO
+	insinto "/usr/share/pixmaps/"
+	doins "image/hi48-app-ethereal.png"
+}
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.4 b/net-analyzer/ethereal/files/digest-ethereal-0.10.4
new file mode 100644
index 000000000000..80d55a03e846
--- /dev/null
+++ b/net-analyzer/ethereal/files/digest-ethereal-0.10.4
@@ -0,0 +1 @@
+MD5 d889d4e6e26047afc5a2b74770c8ac88 ethereal-0.10.4.tar.bz2 4889371