From 145404cc0ada915fc06bbc6d330ebc2db3db49a1 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sat, 28 Nov 2020 04:58:54 +0800 Subject: [PATCH 1/2] [patch tracking] 20201128045849750004 - https://github.com/coreutils/coreutils/commit/5ed804a9b8d6e7ab217fff5bfb11824f69f03e48 --- 5ed804a9b8d6e7ab217fff5bfb11824f69f03e48.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 5ed804a9b8d6e7ab217fff5bfb11824f69f03e48.patch diff --git a/5ed804a9b8d6e7ab217fff5bfb11824f69f03e48.patch b/5ed804a9b8d6e7ab217fff5bfb11824f69f03e48.patch new file mode 100644 index 0000000..0ea0c74 --- /dev/null +++ b/5ed804a9b8d6e7ab217fff5bfb11824f69f03e48.patch @@ -0,0 +1,13 @@ +diff --git a/src/expr.c b/src/expr.c +index 48d0890f8..73807fb24 100644 +--- a/src/expr.c ++++ b/src/expr.c +@@ -212,7 +212,7 @@ mbs_logical_substr (const char *s, size_t pos, size_t len) + return v; + } + +-/* Return the number of logical characteres (possibly multibyte) ++/* Return the number of logical characters (possibly multibyte) + that are in string S in the first OFS octets. + + Example in UTF-8: -- Gitee From c4df2ec36ea053a847bebbd7d090c198056d947d Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sat, 28 Nov 2020 04:58:55 +0800 Subject: [PATCH 2/2] [patch tracking] 20201128045849750004 - update spec file --- coreutils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..8803671 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,7 @@ 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: 5ed804a9b8d6e7ab217fff5bfb11824f69f03e48.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +136,9 @@ fi %{_mandir}/man*/* %changelog +* 20201128045849750004 patch-tracking 8.32-3 +- append patch file of upstream repository from <5ed804a9b8d6e7ab217fff5bfb11824f69f03e48> to <5ed804a9b8d6e7ab217fff5bfb11824f69f03e48> + * Wed Aug 26 2020 chenbo pan - 8.32-2 - fix patch error @@ -221,4 +225,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