From 81d876f95cedc2857c5017c1bf5cc342d51fc9ba Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 23 Nov 2020 18:30:13 +0800 Subject: [PATCH 1/2] [patch tracking] 20201123183007631987 - https://github.com/coreutils/coreutils/commit/d12f5da6d489975d79c177f42fedaefa3df0f985 --- d12f5da6d489975d79c177f42fedaefa3df0f985.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 d12f5da6d489975d79c177f42fedaefa3df0f985.patch diff --git a/d12f5da6d489975d79c177f42fedaefa3df0f985.patch b/d12f5da6d489975d79c177f42fedaefa3df0f985.patch new file mode 100644 index 0000000..e2fd696 --- /dev/null +++ b/d12f5da6d489975d79c177f42fedaefa3df0f985.patch @@ -0,0 +1,13 @@ +diff --git a/src/install.c b/src/install.c +index eb6e403e7..dce29dbe1 100644 +--- a/src/install.c ++++ b/src/install.c +@@ -339,7 +339,7 @@ setdefaultfilecon (char const *file) + return; + if (selabel_lookup (hnd, &scontext, file, st.st_mode) != 0) + { +- if (errno != ENOENT) ++ if (errno != ENOENT && ! ignorable_ctx_err (errno)) + error (0, errno, _("warning: %s: context lookup failed"), + quotef (file)); + return; -- Gitee From 74448f38e8ef2fef93a5ec779682cc3d53bd3feb Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 23 Nov 2020 18:30:13 +0800 Subject: [PATCH 2/2] [patch tracking] 20201123183007631987 - update spec file --- coreutils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..b898b2b 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: d12f5da6d489975d79c177f42fedaefa3df0f985.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +136,9 @@ fi %{_mandir}/man*/* %changelog +* 20201123183007631987 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