Fixed incorrect memory usage (bug #332253)

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 77 insertions, 17 deletions

diff --git a/sys-process/time/ChangeLog b/sys-process/time/ChangeLog
index f0921365cbfe..d53a439a57fa 100644
--- a/sys-process/time/ChangeLog
+++ b/sys-process/time/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/time
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/time/ChangeLog,v 1.8 2014/01/18 03:51:44 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/time/ChangeLog,v 1.9 2015/02/01 11:26:41 polynomial-c Exp $
+
+*time-1.7-r2 (01 Feb 2015)
+
+  01 Feb 2015; Lars Wendler <polynomial-c@gentoo.org> +time-1.7-r2.ebuild,
+  +files/time-1.7-incorrect_memory_usage.patch:
+  Fixed incorrect memory usage (bug #332253).
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> time-1.7-r1.ebuild:
   Add arm64 love.
diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index c6567e14a5a9..6f42e5c6e2a3 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -3,24 +3,26 @@ Hash: SHA256
 
 AUX 1.7-info-dir-entry.patch 461 SHA256 fec1ec5d871e2685b22ae73b89fa9ca7d9df9d662c2d28d0ca15e23c53fa0385 SHA512 8ec76006c58798fc317c9280a16737e133992915e12ea97797fae3e4d02489e38a8d68254a104b540ea953827b222e6672e0c2e0a23ed4992db134c7c5ccc4f2 WHIRLPOOL 23c919612cad9379d6a39f0d50d02d8e1041913442da184ca1377b5e89c8dfe24874a5a9547e023db4fd21a7db8c8d21817343fd44f02c8fe9ca6baa9671924c
 AUX time-1.7-build.patch 297 SHA256 06871e5b9279c8dd59935bfa919f410e44a02a2503ef55c8e95219dcd8e18bf5 SHA512 a08de606393041af79145913f45b7380cbef67c152673b585c84d99e72fc1482bad0bde9c560f7cdce2e72caf46e9e47c870fc0eb5a2ba486dd99a13648184c5 WHIRLPOOL d3b7242594ea1d31047a2c31749bfbb979ad8989663d313f609826d184e1cd0dc222e852dbfb00a286ac7f463b459d9c9b44fe138d90404f3e8145aa7f884557
+AUX time-1.7-incorrect_memory_usage.patch 1217 SHA256 6a54c0e58b63daf8f8fcde16dde649d9104adcf0541989a907f95fd650fe147c SHA512 e00771b2632d795694135c5c2c81b9e4e2d60779fc158e548a73b0b4bbe92a01df9c6770f88bcc75e71142a20aa6e0e019c988f52db973841cc1816fde51d99a WHIRLPOOL b198f90c953d60d832bfd90221ece32c9009c65194f9568d42160a5848fd03741147607b3204def5bcf8415c2659229ee55126c2174ed139c6a724be5103a801
 DIST time-1.7.tar.gz 103066 SHA256 e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1 WHIRLPOOL 8102c994a6b5faa60ee51e7343383f307c0d31cbd26177f86fc96b41014e1065b536202a371556af336394ac0bf473db2571a15bc7644247a9a3d8235269880f
 EBUILD time-1.7-r1.ebuild 678 SHA256 1ebe78e9dcd3a08c70c27eb7dc19b4b9cfd85f2582d6c14e3dc266765c4e700c SHA512 a041fe16b8703fa4b8285f7d74532188e2d230943b979cb7be07e850d751c6e6d7f42469e62dd3eb3689e63e7166cc4bdd4c5ed0fbcb922396d26344c870c47b WHIRLPOOL f2395f72f8e009d05cc909ea7a5c5c8515b813e357cb7ff891dfa14c72ef08d13380f831ad1fa4ecaacc3e1b8d392da5ba4a581a6f8f07b956ef26cff8de1a08
-MISC ChangeLog 2205 SHA256 f57c6c230218dd39b4cf700ff435e96efc08afec1c7143d5dec0ea800609589c SHA512 244dcb20abee6a12bbdceddc3d6ba4ec3f4364015a394037d70f9f062f3b027a9239df868b2c4dffce95e7d584a36a1cb4f2dcc606039c8a832d8001df75794c WHIRLPOOL 3e13815031621698a35779258f33da69a8d9d4955baa30995aff4d1b089618efbb62e7e8ea8bb427150dcc1f6bbe74ab84ac5aa2b9b9b02414187d3a3ee3b3de
+EBUILD time-1.7-r2.ebuild 749 SHA256 192dc6d5eab353ec80886eaff54cc40c9d8849bbffe83b269852b1f7f5bf255e SHA512 3651fd4197cc70b41f2e4879a95823b74c11761371205e84d88433323b4bf35d073ed31c695996d83fb548258505621bc6526cd05c867b0d24a2ed48791274e7 WHIRLPOOL 23ec30993dc063caf98bd57c17db6ea1c747542839d12006fdc2a8001bd1acb7cf90b0bb91509a83b2b456a8bc342d91fd69b689c5a2765d6f57c3f66702c3ff
+MISC ChangeLog 2409 SHA256 94aafa96c12241bda52707b22165c27e87d22e5a43d843bc84b62d8826975a87 SHA512 574fa9cd3b97f4be09eda2efa1e6238b644d98051bfafa7139b978db3320d7264f87521ecf0540bb79930ae59de81c8faff27890e40e6344dd632541cc3fd06f WHIRLPOOL 592284c6d40860f5b42b425d817af231fe697fa5e60b82304a9e3eaddec31fc94631fb98b7e2eeeac594af6171db255e5e4f5171cea96dda712c407f73ddae62
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS2fpXAAoJEPGu1DbS6WIA9AkP/jSCW4CEmKRi7MezPBH6K2XQ
-0JUh18y3IY/gCiRAQcRaKAnKiL4ZQBjex6UG69sRRdgynuwUCGtmuwhdeN+j4VXe
-R6W9TwSJNI/IgsvXxO+C1IbjgVFh1S90OuIiicyz6NF6v8s/id9XQXhmqO3tFQkz
-CrwOQGdahmVanbczCMyXno/WmEGjO2LSWNYIzG0JBqgRlzLyptpPKBVdrrhns4gn
-4vddgxVwIcnhLRkpk2yKb2I3lJ9BNc9f0GANA/nBDx4aizrnO0Dyg763fGfWR8kj
-mSJ86cvj53nlFT3hbTTLN0DucQxikybRPqjhDNpP30OSWEHKQ/2kJ0wpVU1ooZKZ
-lF93b4uYdCuer0csNymoWb46cm52UdHYT8g2DX9mFn6MYYhll4/a+555jQa8sknP
-01jWLpW1fj2AwBpWAA3PAsWceqcJzMyUJNUqDc8Pgbkad9b0LpNH3ab+19A9Ui0o
-roap8x38E8xuLzuaiwqfAg27a6SoZtRKGnLHk2/MPG90q3G+CuPY3vcjtR3I5Ayh
-D644MwKRiPrz9XhvZ+g9RE9xAb3ICrAegbAKwMnsC/IKX9o2NSDyQD5UafMdSsmB
-SyMZQfCY6DJax7uVJuEcxI9ViTe5xSal5rlfHyuBUx65RfzO4OlvPoPpBeb7oah6
-4lkP3SX/7Sihvr5e3iiO
-=vPxI
+iQIbBAEBCAAGBQJUzg1yAAoJEPiazRVxLXTFCIwP+KyJajIqBJpAEzlDglxEFIMR
+31Ut04tNGo3U8WEpxnbfvxWBqMl3fmjAlFjwm6J4GhDf7SrR25bykoU8Xq+6HvaU
+blmHB6fFrbCux3vIKVmA9Ghq9K19aeITUSRRkY5OJkvI/V+gd253lAo4S96mPY9t
+By24xlUmdVTVfw2fua0mx1ryIf1PZj9zV0wcuGMUN7a6RQt0SXvbZjxJHu4LptZ3
+0JyF7SYB1n0tNJYiEBFIAZMaQGICxo9C+rlXY61glHEkdV0qCtZldV8JBQFrKzj2
+390JJW7DVfc7CNPHvfehczbbtcJt6hG6EZhv+j0SuJuvReAFAChSjDzwvIGlT98W
+p/sUepTKyDX2HKreRy2fFTpqzj3Jy5hMKnvljf++E9DW5gN4HqxwhAce7MD7H23o
+xAJMLPbx6qqVo0v8eVLNEQVB/tjfBrWsMseWhFmpav2NzWrY8YY5hte2DjPGThl4
+u3u4u4pBeRURcBoPfUZZDpBOAxpzp0ukh1HPZCLYZOgnY3rtahqd3r+4iMZATUxY
+hNK9LrbBngq3tHaSJ3f6pt72KFZGhZZKinjlc2bMlHm6oKKuxZ9KgOZFXXePtljQ
+BwFISiYdaq0AAd/eH3vuapOh0SBhnPKbBOz091M6q+q7pqivGhVx0Yv5AQWeYZft
+NfJbmPfi0OxGCQTvcds=
+=WaTq
 -----END PGP SIGNATURE-----
diff --git a/sys-process/time/files/time-1.7-incorrect_memory_usage.patch b/sys-process/time/files/time-1.7-incorrect_memory_usage.patch
new file mode 100644
index 000000000000..55807100c3a9
--- /dev/null
+++ b/sys-process/time/files/time-1.7-incorrect_memory_usage.patch
@@ -0,0 +1,28 @@
+https://bugs.launchpad.net/ubuntu/+source/time/+bug/742248
+https://bugs.gentoo.org/332253
+
+diff -rupN time-1.7-original/ChangeLog time-1.7/ChangeLog
+--- time-1.7-original/ChangeLog	2011-11-11 09:17:47.507026731 +0100
++++ time-1.7/ChangeLog	2011-11-11 09:27:46.751002205 +0100
+@@ -1,3 +1,9 @@
++Fri Oct  1 00:00:00 2010	Bob Proulx	<bob@proulx.com>
++	The struct rusage reports ru_maxrss in kbytes not pages and 
++	should not be converted through pages-to-kbytes again. 
++	Reported by Sven Hartrumpf.
++	* time.c (summarize): Do not call ptok on ru_maxrss.
++
+ Thu Jul 11 12:37:17 1996  David J MacKenzie  <djm@catapult.va.pubnix.com>
+ 
+ 	* Version 1.7.
+diff -rupN time-1.7-original/time.c time-1.7/time.c
+--- time-1.7-original/time.c	2011-11-11 09:17:47.507026731 +0100
++++ time-1.7/time.c	2011-11-11 09:27:58.167001738 +0100
+@@ -398,7 +398,7 @@ summarize (fp, fmt, command, resp)
+ 		       ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v));
+ 	      break;
+ 	    case 'M':		/* Maximum resident set size.  */
+-	      fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss));
++	      fprintf (fp, "%lu", (UL) resp->ru.ru_maxrss);
+ 	      break;
+ 	    case 'O':		/* Outputs.  */
+ 	      fprintf (fp, "%ld", resp->ru.ru_oublock);
diff --git a/sys-process/time/time-1.7-r2.ebuild b/sys-process/time/time-1.7-r2.ebuild
new file mode 100644
index 000000000000..a473f8c2ec4c
--- /dev/null
+++ b/sys-process/time/time-1.7-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/time/time-1.7-r2.ebuild,v 1.1 2015/02/01 11:26:41 polynomial-c Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="displays info about resources used by a program"
+HOMEPAGE="http://www.gnu.org/directory/time.html"
+SRC_URI="mirror://gnu/time/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${PV}-info-dir-entry.patch \
+		"${FILESDIR}"/${P}-incorrect_memory_usage.patch
+	eautoreconf
+}