Bug #279819: make top not ignore .toprc.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 113 insertions, 13 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index 3ec2b4cf56b1..21443ec7d61d 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/procps
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.38 2009/11/23 04:56:23 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.39 2010/01/25 03:06:08 robbat2 Exp $
+
+*procps-3.2.8-r1 (25 Jan 2010)
+
+  25 Jan 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +procps-3.2.8-r1.ebuild, +files/procps-3.2.8-toprc-fixup.patch:
+  Bug #279819: make top not ignore .toprc.
 
   23 Nov 2009; Mike Frysinger <vapier@gentoo.org> procps-3.2.8.ebuild:
   Add USE=unicode to control multibyte code.
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index be3cd9c8ff30..2d411baddd98 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.2.5-top-sort.patch 1384 RMD160 7ab964b4dd310d5032826abe64a46b8b6e968a80 SHA1 ad7782f3f4d118fa67c667d611a1eb2f4c736808 SHA256 bd52bdde8f43e9f1428d18efa13691abd83a25ea2f99d8c44fabccd7f2ba902b
 AUX procps-3.2.3-noproc.patch 911 RMD160 0c6714c16424a31cde28f8e667f05a46e71402d1 SHA1 6cc1c4fc8f7e39347619f4c9f1432dfc6d0164a1 SHA256 e3897fe3e8df43750f514e8fc84a82f5e00c0bc2245bbd21ad2d8ff9789087f1
 AUX procps-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch 380 RMD160 1f0796a5e1745d32ac12786e712823ae0359c986 SHA1 145e81079f980913327f3a2680e87d1ebba87f4f SHA256 7fa2c0891f8c96072e0cd6578228b122ca69602e89416e7a73c370895d93a267
 AUX procps-3.2.7-proc-mount.patch 657 RMD160 90d0dae26d4a514ef0dbcb3c90ba167d0890d14e SHA1 07bdfb5484189daad7beb18fd5e2f280e3de3cad SHA256 17194621e6f5307c1712fab15a13a7da0e10315cf8b45b34403b54c70013b2ba
+AUX procps-3.2.8-toprc-fixup.patch 647 RMD160 68ced4f43bcf86f61f4e66baecd60832fbcd8693 SHA1 e81c7dd3f836078bcb9b1d25ef2a161a48c5dce4 SHA256 da07ed67e5d1405ca673075459070f2fee985692ff930124ed484dacfe4db588
 AUX procps-mips-define-pagesize.patch 1028 RMD160 aa0cb4fdf76d50bae983683e0de0a06daba52361 SHA1 7658c35e40c4c565bd4f4124b09c43ec474da0bd SHA256 9000966beaa7ae9e8261dfc691b7b7bec08857e8404de60f30b10bbe6e702d8e
 DIST procps-3.2.8.tar.gz 285758 RMD160 ad63601fb6bf4692108484d9ed362f510cbcf505 SHA1 a0c86790569dec26b5d9037e8868ca907acc9829 SHA256 11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535
+EBUILD procps-3.2.8-r1.ebuild 2526 RMD160 271a4a5ebac316f88851e0de50e4e09f81eb05cb SHA1 fa1c38f21f21a44b9536f24f3f54af1153baa782 SHA256 7e8e590f20154ae31d721d4a84daea73b50a3089afba89aa50cdcd4e97be7caa
 EBUILD procps-3.2.8.ebuild 2457 RMD160 967038956d5cfff8fa4a8890092e94275a932b35 SHA1 42d0731ae16c97c917605b27c8c384e5ea0c5e00 SHA256 13692c647d833b8e122abb8bae7670ee9beb301d0b13e4c2ad1bf296ece4e40e
