Another debug fix, bug 372911.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 50 insertions, 13 deletions

diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog
index a492e3612c94..2583f36e1b6c 100644
--- a/sys-process/htop/ChangeLog
+++ b/sys-process/htop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/htop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.89 2011/06/24 19:59:48 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.90 2011/06/24 22:11:25 idl0r Exp $
+
+  24 Jun 2011; Christian Ruppert <idl0r@gentoo.org> htop-0.9.ebuild,
+  +files/htop-0.9-debug.patch:
+  Another debug fix, bug 372911.
 
   24 Jun 2011; Christian Ruppert <idl0r@gentoo.org> htop-0.9.ebuild,
   metadata.xml:
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index a4032e16161c..b6255b40f008 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -2,20 +2,22 @@
 Hash: SHA256
 
 AUX htop-0.8.1-non-printable-char-filter.patch 576 RMD160 eb716cf0a079b4a06aa60c763c2b3ecb138aa82e SHA1 1ade154e42525b3e04210eb7375e1543ed6d87f5 SHA256 e4ff4eb727b9baae514589ec99d08f3c9f5160618dae493fcacca92473de68a7
+AUX htop-0.9-debug.patch 1001 RMD160 d08dc3ab94a5b13d844311e79984a00e59d10497 SHA1 c2442079a52aca5c38f9891d3000f0983c702380 SHA256 fe2600badc33e7fee7f75f8a5bfd4d4b78619bc2a17d6302c7469d7d39fdb1db
 DIST htop-0.8.3.tar.gz 428061 RMD160 ac1707c2f27ac1c6576601765bda4335e49d6aea SHA1 2a0bf90f160b3d019e26712c94db612d6ff9a429 SHA256 f03bac8999c57c399cbf4332831bcce905d0393d0f97f7e32a1407b48890dd9d
 DIST htop-0.9.tar.gz 418767 RMD160 ac0ef275e8ad5a27e5f35fa03800b15ef0966cfe SHA1 d755bff386c260c06162d50113794722e98e9200 SHA256 4de65c38e1886bccd30ed692b30eb9bf195240680781bfe1eaf5faf84ee6fbfd
 EBUILD htop-0.8.3.ebuild 1441 RMD160 a15f26d46fb6663b9bef520e0450c5ecfa6eff58 SHA1 125fcc6af4919c2ae5eb0bb2db14446246926c47 SHA256 4357980b8ed3a019151c3f2b694288e3e51ddc4a94ed95022056bcc201215902
-EBUILD htop-0.9.ebuild 1670 RMD160 f9c72897e8bd09edb722f85a286a256848ec72b7 SHA1 79c2bbe92756177693d9f7c2123c2053af81227f SHA256 ff6d542aec8b8e0f61d5b8b5b2bd95b8cf3b08e9b2342ac0119bee79417837f8
-MISC ChangeLog 12332 RMD160 da76a3080e1ea6503829c2442e2649f8361e95fd SHA1 49aed7fe0ae539f982178d3061833687b010e3b9 SHA256 573b275ebf4bf8bf42165f69318124e23ef9e51ea94796c7d32fd482154ebd8d
+EBUILD htop-0.9.ebuild 1638 RMD160 848a9db0c355d1be789f8ee6674ccbec1a9818af SHA1 21cd544e646334ec4a181fe8cab163337e9049e3 SHA256 5bff62d3ab1d047e854246b1ea5d8743b11fe5395e9229a2c1ba191a0a201231
+MISC ChangeLog 12466 RMD160 71f2b60de2e4d84a72e7b14801977560bd39b008 SHA1 87a6b394459e40d1bd61b37a24d97fcf932c95f8 SHA256 f0824faad09501299b2374ba677c794ecfc79e0f13c3d693b734d285377c1452
+MISC core 2236416 RMD160 c3a4dd13f11eef188999065e16b63f43b3e2f52a SHA1 0c75929bdbca6f7107a1baac1304497cccbd7061 SHA256 e6299c9f5ab7e2cc559be1bdf6a4d06cf12f11d697ed2d57d90d6655930bbb36
 MISC metadata.xml 646 RMD160 bb721b5dbe90097a4a2d661e9e5af19c7a5e5321 SHA1 984c37dac245d6a5eb05bfaddba2c6ff29c9d88b SHA256 ca74851034f4d0b5382110463036025b2b6f9b2340274225ad9f56f6ecc457f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJOBOy6AAoJEMOx0zmdw4Z1zYIH+QFVOr5wPFmK6abUOmjMuDOO
