fix bug #245966

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.24-gentoo-r5-1 i686

5 files changed, 73 insertions, 6 deletions

diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog
index fa7715c6ad8c..59adc8307b8a 100644
--- a/sys-process/htop/ChangeLog
+++ b/sys-process/htop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/htop
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.63 2008/11/24 10:20:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.64 2008/11/29 18:31:55 wschlich Exp $
+
+*htop-0.8.1-r1 (29 Nov 2008)
+
+  29 Nov 2008; Wolfram Schlich <wschlich@gentoo.org>
+  +files/htop-0.8.1-non-printable-char-filter.patch, metadata.xml,
+  +htop-0.8.1-r1.ebuild:
+  fix bug #245966
 
   24 Nov 2008; Raúl Porcel <armin76@gentoo.org> htop-0.8.1.ebuild:
   ia64/sparc/x86 stable
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 89ee8d37dce5..ce56d3ea5e0e 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,9 +1,11 @@
 AUX htop-0.8.1-desktop-entry.patch 396 RMD160 a86dbdf0856410707d3b352df43c10dddfb3d807 SHA1 4f852f1a9be20bb6d49369c43d43d0c2560f6c49 SHA256 fad5d148a176b61b2ceeba0dfefd6dc9efd54704ff8f845f6b7ef695a49f2625
+AUX htop-0.8.1-non-printable-char-filter.patch 576 RMD160 eb716cf0a079b4a06aa60c763c2b3ecb138aa82e SHA1 1ade154e42525b3e04210eb7375e1543ed6d87f5 SHA256 e4ff4eb727b9baae514589ec99d08f3c9f5160618dae493fcacca92473de68a7
 DIST htop-0.6.6.tar.gz 141140 RMD160 5d91a086657aba75d467cadf3eac4a476814cb5b SHA1 d0bb46a815a5075777ceb557586f72f622c28919 SHA256 b2e2ef39afc870c9ef7228959b53fbd38fab02be74bb0d3e91ebf4fdbaa752e0
 DIST htop-0.7.tar.gz 143896 RMD160 0f7606dfd143512e53414d346893f5a7799a8652 SHA1 43911d32f7b899dfd4addf65a83d8b3656454359 SHA256 1361f4f0b92d7e6bdac25a4b7ee138a7ee83b5a9368820f5aa518051ca82862b
 DIST htop-0.8.1.tar.gz 414870 RMD160 8e73a9b31b6a48d4680c4df06c280c8d1bc125da SHA1 b41b4d83ab7ac40b79f6eeb730cd561293b62fd4 SHA256 25ae28202fa4b782ed0e1298d3feee407bdeb56eaf9c652d0a6f9dbf22125d28
 EBUILD htop-0.6.6.ebuild 942 RMD160 994766208a4832be62555638f8133edb9882d42c SHA1 0782e250b90282aa8deefe9e5798df274ce87387 SHA256 4254b29b187a5703adecaabf2a7a304bbafe10868de227341fac1b31504a419a
 EBUILD htop-0.7.ebuild 945 RMD160 dad4544d03fbb5177d9ad72218c4084ab728621c SHA1 3c95fb3fbfec22f3bb973ebdeea35a1e3086d720 SHA256 aa065482e425d976107dd3e3833b55ccefe357015135c852279b290005547a4e
+EBUILD htop-0.8.1-r1.ebuild 1340 RMD160 d57644756a8f1bdc6876aa4b87c0197402ea951b SHA1 51b7d4711b395869a2f1e7b0092288edf52fd32f SHA256 f4647fc0b88a4df33452da5355fbffb0e30d4784e77e8421961eb4d203e1961f
 EBUILD htop-0.8.1.ebuild 1273 RMD160 2d4e7986cc4fe31e8f327b7f92eccc7b5fdd5533 SHA1 7c3838056ba8fe666a2d1c9a395a81681b61d5ff SHA256 d144c46b1d4c775ab9e4fb840dfda432c3c70c7d89233edad1055df07c265238
