From c6201910c406c16b63f4c3ba344842a533cbf244 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 18 Oct 2020 00:30:13 +0800 Subject: [PATCH 1/3] [patch tracking] 20201018003007632080 - https://github.com/coreutils/coreutils/commit/db3131adb8506bf47b7ab5bdbd18e7a5a502a7a0 --- ...31adb8506bf47b7ab5bdbd18e7a5a502a7a0.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 db3131adb8506bf47b7ab5bdbd18e7a5a502a7a0.patch diff --git a/db3131adb8506bf47b7ab5bdbd18e7a5a502a7a0.patch b/db3131adb8506bf47b7ab5bdbd18e7a5a502a7a0.patch new file mode 100644 index 0000000..48a6925 --- /dev/null +++ b/db3131adb8506bf47b7ab5bdbd18e7a5a502a7a0.patch @@ -0,0 +1,21 @@ +diff --git a/README-prereq b/README-prereq +index fdf89fecd..16684a8b8 100644 +--- a/README-prereq ++++ b/README-prereq +@@ -34,6 +34,7 @@ set correctly by running this command: + # Please use the latest stable release version as indicated by git tags. + git clone --depth=1 git://git.sv.gnu.org/autoconf.git + cd autoconf ++ git pull --tags + git checkout v2.64 + autoreconf -vi + ./configure --prefix=$prefix +@@ -55,7 +56,7 @@ requires version 1.10a or newer, as well as the xz program itself. + + * xz * + +- git clone git://ctrl.tukaani.org/xz.git ++ git clone https://git.tukaani.org/xz.git + cd xz + ./autogen.sh + ./configure --prefix=$prefix -- Gitee From 299412813221f0f59fa681c3f1ff7b65e560d1ca Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 18 Oct 2020 00:30:13 +0800 Subject: [PATCH 2/3] [patch tracking] 20201018003007632080 - https://github.com/coreutils/coreutils/commit/d9b33b1535a2812bbf7023be4e4a036ad55cd00e --- d9b33b1535a2812bbf7023be4e4a036ad55cd00e.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 d9b33b1535a2812bbf7023be4e4a036ad55cd00e.patch diff --git a/d9b33b1535a2812bbf7023be4e4a036ad55cd00e.patch b/d9b33b1535a2812bbf7023be4e4a036ad55cd00e.patch new file mode 100644 index 0000000..fc23615 --- /dev/null +++ b/d9b33b1535a2812bbf7023be4e4a036ad55cd00e.patch @@ -0,0 +1,15 @@ +diff --git a/src/tail.c b/src/tail.c +index 1c8872396..18e52b1bf 100644 +--- a/src/tail.c ++++ b/src/tail.c +@@ -2479,10 +2479,6 @@ main (int argc, char **argv) + recheck it and follow the new file, or ignore it if the + file has changed to being remote. + +- FIXME: when using inotify, and a directory for a watched file +- is recreated, then we don't recheck any new file when +- follow_mode == Follow_name. +- + FIXME-maybe: inotify has a watch descriptor per inode, and hence with + our current hash implementation will only --follow data for one + of the names when multiple hardlinked files are specified, or -- Gitee From 4453fd000b77fb554de77daf3d1ee00991fcd9f8 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 18 Oct 2020 00:30:14 +0800 Subject: [PATCH 3/3] [patch tracking] 20201018003007632080 - update spec file --- coreutils.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..b99e7df 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,8 @@ 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: db3131adb8506bf47b7ab5bdbd18e7a5a502a7a0.patch +Patch6001: d9b33b1535a2812bbf7023be4e4a036ad55cd00e.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +137,9 @@ fi %{_mandir}/man*/* %changelog +* 20201018003007632080 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 +226,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