Add a fix for bug #155957.

Package-Manager: portage-2.1.2_rc4

5 files changed, 65 insertions, 12 deletions

diff --git a/net-analyzer/chaosreader/ChangeLog b/net-analyzer/chaosreader/ChangeLog
index 300e2160046b..b35c0f21ac7c 100644
--- a/net-analyzer/chaosreader/ChangeLog
+++ b/net-analyzer/chaosreader/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/chaosreader
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/ChangeLog,v 1.8 2005/08/12 00:08:50 tester Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/ChangeLog,v 1.9 2006/12/24 16:10:29 spock Exp $
+
+  24 Dec 2006; Michał Januszewski <spock@gentoo.org>
+  +files/chaosreader-0.94-zombies.patch, chaosreader-0.94.ebuild:
+  Add a fix for bug #155957.
 
   12 Aug 2005; Olivier Crête <tester@gentoo.org> chaosreader-0.94.ebuild:
   Marked ~amd64, closes bug #102108, thanks to Mike Cvet for testing
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index 3bcec002f181..3946cc6aee93 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -1,18 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
+AUX chaosreader-0.94-zombies.patch 349 RMD160 024fa499429cd29984f28b2240a3108021f1fdca SHA1 237f586bfe868423963f1e28c1a71241ac579979 SHA256 bbb03272d9d8970ab9c4c7a7f5b263142424f848c114b6108b6604887eb80421
+MD5 2c729474b5a1029d66e49880796f5517 files/chaosreader-0.94-zombies.patch 349
+RMD160 024fa499429cd29984f28b2240a3108021f1fdca files/chaosreader-0.94-zombies.patch 349
+SHA256 bbb03272d9d8970ab9c4c7a7f5b263142424f848c114b6108b6604887eb80421 files/chaosreader-0.94-zombies.patch 349
+DIST chaosreader-0.92.bz2 34308
+DIST chaosreader-0.93.bz2 36291
+DIST chaosreader-0.94.bz2 41039 RMD160 be830d31c4a93d969ad682780a84dae22a5f8202 SHA1 d37c237760cf883dcf311b3656f5bd8f088b1c89 SHA256 523f2107502dda9a1a9c73d8bc14605046f7352ada442bfcafec39a81b41f35b
+EBUILD chaosreader-0.92.ebuild 605 RMD160 878cb06c95a7e424f66270a45dcf3f4e9d53acc0 SHA1 103c46d56fdbcf5474a1f69f266b903e6bc31f9a SHA256 74441ddd3fa4c8483597475040c81a14de8aa6557665a8b52dee6d61a8c3292e
 MD5 70d159c3a6e9ce89a726add6c1c97fd1 chaosreader-0.92.ebuild 605
-MD5 a0ecb146c43529a33c5a50ba8ff596a0 ChangeLog 1126
-MD5 1d7c8b90aa430a6b307c140e663953ad chaosreader-0.94.ebuild 615
+RMD160 878cb06c95a7e424f66270a45dcf3f4e9d53acc0 chaosreader-0.92.ebuild 605
+SHA256 74441ddd3fa4c8483597475040c81a14de8aa6557665a8b52dee6d61a8c3292e chaosreader-0.92.ebuild 605
+EBUILD chaosreader-0.93.ebuild 610 RMD160 931bb644e1886614e7df6cb2b9c721dabf6ffe04 SHA1 0f899017bc533c5d67904f32944457b66b80031d SHA256 7d007118c5299ccc1c56b5f710a6cf88b45a6fcebf58e8c40cf277b5b2d7c74d
 MD5 ed4766dfbf5a1c8d8dce935116cba8a9 chaosreader-0.93.ebuild 610
-MD5 43b51bdb1777364d5237aaebe95995a0 files/digest-chaosreader-0.94 64
+RMD160 931bb644e1886614e7df6cb2b9c721dabf6ffe04 chaosreader-0.93.ebuild 610
+SHA256 7d007118c5299ccc1c56b5f710a6cf88b45a6fcebf58e8c40cf277b5b2d7c74d chaosreader-0.93.ebuild 610
+EBUILD chaosreader-0.94.ebuild 721 RMD160 758c769529c924cdcdb86c6edd3c1ede199a5fb5 SHA1 495f9bad6bea4f6067cbea349e3fb663f181cadc SHA256 47309277dce55a5c47f978c6cd46102a537a9eb339da321cd641b6ca59adbbeb
+MD5 ed63f45c6e681c2f58b57b4de1c4a580 chaosreader-0.94.ebuild 721
+RMD160 758c769529c924cdcdb86c6edd3c1ede199a5fb5 chaosreader-0.94.ebuild 721
+SHA256 47309277dce55a5c47f978c6cd46102a537a9eb339da321cd641b6ca59adbbeb chaosreader-0.94.ebuild 721
+MISC ChangeLog 1275 RMD160 82963e01dd4526bedb1cfc68071d48a95a43f1aa SHA1 c411482e9b30f573c2a76764beda757b8f32f2e8 SHA256 e698556266bca35e22a6cc70cc906511431dc2f9a3ea791ecbf85c87d411498b
+MD5 1208597672e0bbfdea010e2b0d60e785 ChangeLog 1275
+RMD160 82963e01dd4526bedb1cfc68071d48a95a43f1aa ChangeLog 1275
+SHA256 e698556266bca35e22a6cc70cc906511431dc2f9a3ea791ecbf85c87d411498b ChangeLog 1275
+MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
+MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
+RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
+SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5 metadata.xml 255
 MD5 2b9b223c5673dc0cde3af73f5cae47c3 files/digest-chaosreader-0.92 64
