Fixed crash during pause->play.

Package-Manager: portage-2.1-r2

diff --git a/net-analyzer/etherape/ChangeLog b/net-analyzer/etherape/ChangeLog
index cfcb321630054cfc354ba70b831493f7cec0f851..77723e0c53b095cd815a66001a1cc3074a48b547 100644 (file)
--- 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/Manifest b/net-analyzer/etherape/Manifest
index 87b72f643cf14c3944ce637689dd2934ec13dd65..c6667a85d0c18f313d1205130fc065e8234225e9 100644 (file)
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -2,20 +2,28 @@ AUX etherape-0.9.3-res_mkquery.patch 620 RMD160 4de5ce232700f56968d938cea74d3acf
 MD5 5ce49da683534b84b59d34525deb611b files/etherape-0.9.3-res_mkquery.patch 620
 RMD160 4de5ce232700f56968d938cea74d3acf68c2a65b files/etherape-0.9.3-res_mkquery.patch 620
 SHA256 468565bde5932f3e177d065a107f491fe00545b00ace371a9e04212dc253208d files/etherape-0.9.3-res_mkquery.patch 620
+AUX etherape-0.9.6-pause-crash-fix.patch 549 RMD160 4dc161dae5a70fd90a384d401e4ddccb6812ba85 SHA1 1847f47e7db8e31d5b7ba97fcb5b4ae35caf3bee SHA256 bc16e2e6392312645f8ccc02d1a6561c27f02fd568f4fa8a4409a065995e2d0b
+MD5 6d5140092bf0b3abc6ea562a795e783d files/etherape-0.9.6-pause-crash-fix.patch 549
+RMD160 4dc161dae5a70fd90a384d401e4ddccb6812ba85 files/etherape-0.9.6-pause-crash-fix.patch 549
+SHA256 bc16e2e6392312645f8ccc02d1a6561c27f02fd568f4fa8a4409a065995e2d0b files/etherape-0.9.6-pause-crash-fix.patch 549
 DIST etherape-0.9.4.tar.gz 611510 RMD160 81de771e5f896b5b9d0635a025fe407f7365e20d SHA1 aefe1f8ef691d2b3e562bf7ec63f3d569274a60c SHA256 967e4742f3a6a6c20753635f44e29482f63f0143625b19b66376f4bbaad88504
 DIST etherape-0.9.6.tar.gz 860413 RMD160 a672d3ee19aa1040014a653d440fb7b4e700c753 SHA1 214dddb82d768a1ac41b483cd749ccc22ce20779 SHA256 ab4e2f4dc90e2bccbf72f3bc750df4ea3c234fdbc31a85b640107f5b5c5e47fc
 EBUILD etherape-0.9.4.ebuild 1226 RMD160 1d0a58c05438e6f45d4f7b577e70d34f5727be2b SHA1 47a1c1b17c053b792cd63a67e4b61da30dfdd58e SHA256 3f77ddb7e628f8dfc01dcf8adb085af93fe6146d72015dc9c573c6b7665315e5
 MD5 f7419daaa1c9116c52109dd13b1fd0f9 etherape-0.9.4.ebuild 1226
 RMD160 1d0a58c05438e6f45d4f7b577e70d34f5727be2b etherape-0.9.4.ebuild 1226
 SHA256 3f77ddb7e628f8dfc01dcf8adb085af93fe6146d72015dc9c573c6b7665315e5 etherape-0.9.4.ebuild 1226
