Version bump; security issue (#56423)

4 files changed, 99 insertions, 2 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index fc0a3c80a2ee..ac530f848199 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.67 2004/06/24 22:01:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.68 2004/07/08 16:57:23 eldad Exp $
+
+*ethereal-0.10.5 (08 Jul 2004)
+
+  08 Jul 2004; Eldad Zack <eldad@gentoo.org> ethereal-0.10.4.ebuild,
+  +ethereal-0.10.5.ebuild:
+  Version bump due to security issue (#56423). Marking x86 stable.
 
   09 Jun 2004; Aron Griffis <agriffis@gentoo.org> ethereal-0.10.2.ebuild,
   ethereal-0.10.3.ebuild, ethereal-0.9.14.ebuild, ethereal-0.9.16-r1.ebuild,
diff --git a/net-analyzer/ethereal/ethereal-0.10.4.ebuild b/net-analyzer/ethereal/ethereal-0.10.4.ebuild
index a0b75ff51541..b01111c9ec5a 100644
--- a/net-analyzer/ethereal/ethereal-0.10.4.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.4.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.7 2004/07/05 13:21:19 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.4.ebuild,v 1.8 2004/07/08 16:57:23 eldad 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"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/ethereal/ethereal-0.10.5.ebuild b/net-analyzer/ethereal/ethereal-0.10.5.ebuild
new file mode 100644
index 000000000000..e722f374d974
--- /dev/null
+++ b/net-analyzer/ethereal/ethereal-0.10.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.5.ebuild,v 1.1 2004/07/08 16:57:23 eldad 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"
+
+# since if --disable-gtk2 is not passed to configure it will try to build with glib-2.0,
+# the logic is reversed. if gtk2 USE flag is on, gtk2 will be built, even if gtk is not in USE.
+# --disable-ethereal do not have an influence.
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	snmp? ( virtual/snmp )
+	>=dev-util/pkgconfig-0.15.0
+	gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
+	gtk? ( !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-version`" == "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)
+		$(use_enable gtk2)"
+
+	if ! use gtk; then
+		# --disable-ethereal do not have an influence
+		#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.5 b/net-analyzer/ethereal/files/digest-ethereal-0.10.5
new file mode 100644
index 000000000000..3ef37a6aba43
--- /dev/null
+++ b/net-analyzer/ethereal/files/digest-ethereal-0.10.5
@@ -0,0 +1 @@
+MD5 26d5672935ac8bd0793fcd2ad0b4833f ethereal-0.10.5.tar.bz2 4984584