From cd5646adb663147aa51593705fe94e6f85a070c0 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 18 Dec 2020 23:58:54 +0800 Subject: [PATCH 1/3] [patch tracking] 20201218235849749781 - https://github.com/coreutils/coreutils/commit/e5cb4aaa0b007fc1b3b7f0a97a73eb6347992b78 --- ...4aaa0b007fc1b3b7f0a97a73eb6347992b78.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 e5cb4aaa0b007fc1b3b7f0a97a73eb6347992b78.patch diff --git a/e5cb4aaa0b007fc1b3b7f0a97a73eb6347992b78.patch b/e5cb4aaa0b007fc1b3b7f0a97a73eb6347992b78.patch new file mode 100644 index 0000000..3159d8f --- /dev/null +++ b/e5cb4aaa0b007fc1b3b7f0a97a73eb6347992b78.patch @@ -0,0 +1,53 @@ +diff --git a/doc/coreutils.texi b/doc/coreutils.texi +index 44ce7d2e0..7bf47d0f6 100644 +--- a/doc/coreutils.texi ++++ b/doc/coreutils.texi +@@ -18337,6 +18337,12 @@ For instance, the following could be used to @command{sleep} for + sleep 1234e-3 567.89e-6 + @end example + ++Also one could sleep indefinitely like: ++ ++@example ++sleep inf ++@end example ++ + The only options are @option{--help} and @option{--version}. @xref{Common + options}. + +@@ -18786,7 +18792,8 @@ The sequence of numbers ends when the sum of the current number and + so @code{seq 1 10 10} only produces @samp{1}. + @var{increment} must not be @samp{0}; use the tool @command{yes} to get + repeated output of a constant number. +-@var{first}, @var{increment} and @var{last} must not be @code{NaN}. ++@var{first}, @var{increment} and @var{last} must not be @code{NaN}, ++but @code{inf} is supported. + Floating-point numbers may be specified in either the current or + the C locale. @xref{Floating point}. + +@@ -18882,8 +18889,10 @@ $ seq 50000000000000000000 2 50000000000000000004 + @end example + + However, note that when limited to non-negative whole numbers, +-an increment of 1 and no format-specifying option, seq can print +-arbitrarily large numbers. ++an increment of less than 200, and no format-specifying option, ++seq can print arbitrarily large numbers. ++Therefore @command{seq inf} can be used to ++generate an infinite sequence of numbers. + + Be careful when using @command{seq} with outlandish values: otherwise + you may see surprising results, as @command{seq} uses floating point +diff --git a/src/seq.c b/src/seq.c +index 2ca1e4f7b..ee8d005ca 100644 +--- a/src/seq.c ++++ b/src/seq.c +@@ -39,7 +39,7 @@ + + /* Limit below which seq_fast has more throughput. + Determined with: seq 0 200 inf | pv > /dev/null */ +-#define SEQ_FAST_STEP_LIMIT 200 ++#define SEQ_FAST_STEP_LIMIT 200 /* Keep in sync with texinfo description. */ + #define SEQ_FAST_STEP_LIMIT_DIGITS 3 + + /* The official name of this program (e.g., no 'g' prefix). */ -- Gitee From aee65f37c029b69e970ceb2464dc9ca3b2f5855a Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 18 Dec 2020 23:58:55 +0800 Subject: [PATCH 2/3] [patch tracking] 20201218235849749781 - https://github.com/coreutils/coreutils/commit/08b59f31a582ec7bc8eabab9cfc508bf1d5e5288 --- ...9f31a582ec7bc8eabab9cfc508bf1d5e5288.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 08b59f31a582ec7bc8eabab9cfc508bf1d5e5288.patch diff --git a/08b59f31a582ec7bc8eabab9cfc508bf1d5e5288.patch b/08b59f31a582ec7bc8eabab9cfc508bf1d5e5288.patch new file mode 100644 index 0000000..f74b131 --- /dev/null +++ b/08b59f31a582ec7bc8eabab9cfc508bf1d5e5288.patch @@ -0,0 +1,25 @@ +diff --git a/doc/coreutils.texi b/doc/coreutils.texi +index 7bf47d0f6..93b70616c 100644 +--- a/doc/coreutils.texi ++++ b/doc/coreutils.texi +@@ -18752,16 +18752,16 @@ $ LC_ALL=en_US.utf8 numfmt --from=iec --grouping 2G + $ LC_ALL=ta_IN numfmt --from=iec --grouping 2G + 2,14,74,83,648 + +-$ LC_ALL=C ./src/numfmt --from=iec --format="==%'15f==" 2G ++$ LC_ALL=C numfmt --from=iec --format="==%'15f==" 2G + == 2147483648== + +-$ LC_ALL=en_US.utf8 ./src/numfmt --from=iec --format="==%'15f==" 2G ++$ LC_ALL=en_US.utf8 numfmt --from=iec --format="==%'15f==" 2G + == 2,147,483,648== + +-$ LC_ALL=en_US.utf8 ./src/numfmt --from=iec --format="==%'-15f==" 2G ++$ LC_ALL=en_US.utf8 numfmt --from=iec --format="==%'-15f==" 2G + ==2,147,483,648 == + +-$ LC_ALL=ta_IN ./src/numfmt --from=iec --format="==%'15f==" 2G ++$ LC_ALL=ta_IN numfmt --from=iec --format="==%'15f==" 2G + == 2,14,74,83,648== + @end example + -- Gitee From 991b5604d911feb1b1610758f13e86c0718ec87c Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 18 Dec 2020 23:58:55 +0800 Subject: [PATCH 3/3] [patch tracking] 20201218235849749781 - update spec file --- coreutils.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..51a6192 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,6 +1,6 @@ Name: coreutils Version: 8.32 -Release: 2 +Release: 3 License: GPLv3+ Summary: A set of basic GNU tools commonly used in shell scripts Url: https://www.gnu.org/software/coreutils/ @@ -25,6 +25,8 @@ Patch8: skip-the-tests-that-require-selinux-if-selinux-is-di.patch Patch9: coreutils-8.32-ls-removed-dir.patch Patch10: coreutils-8.32-leaf-opt-xfs.patch +Patch6000: e5cb4aaa0b007fc1b3b7f0a97a73eb6347992b78.patch +Patch6001: 08b59f31a582ec7bc8eabab9cfc508bf1d5e5288.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +137,9 @@ fi %{_mandir}/man*/* %changelog +* 20201218235849749781 patch-tracking 8.32-3 +- append patch file of upstream repository from to <08b59f31a582ec7bc8eabab9cfc508bf1d5e5288> + * Wed Aug 26 2020 chenbo pan - 8.32-2 - fix patch error @@ -221,4 +226,4 @@ fi - reintroduce very old Provides (mktemp, sh-utils, textwrap, fileutils, stat) * Thu Jul 12 2018 hexiaowen - 8.30-1 -- Pacakge init +- Pacakge init \ No newline at end of file -- Gitee