Version bump for security bug 84547.

(Portage version: 2.0.51.19)

4 files changed, 106 insertions, 19 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 8290c2c0195f..7bc38846bfcf 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.109 2005/02/28 20:57:21 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.110 2005/03/11 19:08:45 ka0ttic Exp $
+
+*ethereal-0.10.10 (11 Mar 2005)
+
+  11 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +ethereal-0.10.10.ebuild:
+  Version bump for security bug 84547.
 
   28 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   ethereal-0.10.9-r1.ebuild:
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index efd80454f6f1..8efb5a37e3f1 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,26 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 084f6181d34f62ad1e728de981f107ff ChangeLog 7062
-MD5 9aacfb51126057fe6f272e9e68b04823 ethereal-0.10.5-r1.ebuild 2591
+MD5 5873fa93022936b5fffa46b3a2877255 ethereal-0.10.8.ebuild 2419
 MD5 90125878d2e9c146be8cd1513584c594 ethereal-0.10.5.ebuild 2577
+MD5 f6af7aa526e12860c732f4d303890c73 ethereal-0.10.10.ebuild 2513
+MD5 2c1acb617103a36fab80ab721bff6859 ethereal-0.10.9.ebuild 2512
 MD5 42646c10b255d7b2cc1abd0ff17a854a ethereal-0.10.6.ebuild 2482
-MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
-MD5 5873fa93022936b5fffa46b3a2877255 ethereal-0.10.8.ebuild 2419
 MD5 9e6b5aa51a31d63877fd940420dab88c ethereal-0.10.9-r1.ebuild 2673
-MD5 2c1acb617103a36fab80ab721bff6859 ethereal-0.10.9.ebuild 2512
+MD5 dba21864eac136d1c03ce666dd6a24d9 ChangeLog 7210
+MD5 9aacfb51126057fe6f272e9e68b04823 ethereal-0.10.5-r1.ebuild 2591
+MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+MD5 7380c9b1a24a082c69ab1bec0de907e7 files/digest-ethereal-0.10.10 70
+MD5 0810d71e423428b7aefa8ce2ecb95043 files/ethereal-0.10.9-mate.h-gcc2.patch 605
 MD5 5a73274ec255373b4e618388cd057275 files/0.10.4-gcc34.patch 458
-MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5 69
 MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5-r1 69
+MD5 ead2b5faadcb1443141a8a22e0e2a217 files/digest-ethereal-0.10.9-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
-MD5 ead2b5faadcb1443141a8a22e0e2a217 files/digest-ethereal-0.10.9-r1 69
-MD5 0810d71e423428b7aefa8ce2ecb95043 files/ethereal-0.10.9-mate.h-gcc2.patch 605
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCI4XDKRy60XGEcJIRAu1tAKClCzNgAmj6g8U+LIpXQy1wTxtiVQCeJKH/
-8AHG/OfevTXFEYZogGdIktA=
-=VbPh
------END PGP SIGNATURE-----
diff --git a/net-analyzer/ethereal/ethereal-0.10.10.ebuild b/net-analyzer/ethereal/ethereal-0.10.10.ebuild
new file mode 100644
index 000000000000..56e2375d0fa8
--- /dev/null
+++ b/net-analyzer/ethereal/ethereal-0.10.10.ebuild
@@ -0,0 +1,89 @@
+# 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.10.ebuild,v 1.1 2005/03/11 19:08:45 ka0ttic Exp $
+
+inherit libtool flag-o-matic 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 kerberos"
+
+# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
+# --disable-ethereal do not have an influence.
+
+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* )
+		x11-libs/pango
+		dev-libs/atk )
+	!gtk? ( =dev-libs/glib-1.2* )
+	ssl? ( >=dev-libs/openssl-0.9.6e )
+	virtual/libpcap
+	>=dev-libs/libpcre-4.2
+	adns? ( net-libs/adns )
+	kerberos? ( virtual/krb5 )"
+
+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
+
+	if use gtk; then
+		myconf="${myconf} $(use_enable gtk2)"
+	else
+		myconf="${myconf} --disable-gtk2"
+
+		# 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
+
+	econf \
+		$(use_with ssl) \
+		$(use_enable ipv6) \
+		$(use_with adns) \
+		$(use_with kerberos krb5) \
+		$(use_with snmp net-snmp) \
+		--without-ucd-snmp \
+		--enable-dftest \
+		--enable-randpkt \
+		--sysconfdir=/etc/ethereal \
+		${myconf} || die "bad ./configure"
+
+	# fixes an access violation caused by libnetsnmp - see bug 79068
+	use snmp && export MIBDIRS="${D}/usr/share/snmp/mibs"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	dodir /usr/lib/ethereal/plugins/${PV}
+	make DESTDIR=${D} install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO
+
+	insinto /usr/share/icons/hicolor/16x16/apps
+	newins ${S}/image/hi16-app-ethereal.png ethereal.png
+	insinto /usr/share/icons/hicolor/32x32/apps
+	newins ${S}/image/hi32-app-ethereal.png ethereal.png
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins ${S}/image/hi48-app-ethereal.png ethereal.png
+	make_desktop_entry ethereal "Ethereal" ethereal
+}
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.10.10 b/net-analyzer/ethereal/files/digest-ethereal-0.10.10
new file mode 100644
index 000000000000..9a9f18450d54
--- /dev/null
+++ b/net-analyzer/ethereal/files/digest-ethereal-0.10.10
@@ -0,0 +1 @@
+MD5 5addaf1db088a8b51941e4db191b0ab0 ethereal-0.10.10.tar.bz2 5799231