.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1,4 @@
-SOURCES/time-1.9.tar.gz
+time-1.7.tar.gz
+/time-1.8.tar.gz
+/time-1.9.tar.gz
+/time-1.9.tar.gz.sig

.time.metadata

@@ -1 +0,0 @@
-75068c26abbed3ad3980685bae21d7202d288317 SOURCES/time-1.9.tar.gz

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans/tier1.fmf

@@ -0,0 +1,38 @@
+---
+
+summary: Tier1 plan for time
+
+discover:
+  how: fmf
+  url: https://pkgs.devel.redhat.com/git/tests/time
+  ref: master
+  filter: tier:1
+
+prepare:
+  - how: shell
+    script: |
+      set -euxo pipefail
+
+      ENABLE_REPO_CMD="yum-config-manager --enable"
+      if command -v dnf >/dev/null 2>&1; then
+        ENABLE_REPO_CMD="dnf config-manager --set-enabled"
+      fi
+
+      ${ENABLE_REPO_CMD} beaker-tasks || :
+  - how: shell
+    script: |
+        set -exuo pipefail
+
+        if [[ -f /etc/os-release ]]; then
+          . /etc/os-release
+          if [[ "${ID:-}" == "rhel" && "${VERSION_ID%%.*}" -ge 8 ]]; then
+            dnf config-manager --enable rhel-CRB
+          fi
+        fi
+
+execute:
+  how: tmt
+
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora

sources

@@ -0,0 +1,2 @@
+SHA512 (time-1.9.tar.gz) = 5c6dabbbe71e9103a47b892b86bb914c1704122d4fe7dff1e2cbd28503297163118d295077d8e062b035d673a1f91c36f8a45c7383f374fd766942b32bde4406
+SHA512 (time-1.9.tar.gz.sig) = cfcd147e237639144d9a37346ea3fce827544320faf8629d92ccea0b27b7c943de523ed54c50fdbafd4f9d77458954e335c0ea7a6462f157d12e6a5e5478beb0

tests/maximum_RSS/Makefile

@@ -0,0 +1,65 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/time/Sanity/maximum_RSS
+#   Description: check if RSS usage is measured reasonable (in bug, reported value vas 4-times bigger)
+#   Author: Ondrej Ptak <optak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2015 Red Hat, Inc.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/time/Sanity/maximum_RSS
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Ondrej Ptak <optak@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     check if RSS usage is measured reasonable (in bug, reported value vas 4-times bigger)" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          time" >> $(METADATA)
+	@echo "Requires:        time perl bc" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Bug:             703865" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/maximum_RSS/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/time/Sanity/maximum_RSS
+Description: check if RSS usage is measured reasonable (in bug, reported value vas 4-times bigger)
+Author: Ondrej Ptak <optak@redhat.com>

tests/maximum_RSS/runtest.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/time/Sanity/maximum_RSS
+#   Description: check if RSS usage is measured reasonable (in bug, reported value vas 4-times bigger)
+#   Author: Ondrej Ptak <optak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2015 Red Hat, Inc.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/bin/rhts-environment.sh || exit 1
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGES=${PACKAGES:-"time"}
+
+rlJournalStart
+    rlPhaseStartTest
+       supposed_RSS=412024
+       rlLogInfo "RSS usage of given script is suppose to be about $supposed_RSS kB"
+       rlRun "maxRSS=$(/usr/bin/time -f %M perl -e '"x" x 400 x 1024 x 1024' 2>&1)" 0 "Measuring RSS usage"
+       rlAssertGreater "RSS max usage should be < 450000" 450000 $maxRSS 
+       rlAssertGreater "RSS max usage should be > 400000" $maxRSS 400000
+       echo "$maxRSS/$supposed_RSS*100"
+       coef=`echo "$maxRSS*100/$supposed_RSS" | bc`
+       rlLogInfo "RSS value is $coef % of expected value"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd

tests/tests.yml

