From fd66bfd7a0444a7b6ef183e5cbaff7f4ed22c48d Mon Sep 17 00:00:00 2001
From: wangchen2020 <15955488707@163.com>
Date: Fri, 10 Dec 2021 10:15:18 +0800
Subject: [PATCH] chmod: fix exit status when ignoring symlinks

---
 ...x-exit-status-when-ignoring-symlinks.patch | 90 +++++++++++++++++++
 coreutils.spec                                |  6 +-
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 backport-chmod-fix-exit-status-when-ignoring-symlinks.patch

diff --git a/backport-chmod-fix-exit-status-when-ignoring-symlinks.patch b/backport-chmod-fix-exit-status-when-ignoring-symlinks.patch
new file mode 100644
index 0000000..a568605
--- /dev/null
+++ b/backport-chmod-fix-exit-status-when-ignoring-symlinks.patch
@@ -0,0 +1,90 @@
+From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Fri, 24 Sep 2021 20:57:41 +0100
+Subject: [PATCH] chmod: fix exit status when ignoring symlinks
+
+* src/chmod.c: Reorder enum so CH_NOT_APPLIED
+can be treated as a non error.
+* tests/chmod/ignore-symlink.sh: A new test.
+* tests/local.mk: Reference the new test.
+* NEWS: Mention the bug fix.
+Fixes https://bugs.gnu.org/50784
+---
+ src/chmod.c                   |  4 ++--
+ tests/chmod/ignore-symlink.sh | 31 +++++++++++++++++++++++++++++++
+ tests/local.mk                |  1 +
+ 4 files changed, 40 insertions(+), 2 deletions(-)
+ create mode 100755 tests/chmod/ignore-symlink.sh
+
+diff --git a/src/chmod.c b/src/chmod.c
+index 37b04f5006..57ac47f33a 100644
+--- a/src/chmod.c
++++ b/src/chmod.c
+@@ -44,8 +44,8 @@ struct change_status
+   enum
+     {
+       CH_NO_STAT,
+-      CH_NOT_APPLIED,
+       CH_FAILED,
++      CH_NOT_APPLIED,
+       CH_NO_CHANGE_REQUESTED,
+       CH_SUCCEEDED
+     }
+@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
+   if ( ! recurse)
+     fts_set (fts, ent, FTS_SKIP);
+ 
+-  return CH_NO_CHANGE_REQUESTED <= ch.status;
++  return CH_NOT_APPLIED <= ch.status;
+ }
+ 
+ /* Recursively change the modes of the specified FILES (the last entry
+diff --git a/tests/chmod/ignore-symlink.sh b/tests/chmod/ignore-symlink.sh
+new file mode 100755
+index 0000000000..5ce3de8163
+--- /dev/null
++++ b/tests/chmod/ignore-symlink.sh
+@@ -0,0 +1,31 @@
++#!/bin/sh
++# Test for proper exit code of chmod on a processed symlink.
++
++# Copyright (C) 2021 Free Software Foundation, Inc.
++
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <https://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ chmod
++
++mkdir dir || framework_failure_
++touch dir/f || framework_failure_
++ln -s f dir/l || framework_failure_
++
++# This operation ignores symlinks but should succeed.
++chmod u+w -R dir 2> out || fail=1
++
++compare /dev/null out || fail=1
++
++Exit $fail
+diff --git a/tests/local.mk b/tests/local.mk
+index 228d0e3688..b5b893fb77 100644
+--- a/tests/local.mk
++++ b/tests/local.mk
+@@ -456,6 +456,7 @@ all_tests =					\
+   tests/chmod/c-option.sh			\
+   tests/chmod/equal-x.sh			\
+   tests/chmod/equals.sh				\
++  tests/chmod/ignore-symlink.sh			\
+   tests/chmod/inaccessible.sh			\
+   tests/chmod/octal.sh				\
+   tests/chmod/setgid.sh				\
diff --git a/coreutils.spec b/coreutils.spec
index 915a857..93eb3f3 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,6 +1,6 @@
 Name:       coreutils
 Version:    9.0
-Release:    1
+Release:    2
 License:    GPLv3+
 Summary:    A set of basic GNU tools commonly used in shell scripts
 Url:        https://www.gnu.org/software/coreutils/
@@ -18,6 +18,7 @@ Patch3:    bugfix-remove-usr-local-lib-from-m4.patch
 Patch4:    bugfix-dummy_help2man.patch
 Patch5:    bugfix-selinux-flask.patch
 Patch6:    skip-the-tests-that-require-selinux-if-selinux-is-di.patch 
+Patch7:    backport-chmod-fix-exit-status-when-ignoring-symlinks.patch
 
 Conflicts: filesystem < 3
 # To avoid clobbering installs
@@ -132,6 +133,9 @@ fi
 %{_mandir}/man*/*
 
 %changelog
+* Fri Dec 10 2021 wangchen <wangchen137@huawei.com> - 9.0-2
+- fix exit status when ignoring symlinks
+
 * Sat Nov 27 2021 wangchen <wangchen137@huawei.com> - 9.0-1
 - Update to 9.0
 
-- 
Gitee