Fix some build warnings and apply fix by Chris Coleman for HZ warning #303120 by Alexander Holler.

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

5 files changed, 167 insertions, 7 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index b5d02fe6d124..2bc3d7054751 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.40 2010/09/22 15:24:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.41 2010/11/21 20:16:28 vapier Exp $
+
+*procps-3.2.8-r2 (21 Nov 2010)
+
+  21 Nov 2010; Mike Frysinger <vapier@gentoo.org> +procps-3.2.8-r2.ebuild,
+  +files/procps-3.2.8-forest-prefix.patch,
+  +files/procps-3.2.8-linux-ver-init.patch:
+  Fix some build warnings and apply fix by Chris Coleman for HZ warning
+  #303120 by Alexander Holler.
 
   22 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   procps-3.2.8-r1.ebuild, +files/procps-3.2.8+gmake-3.82.patch:
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 9520e319d59c..e15f0fc7689d 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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+gmake-3.82.patch 383 RMD160 d72a3a6cc861b9fa69086235fbffeb60c2eaee06 SHA1 3a4908ed8dbc936e39cb9094af8098ef9e656581 SHA256 1ab2174eeeeda64db81dfd9e422663cf9fbe2c3ee6e1f6e0e922e2d7648c05f0
+AUX procps-3.2.8+gmake-3.82.patch 366 RMD160 8de2f12ffcf2dee2b1074ab16f37c8b664e8d268 SHA1 c1f5e83507dbcbfaf3328accdb9cf9b2d3fe4c1b SHA256 8b74a3ee39ab8535a414931f86b85320a38ef3dc39d65c75ed51fa6d7c041cdb
+AUX procps-3.2.8-forest-prefix.patch 1129 RMD160 b3f7d39cfab5fcf7bc4740a392d9471be1a54c7a SHA1 7974f857634698650953d40a38ed9cdbcaad613b SHA256 4773f42d2c9bd2dafe14431b2b1e41d79bfbf9b567b4003b2a383ed6c65cd930
+AUX procps-3.2.8-linux-ver-init.patch 823 RMD160 e029ee04df0be7ca11878c3bb4e3c544602dc329 SHA1 171d5352940200c209e0c2d43c17f01c02173a66 SHA256 48da9b481af5cbf1beb11f1828c8142b3b77d62c387d8af79e8b0de2c36e6aa8
 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 2580 RMD160 560c99b7653f566d53972df36521e00b79d97006 SHA1 580ce76f41c5c6cb829308ac76e3ed9386df2529 SHA256 f3e68ba0ef0f9926d0dbd0ccb9cb7d3abc8253f2b831dcab6eb70e8337e7f3f6
+EBUILD procps-3.2.8-r2.ebuild 2696 RMD160 6abedc2fd24eeeef5df22f9e30c2d7b8400558b7 SHA1 5f47cdbd3c2a5391d82af87ddcfc6f9b14cd3837 SHA256 e177f9f2fb537b8cdc4f31fa01a0d8825b4a57b09192f162566b239a1b4f4464
 EBUILD procps-3.2.8.ebuild 2457 RMD160 967038956d5cfff8fa4a8890092e94275a932b35 SHA1 42d0731ae16c97c917605b27c8c384e5ea0c5e00 SHA256 13692c647d833b8e122abb8bae7670ee9beb301d0b13e4c2ad1bf296ece4e40e
-MISC ChangeLog 21490 RMD160 56ef98df50ff1287ca35c6212c608e2803271aad SHA1 6d12d8067a0442504e43bb84f05a406b6b076584 SHA256 6d091ba62e1d0df9a86ebab26cee69db23bcf4c863e0d28e4410c6bcb2299fd7
+MISC ChangeLog 21785 RMD160 672c6bf203f1947e555f6e1595c62c9c16c24350 SHA1 52cfa60f823564318e166ce19c8391b894f4a009 SHA256 c79ebf8d9febf7b2701d985ab582f23fe34ae4691eb272cda50dd8190df821fe
 MISC metadata.xml 233 RMD160 eb1f965766a567d9532906b72a415ac9f26568cf SHA1 0d2f3cf7a995f93a571490b449e326f955f49f4f SHA256 3b65bcd57075074266dba6e86dbe969592d58f69469e31072736cd1a42a76932
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyaH9sACgkQAiZjviIA2XgtCgCfe+G/HuLtQXy6RW3A7WQMdOXJ
-pboAn2drpxrD3qCvaMzxj50ByKqeBuUS
-=B4k+
+iF4EAREIAAYFAkzpfaUACgkQTwhj9JtAlp4tYAD+PC4SnJTN3a9ZgFSxqXZXFM8w
+XDwNBNyKMHDmteJbBJcA/A5xtQsoHV8LG/PlmtFgUA1s5DFya69tUKFN2kojoHQ8
+=KMBx
 -----END PGP SIGNATURE-----
