Fixed incorrect memory usage (bug #332253)

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 60 insertions, 2 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/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
+}