diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2017-08-14 14:41:26 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2017-08-14 15:35:55 +0200 |
| commit | 6c217c61bdf05b725d4e9f993ebd457ef78e7fe8 (patch) | |
| tree | 872ab1cc18691c1b1e1f79905c07520489f65fcf /sys-process/time/files | |
| parent | sys-block/thin-provisioning-tools: Removed old. (diff) | |
| download | gentoo-6c217c61bdf05b725d4e9f993ebd457ef78e7fe8.tar.gz gentoo-6c217c61bdf05b725d4e9f993ebd457ef78e7fe8.tar.bz2 gentoo-6c217c61bdf05b725d4e9f993ebd457ef78e7fe8.zip | |
sys-process/time: Bump to version 1.7.2
Package-Manager: Portage-2.3.7, Repoman-2.3.3
Diffstat (limited to 'sys-process/time/files')
4 files changed, 37 insertions, 10 deletions
diff --git a/sys-process/time/files/1.7-info-dir-entry.patch b/sys-process/time/files/1.7-info-dir-entry.patch index 1cc057b04ea1..eb30029722bb 100644 --- a/sys-process/time/files/1.7-info-dir-entry.patch +++ b/sys-process/time/files/1.7-info-dir-entry.patch @@ -1,5 +1,5 @@ ---- time.info.old 2004-09-11 03:00:39.076871344 -0400 -+++ time.info 2004-09-11 03:00:40.394671008 -0400 +--- a/time.info ++++ b/time.info @@ -19,6 +19,9 @@ manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a diff --git a/sys-process/time/files/time-1.7-build.patch b/sys-process/time/files/time-1.7-build.patch index 82d6ae1c7584..504643d768e5 100644 --- a/sys-process/time/files/time-1.7-build.patch +++ b/sys-process/time/files/time-1.7-build.patch @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -1,11 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(time.c) 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 index 55807100c3a9..ab1f4ddfbd5e 100644 --- a/sys-process/time/files/time-1.7-incorrect_memory_usage.patch +++ b/sys-process/time/files/time-1.7-incorrect_memory_usage.patch @@ -1,9 +1,8 @@ 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 +--- time-1.7/ChangeLog ++++ time-1.7/ChangeLog @@ -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 @@ -14,9 +13,8 @@ diff -rupN time-1.7-original/ChangeLog time-1.7/ChangeLog 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 +--- time-1.7/time.c ++++ time-1.7/time.c @@ -398,7 +398,7 @@ summarize (fp, fmt, command, resp) ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v)); break; diff --git a/sys-process/time/files/time-1.7.2-incorrect_memory_usage.patch b/sys-process/time/files/time-1.7.2-incorrect_memory_usage.patch new file mode 100644 index 000000000000..6c83f0bb9264 --- /dev/null +++ b/sys-process/time/files/time-1.7.2-incorrect_memory_usage.patch @@ -0,0 +1,29 @@ +https://bugs.launchpad.net/ubuntu/+source/time/+bug/742248 +https://bugs.gentoo.org/332253 + +--- time-1.7.2/ChangeLog ++++ time-1.7.2/ChangeLog +@@ -1,6 +1,12 @@ + Fri Dec 21 23:00:00 2012 David C Niemi <gnutime@dcn.tuxers.net> + * Version 1.7.1. + ++Fri Oct 1 00:00:00 2010 Bob Proulx <bob@proulx.com> ++ * time.c (summarize): Do not call ptok on ru_maxrss. ++ The struct rusage reports ru_maxrss in kbytes not pages and ++ should not be converted through pages-to-kbytes again. ++ Reported by Sven Hartrumpf. ++ + Thu Jul 11 12:37:17 1996 David J MacKenzie <djm@catapult.va.pubnix.com> + + * Version 1.7. +--- time-1.7.2/time.c ++++ time-1.7.2/time.c +@@ -394,7 +394,7 @@ + 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); |