-MISC ChangeLog 8766 RMD160 7ac204446f09bd6e4de9fafda55c612e3dba3438 SHA1 252d39b36e6368a38a616ea02f1bd3b2d94ca5b2 SHA256 518af7c703732057a8cfa3ccd6c40c14611937e84ce590014c4459215b97d2be
-MISC metadata.xml 568 RMD160 d1c19dc280b15240497b45441aa40f5a618f632c SHA1 6445f6839b3e83b86d3378e101767d76b55f56a5 SHA256 e3bb2239ec18f1eee481212d8da40f2df63704267999ab4fe77a08494b2a4f71
+MISC ChangeLog 8961 RMD160 f155f0d8b09420601eb09e9c6ff4fe54d5ecb366 SHA1 dbdae2e65f467e69dd53b7b90602ef82c0ffddaa SHA256 c5c82ec4f8dcc45b18e61eb273f703d9132be6586c4ca025fdf6d9928362c784
+MISC metadata.xml 500 RMD160 6ddba736faa0cb5e3f7b4f28d1a29d6919944f55 SHA1 3e85797866016974019c3c270b575dd408257358 SHA256 4d196235fde1ba824700f9068c6798678dca529d37cd8377b40c5a89f7d66ddd
diff --git a/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch b/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch
new file mode 100644
index 000000000000..cfbafe84fca5
--- /dev/null
+++ b/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch
@@ -0,0 +1,12 @@
+diff -u htop-0.8.1.orig/RichString.c htop-0.8.1/RichString.c
+--- htop-0.8.1.orig/RichString.c	2008-03-09 03:23:49.000000000 +0100
++++ htop-0.8.1/RichString.c	2008-11-29 19:07:29.284860473 +0100
+@@ -58,7 +58,7 @@
+    int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len);
+    for (int i = this->len, j = 0; i < last; i++, j++) {
+       memset(&this->chstr[i], 0, sizeof(this->chstr[i]));
+-      this->chstr[i].chars[0] = data[j];
++      this->chstr[i].chars[0] = ((data[j] > 31) ? data[j] : '?' );
+       this->chstr[i].attr = attrs;
+    }
+    this->chstr[last].chars[0] = 0;
diff --git a/sys-process/htop/htop-0.8.1-r1.ebuild b/sys-process/htop/htop-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..df7591d02ed9
--- /dev/null
+++ b/sys-process/htop/htop-0.8.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.8.1-r1.ebuild,v 1.1 2008/11/29 18:31:55 wschlich Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="debug unicode"
+DESCRIPTION="interactive process viewer"
+HOMEPAGE="http://htop.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+DEPEND="sys-libs/ncurses"
+
+pkg_setup() {
+	if use elibc_FreeBSD ; then
+		elog
+		elog "htop needs /proc mounted to work, to mount it type"
+		elog "mount -t linprocfs none /proc"
+		elog "or uncomment the example in /etc/fstab"
+		elog
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-desktop-entry.patch
+	epatch "${FILESDIR}"/${P}-non-printable-char-filter.patch
+}
+
+src_compile() {
+	if use unicode && ! built_with_use sys-libs/ncurses unicode; then
+		die "for unicode support of htop, sys-libs/ncurses must be emerged with USE=unicode"
+	fi
+	useq debug && append-flags -O -ggdb -DDEBUG
+	econf \
+		--enable-taskstats \
+		$(use_enable unicode) \
+		|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc README ChangeLog TODO
+}
diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml
index 5e500212fe0e..3e8697042d49 100644
--- a/sys-process/htop/metadata.xml
+++ b/sys-process/htop/metadata.xml
@@ -3,9 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-	<email>wschlich@gentoo.org</email>
-	<name>Wolfram Schlich</name>
-	<description>Primary maintainer</description>
+	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <longdescription>
 htop is an interactive process viewer for Linux. It aims to be a 'better top':