From 8e85e0136574ea40fd60225ae2095b37419be304 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 28 Oct 2020 23:30:15 +0800 Subject: [PATCH 1/4] [patch tracking] 20201028233007631828 - https://github.com/coreutils/coreutils/commit/51cfaef6557a4ff72a8900014185d9299979f7ea --- ...aef6557a4ff72a8900014185d9299979f7ea.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 51cfaef6557a4ff72a8900014185d9299979f7ea.patch diff --git a/51cfaef6557a4ff72a8900014185d9299979f7ea.patch b/51cfaef6557a4ff72a8900014185d9299979f7ea.patch new file mode 100644 index 0000000..defdde9 --- /dev/null +++ b/51cfaef6557a4ff72a8900014185d9299979f7ea.patch @@ -0,0 +1,36 @@ +diff --git a/src/basenc.c b/src/basenc.c +index 13c37f904..ee24a3f15 100644 +--- a/src/basenc.c ++++ b/src/basenc.c +@@ -142,7 +142,6 @@ Base%d encode or decode FILE, or standard input, to standard output.\n\ + -i, --ignore-garbage when decoding, ignore non-alphabet characters\n\ + -w, --wrap=COLS wrap encoded lines after COLS character (default 76).\n\ + Use 0 to disable line wrapping\n\ +-\n\ + "), stdout); + #if BASE_TYPE == 42 + fputs (_("\ +diff --git a/src/realpath.c b/src/realpath.c +index 6ed5f05c3..4391c697f 100644 +--- a/src/realpath.c ++++ b/src/realpath.c +@@ -85,7 +85,6 @@ all but the last component must exist\n\ + --relative-base=DIR print absolute paths unless paths below DIR\n\ + -s, --strip, --no-symlinks don't expand symlinks\n\ + -z, --zero end each output line with NUL, not newline\n\ +-\n\ + "), stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); +diff --git a/src/runcon.c b/src/runcon.c +index b2f4d4a0b..05cbb4f87 100644 +--- a/src/runcon.c ++++ b/src/runcon.c +@@ -93,7 +93,6 @@ With neither CONTEXT nor COMMAND, print the current security context.\n\ + -u, --user=USER user identity\n\ + -r, --role=ROLE role\n\ + -l, --range=RANGE levelrange\n\ +-\n\ + "), stdout); + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); -- Gitee From 7ad2df07f9283ce7bcfaea9459a7c6c1964bfcf2 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 28 Oct 2020 23:30:17 +0800 Subject: [PATCH 2/4] [patch tracking] 20201028233007631828 - https://github.com/coreutils/coreutils/commit/53324dd6112840c0cdd2f87bc775c99cf900a308 --- ...4dd6112840c0cdd2f87bc775c99cf900a308.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 53324dd6112840c0cdd2f87bc775c99cf900a308.patch diff --git a/53324dd6112840c0cdd2f87bc775c99cf900a308.patch b/53324dd6112840c0cdd2f87bc775c99cf900a308.patch new file mode 100644 index 0000000..319c05f --- /dev/null +++ b/53324dd6112840c0cdd2f87bc775c99cf900a308.patch @@ -0,0 +1,21 @@ +diff --git a/src/local.mk b/src/local.mk +index 3894556f3..79c655036 100644 +--- a/src/local.mk ++++ b/src/local.mk +@@ -511,7 +511,7 @@ src/fs-magic-compare: src/fs-magic src/fs-kernel-magic src/fs-def + + CLEANFILES += src/fs-def + src/fs-def: src/fs.h +- grep '^# *define ' src/fs.h | $(ASSORT) > $@-t && mv $@-t $@ ++ @grep '^# *define ' src/fs.h | $(ASSORT) > $@-t && mv $@-t $@ + + # Massage bits of the statfs man page and definitions from + # /usr/include/linux/magic.h to be in a form consistent with what's in fs.h. +@@ -525,6 +525,7 @@ fs_normalize_perl_subst = \ + -e 's/AFS_FS/KAFS/;' \ + -e 's/(_SUPER)?_MAGIC//;' \ + -e 's/\s+0x(\S+)/" 0x" . uc $$1/e;' \ ++ -e 's/(\s+0x)(\X{2})\b/$${1}00$$2/;' \ + -e 's/(\s+0x)(\X{3})\b/$${1}0$$2/;' \ + -e 's/(\s+0x)(\X{6})\b/$${1}00$$2/;' \ + -e 's/(\s+0x)(\X{7})\b/$${1}0$$2/;' \ -- Gitee From 525f85f66d4b35dec47f37d32e92d2b116d82374 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 28 Oct 2020 23:30:17 +0800 Subject: [PATCH 3/4] [patch tracking] 20201028233007631828 - https://github.com/coreutils/coreutils/commit/ff80b6b0a0507e24f39cc1aad09d147f5187430b --- ...b6b0a0507e24f39cc1aad09d147f5187430b.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 ff80b6b0a0507e24f39cc1aad09d147f5187430b.patch diff --git a/ff80b6b0a0507e24f39cc1aad09d147f5187430b.patch b/ff80b6b0a0507e24f39cc1aad09d147f5187430b.patch new file mode 100644 index 0000000..8befb79 --- /dev/null +++ b/ff80b6b0a0507e24f39cc1aad09d147f5187430b.patch @@ -0,0 +1,38 @@ +diff --git a/NEWS b/NEWS +index 7cf15498c..efb97e6b0 100644 +--- a/NEWS ++++ b/NEWS +@@ -40,8 +40,9 @@ GNU coreutils NEWS -*- outline -*- + + ** Improvements + +- stat and tail now know about the "vboxsf" file system type. +- stat -f -c%T now reports the file system type, and tail -f uses polling. ++ stat and tail now know about the "devmem", "vboxsf", and "zonefs" ++ file system types. stat -f -c%T now reports the file system type, ++ and tail -f uses polling for "vboxsf" and inotify for the others. + + + * Noteworthy changes in release 8.32 (2020-03-05) [stable] +diff --git a/src/stat.c b/src/stat.c +index 1c09073a2..70cc8d278 100644 +--- a/src/stat.c ++++ b/src/stat.c +@@ -347,6 +347,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) + return "debugfs"; + case S_MAGIC_DEVFS: /* 0x1373 local */ + return "devfs"; ++ case S_MAGIC_DEVMEM: /* 0x454D444D local */ ++ return "devmem"; + case S_MAGIC_DEVPTS: /* 0x1CD1 local */ + return "devpts"; + case S_MAGIC_DMA_BUF: /* 0x444D4142 local */ +@@ -551,6 +553,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) + return "z3fold"; + case S_MAGIC_ZFS: /* 0x2FC12FC1 local */ + return "zfs"; ++ case S_MAGIC_ZONEFS: /* 0x5A4F4653 local */ ++ return "zonefs"; + case S_MAGIC_ZSMALLOC: /* 0x58295829 local */ + return "zsmallocfs"; + -- Gitee From 7d107a15c8ddb6a01fe75fec54ac81c5354a15c2 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 28 Oct 2020 23:30:18 +0800 Subject: [PATCH 4/4] [patch tracking] 20201028233007631828 - update spec file --- coreutils.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..bb8e709 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,9 @@ 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: 51cfaef6557a4ff72a8900014185d9299979f7ea.patch +Patch6001: 53324dd6112840c0cdd2f87bc775c99cf900a308.patch +Patch6002: ff80b6b0a0507e24f39cc1aad09d147f5187430b.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +138,9 @@ fi %{_mandir}/man*/* %changelog +* 20201028233007631828 patch-tracking 8.32-3 +- append patch file of upstream repository from <51cfaef6557a4ff72a8900014185d9299979f7ea> to + * Wed Aug 26 2020 chenbo pan - 8.32-2 - fix patch error @@ -221,4 +227,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