@@ -0,0 +1,16 @@
+---
+# Tests for classic and container
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    - container
+    - atomic
+    tests:
+    - maximum_RSS
+    required_packages:
+    - bash
+    - bc
+    - perl-interpreter
+    - time

time-1.9-Close-outfp-before-exec.patch

@@ -0,0 +1,34 @@
+From 6a5c4499aab677d19157c7adcf598d14267283c1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 16 Nov 2020 17:45:04 +0100
+Subject: [PATCH] Close outfp before exec
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When called with --outfile, we open an output file to which
+we log timing results. Close that descriptor in the child
+fork before exec'ing the process to be timed.
+
+Reported-by: Ed Santiago <santiago@redhat.com>
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ src/time.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/time.c b/src/time.c
+index f76265a..2f2b702 100644
+--- a/src/time.c
++++ b/src/time.c
+@@ -738,6 +738,8 @@ run_command (cmd, resp)
+     error (EXIT_CANCELED, errno, "cannot fork");
+   else if (pid == 0)
+     {				/* If child.  */
++      if (outfp != stderr)
++        fclose(outfp);
+       /* Don't cast execvp arguments; that causes errors on some systems,
+ 	 versus merely warnings if the cast is left off.  */
+       execvp (cmd[0], cmd);
+-- 
+2.25.4
+

time-1.9-Fix-formatting-a-trailing-backslash-and-a-percent-si.patch

@@ -0,0 +1,68 @@
+From f88ec3114dfdb5f284367d7602a06dc021409616 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 26 Jan 2024 10:36:07 +0100
+Subject: [PATCH] Fix formatting a trailing backslash and a percent sign
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There was a bug report that a trailing backslash leads to printing
+a nul byte and an commandline:
+
+$ /usr/bin/time -f 'abc\' sleep 1 2>&1 | hexdump -vC
+00000000  61 62 63 3f 5c 00 73 6c  65 65 70 0a              |abc?\.sleep.|
+0000000c
+
+This patch fixes it.
+
+A similar fix was already in place for a trailing percent sign, but it
+was missing printing an implicit newline as mandated by
+the documentation. This patch fixes it either.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ src/time.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/time.c b/src/time.c
+index 2f2b702..2184e4e 100644
+--- a/src/time.c
++++ b/src/time.c
+@@ -585,12 +585,13 @@ summarize (fp, fmt, command, resp)
+ 	      break;
+ 	    case '\0':
+ 	      putc ('?', fp);
+-	      return;
++	      break;
+ 	    default:
+ 	      putc ('?', fp);
+ 	      putc (*fmt, fp);
+ 	    }
+-	  ++fmt;
++	  if (*fmt != '\0')
++	    ++fmt;
+ 	  break;
+ 
+ 	case '\\':		/* Format escape.  */
+@@ -605,12 +606,17 @@ summarize (fp, fmt, command, resp)
+ 	    case '\\':
+ 	      putc ('\\', fp);
+ 	      break;
++	    case '\0':
++	      putc ('?', fp);
++	      putc ('\\', fp);
++	      break;
+ 	    default:
+ 	      putc ('?', fp);
+ 	      putc ('\\', fp);
+ 	      putc (*fmt, fp);
+ 	    }
+-	  ++fmt;
++	  if (*fmt != '\0')
++	    ++fmt;
+ 	  break;
+ 
+ 	default:
+-- 
+2.43.0
+

time-1.9-Improve-info-directory-index-entry-description.patch

@@ -0,0 +1,32 @@
+From d8cf31417c84646497657280830c432b6f412495 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 18 Jun 2018 10:05:06 +0200
+Subject: [PATCH] Improve info directory index entry description
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Describing "time" as "time" is not explanatory. Use better
+description.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ doc/time.texi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/time.texi b/doc/time.texi
+index 63d25b4..dac65b4 100644
+--- a/doc/time.texi
++++ b/doc/time.texi
+@@ -28,7 +28,7 @@ Texts.  A copy of the license is included in the section entitled
+ 
+ @dircategory Basics
+ @direntry
+-* Time: (time).                  time
++* Time: (time).                  GNU time utility.
+ @end direntry
+ 
+ 
+-- 
+2.14.4
+

