From 591f6d3257d9113afa189451e858a35388d22442 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 16 Dec 2020 04:58:53 +0800 Subject: [PATCH 1/2] [patch tracking] 20201216045849751437 - https://github.com/coreutils/coreutils/commit/3e61d5dd315be3aa1982b66b4e137564c61c849f --- ...d5dd315be3aa1982b66b4e137564c61c849f.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 3e61d5dd315be3aa1982b66b4e137564c61c849f.patch diff --git a/3e61d5dd315be3aa1982b66b4e137564c61c849f.patch b/3e61d5dd315be3aa1982b66b4e137564c61c849f.patch new file mode 100644 index 0000000..8d8a1ee --- /dev/null +++ b/3e61d5dd315be3aa1982b66b4e137564c61c849f.patch @@ -0,0 +1,50 @@ +diff --git a/doc/coreutils.texi b/doc/coreutils.texi +index df0655c20..44ce7d2e0 100644 +--- a/doc/coreutils.texi ++++ b/doc/coreutils.texi +@@ -10693,6 +10693,8 @@ Set the file permission bits of created directories to @var{mode}, + which uses the same syntax as + in @command{chmod} and uses @samp{a=rwx} (read, write and execute allowed for + everyone) for the point of the departure. @xref{File permissions}. ++This option affects only directories given on the command line; ++it does not affect any parents that may be created via the @option{-p} option. + + Normally the directory has the desired file mode bits at the moment it + is created. As a GNU extension, @var{mode} may also mention +@@ -10708,15 +10710,18 @@ overridden in this way. + @opindex --parents + @cindex parent directories, creating + Make any missing parent directories for each argument, setting their +-file permission bits to the umask modified by @samp{u+wx}. Ignore ++file permission bits to @samp{=rwx,u+wx}, ++that is, with the umask modified by @samp{u+wx}. Ignore + existing parent directories, and do not change their file permission + bits. + +-To set the file permission bits of any newly-created parent +-directories to a value that includes @samp{u+wx}, you can set the ++If the @option{-m} option is also given, it does not affect ++file permission bits of any newly-created parent directories. ++To control these bits, set the + umask before invoking @command{mkdir}. For example, if the shell + command @samp{(umask u=rwx,go=rx; mkdir -p P/Q)} creates the parent +-@file{P} it sets the parent's permission bits to @samp{u=rwx,go=rx}. ++@file{P} it sets the parent's file permission bits to @samp{u=rwx,go=rx}. ++(The umask must include @samp{u=wx} for this method to work.) + To set a parent's special mode bits as well, you can invoke + @command{chmod} after @command{mkdir}. @xref{Directory Setuid and + Setgid}, for how the set-user-ID and set-group-ID bits of +diff --git a/src/mkdir.c b/src/mkdir.c +index 8f07d666e..1f4588f10 100644 +--- a/src/mkdir.c ++++ b/src/mkdir.c +@@ -65,7 +65,8 @@ Create the DIRECTORY(ies), if they do not already exist.\n\ + + fputs (_("\ + -m, --mode=MODE set file mode (as in chmod), not a=rwx - umask\n\ +- -p, --parents no error if existing, make parent directories as needed\n\ ++ -p, --parents no error if existing, make parent directories as needed,\n\ ++ with their file modes unaffected by any -m option.\n\ + -v, --verbose print a message for each created directory\n\ + "), stdout); + fputs (_("\ -- Gitee From cb0d87f373aed7658ecd778af1cadc5af474f43c Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 16 Dec 2020 04:58:54 +0800 Subject: [PATCH 2/2] [patch tracking] 20201216045849751437 - update spec file --- coreutils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..5ebfb81 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: 3e61d5dd315be3aa1982b66b4e137564c61c849f.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +136,9 @@ fi %{_mandir}/man*/* %changelog +* 20201216045849751437 patch-tracking 8.32-3 +- append patch file of upstream repository from <3e61d5dd315be3aa1982b66b4e137564c61c849f> to <3e61d5dd315be3aa1982b66b4e137564c61c849f> + * 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