-MISC ChangeLog 21086 RMD160 ead2914ab53768f1abd2f6c20dd6e241b40f951b SHA1 3783f1955d5ce1f83fe9ec8ef9e02252f1c4b138 SHA256 5efae2dbb3011425dcf0575287a17bd90bf18e7d66387baa63230c0c5e76f81e
+MISC ChangeLog 21282 RMD160 1bc9e3e8cc2f8044ea5bb2ebf12311db98079393 SHA1 1d4f63c1621339fe660266a63c140d371d171343 SHA256 e35a15e43afa316d0517be03d16eab3c9e679539158a12b980919e8b60ec1a22
+MISC core 790528 RMD160 1eddb0a18834e3355e2c9531753d838a96406d69 SHA1 447e5eb8c0caec5a557d06b0fffcf77ce26411a1 SHA256 b402a6063f912b88b356fc55821866d0ff980e1d413c90a43d67e95d5e7f1b50
 MISC metadata.xml 233 RMD160 eb1f965766a567d9532906b72a415ac9f26568cf SHA1 0d2f3cf7a995f93a571490b449e326f955f49f4f SHA256 3b65bcd57075074266dba6e86dbe969592d58f69469e31072736cd1a42a76932
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAksKFtsACgkQlPl3HsVfCDrnigCfQgm0Npo/l/o956c03e3XXRCu
-jZkAnRuB/UIA9sqcix+rc8sdMe0qj2SO
-=sMmC
------END PGP SIGNATURE-----
diff --git a/sys-process/procps/files/procps-3.2.8-toprc-fixup.patch b/sys-process/procps/files/procps-3.2.8-toprc-fixup.patch
new file mode 100644
index 000000000000..24890b0d1369
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.8-toprc-fixup.patch
@@ -0,0 +1,16 @@
+X-Gentoo-Bug: 279819
+Upstream-Patch: http://procps.cvs.sourceforge.net/viewvc/procps/procps/top.c?r1=1.132&r2=1.134
+--- top.c	2008/03/24 04:41:26	1.132
++++ top.c	2009/12/10 11:37:48	1.134
+@@ -2190,7 +2190,10 @@
+ // Value a window's name and make the associated group name.
+ static void win_names (WIN_t *q, const char *name)
+ {
+-   sprintf(q->rc.winname, "%.*s", WINNAMSIZ -1, name);
++   // Note that src==dst is illegal in sprintf.
++   // Failure: amd64, glibc 2.9-20081201, gcc 4.3.4
++   if(q->rc.winname != name)
++      sprintf(q->rc.winname, "%.*s", WINNAMSIZ -1, name);
+    sprintf(q->grpname, "%d:%.*s", q->winnum, WINNAMSIZ -1, name);
+ }
+ 
diff --git a/sys-process/procps/procps-3.2.8-r1.ebuild b/sys-process/procps/procps-3.2.8-r1.ebuild
new file mode 100644
index 000000000000..a8f02945953e
--- /dev/null
+++ b/sys-process/procps/procps-3.2.8-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8-r1.ebuild,v 1.1 2010/01/25 03:06:08 robbat2 Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="Standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps.sourceforge.net/"
+SRC_URI="http://procps.sourceforge.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="n32 unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/3.2.5-top-sort.patch
+	epatch "${FILESDIR}"/procps-3.2.7-proc-mount.patch
+	epatch "${FILESDIR}"/procps-3.2.3-noproc.patch
+	epatch "${FILESDIR}"/procps-3.2.8-toprc-fixup.patch
+
+	# Clean up the makefile
+	#  - we do stripping ourselves
+	#  - punt fugly gcc flags
+	sed -i \
+		-e '/install/s: --strip : :' \
+		-e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \
+		-e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,' \
+		-e "/^lib64/s:=.*:=$(get_libdir):" \
+		-e 's:-m64::g' \
+		Makefile || die "sed Makefile"
+
+	# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in
+	# userspace anymore, so this patch instructs procps to get the
+	# value from sysconf().
+	epatch "${FILESDIR}"/${PN}-mips-define-pagesize.patch
+
+	# lame unicode stuff checks glibc defines
+	sed -i "s:__GNU_LIBRARY__ >= 6:0 == $(use unicode; echo $?):" proc/escape.c || die
+
+	# n32 isn't completly reliable of an ABI on mips64 at the current
+	# time.  Eventually, it will be, but for now, we need to make sure
+	# procps doesn't try to force it on us.
+	if ! use n32 ; then
+		epatch "${FILESDIR}"/${PN}-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch
+	fi
+}
+
+src_compile() {
+	replace-flags -O3 -O2
+	emake \
+		CC="$(tc-getCC)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		|| die "make failed"
+}
+
+src_install() {
+	emake \
+		ln_f="ln -sf" \
+		ldconfig="true" \
+		DESTDIR="${D}" \
+		install \
+		|| die "install failed"
+
+	insinto /usr/include/proc
+	doins proc/*.h || die "doins include"
+
+	dodoc sysctl.conf BUGS NEWS TODO ps/HACKING
+
+	# compat symlink so people who shouldnt be using libproc can #170077
+	dosym libproc-${PV}.so /$(get_libdir)/libproc.so
+}
+
+pkg_postinst() {
+	einfo "NOTE: With NPTL \"ps\" and \"top\" no longer"
+	einfo "show threads. You can use any of: -m m -L -T H"
+	einfo "in ps or the H key in top to show them"
+}