Compare commits

..

No commits in common. "rawhide" and "f35" have entirely different histories.
rawhide ... f35

8 changed files with 44 additions and 56 deletions

View File

@ -16,7 +16,7 @@ diff --git a/doc/find.texi b/doc/find.texi
index c584298..9731b71 100644 index c584298..9731b71 100644
--- a/doc/find.texi --- a/doc/find.texi
+++ b/doc/find.texi +++ b/doc/find.texi
@@ -1606,6 +1606,10 @@ them. @@ -1474,6 +1474,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:
@ -31,7 +31,7 @@ diff --git a/find/defs.h b/find/defs.h
index 11d1d00..f95ce72 100644 index 11d1d00..f95ce72 100644
--- a/find/defs.h --- a/find/defs.h
+++ b/find/defs.h +++ b/find/defs.h
@@ -562,6 +562,9 @@ struct options @@ -574,6 +574,9 @@ struct options
/* If true, don't cross filesystem boundaries. */ /* If true, don't cross filesystem boundaries. */
bool stay_on_filesystem; bool stay_on_filesystem;
@ -45,7 +45,7 @@ diff --git a/find/find.1 b/find/find.1
index e851f82..a4799ff 100644 index e851f82..a4799ff 100644
--- a/find/find.1 --- a/find/find.1
+++ b/find/find.1 +++ b/find/find.1
@@ -638,6 +638,9 @@ to stat them; this gives a significant increase in search speed. @@ -567,6 +567,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.
@ -59,7 +59,7 @@ diff --git a/find/ftsfind.c b/find/ftsfind.c
index 9fdb8ef..bd7cc37 100644 index 9fdb8ef..bd7cc37 100644
--- a/find/ftsfind.c --- a/find/ftsfind.c
+++ b/find/ftsfind.c +++ b/find/ftsfind.c
@@ -435,6 +435,12 @@ consider_visiting (FTS *p, FTSENT *ent) @@ -479,6 +479,12 @@ consider_visiting (FTS *p, FTSENT *ent)
} }
} }
@ -76,7 +76,7 @@ diff --git a/find/parser.c b/find/parser.c
index 52a1ef6..995aec3 100644 index 52a1ef6..995aec3 100644
--- a/find/parser.c --- a/find/parser.c
+++ b/find/parser.c +++ b/find/parser.c
@@ -139,6 +139,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 *
static bool parse_user (const struct parser_table*, char *argv[], int *arg_ptr); 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_wholename (const struct parser_table*, char *argv[], int *arg_ptr);
static bool parse_xdev (const struct parser_table*, char *argv[], int *arg_ptr); static bool parse_xdev (const struct parser_table*, char *argv[], int *arg_ptr);
@ -84,7 +84,7 @@ index 52a1ef6..995aec3 100644
static bool parse_ignore_race (const struct parser_table*, char *argv[], int *arg_ptr); 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_noignore_race (const struct parser_table*, char *argv[], int *arg_ptr);
static bool parse_warn (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[] = @@ -302,6 +303,7 @@ static struct parser_table const parse_table[] =
PARSE_TEST_NP ("wholename", wholename), /* GNU, replaced -path, but now -path is standardized since POSIX 2008 */ 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+ */ {ARG_TEST, "writable", parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */
PARSE_OPTION ("xdev", xdev), /* POSIX */ PARSE_OPTION ("xdev", xdev), /* POSIX */
@ -92,7 +92,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.
@@ -2607,6 +2609,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) @@ -2603,6 +2605,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);
} }
@ -110,16 +110,16 @@ diff --git a/find/util.c b/find/util.c
index 8577396..4d45f84 100644 index 8577396..4d45f84 100644
--- a/find/util.c --- a/find/util.c
+++ b/find/util.c +++ b/find/util.c
@@ -183,7 +183,7 @@ Positional options (always true):\n\ @@ -181,7 +181,7 @@ operators (decreasing precedence; -and is implicit where no others are given):\n
HTL (_("\n\ positional options (always true): -daystart -follow -regextype\n\n\
Normal options (always true, specified before other expressions):\n\ normal options (always true, specified before other expressions):\n\
-depth -files0-from FILE -maxdepth LEVELS -mindepth LEVELS\n\ -depth --help -maxdepth LEVELS -mindepth LEVELS -mount -noleaf\n\
- -mount -noleaf -xdev -ignore_readdir_race -noignore_readdir_race\n")); - --version -xdev -ignore_readdir_race -noignore_readdir_race\n"));
+ -mount -noleaf -xautofs -xdev -ignore_readdir_race -noignore_readdir_race\n")); + --version -xautofs -xdev -ignore_readdir_race -noignore_readdir_race\n"));
HTL (_("\n\ HTL (_("\
Tests (N can be +N or -N or N):\n\ tests (N can be +N or -N or N): -amin N -anewer FILE -atime N -cmin N\n\
-amin N -anewer FILE -atime N -cmin N -cnewer FILE -context CONTEXT\n\ -cnewer FILE -ctime N -empty -false -fstype TYPE -gid N -group NAME\n\
@@ -1028,6 +1028,7 @@ set_option_defaults (struct options *p) @@ -1044,6 +1044,7 @@ set_option_defaults (struct options *p)
p->full_days = false; p->full_days = false;
p->stay_on_filesystem = false; p->stay_on_filesystem = false;

View File

@ -11,7 +11,7 @@ diff --git a/xargs/xargs.c b/xargs/xargs.c
index 5e373f2..c0a8676 100644 index 5e373f2..c0a8676 100644
--- a/xargs/xargs.c --- a/xargs/xargs.c
+++ b/xargs/xargs.c +++ b/xargs/xargs.c
@@ -1346,7 +1346,8 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char * @@ -1299,7 +1299,8 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
* utility if we run it, for POSIX compliance on the * utility if we run it, for POSIX compliance on the
* handling of exit values. * handling of exit values.
*/ */

View File

@ -90,7 +90,7 @@ index c2714dd..01367a4 100644
@iftex @iftex
@finalout @finalout
@@ -661,8 +660,7 @@ the databases are updated, and the directories for which they contain @@ -572,8 +571,7 @@ the databases are updated, and the directories for which they contain
entries. entries.
Here is how to select which file name databases @code{locate} Here is how to select which file name databases @code{locate}
@ -100,7 +100,7 @@ index c2714dd..01367a4 100644
@table @code @table @code
@item --database=@var{path} @item --database=@var{path}
@@ -3112,13 +3110,9 @@ thrashing the network. @@ -2993,13 +2991,9 @@ thrashing the network.
directories are indexed by each database file. directories are indexed by each database file.
The default location for the locate database depends on how findutils The default location for the locate database depends on how findutils
@ -109,7 +109,7 @@ index c2714dd..01367a4 100644
- -
-If no database exists at @file{@value{LOCATE_DB}} but the user did not -If no database exists at @file{@value{LOCATE_DB}} but the user did not
-specify where to look (by using @samp{-d} or setting -specify where to look (by using @samp{-d} or setting
-@env{LOCATE_PATH}), then @code{locate} will also check for a -@code{LOCATE_PATH}), then @code{locate} will also check for a
-``secure'' database in @file{/var/lib/slocate/slocate.db}. -``secure'' database in @file{/var/lib/slocate/slocate.db}.
+is built. If user did not specify where to look (by using @samp{-d} +is built. If user did not specify where to look (by using @samp{-d}
+or setting @code{LOCATE_PATH}), then @code{locate} will also check for +or setting @code{LOCATE_PATH}), then @code{locate} will also check for
@ -117,7 +117,7 @@ index c2714dd..01367a4 100644
@node Database Formats @node Database Formats
@section Database Formats @section Database Formats
@@ -3627,8 +3621,7 @@ present. @@ -3508,8 +3502,7 @@ present.
@item --database=@var{path} @item --database=@var{path}
@itemx -d @var{path} @itemx -d @var{path}
@ -126,8 +126,8 @@ index c2714dd..01367a4 100644
+@code{locate} searches the file +@code{locate} searches the file
name databases in @var{path}, which is a colon-separated list of name databases in @var{path}, which is a colon-separated list of
database file names. You can also use the environment variable database file names. You can also use the environment variable
@env{LOCATE_PATH} to set the list of database files to search. The @code{LOCATE_PATH} to set the list of database files to search. The
@@ -3803,8 +3796,7 @@ The environment variable @env{PRUNEFS} also sets this value. Default @@ -3684,8 +3677,7 @@ The environment variable @code{PRUNEFS} also sets this value. Default
is @file{nfs NFS proc}. is @file{nfs NFS proc}.
@item --output=@var{dbfile} @item --output=@var{dbfile}
@ -137,7 +137,7 @@ index c2714dd..01367a4 100644
@item --localuser=@var{user} @item --localuser=@var{user}
The user to search the non-network directories as, using @code{su}. The user to search the non-network directories as, using @code{su}.
@@ -5828,7 +5820,7 @@ See the manual of the system call @code{dup2(2)}. @@ -5709,7 +5701,7 @@ See the manual of the system call @code{dup2(2)}.
@section Error Messages From @code{locate} @section Error Messages From @code{locate}
@table @samp @table @samp
@ -146,7 +146,7 @@ index c2714dd..01367a4 100644
The @code{locate} program relies on a database which is periodically The @code{locate} program relies on a database which is periodically
built by the @code{updatedb} program. That hasn't happened in a long built by the @code{updatedb} program. That hasn't happened in a long
time. To fix this problem, run @code{updatedb} manually. This can time. To fix this problem, run @code{updatedb} manually. This can
@@ -5836,7 +5828,7 @@ often happen on systems that are generally not left on, so the @@ -5717,7 +5709,7 @@ often happen on systems that are generally not left on, so the
periodic ``cron'' task which normally does this doesn't get a chance periodic ``cron'' task which normally does this doesn't get a chance
to run. to run.
@ -163,8 +163,8 @@ index 7e52a04..ae08a56 100644
## You should have received a copy of the GNU General Public License ## You should have received a copy of the GNU General Public License
## along with this program. If not, see <https://www.gnu.org/licenses/>. ## along with this program. If not, see <https://www.gnu.org/licenses/>.
-built_programs = find xargs frcode locate updatedb -built_programs = find oldfind xargs frcode locate updatedb
+built_programs = find xargs +built_programs = find oldfind xargs
# Indirections required so that we'll still be able to know the # Indirections required so that we'll still be able to know the
# complete list of our tests even if the user overrides TESTS # complete list of our tests even if the user overrides TESTS

View File

@ -54,7 +54,7 @@ diff --git a/gl/lib/fts.c b/gl/lib/fts.c
index d2d404f..808466f 100644 index d2d404f..808466f 100644
--- a/gl/lib/fts.c --- a/gl/lib/fts.c
+++ b/gl/lib/fts.c +++ b/gl/lib/fts.c
@@ -706,6 +706,10 @@ filesystem_type (FTSENT const *p, int fd) @@ -713,6 +713,10 @@ filesystem_type (FTSENT const *p, int fd)
struct dev_type *ent; struct dev_type *ent;
struct statfs fs_buf; struct statfs fs_buf;
@ -107,7 +107,7 @@ diff --git a/find/ftsfind.c b/find/ftsfind.c
index 5159470..e34b672 100644 index 5159470..e34b672 100644
--- a/find/ftsfind.c --- a/find/ftsfind.c
+++ b/find/ftsfind.c +++ b/find/ftsfind.c
@@ -509,6 +509,9 @@ find (char *arg) @@ -553,6 +553,9 @@ find (char *arg)
if (options.stay_on_filesystem) if (options.stay_on_filesystem)
ftsoptions |= FTS_XDEV; ftsoptions |= FTS_XDEV;

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEpRidtpwRZNMwApNmRlAu95aRcZUFAl/53q8ACgkQRlAu95aR
cZVPlwgAshQRkDwagj5Zi1tFovX2GBbGfoTT9PddleIqGCieCy28GvVRkQNKf/q9
8hjZ5L/dKUhMPQuoiB6zlL2iVzWz/8pHxBIbCWUqWEIyoubSzPI6oSfpKmzODLNk
2BBWcM+7uTPEK7Q/l2GCk7R1txzFM7izk5wwyVNtq0ARjU0njUm3w6wSgKUcXKpR
deV4psEwSkkUzcZ/IBXKZrW41Dtj4LaS0AsIqj4j1lUsDyYd/NC4Z66GAlg80PRK
7TOv8AHels0nXpgJtWiwcIz74MmCfbMq8IL1vzoTVEMMYItRkGyREoGTKnDecjCm
w9GvH4sTRO0h7JDWjKMDXD2ZxHxXmg==
=QPJY
-----END PGP SIGNATURE-----

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEpRidtpwRZNMwApNmRlAu95aRcZUFAmH50AcACgkQRlAu95aR
cZU/DQgAjt38b5+7CREWR7rk9y/NRvc+xAg7wMfwjt90cAycjRZ7hMVviB7R+MhO
1rrV+4UkKCYzBzks5FIhN00IwmXoe0VPeH17ATtSB6c70rBNwHE7CWcGz2cnqHBQ
CzPBy3hXEq7YY1kq7bfZCkTTEnxve9eKrgoczj/NpxvxoRkLmXzzKd0ChvHLlYJl
m0GrPAl81eUF2vYIo5/9F28AR2mfCv1cwzsb1Ch3WEXqZB2tcIKsocrO4AVVpkmD
o1pmPZa1FTKPI4YdBOlOuWUYkf6rD7WEKTcFmXrafkPlzhY4HJyN35XslAllJg6w
81EbRarQvxrVDuxoS0jnx0oMvV7jxg==
=hp30
-----END PGP SIGNATURE-----

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.9.0 Version: 4.8.0
Release: 2%{?dist} Release: 4%{?dist}
Epoch: 1 Epoch: 1
License: GPLv3+ License: GPLv3+
URL: https://www.gnu.org/software/findutils/ URL: https://www.gnu.org/software/findutils/
@ -111,18 +111,6 @@ rm -f %{buildroot}%{_infodir}/dir
%{_infodir}/find-maint.info.* %{_infodir}/find-maint.info.*
%changelog %changelog
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Feb 02 2022 Kamil Dudka <kdudka@redhat.com> - 1:4.9.0-1
- new upstream release
* Mon Jan 24 2022 Kamil Dudka <kdudka@redhat.com> - 1:4.8.0-6
- make findutils build on 32bit x86
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.0-4 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (findutils-4.9.0.tar.xz) = ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9 SHA512 (findutils-4.8.0.tar.xz) = eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e