Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1988 from Rmys/master

Browse Source 
findutils-4.10.0
This commit is contained in:
Rmys
2024-10-14 17:03:01 +03:00
committed by GitHub
parent 818365597d 850b190267
commit 1b6bdcad93
3 changed files with 76 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/findutils/files/findutils-fedora-4.4.2-xautofs.patch
+50 -38
View File
@@ -1,25 +1,25 @@
From 17e470dc1acca4824b70328d733d5f99c12d0d65 Mon Sep 17 00:00:00 2001
From cd653102f401f91748c3f038be4d38ddacc2d7db Mon Sep 17 00:00:00 2001
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
---
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:
+@deffn Option -xautofs
+Don't descend directories on autofs filesystems.
+@end deffn
@@ -28,13 +28,13 @@ 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;
+ /* If true, don't descend directories on autofs filesystems. */
+ bool bypass_autofs;
+
@@ -42,29 +42,41 @@ 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.
+.IP \-xautofs
+Don't descend directories on autofs filesystems.
+
.IP \-xdev
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,10 +104,10 @@ 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);
}
+static bool
+parse_xautofs (const struct parser_table* entry, char **argv, int *arg_ptr)
+{
@@ -107,26 +119,26 @@ 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\
- -mount -noleaf -xdev -ignore_readdir_race -noignore_readdir_race\n"));
+ -mount -noleaf -xautofs -xdev -ignore_readdir_race -noignore_readdir_race\n"));
- -mount -noleaf -xdev -ignore_readdir_race -noignore_readdir_race\n"));
+ -mount -noleaf -xautofs -xdev -ignore_readdir_race -noignore_readdir_race\n"));
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;
+ p->bypass_autofs = false;
p->ignore_readdir_race = false;
if (p->posixly_correct)
--
1.7.4.4
--
2.45.2
system/base/findutils/files/findutils-fedora-4.9.0-ignore_readdir_race-symlink_loop.patch
+17
View File
@@ -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
system/base/findutils/pspec.xml
+9 -2
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>GNU utilities to find files</Summary>
<Description>The GNU Find Utilities are the basic directory searching utilities of the GNU operating system. These programs are typically used in conjunction with other programs to provide modular and powerful directory search and file locating capabilities to other commands.</Description>
<Archive sha1sum="2a7830f1c25c3c7179150084748099c3c31f819b" type="tarxz">http://ftp.gnu.org/pub/gnu/findutils/findutils-4.9.0.tar.xz</Archive>
<Archive sha1sum="aa0646445da9aba2ab7823d7298f3a9a40a6b6ad" type="tarxz">http://ftp.gnu.org/pub/gnu/findutils/findutils-4.10.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>gettext</Dependency>
<Dependency>texinfo</Dependency>
@@ -23,7 +23,7 @@
<Patch level="1">findutils-fedora-4.5.13-warnings.patch</Patch>
<Patch level="1">findutils-fedora-4.6.0-leaf-opt.patch</Patch>
<Patch level="1">findutils-fedora-4.6.0-test-lock.patch</Patch>
<!-- <Patch level="1">findutils-4.7.0-leaf-opt-xfs.patch</Patch> -->
<Patch level="1">findutils-fedora-4.9.0-ignore_readdir_race-symlink_loop.patch</Patch> -->
<!-- <Patch level="1">findutils-4.7.0-root-tests.patch</Patch> -->
</Patches>
</Source>
@@ -43,6 +43,13 @@
</Package>
<History>
<Update release="8">
<Date>2024-10-04</Date>
<Version>4.10.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="7">
<Date>2023-01-28</Date>
<Version>4.9.0</Version>