Fix ps segfault on x32 ABI.

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

4 files changed, 30 insertions, 9 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index 716136ea3a01..cdff406a00ee 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.58 2011/12/03 18:03:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.59 2011/12/08 06:23:58 vapier Exp $
+
+  08 Dec 2011; Mike Frysinger <vapier@gentoo.org> procps-3.2.8_p11.ebuild,
+  +files/procps-3.2.8-time_t.patch:
+  Fix ps segfault on x32 ABI.
 
   03 Dec 2011; Raúl Porcel <armin76@gentoo.org> procps-3.2.8_p11.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #390003
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index f8f1c56f2859..65fccbcd85da 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,5 +1,5 @@
 -----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 514 RMD160 0d27f02b6e1e8a9a717f293d2cde4013a531cc06 SHA1 6106530a402f772426ee80d05dab9a24deec49a4 SHA256 44dd3145a8be03cdb0ab3b691de5a98c89398d9990b3094af2e879ef54f98c51
@@ -8,6 +8,7 @@ AUX procps-3.2.8+gmake-3.82.patch 366 RMD160 8de2f12ffcf2dee2b1074ab16f37c8b664e
 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-r1-forest-prefix.patch 1178 RMD160 a1290cdca6b058a0b7a6f648f9c4f030ad037dd9 SHA1 5476d86cce4d201b3b684c99ddd53bb09962ef5c SHA256 7f1f56c34014243b140f4e71bfd396b5e3e86fba600e7826bb031236ae95d5dc
+AUX procps-3.2.8-time_t.patch 510 RMD160 e091b640bb1a7ebf7bc970448c3f2426244d1c60 SHA1 7f416bc994fa8ea8937303e66198203d47dbe4e9 SHA256 e2f48af1e487bdbb1d30ba4b638951b1082209ea9cd2607ff91f95591445bba7
 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
@@ -17,13 +18,13 @@ EBUILD procps-3.2.8-r1.ebuild 2297 RMD160 33568cf3dbc91f41dbc77a91e68a629359e438
 EBUILD procps-3.2.8-r2.ebuild 2404 RMD160 6c7555d8704fc852ad796cf964829a4d9a1456b0 SHA1 8b2bcc0c9be52cdd3f76a1220a9c06d9cbc85cf2 SHA256 288127656d1c50ed1a4da866a41179bedc29fa37836e3aefae33bba40edd2107
 EBUILD procps-3.2.8.ebuild 2178 RMD160 137ac755f53942f610174836337d95189278b2c1 SHA1 a2078c1e328c8dcf27323076faf133e590221611 SHA256 aa8bf0982fb584e8bc27cd6fba80871a85db1f818464bb9e7b08f586e10af1be
 EBUILD procps-3.2.8_p10-r1.ebuild 2666 RMD160 3697b5505e2360f0a633cdbebb0133db6546d352 SHA1 556d84a3433f3854785a2a225ffb18a5751dd090 SHA256 0ba59322fe034c1bab2f0e750ec7b225a9123a3270b630a60c559829a3b388c4
-EBUILD procps-3.2.8_p11.ebuild 2652 RMD160 8b553e680d73c1199db4435f8b7b2dd18ac6f7d0 SHA1 a7a271d82a3c11d89013a907ff7ccc6bf53602f0 SHA256 3b8b62db4e5e370a4542c54a467212d61a6d64e43c71ec4dcb941582b16e9171
-MISC ChangeLog 24178 RMD160 5b0eb02ac65dd8fad994cd031368f8d54b58806d SHA1 d7fb925f28da02c819c480c10af97bf457bba61e SHA256 c20d1293720491065b79309a6bd1098fd0899d0ed1820e58d3daa12a4b259a1b
+EBUILD procps-3.2.8_p11.ebuild 2698 RMD160 a99d362c39297626a8e2f91f63ed2b4ecb32fc29 SHA1 cc57b0ad48b1d2c17936872bab2191fa514325c3 SHA256 76753968e166a1149dc0d000e40d9f6104d87088c4837902063fac8fed137838
+MISC ChangeLog 24319 RMD160 d28bcfd7b1777edb666055c7e23b163ff723fab7 SHA1 cce5316c38a6d50d190f25a7674cea6424cc0fde SHA256 63c26ac5fd9d7365fc92880d78b60f1d7a7448a68a2b1492a4e50fc227efd52c
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7aZHAACgkQuQc30/atMkDgIwCcDn4Nw0o8d3L6Ib1JO1evz9Im
-gJ0AnR8BHsXqz68wf5R8uGi/zBFPA1dv
-=o2eU
+iF4EAREIAAYFAk7gWAoACgkQaC/OocHi7JZymwD/Qjq07WpFbqj2j0ohhK1Ky5vi
+CIe9LE5DogJ9YbBbzsAA/3lI3GwNSPfnUhm8WSIfEApMq9xsTRYi5B4TA4oEGMdJ
+=EfLo
 -----END PGP SIGNATURE-----
diff --git a/sys-process/procps/files/procps-3.2.8-time_t.patch b/sys-process/procps/files/procps-3.2.8-time_t.patch
new file mode 100644
index 000000000000..8053cda924c8
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.8-time_t.patch
@@ -0,0 +1,15 @@
+seconds_since_1970 is unsigned long, so we can't pass it as time_t or
+we corrupt memory if sizeof(time_t) > sizeof(unsigned long)
+
+--- ps/output.c
++++ ps/output.c
+@@ -989,7 +989,8 @@
+   const char *fmt;
+   int tm_year;
+   int tm_yday;
+-  our_time = localtime(&seconds_since_1970);   /* not reentrant */
++  time_t sec_1970 = seconds_since_1970;
++  our_time = localtime(&sec_1970);   /* not reentrant */
+   tm_year = our_time->tm_year;
+   tm_yday = our_time->tm_yday;
+   t = getbtime() + pp->start_time / Hertz;
diff --git a/sys-process/procps/procps-3.2.8_p11.ebuild b/sys-process/procps/procps-3.2.8_p11.ebuild
index 7948ddb5311c..88625c5fcf01 100644
--- a/sys-process/procps/procps-3.2.8_p11.ebuild
+++ b/sys-process/procps/procps-3.2.8_p11.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/procps/procps-3.2.8_p11.ebuild,v 1.6 2011/12/03 18:03:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8_p11.ebuild,v 1.7 2011/12/08 06:23:58 vapier Exp $
 
 EAPI="2"
 
@@ -41,6 +41,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.2.3-noproc.patch
 	epatch "${FILESDIR}"/${PN}-3.2.8-toprc-fixup.patch
 	epatch "${FILESDIR}"/${PN}-3.2.8-r1-forest-prefix.patch
+	epatch "${FILESDIR}"/${PN}-3.2.8-time_t.patch
 
 	# Clean up the makefile
 	#  - we do stripping ourselves