diff --git a/sys-process/procps/files/procps-3.2.8-forest-prefix.patch b/sys-process/procps/files/procps-3.2.8-forest-prefix.patch
new file mode 100644
index 000000000000..915be67308b7
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.8-forest-prefix.patch
@@ -0,0 +1,38 @@
+avoid gcc warnings like:
+
+ps/output.c:341:6: warning: the address of ‘forest_prefix’ will always evaluate as ‘true’
+
+Index: ps/output.c
+===================================================================
+RCS file: /cvsroot/procps/procps/ps/output.c,v
+retrieving revision 1.63
+diff -u -p -r1.63 output.c
+--- ps/output.c	3 May 2009 06:39:33 -0000	1.63
++++ ps/output.c	14 Nov 2010 00:24:56 -0000
+@@ -338,7 +338,7 @@ static int pr_args(char *restrict const 
+   unsigned flags;
+   int rightward=max_rightward;
+ 
+-  if(forest_prefix){
++  if(/*forest_prefix*/1){
+     int fh = forest_helper(outbuf);
+     endp += fh;
+     rightward -= fh;
+@@ -365,7 +365,7 @@ static int pr_comm(char *restrict const 
+   unsigned flags;
+   int rightward=max_rightward;
+   
+-  if(forest_prefix){
++  if(/*forest_prefix*/1){
+     int fh = forest_helper(outbuf);
+     endp += fh;
+     rightward -= fh;
+@@ -390,7 +390,7 @@ static int pr_fname(char *restrict const
+   char *endp = outbuf;
+   int rightward = max_rightward;
+   
+-  if(forest_prefix){
++  if(/*forest_prefix*/1){
+     int fh = forest_helper(outbuf);
+     endp += fh;
+     rightward -= fh;
diff --git a/sys-process/procps/files/procps-3.2.8-linux-ver-init.patch b/sys-process/procps/files/procps-3.2.8-linux-ver-init.patch
new file mode 100644
index 000000000000..6d4039c91088
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.8-linux-ver-init.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/303120
+
+make sure the linux version constructor runs before the libproc constructor
+since the latter uses variables setup by the former
+
+fix by Chris Coleman
+
+Index: proc/version.c
+===================================================================
+RCS file: /cvsroot/procps/procps/proc/version.c,v
+retrieving revision 1.7
+diff -u -p -r1.7 version.c
+--- proc/version.c	9 Feb 2003 07:27:16 -0000	1.7
++++ proc/version.c	14 Nov 2010 00:22:44 -0000
+@@ -33,7 +33,7 @@ void display_version(void) {
+ 
+ int linux_version_code;
+ 
+-static void init_Linux_version(void) __attribute__((constructor));
++static void init_Linux_version(void) __attribute__((constructor(100)));
+ static void init_Linux_version(void) {
+     static struct utsname uts;
+     int x = 0, y = 0, z = 0;	/* cleared in case sscanf() < 3 */
diff --git a/sys-process/procps/procps-3.2.8-r2.ebuild b/sys-process/procps/procps-3.2.8-r2.ebuild
new file mode 100644
index 000000000000..df087555f471
--- /dev/null
+++ b/sys-process/procps/procps-3.2.8-r2.ebuild
@@ -0,0 +1,88 @@
+# 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-r2.ebuild,v 1.1 2010/11/21 20:16:28 vapier 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
+	epatch "${FILESDIR}"/procps-3.2.8+gmake-3.82.patch
+	epatch "${FILESDIR}"/procps-3.2.8-linux-ver-init.patch #303120
+	epatch "${FILESDIR}"/procps-3.2.8-forest-prefix.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"
+}