- security bump for bug #78559

(Portage version: 2.0.51-r13)

8 files changed, 108 insertions, 14 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 6f50e4018287..aa3f256403e8 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,11 @@
 # 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.96 2004/12/29 02:47:42 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.97 2005/01/20 23:45:55 solar Exp $
+
+*ethereal-0.10.9 (20 Jan 2005)
+
+  20 Jan 2005; <solar@gentoo.org> +ethereal-0.10.9.ebuild:
+  - security bump for bug #78559
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index de9caab0ce33..c23be8b6edc3 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,11 +1,13 @@
-MD5 5af3d535187daa1c66c7e893754d4f0c ethereal-0.10.6.ebuild 2484
+MD5 624e801862bf13657e6b8ff81bfe6d7c ethereal-0.10.8.ebuild 2423
 MD5 e70cd283dc61b8b8ffdaba5e82ceb873 ethereal-0.10.5.ebuild 2580
+MD5 d74f31d1407dfadbcf340591ba5e256c ethereal-0.10.9.ebuild 2430
+MD5 5af3d535187daa1c66c7e893754d4f0c ethereal-0.10.6.ebuild 2484
 MD5 e2f80720be802cb554f0a8ead80c568b ChangeLog 5401
-MD5 624e801862bf13657e6b8ff81bfe6d7c ethereal-0.10.8.ebuild 2423
-MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
 MD5 ac5ab068efc12615cf18dfcb44aad2e8 ethereal-0.10.5-r1.ebuild 2594
-MD5 8f052b2e09156338ef122fbfd4cfa975 files/digest-ethereal-0.10.8 69
+MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
 MD5 5a73274ec255373b4e618388cd057275 files/0.10.4-gcc34.patch 458
 MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5-r1 69
 MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5 69
 MD5 5bc98004e6492e3349a16bf0591c743e files/digest-ethereal-0.10.6 69
+MD5 8f052b2e09156338ef122fbfd4cfa975 files/digest-ethereal-0.10.8 69
+MD5 ead2b5faadcb1443141a8a22e0e2a217 files/digest-ethereal-0.10.9 69
diff --git a/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild b/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild
index 9768e0cb94c0..4b81b3871eea 100644
--- a/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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-r1.ebuild,v 1.6 2004/10/24 16:40:17 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.5-r1.ebuild,v 1.7 2005/01/20 23:45:55 solar Exp $
 
 inherit libtool flag-o-matic gcc eutils
 
diff --git a/net-analyzer/ethereal/ethereal-0.10.5.ebuild b/net-analyzer/ethereal/ethereal-0.10.5.ebuild
index 42d9617574e0..8d1e417a461a 100644
--- a/net-analyzer/ethereal/ethereal-0.10.5.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.9 2004/09/23 13:14:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.5.ebuild,v 1.10 2005/01/20 23:45:55 solar Exp $
 
 inherit libtool flag-o-matic gcc eutils
 
diff --git a/net-analyzer/ethereal/ethereal-0.10.6.ebuild b/net-analyzer/ethereal/ethereal-0.10.6.ebuild
index cf30d829da02..a2849c0bbd1c 100644
--- a/net-analyzer/ethereal/ethereal-0.10.6.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.6.ebuild,v 1.9 2004/12/17 23:10:45 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.6.ebuild,v 1.10 2005/01/20 23:45:55 solar Exp $
 
 inherit libtool flag-o-matic gcc eutils
 
diff --git a/net-analyzer/ethereal/ethereal-0.10.8.ebuild b/net-analyzer/ethereal/ethereal-0.10.8.ebuild
index 3f57b751b00d..429a79740a43 100644
--- a/net-analyzer/ethereal/ethereal-0.10.8.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.8.ebuild,v 1.7 2004/12/21 11:18:07 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.8.ebuild,v 1.8 2005/01/20 23:45:55 solar Exp $
 
 inherit libtool flag-o-matic gcc eutils
 
diff --git a/net-analyzer/ethereal/ethereal-0.10.9.ebuild b/net-analyzer/ethereal/ethereal-0.10.9.ebuild
new file mode 100644
index 000000000000..4211685f5960
--- /dev/null
+++ b/net-analyzer/ethereal/ethereal-0.10.9.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.9.ebuild,v 1.1 2005/01/20 23:45:55 solar 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 ~ppc64"
+IUSE="adns gtk ipv6 snmp ssl gtk2"
+
+# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
+# --disable-ethereal do not have an influence.
+
+# snmp support requires >=net-snmp-5.1.1. Taking virtual off: snmp? ( virtual/snmp )
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
+	>=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_compile() {
+
+	replace-flags -O3 -O
+	replace-flags -O2 -O
+
+	# Fix gcc-3.4 segfault #49238
+	[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
+
+	local myconf="
+		$(use_with ssl)
+		$(use_enable ipv6)
+		$(use_with adns)"
+
+	if use gtk; then
+		myconf="${myconf} $(use_enable gtk2)"
+	else
+		myconf="${myconf} --disable-gtk2"
+
+		# --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.9 b/net-analyzer/ethereal/files/digest-ethereal-0.10.9
new file mode 100644
index 000000000000..e09698606b76
--- /dev/null
+++ b/net-analyzer/ethereal/files/digest-ethereal-0.10.9
@@ -0,0 +1 @@
+MD5 f8b7a2c2dcf273e7fd755f972167dacb ethereal-0.10.9.tar.bz2 5499000