From 1b8fed63e4f69a9d0dd5799793cb3678ec4058fe Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 26 Oct 2020 23:30:12 +0800 Subject: [PATCH 1/2] [patch tracking] 20201026233007633134 - https://github.com/coreutils/coreutils/commit/cc816fb978113370ff9eac41891f256bf217dffc --- cc816fb978113370ff9eac41891f256bf217dffc.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 cc816fb978113370ff9eac41891f256bf217dffc.patch diff --git a/cc816fb978113370ff9eac41891f256bf217dffc.patch b/cc816fb978113370ff9eac41891f256bf217dffc.patch new file mode 100644 index 0000000..29dd481 --- /dev/null +++ b/cc816fb978113370ff9eac41891f256bf217dffc.patch @@ -0,0 +1,13 @@ +diff --git a/src/sort.c b/src/sort.c +index 0163ba18a..8671ea767 100644 +--- a/src/sort.c ++++ b/src/sort.c +@@ -1651,7 +1651,7 @@ begfield (struct line const *line, struct keyfield const *key) + /* Return the limit of (a pointer to the first character after) the field + in LINE specified by KEY. */ + +-static char * ++static char * _GL_ATTRIBUTE_PURE + limfield (struct line const *line, struct keyfield const *key) + { + char *ptr = line->text, *lim = ptr + line->length - 1; -- Gitee From cff4eae1bf9e8edb77ac83c87f6afebfbbc3d6c9 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 26 Oct 2020 23:30:13 +0800 Subject: [PATCH 2/2] [patch tracking] 20201026233007633134 - update spec file --- coreutils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..890cce4 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: cc816fb978113370ff9eac41891f256bf217dffc.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +136,9 @@ fi %{_mandir}/man*/* %changelog +* 20201026233007633134 patch-tracking 8.32-3 +- append patch file of upstream repository from to + * 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