+RMD160 4e770ba2eefe355b01ceaad3c9cea504bc882098 files/digest-chaosreader-0.92 64
+SHA256 eb7f1aac2aefce74cfc5a43be34cb4e5906b5b6b8a96ec365af612cb4aa4e870 files/digest-chaosreader-0.92 64
 MD5 9a6fc091a0e89a040692fb7f55d9238e files/digest-chaosreader-0.93 64
+RMD160 f0a0e74201366633e734624cd1c4489223a725e4 files/digest-chaosreader-0.93 64
+SHA256 fb14296fbc17ef79d2ff058eb14a01afc38c3936a97d646a535e6d946955c42e files/digest-chaosreader-0.93 64
+MD5 ee3e49acf8f0a8916323db8fb58bd5ca files/digest-chaosreader-0.94 238
+RMD160 53877d9ada7c11218e1c62ef372b1a335ba0e537 files/digest-chaosreader-0.94 238
+SHA256 65b256f607b1fadc4ac3ecee8c7578f7e6f1fbdd4f3c3782719189914603ef09 files/digest-chaosreader-0.94 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFC++kZmOfEJZHYOKcRAhhNAKCL4UHkefRPKvPLBzsu+sFTsfvLswCePjYX
-awR+/kr+U7Xjan2sQV7//U8=
-=A8/1
+iD8DBQFFjqaRchej4aZK9/cRAnGYAJ4lTO1WNGlekvRz3+N4YLZ/SaqLtACeJCwi
+QS4YL05r2Q8LqQks7B+UE2E=
+=VDeP
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/chaosreader/chaosreader-0.94.ebuild b/net-analyzer/chaosreader/chaosreader-0.94.ebuild
index be7fa25dc183..32fc6f03fa52 100644
--- a/net-analyzer/chaosreader/chaosreader-0.94.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.94.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/chaosreader-0.94.ebuild,v 1.4 2005/08/12 00:08:50 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/chaosreader-0.94.ebuild,v 1.5 2006/12/24 16:10:29 spock Exp $
+
+inherit eutils
 
 DESCRIPTION="A tool to trace TCP/UDP/... sessions and fetch application data from snoop or tcpdump logs."
 HOMEPAGE="http://users.tpg.com.au/bdgcvb/chaosreader.html"
@@ -12,6 +14,12 @@ IUSE=""
 DEPEND=">=dev-lang/perl-5.8.0"
 S=${WORKDIR}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/chaosreader-0.94-zombies.patch
+}
+
 src_install() {
 	newbin ${S}/${P} chaosreader
 }
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-zombies.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-zombies.patch
new file mode 100644
index 000000000000..8f7dd04e50ed
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.94-zombies.patch
@@ -0,0 +1,11 @@
+--- chaosreader-orig	2006-12-24 15:12:23.000000000 +0100
++++ chaosreader-0.94	2006-12-24 15:11:56.000000000 +0100
+@@ -396,6 +395,8 @@ if ($Arg{normal}) {
+ 
+ elsif ($Arg{standalone}) {
+ 
++   $SIG{CHLD} = "IGNORE";
++
+    ############################################################
+    # --- STANDALONE - Create Packet Logs and Process them ---
+    #
diff --git a/net-analyzer/chaosreader/files/digest-chaosreader-0.94 b/net-analyzer/chaosreader/files/digest-chaosreader-0.94
index 6ef685c68389..1de4fccf912b 100644
--- a/net-analyzer/chaosreader/files/digest-chaosreader-0.94
+++ b/net-analyzer/chaosreader/files/digest-chaosreader-0.94
@@ -1 +1,3 @@
 MD5 53aafe07364c0c78fca8049f52fd74b7 chaosreader-0.94.bz2 41039
+RMD160 be830d31c4a93d969ad682780a84dae22a5f8202 chaosreader-0.94.bz2 41039
+SHA256 523f2107502dda9a1a9c73d8bc14605046f7352ada442bfcafec39a81b41f35b chaosreader-0.94.bz2 41039