From 9f5e0f0d5fbde7d6e64fbe0492964efbcb9ff1c4 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 22 Nov 2020 23:30:13 +0800 Subject: [PATCH 1/2] [patch tracking] 20201122233007634250 - https://github.com/coreutils/coreutils/commit/344cf0ee5fcc827d0e65d3b76b5f4a8c7176bb4d --- ...f0ee5fcc827d0e65d3b76b5f4a8c7176bb4d.patch | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 344cf0ee5fcc827d0e65d3b76b5f4a8c7176bb4d.patch diff --git a/344cf0ee5fcc827d0e65d3b76b5f4a8c7176bb4d.patch b/344cf0ee5fcc827d0e65d3b76b5f4a8c7176bb4d.patch new file mode 100644 index 0000000..8c3b8a6 --- /dev/null +++ b/344cf0ee5fcc827d0e65d3b76b5f4a8c7176bb4d.patch @@ -0,0 +1,86 @@ +diff --git a/.gitignore b/.gitignore +index e1abcdfb7..103fd4ba5 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -39,8 +39,8 @@ + /coreutils-*.tar.gz.sig + /coreutils-*.tar.xz + /coreutils-*.tar.xz.sig +-/doc/manual + /doc/coverage ++/doc/manual + /gnulib-tests + /lib/.dirstamp + /lib/.gitignore +@@ -59,8 +59,8 @@ + /lib/fcntl.h + /lib/float.h + /lib/fnmatch.h +-/lib/getopt.h + /lib/getopt-cdefs.h ++/lib/getopt.h + /lib/glthread + /lib/iconv.h + /lib/iconv_open-aix.h +@@ -78,14 +78,15 @@ + /lib/math.h + /lib/netdb.h + /lib/netinet/in.h +-/lib/parse-datetime.c + /lib/parse-datetime-gen.h ++/lib/parse-datetime.c + /lib/printf.c + /lib/pthread.h + /lib/ref-add.sed + /lib/ref-del.sed + /lib/sched.h + /lib/se-context.h ++/lib/se-label.h + /lib/se-selinux.h + /lib/selinux + /lib/signal.h +@@ -173,12 +174,12 @@ + /po/remove-potcdate.sin + /po/stamp-po + /src/coreutils.h +-/src/coreutils_symlinks + /src/coreutils_shebangs ++/src/coreutils_symlinks + /src/cu-progs.mk +-/src/fs-latest-magic.h + /src/fs-def + /src/fs-kernel-magic ++/src/fs-latest-magic.h + /src/fs-magic + /src/libsinglebin_*.a + /src/make-prime-list +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 074322393..5ccc0e9a9 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -109,7 +109,6 @@ src/remove.c + src/rm.c + src/rmdir.c + src/runcon.c +-src/selinux.c + src/seq.c + src/set-fields.c + src/shred.c +diff --git a/src/mv.c b/src/mv.c +index 21621af21..6855f5373 100644 +--- a/src/mv.c ++++ b/src/mv.c +@@ -417,10 +417,9 @@ main (int argc, char **argv) + if (selinux_enabled) + { + x.preserve_security_context = false; +- x.set_security_context = selabel_open (SELABEL_CTX_FILE, +- NULL, 0); +- if (! x.set_security_context) +- error (0, errno, _("warning: ignoring --context")); ++ x.set_security_context = selabel_open (SELABEL_CTX_FILE, NULL, 0); ++ if (! x.set_security_context) ++ error (0, errno, _("warning: ignoring --context")); + } + break; + case_GETOPT_HELP_CHAR; -- Gitee From 88054b7499a69679899de53e7fe70393994fea76 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 22 Nov 2020 23:30:13 +0800 Subject: [PATCH 2/2] [patch tracking] 20201122233007634250 - update spec file --- coreutils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..1e60a92 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: 344cf0ee5fcc827d0e65d3b76b5f4a8c7176bb4d.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +136,9 @@ fi %{_mandir}/man*/* %changelog +* 20201122233007634250 patch-tracking 8.32-3 +- append patch file of upstream repository from <344cf0ee5fcc827d0e65d3b76b5f4a8c7176bb4d> to <344cf0ee5fcc827d0e65d3b76b5f4a8c7176bb4d> + * 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