time-1.9-Use-kibibytes-instead-of-kilobytes-in-a-documentatio.patch

@@ -0,0 +1,189 @@
+From 9fd52d5705fad70c0cb4ad8d508596a488262acf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 13 Jul 2020 09:24:35 +0200
+Subject: [PATCH] Use kibibytes instead of kilobytes in a documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch does not changes any output of the time program. It only
+clarifies a manual and the comments.
+
+<https://lists.gnu.org/archive/html/bug-time/2020-07/msg00000.html>
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ configure.ac          |  6 +++---
+ doc/time.texi         | 12 ++++++------
+ src/rusage-kb.c       |  4 ++--
+ src/rusage-kb.h       | 10 +++++-----
+ src/time.c            |  6 +++---
+ tests/time-max-rss.sh |  4 ++--
+ 6 files changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d2950bd..67738b5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -90,7 +90,7 @@ if test -z "$time_getrusage_mem_units" ; then
+ 
+     solaris*)        time_getrusage_mem_units=pages ;;
+ 
+-    # As a fallback, assume KB (the most common value).
++    # As a fallback, assume KiB (the most common value).
+     # Set the 'warn' variable to warn the user at the end
+     # of ./configure
+     *) time_getrusage_mem_units=kb
+@@ -104,7 +104,7 @@ case $time_getrusage_mem_units in
+   kb)
+      AC_DEFINE([GETRUSAGE_RETURNS_KB],[1],
+                 [Define to 1 if getrusage(2) on this systems returns
+-                 ru_maxrss in kilobytes])
++                 ru_maxrss in kibibytes])
+      ;;
+ 
+   bytes)
+@@ -140,7 +140,7 @@ AC_OUTPUT
+ # Warn the user if getrusage(2) behaviour on this OS is unknown
+ if test "$warn_getrusage_mem_units" ; then
+   AC_MSG_WARN([unknown getrusage behavior on operating system '$host_os'.
+-               Assuming Kilobytes.
++               Assuming kibibytes.
+                please report this with the output of 'uname -a' to
+                bug-time@gnu.org])
+ fi
+diff --git a/doc/time.texi b/doc/time.texi
+index dac65b4..3a05ed9 100644
+--- a/doc/time.texi
++++ b/doc/time.texi
+@@ -241,22 +241,22 @@ times divied by the total running time.
+ @table @code
+ @item M
+ Maximum resident set size of the process during its lifetime, in
+-Kilobytes.
++kibibytes.
+ 
+ @item t
+-Average resident set size of the process, in Kilobytes.
++Average resident set size of the process, in kibibytes.
+ 
+ @item K
+-Average total (data+stack+text) memory use of the process, in Kilobytes.
++Average total (data+stack+text) memory use of the process, in kibibytes.
+ 
+ @item D
+-Average size of the process's unshared data area, in Kilobytes.
++Average size of the process's unshared data area, in kibibytes.
+ 
+ @item p
+-Average size of the process's unshared stack, in Kilobytes.
++Average size of the process's unshared stack, in kibibytes.
+ 
+ @item X
+-Average size of the process's shared text, in Kilobytes.
++Average size of the process's shared text, in kibibytes.
+ 
+ @item Z
+ System's page size, in bytes.  This is a per-system constant, but
+diff --git a/src/rusage-kb.c b/src/rusage-kb.c
+index aad06b8..04352cd 100644
+--- a/src/rusage-kb.c
++++ b/src/rusage-kb.c
+@@ -25,8 +25,8 @@
+ #include <limits.h>
+ #include <unistd.h>
+ 
+-/* Return the number of kilobytes corresponding to a number of pages PAGES.
+-   (Actually, we use it to convert pages*ticks into kilobytes*ticks.)
++/* Return the number of kibibytes corresponding to a number of pages PAGES.
++   (Actually, we use it to convert pages*ticks into kibibytes*ticks.)
+ 
+    Try to do arithmetic so that the risk of overflow errors is minimized.
+    This is funky since the pagesize could be less than 1K.
+diff --git a/src/rusage-kb.h b/src/rusage-kb.h
+index 4a53515..b7b1155 100644
+--- a/src/rusage-kb.h
++++ b/src/rusage-kb.h
+@@ -19,7 +19,7 @@
+ #ifndef _RUSAGE_KB_
+ #define _RUSAGE_KB_
+ 
+-/* As of 2017, most kernels' getrusage(2) returns ru_maxrss in kilobytes:
++/* As of 2017, most kernels' getrusage(2) returns ru_maxrss in kibibytes:
+       Linux, Hurd, Free/Open/Net-BSD, MINIX, AIX7
+ 
+    OpenSolaris's getrusage(2) documents a return value in pages,
+@@ -32,20 +32,20 @@
+ 
+ #if GETRUSAGE_RETURNS_KB
+ 
+-/* define as no-op, as RUSAGE values are already in KB */
++/* define as no-op, as RUSAGE values are already in KiB */
+ #define RUSAGE_MEM_TO_KB(x) (x)
+ 
+ #elif GETRUSAGE_RETURNS_BYTES
+ 
+-/* Convert bytes to kilobytes */
++/* Convert bytes to kibibytes */
+ #define RUSAGE_MEM_TO_KB(x) ((x)/1024)
+ 
+ #elif GETRUSAGE_RETURNS_PAGES
+ 
+-/* Convert bytes to kilobytes */
++/* Convert bytes to kibibytes */
+ #define RUSAGE_MEM_TO_KB(x) (ptok (x))
+ 
+-/* A function to get the system's page size and convert pages to KB */
++/* A function to get the system's page size and convert pages to KiB */
+ unsigned long
+ ptok (unsigned long pages);
+ 
+diff --git a/src/time.c b/src/time.c
+index 7e07995..f76265a 100644
+--- a/src/time.c
++++ b/src/time.c
+@@ -108,8 +108,8 @@ typedef RETSIGTYPE (*sighandler) ();
+    and 100 on the sun4.
+ 
+    Some manuals have an apparent error, claiming that units for average
+-   sizes are kb*sec.  Judging by the contents of `struct rusage', it
+-   looks like it should be kb*ticks, like on SunOS.  Ticks/sec seems
++   sizes are KiB*sec.  Judging by the contents of `struct rusage', it
++   looks like it should be KiB*ticks, like on SunOS.  Ticks/sec seems
+    to be (empirically):
+    50 Mt. Xinu
+    250 Ultrix (mips)
+@@ -412,7 +412,7 @@ linear_argv (argv)
+    x == exit status of command
+ 
+    Various memory usages are found by converting from page-seconds
+-   to kbytes by multiplying by the page size, dividing by 1024,
++   to kibibytes by multiplying by the page size, dividing by 1024,
+    and dividing by elapsed real time.
+ 
+    FP is the stream to print to.
+diff --git a/tests/time-max-rss.sh b/tests/time-max-rss.sh
+index 0adda5c..5ecd3f2 100755
+--- a/tests/time-max-rss.sh
++++ b/tests/time-max-rss.sh
+@@ -27,7 +27,7 @@ fail=
+ # The auxiliary program should be built and runnable
+ time-aux || framework_failure_ "time-aux is missing/not runnable"
+ 
+-# Get the baseline number of MAX-RSS kilobytes
++# Get the baseline number of MAX-RSS kibibytes
+ # use by the program when not allocating any extra memory
+ env time -o mem-baseline -f "%M" time-aux \
+   || framework_failure_ "failed to run time/time-aux (baseline max-rss)"
+@@ -49,7 +49,7 @@ test "$b" -eq "0" && test "$c" -eq 0 \
+ # There could be alot of variation between each invocation,
+ # accept a reasonable range
+ if test "$d" -ge 5000 && test "$d" -le 6000 ; then
+-    : # acceptable values: 5000-6000 KB
++    : # acceptable values: 5000-6000 KiB
+ else
+     cat<<EOF>&2
+ time(1) failed to detect 5MB allcoation.
+-- 
+2.25.4
+

