diff --git a/findutils-4.4.2-xautofs.patch b/findutils-4.4.2-xautofs.patch index 271b68c..c8de53f 100644 --- a/findutils-4.4.2-xautofs.patch +++ b/findutils-4.4.2-xautofs.patch @@ -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 -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 --- - doc/find.texi | 4 ++++ - find/defs.h | 3 +++ - find/find.1 | 3 +++ - find/ftsfind.c | 6 ++++++ - find/parser.c | 9 +++++++++ - find/util.c | 3 ++- - 6 files changed, 27 insertions(+), 1 deletions(-) + doc/find.texi | 4 ++++ + find/defs.h | 3 +++ + find/find.1 | 3 +++ + find/ftsfind.c | 11 +++++++++-- + find/parser.c | 9 +++++++++ + find/util.c | 3 ++- + 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/doc/find.texi b/doc/find.texi -index c584298..9731b71 100644 +index f58c060..21b4bf5 100644 --- a/doc/find.texi +++ b/doc/find.texi -@@ -1606,6 +1606,10 @@ them. +@@ -1605,6 +1605,10 @@ them. There are two ways to avoid searching certain filesystems. One way is to tell @code{find} to only search one filesystem: @@ -28,10 +28,10 @@ index c584298..9731b71 100644 @deffnx Option -mount Don't descend directories on other filesystems. These options are diff --git a/find/defs.h b/find/defs.h -index 11d1d00..f95ce72 100644 +index 453dc27..9424168 100644 --- a/find/defs.h +++ b/find/defs.h -@@ -562,6 +562,9 @@ struct options +@@ -557,6 +557,9 @@ struct options /* If true, don't cross filesystem boundaries. */ bool stay_on_filesystem; @@ -42,10 +42,10 @@ index 11d1d00..f95ce72 100644 * no longer exists by the time we get around to processing it. */ diff --git a/find/find.1 b/find/find.1 -index e851f82..a4799ff 100644 +index 319aa63..002fb16 100644 --- a/find/find.1 +++ b/find/find.1 -@@ -638,6 +638,9 @@ to stat them; this gives a significant increase in search speed. +@@ -654,6 +654,9 @@ to stat them; this gives a significant increase in search speed. .IP "\-version, \-\-version" Print the \fBfind\fR version number and exit. @@ -56,15 +56,27 @@ index e851f82..a4799ff 100644 Don't descend directories on other filesystems. diff --git a/find/ftsfind.c b/find/ftsfind.c -index 9fdb8ef..bd7cc37 100644 +index b7f69a0..aca856c 100644 --- a/find/ftsfind.c +++ b/find/ftsfind.c -@@ -435,6 +435,12 @@ consider_visiting (FTS *p, FTSENT *ent) +@@ -268,8 +268,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) +@@ -433,6 +433,13 @@ consider_visiting (FTS *p, FTSENT *ent) } } -+ if (options.bypass_autofs && -+ 0 == strcmp ("autofs", filesystem_type (&statbuf, ent->fts_name))) ++ if (options.bypass_autofs ++ && 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 */ + } @@ -73,10 +85,10 @@ index 9fdb8ef..bd7cc37 100644 { /* this is the preorder visit, but user said -depth */ diff --git a/find/parser.c b/find/parser.c -index 52a1ef6..995aec3 100644 +index b86e685..6d74d1e 100644 --- a/find/parser.c +++ b/find/parser.c -@@ -139,6 +139,7 @@ static bool parse_used (const struct parser_table*, char *argv[], int * +@@ -150,6 +150,7 @@ static bool parse_used (const struct parser_table*, char *argv[], int * static bool parse_user (const struct parser_table*, char *argv[], int *arg_ptr); static bool parse_wholename (const struct parser_table*, char *argv[], int *arg_ptr); static bool parse_xdev (const struct parser_table*, char *argv[], int *arg_ptr); @@ -84,7 +96,7 @@ index 52a1ef6..995aec3 100644 static bool parse_ignore_race (const struct parser_table*, char *argv[], int *arg_ptr); static bool parse_noignore_race (const struct parser_table*, char *argv[], int *arg_ptr); static bool parse_warn (const struct parser_table*, char *argv[], int *arg_ptr); -@@ -304,6 +305,7 @@ static struct parser_table const parse_table[] = +@@ -309,6 +310,7 @@ static struct parser_table const parse_table[] = PARSE_TEST_NP ("wholename", wholename), /* GNU, replaced -path, but now -path is standardized since POSIX 2008 */ {ARG_TEST, "writable", parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */ PARSE_OPTION ("xdev", xdev), /* POSIX */ @@ -92,7 +104,7 @@ index 52a1ef6..995aec3 100644 PARSE_TEST ("xtype", xtype), /* GNU */ #ifdef UNIMPLEMENTED_UNIX /* It's pretty ugly for find to know about archive formats. -@@ -2607,6 +2609,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) +@@ -2489,6 +2491,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) return parse_noop (entry, argv, arg_ptr); } @@ -107,10 +119,10 @@ index 52a1ef6..995aec3 100644 parse_ignore_race (const struct parser_table* entry, char **argv, int *arg_ptr) { diff --git a/find/util.c b/find/util.c -index 8577396..4d45f84 100644 +index 88dafd7..a592055 100644 --- a/find/util.c +++ b/find/util.c -@@ -183,7 +183,7 @@ Positional options (always true):\n\ +@@ -181,7 +181,7 @@ Positional options (always true):\n\ HTL (_("\n\ Normal options (always true, specified before other expressions):\n\ -depth -files0-from FILE -maxdepth LEVELS -mindepth LEVELS\n\ @@ -119,7 +131,7 @@ index 8577396..4d45f84 100644 HTL (_("\n\ Tests (N can be +N or -N or N):\n\ -amin N -anewer FILE -atime N -cmin N -cnewer FILE -context CONTEXT\n\ -@@ -1028,6 +1028,7 @@ set_option_defaults (struct options *p) +@@ -1027,6 +1027,7 @@ set_option_defaults (struct options *p) p->full_days = false; p->stay_on_filesystem = false; @@ -128,5 +140,5 @@ index 8577396..4d45f84 100644 if (p->posixly_correct) -- -1.7.4.4 +2.45.2 diff --git a/findutils.spec b/findutils.spec index 311f8a8..f06f062 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.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 License: GPL-3.0-or-later URL: https://www.gnu.org/software/findutils/ @@ -118,6 +118,9 @@ rm -f %{buildroot}%{_infodir}/dir %{_infodir}/find-maint.info.* %changelog +* Tue Jul 02 2024 Lukáš Zaoral - 1:4.10.0-4 +- fix autofs patch when stat was not performed (RHEL-43285) + * Mon Jun 24 2024 Troy Dawson - 1:4.10.0-3 - Bump release for June 2024 mass rebuild