From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- sys-process/time/files/1.7-info-dir-entry.patch | 12 --------- sys-process/time/files/time-1.7-build.patch | 16 ------------ .../files/time-1.7-incorrect_memory_usage.patch | 26 ------------------- .../files/time-1.7.2-incorrect_memory_usage.patch | 29 ---------------------- 4 files changed, 83 deletions(-) delete mode 100644 sys-process/time/files/1.7-info-dir-entry.patch delete mode 100644 sys-process/time/files/time-1.7-build.patch delete mode 100644 sys-process/time/files/time-1.7-incorrect_memory_usage.patch delete mode 100644 sys-process/time/files/time-1.7.2-incorrect_memory_usage.patch (limited to 'sys-process/time/files') diff --git a/sys-process/time/files/1.7-info-dir-entry.patch b/sys-process/time/files/1.7-info-dir-entry.patch deleted file mode 100644 index eb30029722bb..000000000000 --- a/sys-process/time/files/1.7-info-dir-entry.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 - translation approved by the Foundation. -+START-INFO-DIR-ENTRY -+* time: (time). summarize system resources used -+END-INFO-DIR-ENTRY - -  - File: time.info, Node: Top, Prev: (dir), Up: (dir) diff --git a/sys-process/time/files/time-1.7-build.patch b/sys-process/time/files/time-1.7-build.patch deleted file mode 100644 index 504643d768e5..000000000000 --- a/sys-process/time/files/time-1.7-build.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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) --VERSION=1.7 --AC_SUBST(VERSION) --PACKAGE=time --AC_SUBST(PACKAGE) -- --AC_ARG_PROGRAM -+AC_INIT(time, 1.7) -+AM_INIT_AUTOMAKE - - dnl Checks for programs. - AC_PROG_CC 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 deleted file mode 100644 index ab1f4ddfbd5e..000000000000 --- a/sys-process/time/files/time-1.7-incorrect_memory_usage.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.launchpad.net/ubuntu/+source/time/+bug/742248 -https://bugs.gentoo.org/332253 - ---- time-1.7/ChangeLog -+++ time-1.7/ChangeLog -@@ -1,3 +1,9 @@ -+Fri Oct 1 00:00:00 2010 Bob Proulx -+ 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 - - * Version 1.7. ---- 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; - 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/files/time-1.7.2-incorrect_memory_usage.patch b/sys-process/time/files/time-1.7.2-incorrect_memory_usage.patch deleted file mode 100644 index 6c83f0bb9264..000000000000 --- a/sys-process/time/files/time-1.7.2-incorrect_memory_usage.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - * Version 1.7.1. - -+Fri Oct 1 00:00:00 2010 Bob Proulx -+ * 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 - - * 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); -- cgit v1.2.3