time-1.9-drop-flawed-rss-test.patch

@@ -0,0 +1,11 @@
+diff --color -ruN time-1.9.orig/Makefile.am time-1.9/Makefile.am
+--- time-1.9.orig/Makefile.am	2017-11-08 16:31:54.000000000 -0500
++++ time-1.9/Makefile.am	2023-06-28 13:26:45.271212609 -0400
+@@ -74,7 +74,6 @@
+ 
+ 
+ TESTS = tests/help-version.sh \
+-	tests/time-max-rss.sh \
+ 	tests/time-exit-codes.sh \
+ 	tests/time-posix-quiet.sh
+ 

time.spec

@@ -1,59 +1,78 @@
 Summary:    A GNU utility for monitoring a program's use of system resources
 Name:       time
 Version:    1.9
-Release:    3%{?dist}
+Release:    25%{?dist}
-# src/time.c:               GPLv3+
+# src/time.c:               GPL-3.0-or-later
-# COPYING:                  GPLv3 text
+# COPYING:                  GPL-3.0 text
-# doc/time.texi:            GFDL
+# doc/time.texi:            GFDL-1.3-no-invariants-or-later
-# doc/fdl.texi:             GFDL 1.3 text
+# doc/fdl.texi:             GFDL-1.3 text
-# doc/time.info:            GFDL
+# doc/time.info:            GFDL-1.3-no-invariants-or-later
-# lib/stdnoreturn.in.h:     GPLv3+
+# lib/stdnoreturn.in.h:     GPL-3.0-or-later
-# lib/strerror-override.c:  GPLv3+
+# lib/strerror-override.c:  GPL-3.0-or-later
-# lib/error.h:              GPLv3+
+# lib/error.h:              GPL-3.0-or-later
 ## Not in a binary package