+EBUILD etherape-0.9.6-r1.ebuild 904 RMD160 532ea47cf8c81c3e039dce575ead8ce2829bcc3c SHA1 6ae669b33adf05da98592f4d52ec816a9a0292af SHA256 4192f7a90740f0bfc24acf2b62eb7b6dc153ed708c8d7c792a07fb4bab9e4647
+MD5 626fa0253f2180fb7f5d01dfdf868119 etherape-0.9.6-r1.ebuild 904
+RMD160 532ea47cf8c81c3e039dce575ead8ce2829bcc3c etherape-0.9.6-r1.ebuild 904
+SHA256 4192f7a90740f0bfc24acf2b62eb7b6dc153ed708c8d7c792a07fb4bab9e4647 etherape-0.9.6-r1.ebuild 904
 EBUILD etherape-0.9.6.ebuild 852 RMD160 6e3b5116f158f88842b4082121d65d5178990fe8 SHA1 13fe21c4c993516259aac0bf422e4d96eb822aa0 SHA256 5f115153c114aa153224a4560d4757ee448ce99beb3973976fe8b347f25ae4de
 MD5 3b2bd909565466d4277909d18215fc10 etherape-0.9.6.ebuild 852
 RMD160 6e3b5116f158f88842b4082121d65d5178990fe8 etherape-0.9.6.ebuild 852
 SHA256 5f115153c114aa153224a4560d4757ee448ce99beb3973976fe8b347f25ae4de etherape-0.9.6.ebuild 852
-MISC ChangeLog 5577 RMD160 2db0fec5691e006acc498a54f97265acf5593f8b SHA1 a6a22d6e475474f13dc3db4103ac399b5a9cdfe7 SHA256 10c65adf38c7af27e9a4d80361ed79923f1d086b0076613a2e2d84e0de9d4edd
-MD5 110cf124987d30eaaf89cc8438ccc87a ChangeLog 5577
-RMD160 2db0fec5691e006acc498a54f97265acf5593f8b ChangeLog 5577
-SHA256 10c65adf38c7af27e9a4d80361ed79923f1d086b0076613a2e2d84e0de9d4edd ChangeLog 5577
+MISC ChangeLog 5765 RMD160 10ab4fbbd02a5403449c1919d682ef814ddf26d3 SHA1 05ae48af2f8539c683e7df8cef4a0749d2790f62 SHA256 3d11ef121a5609540da787c3bba960569bb55fd78a0d37c1319a8406089fb0f0
+MD5 4453445a22a057391f1cf73f76cc760e ChangeLog 5765
+RMD160 10ab4fbbd02a5403449c1919d682ef814ddf26d3 ChangeLog 5765
+SHA256 3d11ef121a5609540da787c3bba960569bb55fd78a0d37c1319a8406089fb0f0 ChangeLog 5765
 MISC metadata.xml 621 RMD160 bb14260cccc31851e6a5bca81d962dc5050ab82e SHA1 c639a6e8bcd117c78d6d590f6b073faf8580c9a3 SHA256 24acd07cf59238e01dca25439d05e18f5fa47ad26fe6c387a4a56e6ce1d7e612
 MD5 d9b3c85ba68d751187c28b61eeb4c1a9 metadata.xml 621
 RMD160 bb14260cccc31851e6a5bca81d962dc5050ab82e metadata.xml 621
@@ -26,3 +34,6 @@ SHA256 f5ba5ac69672ea3a785a4375c915b6967574ad44a3720296965a45ad6a21210c files/di
 MD5 30f0bf9be37aed883506a182b86e0784 files/digest-etherape-0.9.6 244
 RMD160 5672bf9c9a46ad583bb6e0acc33a850bfba6b3d6 files/digest-etherape-0.9.6 244
 SHA256 42ff74fdbe7be9698cf606d230a06a73f2cfe9757680d382d044b86962e085dd files/digest-etherape-0.9.6 244
+MD5 30f0bf9be37aed883506a182b86e0784 files/digest-etherape-0.9.6-r1 244
+RMD160 5672bf9c9a46ad583bb6e0acc33a850bfba6b3d6 files/digest-etherape-0.9.6-r1 244
+SHA256 42ff74fdbe7be9698cf606d230a06a73f2cfe9757680d382d044b86962e085dd files/digest-etherape-0.9.6-r1 244

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 (file)
index 0000000..2950897
--- /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 (file)
index 0000000..515b7f4
--- /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 (file)
index 0000000..4a7a0a4
--- /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