From 6c784e8a65716c686d9dbb96fcacbadb5713aeab Mon Sep 17 00:00:00 2001 From: wenyuzifangtest001 Date: Fri, 12 Sep 2025 20:26:12 +0800 Subject: [PATCH] Update code from upstream --- ...76AAAC1B0FF849792D8CB129A794FD2272BC86.gpg | Bin 0 -> 4529 bytes ...-trailing-backslash-and-a-percent-si.patch | 68 ++++++++++++++++++ time-1.9.tar.gz.sig | 17 +++++ time.spec | 11 ++- 4 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 gpgkey-F576AAAC1B0FF849792D8CB129A794FD2272BC86.gpg create mode 100644 time-1.9-Fix-formatting-a-trailing-backslash-and-a-percent-si.patch create mode 100644 time-1.9.tar.gz.sig diff --git a/gpgkey-F576AAAC1B0FF849792D8CB129A794FD2272BC86.gpg b/gpgkey-F576AAAC1B0FF849792D8CB129A794FD2272BC86.gpg new file mode 100644 index 0000000000000000000000000000000000000000..c17e1624260aff4dd566355b6dd34e03aa523431 GIT binary patch literal 4529 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 literal 0 HcmV?d00001 diff --git a/time-1.9-Fix-formatting-a-trailing-backslash-and-a-percent-si.patch b/time-1.9-Fix-formatting-a-trailing-backslash-and-a-percent-si.patch new file mode 100644 index 0000000..c61de51 --- /dev/null +++ b/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?= +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ř +--- + 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 + diff --git a/time-1.9.tar.gz.sig b/time-1.9.tar.gz.sig new file mode 100644 index 0000000..f101395 --- /dev/null +++ b/time-1.9.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCgAGBQJapvw2AAoJEAoRth02V7kBwpcP/3uhXpenR0/SAZ8HEUlD+fnV +cSp+Yg8D0YGhs6thvVT7cNYWfAXeUeHPNRoHmMpvwGBktRDf5MPKA7v42d8peoVJ +MpotpeoUHiGiw8KBDRMSBjFoZrn5hjM7FZDPFtrChVAor8FCw4mbMknK4KLrkmyt +2B1M3PPVeQ/2m+sho+XKYZTIV4JIV9rbZn5fXjSnr3QhDGyeRgSip548LTD8Li97 +EquxdaPd9bibvBEH8ZX4+XG9qWKJyThA21VmBhrylwpFAj7W4yBPSaW3B7HRvuCY +X65cpJem6JYSpe/Hh6rHQrFdIrw3X+cO9U3vpHQq4AfSaCLIfmWw8GAXE2+6btsz +aDMDafQy4OaFo45TGURQ6V73aa9d5et7Rt6btmatNP+vG5pU9iSDK9ViN+AmX5CL +wLTtWlUyAZDzLn5UuiIAtrLtY7UWD5EcyKVe9B8T9ypRk9oAxaLgIGToukeZN6Dk +qa0AhE7xtxC0yxUPR1Pwdt7XYYpAP8/dL2hPX6jRtKnLkvMMwYheUARx60Wm9Y6W +YcE5fI+f5PoZprCbC6skwQvNbT8KmJcDrefPlSSTvj0e10IB2HZ9O1M1vNNUDL66 +0zt2j4ddtyc1NG1fLRCF52XAfIqI5a983yD40CKSRqcG3bYcyygQBhGx34Ez0buQ +YGWpJ6ZvDh8d8j77Z0n4 +=FnFy +-----END PGP SIGNATURE----- diff --git a/time.spec b/time.spec index 59cd000..cce0350 100644 --- a/time.spec +++ b/time.spec @@ -1,8 +1,8 @@ -%define anolis_release 1 +%define anolis_release 2 Summary: A GNU utility for monitoring a program's use of system resources Name: time -Version: 1.9 +Version: 1.9 Release: %{anolis_release}%{?dist} # src/time.c: GPLv3+ # COPYING: GPLv3 text @@ -42,7 +42,9 @@ Release: %{anolis_release}%{?dist} # tests/time-posix-quiet.sh: GPLv3+ License: GPLv3+ and GFDL Url: https://www.gnu.org/software/%{name}/ -Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz +Source0: https://ftp.gnu.org/gnu/time/time-1.9.tar.gz +Source1: https://ftp.gnu.org/gnu/time/time-1.9.tar.gz.sig +Source2: gpgkey-F576AAAC1B0FF849792D8CB129A794FD2272BC86.gpg # Fix measuring time when a clock experiences a jump. # Patch0: time-1.8-Prefer-clock_gettime-CLOCK_MONOTONIC.patch @@ -50,6 +52,7 @@ Patch0: time-1.8-Prefer-clock_gettime-CLOCK_MONOTONIC.patch # proposed to an upstream, # Patch3: time-1.9-Close-outfp-before-exec.patch +Patch4: time-1.9-Fix-formatting-a-trailing-backslash-and-a-percent-si.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bash @@ -106,5 +109,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir %doc AUTHORS ChangeLog NEWS README %changelog +* Fri Sep 12 2025 wenyuzifangtest001 - 1.9-2 +- Apply patch to ensure correct output formatting, prevent garbage data, and maintain script compatibility * Mon Mar 20 2023 Yuanhong Peng - 1.9-1 - Init from upstream -- Gitee