-# tests/init.sh:            GPLv3+
+# tests/init.sh:            GPL-3.0-or-later
 # INSTALL:                  FSFAP
-# build-aux/config.guess:   GPLv3+ with exceptions
+# configure:                FSFUL
-# build-aux/install-sh:     MIT and Public Domain
+# build-aux/config.guess:   GPL-3.0-or-later WITH Autoconf-exception-generic
+# build-aux/install-sh:     X11 AND LicenseRef-Fedora-Public-Domain
 # build-aux/config.rpath:   FSFULLR
-# build-aux/test-driver:    GPLv2+ with exceptions
+# build-aux/test-driver:    GPL-2.0-or-later WITH Autoconf-exception-generic
-# build-aux/update-copyright:   GPLv3+
+# build-aux/update-copyright:   GPL-3.0-or-later
-# build-aux/useless-if-before-free: GPLv3+
+# build-aux/useless-if-before-free: GPL-3.0-or-later
-# build-aux/vc-list-files:  GPLv3+
+# build-aux/vc-list-files:  GPL-3.0-or-later
-# build-aux/missing:        GPLv2+ with exceptions
+# build-aux/missing:        GPL-2.0-or-later WITH Autoconf-exception-generic
-# build-aux/compile:        GPLv2+ with exceptions
+# build-aux/compile:        GPL-2.0-or-later WITH Autoconf-exception-generic
-# build-aux/config.sub:     GPLv3+ with exceptions
+# build-aux/config.sub:     GPL-3.0-or-later WITH Autoconf-exception-generic
-# build-aux/gitlog-to-changelog:    GPLv3+
+# build-aux/gitlog-to-changelog:    GPL-3.0-or-later
-# build-aux/git-version-gen:        GPLv3+
+# build-aux/git-version-gen:        GPL-3.0-or-later
-# build-aux/texinfo.tex:    GPLv3+ with exceptions
+# build-aux/texinfo.tex:    GPL-3.0-or-later WITH Texinfo-exception AND GPL-1.0-or-later
-# build-aux/depcomp:        GPLv2+ with exceptions
+# build-aux/depcomp:        GPL-2.0-or-later WITH Autoconf-exception-generic
-# build-aux/mdate-sh:       GPLv2+ with exceptions
+# build-aux/mdate-sh:       GPL-2.0-or-later WITH Autoconf-exception-generic
-# GNUmakefile:              GPLv3+
+# GNUmakefile:              GPL-3.0-or-later
 # m4/asm-underscore.m4:     FSFULLR
