fixes for bugs #16832 #17831

4 files changed, 88 insertions, 2 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index ca25abbcf115..f20544154df9 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.27 2003/03/17 17:01:49 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.28 2003/06/03 05:40:29 bcowan Exp $
+
+*ethereal-0.9.12-r1 (03 Jun 2003)
+
+  03 Jun 2003; Brad Cowan <bcowan@gentoo.org> :
+  Added support for virtual/snmp and hopefully fixed a recurring sandbox bug.
+  Closing bugs #16832 #17831.
 
 *ethereal-0.9.11 (11 mar 2003)
 
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 150296c225e4..f81b49ecbfd6 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,9 +1,11 @@
+MD5 66e0a6d31dcc3da46d8a9719d5154623 ethereal-0.9.12-r1.ebuild 1942
 MD5 136f313c8528f362e7ffe806da893e03 ethereal-0.9.9.ebuild 1963
 MD5 68c7f21c633c3a5eee268bb5e30bf362 ethereal-0.9.10.ebuild 1963
 MD5 01745544dcf1ee3534ebc85e2f4407b3 ethereal-0.9.8-r1.ebuild 1968
 MD5 20e847d9cf9d81d9bf8049abd0555ad2 ethereal-0.9.12.ebuild 1953
-MD5 41671adb3867166118e39caa9390ed65 ChangeLog 4234
+MD5 2ca5249955f8ab6a0ce6d5b8ca343f3f ChangeLog 4425
 MD5 f8a6f8a09144d42f95576806cea00e68 ethereal-0.9.11.ebuild 1950
+MD5 a59519f57adc6a2da471b064e3bf87a7 files/digest-ethereal-0.9.12-r1 69
 MD5 8b9d978e964fa8a3a3a27bbb23e2e0c9 files/digest-ethereal-0.9.8-r1 68
 MD5 3501b880e32bb8a3b9bb7fa681b9c090 files/digest-ethereal-0.9.10 69
 MD5 c5a4585c3e296d610a886c3695568d64 files/digest-ethereal-0.9.11 69
diff --git a/net-analyzer/ethereal/ethereal-0.9.12-r1.ebuild b/net-analyzer/ethereal/ethereal-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..9c869f60dcf4
--- /dev/null
+++ b/net-analyzer/ethereal/ethereal-0.9.12-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.9.12-r1.ebuild,v 1.1 2003/06/03 05:40:29 bcowan Exp $
+
+IUSE="gtk ipv6 snmp ssl gtk2"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A commercial-quality network protocol analyzer"
+SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2"
+HOMEPAGE="http://www.ethereal.com/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	snmp? ( virtual/snmp )
+	gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* ) : ( gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* ) )
+	gtk? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )
+	ssl? ( >=dev-libs/openssl-0.9.6e )
+	>=net-libs/libpcap-0.7.1"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# gcc related configure script braindamage
+	mv configure configure.broken
+	sed "s|-I/usr/local/include||" configure.broken > configure
+	chmod +x ./configure
+
+}
+
+src_compile() {
+	local myconf
+	if [ "`use gtk2`" ]
+	then
+		myconf="--enable-gtk2"
+	elif [ -z "`use gtk`" ]
+	then
+		myconf="--disable-ethereal"
+	fi
+	
+	use ssl || myconf="${myconf} --without-ssl"
+	use snmp || myconf="${myconf} --without-ucdsnmp"
+	use ipv6 && myconf="${myconf} --enable-ipv6"
+	use gtk || myconf="${myconf} --disable-ethereal"
+	
+	addwrite "/usr/share/snmp/mibs/.index" 
+	
+	econf \
+		--enable-pcap \
+		--enable-zlib \
+		--enable-tethereal \
+		--enable-editcap \
+		--enable-mergecap \
+		--enable-text2cap \
+		--enable-idl2eth \
+		--enable-dftest \
+		--enable-randpkt \
+		--sysconfdir=/etc/ethereal \
+		--with-plugindir=/usr/lib/ethereal/plugins/${PV} \
+		${myconf} || die "bad ./configure"
+                
+	emake || die "compile problem"
+}
+
+src_install() {
+	dodir /usr/lib/ethereal/plugins/${PV}
+	make DESTDIR=${D} install
+	dodoc AUTHORS COPYING ChangeLog INSTALL.* NEWS README* TODO
+}
diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.9.12-r1 b/net-analyzer/ethereal/files/digest-ethereal-0.9.12-r1
new file mode 100644
index 000000000000..b2cb16ceac75
--- /dev/null
+++ b/net-analyzer/ethereal/files/digest-ethereal-0.9.12-r1
@@ -0,0 +1 @@
+MD5 b25d815f98293f78f72ac0db75637496 ethereal-0.9.12.tar.bz2 3708148