rpms/findutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

import UBI findutils-4.8.0-7.el9

Browse Source
This commit is contained in:
eabdullin 2024-11-12 10:57:54 +00:00
parent fe6a626554
commit 13e71b4fa9
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
SOURCES/findutils-4.4.2-xautofs.patch
View File

@ -1,22 +1,22 @@
From 17e470dc1acca4824b70328d733d5f99c12d0d65 Mon Sep 17 00:00:00 2001 From cd653102f401f91748c3f038be4d38ddacc2d7db Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com> From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 11 May 2011 16:46:45 +0200 Date: Wed, 3 Jul 2024 10:22:49 +0200
Subject: [PATCH] findutils-4.4.2-xautofs.patch Subject: [PATCH] findutils-4.4.2-xautofs.patch
--- ---
doc/find.texi | 4 ++++ doc/find.texi | 4 ++++
find/defs.h | 3 +++ find/defs.h | 3 +++
find/find.1 | 3 +++ find/find.1 | 3 +++
find/ftsfind.c | 6 ++++++ find/ftsfind.c | 11 +++++++++--
find/parser.c | 9 +++++++++ find/parser.c | 9 +++++++++
find/util.c | 3 ++- find/util.c | 3 ++-
6 files changed, 27 insertions(+), 1 deletions(-) 6 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/doc/find.texi b/doc/find.texi diff --git a/doc/find.texi b/doc/find.texi
index c584298..9731b71 100644 index f31f8d1..b2e5fc5 100644
--- a/doc/find.texi --- a/doc/find.texi
+++ b/doc/find.texi +++ b/doc/find.texi
@@ -1474,6 +1474,10 @@ them. @@ -1517,6 +1517,10 @@ them.
There are two ways to avoid searching certain filesystems. One way is There are two ways to avoid searching certain filesystems. One way is
to tell @code{find} to only search one filesystem: to tell @code{find} to only search one filesystem:
@ -28,7 +28,7 @@ index c584298..9731b71 100644
@deffnx Option -mount @deffnx Option -mount
Don't descend directories on other filesystems. These options are Don't descend directories on other filesystems. These options are
diff --git a/find/defs.h b/find/defs.h diff --git a/find/defs.h b/find/defs.h
index 11d1d00..f95ce72 100644 index 72048ff..adb5973 100644
--- a/find/defs.h --- a/find/defs.h
+++ b/find/defs.h +++ b/find/defs.h
@@ -574,6 +574,9 @@ struct options @@ -574,6 +574,9 @@ struct options
@ -42,10 +42,10 @@ index 11d1d00..f95ce72 100644
* no longer exists by the time we get around to processing it. * no longer exists by the time we get around to processing it.
*/ */
diff --git a/find/find.1 b/find/find.1 diff --git a/find/find.1 b/find/find.1
index e851f82..a4799ff 100644 index a536106..b8cf1fb 100644
--- a/find/find.1 --- a/find/find.1
+++ b/find/find.1 +++ b/find/find.1
@@ -567,6 +567,9 @@ to stat them; this gives a significant increase in search speed. @@ -576,6 +576,9 @@ to stat them; this gives a significant increase in search speed.
.IP "\-version, \-\-version" .IP "\-version, \-\-version"
Print the \fBfind\fR version number and exit. Print the \fBfind\fR version number and exit.
@ -56,15 +56,27 @@ index e851f82..a4799ff 100644
Don't descend directories on other filesystems. Don't descend directories on other filesystems.
diff --git a/find/ftsfind.c b/find/ftsfind.c diff --git a/find/ftsfind.c b/find/ftsfind.c
index 9fdb8ef..bd7cc37 100644 index 109f23a..5c4c2e2 100644
--- a/find/ftsfind.c --- a/find/ftsfind.c
+++ b/find/ftsfind.c +++ b/find/ftsfind.c
@@ -479,6 +479,12 @@ consider_visiting (FTS *p, FTSENT *ent) @@ -267,8 +267,8 @@ symlink_loop (const char *name)
static void
consider_visiting (FTS *p, FTSENT *ent)
{
- struct stat statbuf;
- mode_t mode;
+ struct stat statbuf = {0};
+ mode_t mode = 0;
int ignore, isdir;
if (options.debug_options & DebugSearch)
@@ -432,6 +432,13 @@ consider_visiting (FTS *p, FTSENT *ent)
} }
} }
+ if (options.bypass_autofs && + if (options.bypass_autofs
+ 0 == strcmp ("autofs", filesystem_type (&statbuf, ent->fts_name))) + && 0 == get_statinfo (ent->fts_path, ent->fts_name, &statbuf)
+ && 0 == strcmp ("autofs", filesystem_type (&statbuf, ent->fts_name)))
+ { + {
+ fts_set(p, ent, FTS_SKIP); /* descend no further */ + fts_set(p, ent, FTS_SKIP); /* descend no further */
+ } + }
@ -73,7 +85,7 @@ index 9fdb8ef..bd7cc37 100644
{ {
/* this is the preorder visit, but user said -depth */ /* this is the preorder visit, but user said -depth */
diff --git a/find/parser.c b/find/parser.c diff --git a/find/parser.c b/find/parser.c
index 52a1ef6..995aec3 100644 index 8546982..3d42efc 100644
--- a/find/parser.c --- a/find/parser.c
+++ b/find/parser.c +++ b/find/parser.c
@@ -138,6 +138,7 @@ static bool parse_used (const struct parser_table*, char *argv[], int * @@ -138,6 +138,7 @@ static bool parse_used (const struct parser_table*, char *argv[], int *
@ -92,7 +104,7 @@ index 52a1ef6..995aec3 100644
PARSE_TEST ("xtype", xtype), /* GNU */ PARSE_TEST ("xtype", xtype), /* GNU */
#ifdef UNIMPLEMENTED_UNIX #ifdef UNIMPLEMENTED_UNIX
/* It's pretty ugly for find to know about archive formats. /* It's pretty ugly for find to know about archive formats.
@@ -2603,6 +2605,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) @@ -2594,6 +2596,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
return parse_noop (entry, argv, arg_ptr); return parse_noop (entry, argv, arg_ptr);
} }
@ -107,7 +119,7 @@ index 52a1ef6..995aec3 100644
parse_ignore_race (const struct parser_table* entry, char **argv, int *arg_ptr) parse_ignore_race (const struct parser_table* entry, char **argv, int *arg_ptr)
{ {
diff --git a/find/util.c b/find/util.c diff --git a/find/util.c b/find/util.c
index 8577396..4d45f84 100644 index 959272a..e7d174e 100644
--- a/find/util.c --- a/find/util.c
+++ b/find/util.c +++ b/find/util.c
@@ -181,7 +181,7 @@ operators (decreasing precedence; -and is implicit where no others are given):\n @@ -181,7 +181,7 @@ operators (decreasing precedence; -and is implicit where no others are given):\n
@ -128,5 +140,5 @@ index 8577396..4d45f84 100644
if (p->posixly_correct) if (p->posixly_correct)
-- --
1.7.4.4 2.45.2

5
SPECS/findutils.spec
View File

@ -1,7 +1,7 @@
Summary: The GNU versions of find utilities (find and xargs) Summary: The GNU versions of find utilities (find and xargs)
Name: findutils Name: findutils
Version: 4.8.0 Version: 4.8.0
Release: 6%{?dist} Release: 7%{?dist}
Epoch: 1 Epoch: 1
License: GPLv3+ License: GPLv3+
URL: https://www.gnu.org/software/findutils/ URL: https://www.gnu.org/software/findutils/
@ -114,6 +114,9 @@ rm -f %{buildroot}%{_infodir}/dir
%{_infodir}/find-maint.info.* %{_infodir}/find-maint.info.*
%changelog %changelog
* Thu Jul 04 2024 Lukáš Zaoral <lzaoral@redhat.com> - 1:4.8.0-7
- fix autofs patch when stat was not performed (RHEL-45721)
* Thu Aug 17 2023 Lukáš Zaoral <lzaoral@redhat.com> - 1:4.8.0-6 * Thu Aug 17 2023 Lukáš Zaoral <lzaoral@redhat.com> - 1:4.8.0-6
- fix find not obeying option -ignore_readdir_race in symlink_loop (#2232519) - fix find not obeying option -ignore_readdir_race in symlink_loop (#2232519)