-# m4/gnulib-cache.m4:       GPLv3+ with exceptions
+# m4/gnulib-cache.m4:       GPL-3.0-or-later WITH Autoconf-exception-generic
 # m4/host-cpu-c-abi.m4:     FSFULLR
 # m4/longlong.m4:           FSFULLR
 # m4/ssize_t.m4:            FSFULLR
 # m4/stdnoreturn.m4:        FSFULLR
-# maint.mk:                 GPLv3+
+# maint.mk:                 GPL-3.0-or-later
-# tests/time-posix-quiet.sh:    GPLv3+
+# tests/time-posix-quiet.sh:    GPL-3.0-or-later
-License:    GPLv3+ and GFDL
+License:    GPL-3.0-or-later AND GFDL-1.3-no-invariants-or-later
-Url:        http://www.gnu.org/software/%{name}/
+SourceLicense: %{license} AND GPL-3.0-or-later WITH Autoconf-exception-generic AND GPL-3.0-or-later WITH Texinfo-exception AND GPL-2.0-or-later WITH Autoconf-exception-generic AND GPL-1.0-or-later AND X11 AND FSFAP AND FSFUL AND FSFULLR AND LicenseRef-Fedora-Public-Domain
-Source:     ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Url:        https://www.gnu.org/software/%{name}/
+Source0:    https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Source1:    https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
+# Obtained from a key server
+Source2:    gpgkey-F576AAAC1B0FF849792D8CB129A794FD2272BC86.gpg
 # Fix measuring time when a clock experiences a jump, bug #1004416,
 # <http://lists.gnu.org/archive/html/bug-gnu-utils/2013-09/msg00003.html>
 Patch0:     time-1.8-Prefer-clock_gettime-CLOCK_MONOTONIC.patch
+# Fix info directory entry
+Patch1:     time-1.9-Improve-info-directory-index-entry-description.patch
+# Clarify RSS size as kibibytes in a documentation, proposed to an upstream,
+# <https://lists.gnu.org/archive/html/bug-time/2020-07/msg00000.html>
+Patch2:     time-1.9-Use-kibibytes-instead-of-kilobytes-in-a-documentatio.patch
+# Do not leak a file descriptor of the --output argument to a command,
+# proposed to an upstream,
+# <https://lists.gnu.org/archive/html/bug-time/2020-11/msg00001.html>
+Patch3:     time-1.9-Close-outfp-before-exec.patch
+# The time-max-rss.sh test randomly fails( mallocating 5 MB more does not have
+# to increase RSS in 5 MB). In addition there is regression in ppc64le kernel
+# (bug #2212765) which always fails.
+Patch4:     time-1.9-drop-flawed-rss-test.patch
+# Fix formatting a trailing backslash, proposed to the upstream,
+# <https://lists.gnu.org/archive/html/bug-time/2024-01/msg00000.html>
+Patch5:     time-1.9-Fix-formatting-a-trailing-backslash-and-a-percent-si.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bash
 BuildRequires:  coreutils
 BuildRequires:  gcc
+BuildRequires:  gnupg2
 BuildRequires:  make
-BuildRequires:  texinfo
-# Tests
 BuildRequires:  sed
