diff --git a/coreutils.spec b/coreutils.spec index f5a08aa750f6eecebb0afdb66bc44e9d689578f4..6eb96b007c88f2614fc8e1387bf4a84939be7c66 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: fb64712c4d79a542bae533034c6c4802eae555fd.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +136,9 @@ fi %{_mandir}/man*/* %changelog +* 20201225145849748845 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 diff --git a/fb64712c4d79a542bae533034c6c4802eae555fd.patch b/fb64712c4d79a542bae533034c6c4802eae555fd.patch new file mode 100644 index 0000000000000000000000000000000000000000..257d970d43e3f968772d41625467737aec47e222 --- /dev/null +++ b/fb64712c4d79a542bae533034c6c4802eae555fd.patch @@ -0,0 +1,22 @@ +diff --git a/gnulib b/gnulib +index 8183682cc..d411aa6ff 160000 +--- a/gnulib ++++ b/gnulib +@@ -1 +1 @@ +-Subproject commit 8183682cc4436bee18007d61bc79938eaf78619a ++Subproject commit d411aa6ffa127d2707958a364896a0fd7d500b1b +diff --git a/src/make-prime-list.c b/src/make-prime-list.c +index 4ae8676e0..035652e80 100644 +--- a/src/make-prime-list.c ++++ b/src/make-prime-list.c +@@ -27,8 +27,9 @@ this program. If not, see https://www.gnu.org/licenses/. */ + #include + #include + +-/* Deactivate config.h's "rpl_"-prefixed definitions of these symbols. */ ++/* Deactivate "rpl_"-prefixed definitions of these symbols. */ + #undef fclose ++#undef free + #undef malloc + #undef strerror +