Fixed crash during pause->play.

(Portage version: 2.1-r2)

4 files changed, 63 insertions, 1 deletions

diff --git a/net-analyzer/etherape/ChangeLog b/net-analyzer/etherape/ChangeLog
index cfcb32163005..77723e0c53b0 100644
--- a/net-analyzer/etherape/ChangeLog
+++ b/net-analyzer/etherape/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/etherape
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/ChangeLog,v 1.36 2006/09/04 16:41:30 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/ChangeLog,v 1.37 2006/09/06 17:02:39 pva Exp $
+
+*etherape-0.9.6-r1 (06 Sep 2006)
+
+  06 Sep 2006; Peter Volkov <pva@gentoo.org>
+  +files/etherape-0.9.6-pause-crash-fix.patch, +etherape-0.9.6-r1.ebuild:
+  Fixed crash during pause->play.
 
 *etherape-0.9.6 (04 Sep 2006)
 
diff --git a/net-analyzer/etherape/etherape-0.9.6-r1.ebuild b/net-analyzer/etherape/etherape-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..2950897569b2
--- /dev/null
+++ b/net-analyzer/etherape/etherape-0.9.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/etherape-0.9.6-r1.ebuild,v 1.1 2006/09/06 17:02:39 pva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
+SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
+HOMEPAGE="http://etherape.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=gnome-base/libglade-2.0
+	>=gnome-base/libgnomeui-2.0
+	net-libs/libpcap
+	sys-devel/gettext"
+
+DOCS="ABOUT-NLS AUTHORS ChangeLog FAQ NEWS OVERVIEW README* TODO"
+
+src_unpack() {
+	unpack ${A};
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.9.3-res_mkquery.patch
+	epatch "${FILESDIR}"/${P}-pause-crash-fix.patch
+
+	aclocal -I m4 || die "aclocal failed"
+	autoconf || die "autoconf failed"
+	libtoolize --copy --force
+}
diff --git a/net-analyzer/etherape/files/digest-etherape-0.9.6-r1 b/net-analyzer/etherape/files/digest-etherape-0.9.6-r1
new file mode 100644
index 000000000000..515b7f4a34d2
--- /dev/null
+++ b/net-analyzer/etherape/files/digest-etherape-0.9.6-r1
@@ -0,0 +1,3 @@
+MD5 a6f2b27da7d25346b824c42762ada61f etherape-0.9.6.tar.gz 860413
+RMD160 a672d3ee19aa1040014a653d440fb7b4e700c753 etherape-0.9.6.tar.gz 860413
+SHA256 ab4e2f4dc90e2bccbf72f3bc750df4ea3c234fdbc31a85b640107f5b5c5e47fc etherape-0.9.6.tar.gz 860413
diff --git a/net-analyzer/etherape/files/etherape-0.9.6-pause-crash-fix.patch b/net-analyzer/etherape/files/etherape-0.9.6-pause-crash-fix.patch
new file mode 100644
index 000000000000..4a7a0a44e28c
--- /dev/null
+++ b/net-analyzer/etherape/files/etherape-0.9.6-pause-crash-fix.patch
@@ -0,0 +1,20 @@
+--- src/capture.c.orig	Sat Apr 29 09:58:35 2006
++++ src/capture.c	Mon May 29 01:14:23 2006
+@@ -464,10 +464,13 @@
+       return FALSE;
+     }
+ 
+-  /* preparing protocol summary and nodes/links catalogs */
+-  protocol_summary_open();
+-  nodes_catalog_open();
+-  links_catalog_open();
++  if (status != PAUSE)
++    {
++      /* preparing protocol summary and nodes/links catalogs */
++      protocol_summary_open();
++      nodes_catalog_open();
++      links_catalog_open();
++    }
+ 
+   /*
+    * See pause_capture for an explanation of why we don't always