-Requires(post): /sbin/install-info
+BuildRequires:  texinfo
-Requires(preun): /sbin/install-info
 
 %description
 The GNU time utility runs another program, collects information about
@@ -61,45 +80,116 @@ the resources used by that program while it is running, and displays
 the results.
 
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q
-%patch0 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+# Set time stamp stored in an info page to the latest patch
+touch -d "$(sed -n -e '/^Date: /{s/^[^:]*: //;p}' %{PATCH2})" doc/time.texi
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
+# Correct version VERSION flag for doc/time.texi
+# <https://lists.gnu.org/archive/html/bug-time/2021-01/msg00000.html>
+printf '%{version}\n' > .tarball-version
 autoreconf -fi
 
 %build
 %configure
-%make_build
+%{make_build}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
-# Remove info index, we update it in %%post script
+# Remove info index, it's updated by file triggers
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %check
-make %{?_smp_mflags} check
+%{make_build} check
-
-%post
-/sbin/install-info %{_infodir}/time.info.gz %{_infodir}/dir \
-    --entry="* time: (time).        GNU time Utility" >/dev/null 2>&1 || :
-
-%preun
-if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/time.info.gz %{_infodir}/dir \
-    --entry="* time: (time).        GNU time Utility" >/dev/null 2>&1 || :
-fi
 
 %files
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README
 %{_bindir}/time
 %{_infodir}/time.info*
-# time(1) manual page lives in man-pages package, bug #1612725.
+# time(1) manual page lives in man-pages package, bug #1612294.
 
 %changelog
-* Tue Aug 07 2018 Petr Pisar <ppisar@redhat.com> - 1.9-3
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com>
-- Remove time(1) manual page because it's provided by man-pages (bug #1612725)
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Mon Aug 06 2018 Petr Pisar <ppisar@redhat.com> - 1.9-2
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com>
-- Add time(1) manual page (bug #1612725)
+- Bump release for June 2024 mass rebuild
+
+* Fri Jan 26 2024 Petr Pisar <ppisar@redhat.com> - 1.9-23
+- Fix formatting a trailing backslash
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jun 28 2023 Stephen Gallagher <sgallagh@redhat.com> - 1.9-21
+- Tests: drop time-max-rss.sh test (bug #2212765)
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan 13 2021 Petr Pisar <ppisar@redhat.com> - 1.9-15
+- Retrieve a time stamp of the info page from a patch date header
+
+* Wed Jan 13 2021 Petr Pisar <ppisar@redhat.com> - 1.9-14
+- Correct version in an info page
+- Set time stamp stored in an info page to the latest patch
+
+* Wed Jan 13 2021 Petr Pisar <ppisar@redhat.com> - 1.9-13
+- Update URL and Source addresses (thanks to Robert Scheck)
+- Verify an upstream archive signature
+
+* Mon Nov 16 2020 Petr Pisar <ppisar@redhat.com> - 1.9-12
+- Fix a regression in closing a file descriptor if no --output was given
+  (bug #1898138)
+
+* Wed Nov 11 2020 Petr Pisar <ppisar@redhat.com> - 1.9-11
+- Do not leak a file descriptor of the --output argument to a command
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 13 2020 Petr Pisar <ppisar@redhat.com> - 1.9-9
+- Clarify RSS size as kibibytes in a documentation
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Aug 07 2018 Petr Pisar <ppisar@redhat.com> - 1.9-5
+- Remove time(1) manual page because it's provided by man-pages (bug #1612294)
+
+* Mon Aug 06 2018 Petr Pisar <ppisar@redhat.com> - 1.9-4
+- Add time(1) manual page (bug #1612294)
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jun 18 2018 Petr Pisar <ppisar@redhat.com> - 1.9-2
+- Remove install-info from scriptlets
 
 * Tue Mar 13 2018 Petr Pisar <ppisar@redhat.com> - 1.9-1
 - 1.9 bump