-YXFLPfOHn3jDN7MfrCML9X7alKX27LrMgjH+pslL8oLibTQl8dr+RqvTGKQ4Munj
-0yj7PxygFGfoTW1+xvVU8mGX6tpcN/xsISDxHsgahcfPNeZYV+Yej8Qb5CNi3gQ2
-Y8tvxnN1AViPcCVZ46hMnClpbgaIqStee7XIycf4kSrGXTO7MIyQoCClun6tQJGx
-TfpFQVUWxADFYrZUdSf029jKYk9NyhifB269HbT08gSux8hYlbaaff260AIkqz7R
-wM5HaF9nmkWyCYCl0sn3BGkWTGKx6NSJ0ylawC/Sg1ZDwdmSt8s2BhPqE1XQo64=
-=No05
+iQEcBAEBCAAGBQJOBQuSAAoJEMOx0zmdw4Z1KHMH/2Wcq0usMKjO+I3XaZfOI4DT
+RzCPg18X+XgbTQlIPlFVpZzff187pLqVXis8M9zEjRsrvBJBycd4q7Ara0tA4DrP
+FFhyGzKoLAJYh65ZFOcIdLZySiuJKqiEv/C/TP+9Mv3Rr02HhED+bnzHJLYnEYO6
+V/58Mai4AHYeHsdJMBc2lowfgc3nN3lR80Vj8bBgtrx+/E4aej4cJIotHZj7uLWG
+tL5NvOyHuP+MU+bCtyf4bJn0D20tRzW52f+RcfISGtmEbc9riJnjRO5DABfDJm79
+7S+ZcmGX4jN1NxL3NVIEuOL8HbYWB2xk+JomEKSiHGYYq/BZh2eN+wzxLO/Tb4I=
+=c8Ep
 -----END PGP SIGNATURE-----
diff --git a/sys-process/htop/files/htop-0.9-debug.patch b/sys-process/htop/files/htop-0.9-debug.patch
new file mode 100644
index 000000000000..a1aa1b9ea3ec
--- /dev/null
+++ b/sys-process/htop/files/htop-0.9-debug.patch
@@ -0,0 +1,31 @@
+--- trunk/DebugMemory.c	2006/11/08 20:40:10	66
++++ trunk/DebugMemory.c	2011/03/22 20:37:08	216
+@@ -90,7 +90,7 @@
+    return data;
+ }
+ 
+-void* DebugMemory_strdup(char* str, char* file, int line) {
++void* DebugMemory_strdup(const char* str, char* file, int line) {
+    assert(str);
+    char* data = strdup(str);
+    DebugMemory_registerAllocation(data, file, line);
+@@ -102,7 +102,7 @@
+ }
+ 
+ void DebugMemory_free(void* data, char* file, int line) {
+-   assert(data);
++   if (!data) return;
+    DebugMemory_registerDeallocation(data, file, line);
+    if (singleton->file) {
+       if (singleton->totals) fprintf(singleton->file, "%d\t", singleton->size);
+--- trunk/Process.c	2010/11/22 12:40:20	206
++++ trunk/Process.c	2011/03/22 20:37:08	216
+@@ -471,7 +471,7 @@
+       RichString_setAttr(out, CRT_colors[PROCESS_SHADOW]);
+    if (this->tag == true)
+       RichString_setAttr(out, CRT_colors[PROCESS_TAG]);
+-   assert(out->len > 0);
++   assert(out->chlen > 0);
+ }
+ 
+ void Process_delete(Object* cast) {
diff --git a/sys-process/htop/htop-0.9.ebuild b/sys-process/htop/htop-0.9.ebuild
index f24d06b7f05e..f945644c092a 100644
--- a/sys-process/htop/htop-0.9.ebuild
+++ b/sys-process/htop/htop-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.9.ebuild,v 1.4 2011/06/24 19:59:49 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.9.ebuild,v 1.5 2011/06/24 22:11:25 idl0r Exp $
 
 EAPI=3
 
@@ -38,8 +38,8 @@ src_prepare() {
 	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
 		scripts/MakeHeader.py || die
 
-	# bug 352024
-	sed -i -e 's:assert(out->len > 0);:assert(out->chlen > 0);:' Process.c || die
+	# bug 352024, 372911
+	epatch "${FILESDIR}/${P}-debug.patch"
 }
 
 src_configure() {