From 3a8b2da26b8ada6e8a3b9de23fcabee89f7c6a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Wed, 16 Aug 2023 11:28:30 +0200 Subject: [PATCH] fix find not obeying option -ignore_readdir_race in symlink_loop Resolves: #2232278 --- ...4.6.0-ignore_readdir_race-symlink_loop.patch | 17 +++++++++++++++++ findutils.spec | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 findutils-4.6.0-ignore_readdir_race-symlink_loop.patch diff --git a/findutils-4.6.0-ignore_readdir_race-symlink_loop.patch b/findutils-4.6.0-ignore_readdir_race-symlink_loop.patch new file mode 100644 index 0000000..f6ac52d --- /dev/null +++ b/findutils-4.6.0-ignore_readdir_race-symlink_loop.patch @@ -0,0 +1,17 @@ +# cherry picked from https://savannah.gnu.org/bugs/?45930 +diff --git a/find/ftsfind.c b/find/ftsfind.c +index 0d96c4ca..6aeac28c 100644 +--- a/find/ftsfind.c ++++ b/find/ftsfind.c +@@ -401,6 +401,10 @@ consider_visiting (FTS *p, FTSENT *ent) + } + else + { ++ /* Ignore unlink() error for vanished files. */ ++ if (ENOENT == ent->fts_errno && options.ignore_readdir_race) ++ return; ++ + nonfatal_target_file_error (ent->fts_errno, ent->fts_path); + /* Continue despite the error, as file name without stat info + * might be better than not even processing the file name. This + diff --git a/findutils.spec b/findutils.spec index c2f5bb9..809379b 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,7 +1,7 @@ Summary: The GNU versions of find utilities (find and xargs) Name: findutils Version: 4.6.0 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 1 License: GPLv3+ Group: Applications/File @@ -49,6 +49,9 @@ Patch12: findutils-4.6.0-leaf-opt.patch # fix programming mistakes detected by static analysis (#1606953) Patch13: findutils-4.6.0-covscan.patch +# fix find not obeying option -ignore_readdir_race in symlink_loop (#2232278) +Patch14: findutils-4.6.0-ignore_readdir_race-symlink_loop.patch + Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Conflicts: filesystem < 3 @@ -150,6 +153,9 @@ fi %{_infodir}/find-maint.info.gz %changelog +* Wed Aug 16 2023 Lukáš Zaoral - 1:4.6.0-21 +- fix find not obeying option -ignore_readdir_race in symlink_loop (#2232278) + * Mon Nov 05 2018 Kamil Dudka - 1:4.6.0-20 - fix programming mistakes detected by static analysis (#1606953)