1 |
commit: 6c217c61bdf05b725d4e9f993ebd457ef78e7fe8 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 14 12:41:26 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 14 13:35:55 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c217c61 |
7 |
|
8 |
sys-process/time: Bump to version 1.7.2 |
9 |
|
10 |
Package-Manager: Portage-2.3.7, Repoman-2.3.3 |
11 |
|
12 |
sys-process/time/Manifest | 1 + |
13 |
sys-process/time/files/1.7-info-dir-entry.patch | 4 +-- |
14 |
sys-process/time/files/time-1.7-build.patch | 4 +-- |
15 |
.../files/time-1.7-incorrect_memory_usage.patch | 10 +++----- |
16 |
.../files/time-1.7.2-incorrect_memory_usage.patch | 29 ++++++++++++++++++++++ |
17 |
sys-process/time/time-1.7.2.ebuild | 28 +++++++++++++++++++++ |
18 |
6 files changed, 66 insertions(+), 10 deletions(-) |
19 |
|
20 |
diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest |
21 |
index aa5e05278e9..b2122bb1938 100644 |
22 |
--- a/sys-process/time/Manifest |
23 |
+++ b/sys-process/time/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
+DIST time-1.7.2.tar.gz 108371 SHA256 be6927ef6cb08c411b907ac039d9228e1649f4944ef3e0fbe381471d6a61e45b SHA512 dfde8f48a9d52bcc9080596feca6c429556e1e510977503138195d390cb52f27dd171f519d78226b0b48adc404062ec1f9234d92ea9707ec16d1be23ced90afc WHIRLPOOL 2d9bbe909bed2861459fdd2a72104ca754f99439d0ffcd9df1db23969c44b2cfcd334907a560569d552a4ed4184fd9793ad134ccb3eaad24244953c3443a1b7d |
26 |
DIST time-1.7.tar.gz 103066 SHA256 e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1 WHIRLPOOL 8102c994a6b5faa60ee51e7343383f307c0d31cbd26177f86fc96b41014e1065b536202a371556af336394ac0bf473db2571a15bc7644247a9a3d8235269880f |
27 |
|
28 |
diff --git a/sys-process/time/files/1.7-info-dir-entry.patch b/sys-process/time/files/1.7-info-dir-entry.patch |
29 |
index 1cc057b04ea..eb30029722b 100644 |
30 |
--- a/sys-process/time/files/1.7-info-dir-entry.patch |
31 |
+++ b/sys-process/time/files/1.7-info-dir-entry.patch |
32 |
@@ -1,5 +1,5 @@ |
33 |
---- time.info.old 2004-09-11 03:00:39.076871344 -0400 |
34 |
-+++ time.info 2004-09-11 03:00:40.394671008 -0400 |
35 |
+--- a/time.info |
36 |
++++ b/time.info |
37 |
@@ -19,6 +19,9 @@ |
38 |
manual into another language, under the above conditions for modified |
39 |
versions, except that this permission notice may be stated in a |
40 |
|
41 |
diff --git a/sys-process/time/files/time-1.7-build.patch b/sys-process/time/files/time-1.7-build.patch |
42 |
index 82d6ae1c758..504643d768e 100644 |
43 |
--- a/sys-process/time/files/time-1.7-build.patch |
44 |
+++ b/sys-process/time/files/time-1.7-build.patch |
45 |
@@ -1,5 +1,5 @@ |
46 |
---- configure.in |
47 |
-+++ configure.in |
48 |
+--- a/configure.in |
49 |
++++ b/configure.in |
50 |
@@ -1,11 +1,6 @@ |
51 |
dnl Process this file with autoconf to produce a configure script. |
52 |
-AC_INIT(time.c) |
53 |
|
54 |
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 |
55 |
index 55807100c3a..ab1f4ddfbd5 100644 |
56 |
--- a/sys-process/time/files/time-1.7-incorrect_memory_usage.patch |
57 |
+++ b/sys-process/time/files/time-1.7-incorrect_memory_usage.patch |
58 |
@@ -1,9 +1,8 @@ |
59 |
https://bugs.launchpad.net/ubuntu/+source/time/+bug/742248 |
60 |
https://bugs.gentoo.org/332253 |
61 |
|
62 |
-diff -rupN time-1.7-original/ChangeLog time-1.7/ChangeLog |
63 |
---- time-1.7-original/ChangeLog 2011-11-11 09:17:47.507026731 +0100 |
64 |
-+++ time-1.7/ChangeLog 2011-11-11 09:27:46.751002205 +0100 |
65 |
+--- time-1.7/ChangeLog |
66 |
++++ time-1.7/ChangeLog |
67 |
@@ -1,3 +1,9 @@ |
68 |
+Fri Oct 1 00:00:00 2010 Bob Proulx <bob@××××××.com> |
69 |
+ The struct rusage reports ru_maxrss in kbytes not pages and |
70 |
@@ -14,9 +13,8 @@ diff -rupN time-1.7-original/ChangeLog time-1.7/ChangeLog |
71 |
Thu Jul 11 12:37:17 1996 David J MacKenzie <djm@××××××××××××××××××.com> |
72 |
|
73 |
* Version 1.7. |
74 |
-diff -rupN time-1.7-original/time.c time-1.7/time.c |
75 |
---- time-1.7-original/time.c 2011-11-11 09:17:47.507026731 +0100 |
76 |
-+++ time-1.7/time.c 2011-11-11 09:27:58.167001738 +0100 |
77 |
+--- time-1.7/time.c |
78 |
++++ time-1.7/time.c |
79 |
@@ -398,7 +398,7 @@ summarize (fp, fmt, command, resp) |
80 |
ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v)); |
81 |
break; |
82 |
|
83 |
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 |
84 |
new file mode 100644 |
85 |
index 00000000000..6c83f0bb926 |
86 |
--- /dev/null |
87 |
+++ b/sys-process/time/files/time-1.7.2-incorrect_memory_usage.patch |
88 |
@@ -0,0 +1,29 @@ |
89 |
+https://bugs.launchpad.net/ubuntu/+source/time/+bug/742248 |
90 |
+https://bugs.gentoo.org/332253 |
91 |
+ |
92 |
+--- time-1.7.2/ChangeLog |
93 |
++++ time-1.7.2/ChangeLog |
94 |
+@@ -1,6 +1,12 @@ |
95 |
+ Fri Dec 21 23:00:00 2012 David C Niemi <gnutime@××××××××××.net> |
96 |
+ * Version 1.7.1. |
97 |
+ |
98 |
++Fri Oct 1 00:00:00 2010 Bob Proulx <bob@××××××.com> |
99 |
++ * time.c (summarize): Do not call ptok on ru_maxrss. |
100 |
++ The struct rusage reports ru_maxrss in kbytes not pages and |
101 |
++ should not be converted through pages-to-kbytes again. |
102 |
++ Reported by Sven Hartrumpf. |
103 |
++ |
104 |
+ Thu Jul 11 12:37:17 1996 David J MacKenzie <djm@××××××××××××××××××.com> |
105 |
+ |
106 |
+ * Version 1.7. |
107 |
+--- time-1.7.2/time.c |
108 |
++++ time-1.7.2/time.c |
109 |
+@@ -394,7 +394,7 @@ |
110 |
+ ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v)); |
111 |
+ break; |
112 |
+ case 'M': /* Maximum resident set size. */ |
113 |
+- fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss)); |
114 |
++ fprintf (fp, "%lu", (UL) resp->ru.ru_maxrss); |
115 |
+ break; |
116 |
+ case 'O': /* Outputs. */ |
117 |
+ fprintf (fp, "%ld", resp->ru.ru_oublock); |
118 |
|
119 |
diff --git a/sys-process/time/time-1.7.2.ebuild b/sys-process/time/time-1.7.2.ebuild |
120 |
new file mode 100644 |
121 |
index 00000000000..ed96169755c |
122 |
--- /dev/null |
123 |
+++ b/sys-process/time/time-1.7.2.ebuild |
124 |
@@ -0,0 +1,28 @@ |
125 |
+# Copyright 1999-2017 Gentoo Foundation |
126 |
+# Distributed under the terms of the GNU General Public License v2 |
127 |
+ |
128 |
+EAPI=6 |
129 |
+ |
130 |
+inherit autotools |
131 |
+ |
132 |
+DESCRIPTION="Displays info about resources used by a program" |
133 |
+HOMEPAGE="https://www.gnu.org/directory/time.html" |
134 |
+SRC_URI="http://git.savannah.gnu.org/cgit/time.git/snapshot/${P}.tar.gz" |
135 |
+ |
136 |
+LICENSE="GPL-2" |
137 |
+SLOT="0" |
138 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
139 |
+IUSE="" |
140 |
+ |
141 |
+DEPEND="sys-apps/texinfo" |
142 |
+ |
143 |
+PATCHES=( |
144 |
+ "${FILESDIR}"/${PN}-1.7-build.patch |
145 |
+ "${FILESDIR}"/1.7-info-dir-entry.patch |
146 |
+ "${FILESDIR}"/${PN}-1.7.2-incorrect_memory_usage.patch |
147 |
+) |
148 |
+ |
149 |
+src_prepare() { |
150 |
+ default |
151 |
+ eautoreconf |
152 |
+} |