public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/findutils] rawhide: rebase to the latest upstream release
Date: Mon, 13 Jul 2026 10:23:06 GMT [thread overview]
Message-ID: <178393818654.1.8079096293370402364.rpms-findutils-26e61a105842@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/findutils
Branch : rawhide
Commit : 26e61a10584219c570932ee14b1bf10339d55023
Author : Lukáš Zaoral <lzaoral@redhat.com>
Date : 2026-07-13T12:16:22+02:00
Stats : +100/-190 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/findutils/c/26e61a10584219c570932ee14b1bf10339d55023?branch=rawhide
Log:
rebase to the latest upstream release
Resolves: rhbz#2499353
---
diff --git a/findutils-4.4.2-xautofs.patch b/findutils-4.4.2-xautofs.patch
index c8de53f..ca81e11 100644
--- a/findutils-4.4.2-xautofs.patch
+++ b/findutils-4.4.2-xautofs.patch
@@ -1,4 +1,4 @@
-From cd653102f401f91748c3f038be4d38ddacc2d7db Mon Sep 17 00:00:00 2001
+From f99f1b5fd5e9c40fd1127fedff86383cf1ee4a49 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 3 Jul 2024 10:22:49 +0200
Subject: [PATCH] findutils-4.4.2-xautofs.patch
@@ -13,27 +13,27 @@ Subject: [PATCH] findutils-4.4.2-xautofs.patch
6 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/doc/find.texi b/doc/find.texi
-index f58c060..21b4bf5 100644
+index ca5e89e..54a93ff 100644
--- a/doc/find.texi
+++ b/doc/find.texi
-@@ -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:
+@@ -1651,6 +1651,10 @@ There are two ways to avoid searching certain filesystems. One way is
+ to tell @code{find} to only search within the same filesystem as the
+ start-point currently being searched:
+@deffn Option -xautofs
+Don't descend directories on autofs filesystems.
+@end deffn
+
- @deffn Option -xdev
- @deffnx Option -mount
- Don't descend directories on other filesystems. These options are
+ @deffn Option -mount
+ Ignore files on other devices. Do not visit or search inside mount
+ points. Do not search inside directories within other file systems
diff --git a/find/defs.h b/find/defs.h
-index 453dc27..9424168 100644
+index f1c8d70..6b968e1 100644
--- a/find/defs.h
+++ b/find/defs.h
-@@ -557,6 +557,9 @@ struct options
+@@ -555,6 +555,9 @@ struct options
/* If true, don't cross filesystem boundaries. */
- bool stay_on_filesystem;
+ bool xdev;
+ /* If true, don't descend directories on autofs filesystems. */
+ bool bypass_autofs;
@@ -42,24 +42,24 @@ index 453dc27..9424168 100644
* no longer exists by the time we get around to processing it.
*/
diff --git a/find/find.1 b/find/find.1
-index 319aa63..002fb16 100644
+index 53d2217..67c7cd7 100644
--- a/find/find.1
+++ b/find/find.1
-@@ -654,6 +654,9 @@ to stat them; this gives a significant increase in search speed.
+@@ -685,6 +685,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.
-+
++Don't descend into directories on autofs filesystems.
++.
.IP \-xdev
- Don't descend directories on other filesystems.
-
+ Don't descend into directories on other devices.
+ .
diff --git a/find/ftsfind.c b/find/ftsfind.c
-index b7f69a0..aca856c 100644
+index fecc0d8..49b66fe 100644
--- a/find/ftsfind.c
+++ b/find/ftsfind.c
-@@ -268,8 +268,8 @@ symlink_loop (const char *name)
+@@ -243,8 +243,8 @@ symlink_loop (const char *name)
static void
consider_visiting (FTS *p, FTSENT *ent)
{
@@ -70,8 +70,8 @@ index b7f69a0..aca856c 100644
int ignore, isdir;
if (options.debug_options & DebugSearch)
-@@ -433,6 +433,13 @@ consider_visiting (FTS *p, FTSENT *ent)
- }
+@@ -415,6 +415,13 @@ consider_visiting (FTS *p, FTSENT *ent)
+ }
}
+ if (options.bypass_autofs
@@ -85,10 +85,10 @@ index b7f69a0..aca856c 100644
{
/* this is the preorder visit, but user said -depth */
diff --git a/find/parser.c b/find/parser.c
-index b86e685..6d74d1e 100644
+index 9847ad7..4065c7f 100644
--- a/find/parser.c
+++ b/find/parser.c
-@@ -150,6 +150,7 @@ static bool parse_used (const struct parser_table*, char *argv[], int *
+@@ -151,6 +151,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);
@@ -96,15 +96,15 @@ index b86e685..6d74d1e 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);
-@@ -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 */
-+ PARSE_OPTION ("xautofs", xautofs),
- PARSE_TEST ("xtype", xtype), /* GNU */
- #ifdef UNIMPLEMENTED_UNIX
- /* It's pretty ugly for find to know about archive formats.
-@@ -2489,6 +2491,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
+@@ -219,6 +220,7 @@ static struct parser_table const parse_table[] =
+ { ARG_OPTION, "noleaf", parse_noleaf, NULL }, /* GNU */
+ { ARG_OPTION, "noignore_readdir_race", parse_noignore_race, NULL }, /* GNU */
+ { ARG_OPTION, "xdev", parse_xdev, NULL }, /* POSIX */
++ { ARG_OPTION, "xautofs", parse_xautofs, NULL },
+ /* GNU mandated, general options. */
+ { ARG_OPTION, "help", parse_help, NULL }, /* GNU */
+ { ARG_OPTION, "-help", parse_help, NULL }, /* GNU */
+@@ -2502,6 +2504,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
return parse_noop (entry, argv, arg_ptr);
}
@@ -119,7 +119,7 @@ index b86e685..6d74d1e 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 88dafd7..a592055 100644
+index eb02745..8cb2942 100644
--- a/find/util.c
+++ b/find/util.c
@@ -181,7 +181,7 @@ Positional options (always true):\n\
@@ -131,14 +131,14 @@ index 88dafd7..a592055 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\
-@@ -1027,6 +1027,7 @@ set_option_defaults (struct options *p)
+@@ -1024,6 +1024,7 @@ set_option_defaults (struct options *p)
p->full_days = false;
- p->stay_on_filesystem = false;
+ p->mount = p->xdev = false;
+ p->bypass_autofs = false;
p->ignore_readdir_race = false;
if (p->posixly_correct)
--
-2.45.2
+2.55.0
diff --git a/findutils-4.5.13-warnings.patch b/findutils-4.5.13-warnings.patch
index 3b350fc..c3e976b 100644
--- a/findutils-4.5.13-warnings.patch
+++ b/findutils-4.5.13-warnings.patch
@@ -1,4 +1,4 @@
-From 690d4bd9f29a805999a3ce4651dac9585ccc9917 Mon Sep 17 00:00:00 2001
+From f56815160ef35943c4ddf5fc03acfa7f84e4246f Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 11 May 2011 16:46:57 +0200
Subject: [PATCH] findutils-4.5.7-warnings.patch
@@ -8,19 +8,19 @@ Subject: [PATCH] findutils-4.5.7-warnings.patch
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/xargs/xargs.c b/xargs/xargs.c
-index 5e373f2..c0a8676 100644
+index da20a58..fbd58ba 100644
--- a/xargs/xargs.c
+++ b/xargs/xargs.c
-@@ -1346,7 +1346,8 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
- * utility if we run it, for POSIX compliance on the
- * handling of exit values.
- */
-- write (fd[1], &errno, sizeof (int));
-+ int sink = write (fd[1], &errno, sizeof (int));
-+ (void) sink;
- }
+@@ -1396,7 +1396,8 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
+ * utility if we run it, for POSIX compliance on the
+ * handling of exit values.
+ */
+- write (fd[1], &saved_errno, sizeof (int));
++ int sink = write (fd[1], &saved_errno, sizeof (int));
++ (void) sink;
+ }
- close (fd[1]);
+ close (fd[1]);
--
-1.7.1
+2.55.0
diff --git a/findutils-4.5.15-no-locate.patch b/findutils-4.5.15-no-locate.patch
index cf39c95..8abd5bd 100644
--- a/findutils-4.5.15-no-locate.patch
+++ b/findutils-4.5.15-no-locate.patch
@@ -1,4 +1,4 @@
-From 3e5e311d23ac0a5bd5930ddb4094f7555b886329 Mon Sep 17 00:00:00 2001
+From a26d8c03efa9a2e6e372e3700e119030780b568f Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Sat, 19 Dec 2015 22:56:40 +0100
Subject: [PATCH 1/2] Revert "Don't include dblocation.texi from original spot,
@@ -10,7 +10,7 @@ This reverts commit f59d88e456553dfe0b5185caf75e4041285fd595.
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
-index f6f7443..6fbf57b 100644
+index 0af544c..1193db6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,11 +16,9 @@ AM_CFLAGS = $(WARN_CFLAGS)
@@ -26,7 +26,7 @@ index f6f7443..6fbf57b 100644
find_mono.html findutils.texi_html_node.tar.gz \
find-info.tar.gz find.texi.tar.gz \
find.txt tmp-doc-install find_mono.html.gz
-@@ -73,9 +71,6 @@ findutils.texi_html_node.tar.gz: find.html
+@@ -81,9 +79,6 @@ findutils.texi_html_node.tar.gz: find.html
tar zcf $@ find.html
@@ -37,10 +37,9 @@ index f6f7443..6fbf57b 100644
$(MKDIR_P) tmp-doc-install/info
$(MAKE) $(AM_MAKEFLAGS) \
--
-2.5.0
+2.55.0
-
-From d5473caa86f689ebcadacc593f5a71781c99e829 Mon Sep 17 00:00:00 2001
+From 9dba711cc323233f7718e730c0875cf4d80ccaf1 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 11 May 2011 16:46:13 +0200
Subject: [PATCH 2/2] findutils-4.4.0-no-locate.patch
@@ -53,7 +52,7 @@ Subject: [PATCH 2/2] findutils-4.4.0-no-locate.patch
4 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index af82d54..6ad453b 100644
+index 33806e1..f521f44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ DISTCLEANFILES = tool-versions.txt
@@ -66,10 +65,10 @@ index af82d54..6ad453b 100644
ALL_RECURSIVE_TARGETS =
diff --git a/configure.ac b/configure.ac
-index ce0e768..521e665 100644
+index a14c238..f038899 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -309,8 +309,6 @@ find/testsuite/Makefile
+@@ -320,8 +320,6 @@ find/testsuite/Makefile
gl/Makefile
gl/lib/Makefile
lib/Makefile
@@ -79,7 +78,7 @@ index ce0e768..521e665 100644
po/Makefile.in
po/Makefile
diff --git a/doc/find.texi b/doc/find.texi
-index c2714dd..01367a4 100644
+index eaa3dc3..ca5e89e 100644
--- a/doc/find.texi
+++ b/doc/find.texi
@@ -7,7 +7,6 @@
@@ -90,7 +89,7 @@ index c2714dd..01367a4 100644
@iftex
@finalout
-@@ -661,8 +660,7 @@ the databases are updated, and the directories for which they contain
+@@ -689,8 +688,7 @@ the databases are updated, and the directories for which they contain
entries.
Here is how to select which file name databases @code{locate}
@@ -100,7 +99,7 @@ index c2714dd..01367a4 100644
@table @code
@item --database=@var{path}
-@@ -3112,13 +3110,9 @@ thrashing the network.
+@@ -3234,13 +3232,9 @@ thrashing the network.
directories are indexed by each database file.
The default location for the locate database depends on how findutils
@@ -117,7 +116,7 @@ index c2714dd..01367a4 100644
@node Database Formats
@section Database Formats
-@@ -3627,8 +3621,7 @@ present.
+@@ -3764,8 +3758,7 @@ present.
@item --database=@var{path}
@itemx -d @var{path}
@@ -127,7 +126,7 @@ index c2714dd..01367a4 100644
name databases in @var{path}, which is a colon-separated list of
database file names. You can also use the environment variable
@env{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
+@@ -3940,8 +3933,7 @@ The environment variable @env{PRUNEFS} also sets this value. Default
is @file{nfs NFS proc}.
@item --output=@var{dbfile}
@@ -137,7 +136,7 @@ index c2714dd..01367a4 100644
@item --localuser=@var{user}
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)}.
+@@ -5964,7 +5956,7 @@ See the manual of the system call @code{dup2(2)}.
@section Error Messages From @code{locate}
@table @samp
@@ -146,7 +145,7 @@ index c2714dd..01367a4 100644
The @code{locate} program relies on a database which is periodically
built by the @code{updatedb} program. That hasn't happened in a long
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
+@@ -5972,7 +5964,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
to run.
@@ -156,7 +155,7 @@ index c2714dd..01367a4 100644
@code{locate} still produces this error, run @code{locate --version}
and @code{updatedb --version}. These should produce the same output.
diff --git a/tests/local.mk b/tests/local.mk
-index 7e52a04..ae08a56 100644
+index bb575c1..078cb2e 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -15,7 +15,7 @@
@@ -166,8 +165,8 @@ index 7e52a04..ae08a56 100644
-built_programs = find xargs frcode locate updatedb
+built_programs = find xargs
- # Indirections required so that we'll still be able to know the
- # complete list of our tests even if the user overrides TESTS
+ AM_CPPFLAGS = -I$(top_srcdir)/gl/lib
+ LDADD = $(top_builddir)/gl/lib/libgnulib.a
--
-2.5.0
+2.55.0
diff --git a/findutils-4.6.0-leaf-opt.patch b/findutils-4.6.0-leaf-opt.patch
index 37ae9d5..3b3a662 100644
--- a/findutils-4.6.0-leaf-opt.patch
+++ b/findutils-4.6.0-leaf-opt.patch
@@ -1,62 +1,23 @@
-From 547e7145f335dc07144f35eaacc520475068852e Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Fri, 30 Aug 2019 10:22:22 +0200
-Subject: [PATCH 1/3] Revert "fts: cleanup after FTS_NOATIME removal"
-
-This reverts commit dce8759f0f0236a860a3e68b63c5e99cc6f168f9.
----
- gl/lib/fts_.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/gl/lib/fts_.h b/gl/lib/fts_.h
-index fb5558f..0122262 100644
---- a/gl/lib/fts_.h
-+++ b/gl/lib/fts_.h
-@@ -149,14 +149,16 @@ typedef struct {
- dirent.d_type data. */
- # define FTS_DEFER_STAT 0x0400
-
-+/* 0x0800 unused, was non-working FTS_NOATIME */
-+
- /* Use this flag to disable stripping of trailing slashes
- from input path names during fts_open initialization. */
--# define FTS_VERBATIM 0x0800
-+# define FTS_VERBATIM 0x1000
-
--# define FTS_OPTIONMASK 0x0fff /* valid user option mask */
-+# define FTS_OPTIONMASK 0x1fff /* valid user option mask */
-
--# define FTS_NAMEONLY 0x1000 /* (private) child names only */
--# define FTS_STOP 0x2000 /* (private) unrecoverable error */
-+# define FTS_NAMEONLY 0x2000 /* (private) child names only */
-+# define FTS_STOP 0x4000 /* (private) unrecoverable error */
- int fts_options; /* fts_open options, global flags */
-
- /* Map a directory's device number to a boolean. The boolean is
---
-2.20.1
-
-
-From 1328926a705fdb4728c1f255dd368de928736d39 Mon Sep 17 00:00:00 2001
+From 02c1a30f95f65ef9e59c24fc4ee7ceef635a2c00 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 25 Sep 2015 16:09:39 +0200
-Subject: [PATCH 2/3] fts: introduce the FTS_NOLEAF flag
+Subject: [PATCH 1/2] fts: introduce the FTS_NOLEAF flag
The flag is needed to implement the -noleaf option of find.
* lib/fts.c (link_count_optimize_ok): Implement the FTS_NOLEAF flag.
* lib/fts_.h (FTS_NOLEAF): New macro, shifted conflicting constants.
---
- gl/lib/fts.c | 4 ++++
- gl/lib/fts_.h | 12 +++++++++---
+ gl/lib/fts.c | 4 ++++
+ gl/lib/fts.in.h | 12 +++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/gl/lib/fts.c b/gl/lib/fts.c
-index d2d404f..808466f 100644
+index 98851cd..23dadd3 100644
--- a/gl/lib/fts.c
+++ b/gl/lib/fts.c
-@@ -706,6 +706,10 @@ filesystem_type (FTSENT const *p, int fd)
- struct dev_type *ent;
- struct statfs fs_buf;
+@@ -692,6 +692,10 @@ filesystem_type (FTSENT const *p, int fd)
+ {
+ FTS *sp = p->fts_fts;
+ if (ISSET(FTS_NOLEAF))
+ /* leaf optimization explicitly disabled by the FTS_NOLEAF flag */
@@ -65,13 +26,13 @@ index d2d404f..808466f 100644
/* If we're not in CWDFD mode, don't bother with this optimization,
since the caller is not serious about performance. */
if (!ISSET (FTS_CWDFD))
-diff --git a/gl/lib/fts_.h b/gl/lib/fts_.h
-index 63d4b74..f1d519b 100644
---- a/gl/lib/fts_.h
-+++ b/gl/lib/fts_.h
-@@ -155,10 +155,16 @@ typedef struct {
- from input path names during fts_open initialization. */
- # define FTS_VERBATIM 0x1000
+diff --git a/gl/lib/fts.in.h b/gl/lib/fts.in.h
+index 6b2019c..67c2af8 100644
+--- a/gl/lib/fts.in.h
++++ b/gl/lib/fts.in.h
+@@ -194,10 +194,16 @@ typedef struct {
+ # define FTS_VERBATIM 0x0800
+ # define FTS_MOUNT 0x1000 /* skip other devices */
-# define FTS_OPTIONMASK 0x1fff /* valid user option mask */
+ /* Disable leaf optimization (which eliminates stat() calls during traversal,
@@ -90,13 +51,12 @@ index 63d4b74..f1d519b 100644
/* Map a directory's device number to a boolean. The boolean is
--
-2.5.0
-
+2.55.0
-From c186934e6e37ddadf7511abb9b1045192757618e Mon Sep 17 00:00:00 2001
+From 1df3a645d67357344a7fe606ad0d58b40950e343 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 25 Sep 2015 19:13:15 +0200
-Subject: [PATCH 3/3] ftsfind: propagate the -noleaf option to FTS
+Subject: [PATCH 2/2] ftsfind: propagate the -noleaf option to FTS
* find/ftsfind.c (find): Propagate the -noleaf option to FTS.
---
@@ -104,11 +64,11 @@ Subject: [PATCH 3/3] ftsfind: propagate the -noleaf option to FTS
1 file changed, 3 insertions(+)
diff --git a/find/ftsfind.c b/find/ftsfind.c
-index 5159470..e34b672 100644
+index 49b66fe..2b65e68 100644
--- a/find/ftsfind.c
+++ b/find/ftsfind.c
-@@ -509,6 +509,9 @@ find (char *arg)
- if (options.stay_on_filesystem)
+@@ -493,6 +493,9 @@ find (char *arg)
+ if (options.xdev)
ftsoptions |= FTS_XDEV;
+ if (options.no_leaf_check)
@@ -118,5 +78,5 @@ index 5159470..e34b672 100644
if (NULL == p)
{
--
-2.5.0
+2.55.0
diff --git a/findutils-4.6.0-test-lock.patch b/findutils-4.6.0-test-lock.patch
deleted file mode 100644
index b74c0dc..0000000
--- a/findutils-4.6.0-test-lock.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 129f23ce758620fade812baab811379ce8454048 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Fri, 27 Jan 2017 11:44:41 +0100
-Subject: [PATCH] test-lock: disable the rwlock test
-
-It hangs indefinitely if the system rwlock implementation does not
-prevent writer starvation (and glibc does not implement it).
-
-Bug: http://www.mail-archive.com/bug-gnulib@gnu.org/msg33017.html
----
- gnulib-tests/test-lock.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gnulib-tests/test-lock.c b/gnulib-tests/test-lock.c
-index a992f64..fd9c014 100644
---- a/gnulib-tests/test-lock.c
-+++ b/gnulib-tests/test-lock.c
-@@ -42,7 +42,7 @@
- Uncomment some of these, to verify that all tests crash if no locking
- is enabled. */
- #define DO_TEST_LOCK 1
--#define DO_TEST_RWLOCK 1
-+#define DO_TEST_RWLOCK 0
- #define DO_TEST_RECURSIVE_LOCK 1
- #define DO_TEST_ONCE 1
-
---
-2.7.4
-
diff --git a/findutils-4.9.0-ignore_readdir_race-symlink_loop.patch b/findutils-4.9.0-ignore_readdir_race-symlink_loop.patch
deleted file mode 100644
index f6ac52d..0000000
--- a/findutils-4.9.0-ignore_readdir_race-symlink_loop.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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 b59159b..1b8241b 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: 7%{?dist}
+Version: 4.11.0
+Release: 1%{?dist}
Epoch: 1
License: GPL-3.0-or-later
URL: https://www.gnu.org/software/findutils/
@@ -21,14 +21,8 @@ Patch2: findutils-4.4.2-xautofs.patch
# eliminate compile-time warnings
Patch3: findutils-4.5.13-warnings.patch
-# test-lock: disable the rwlock test
-Patch4: findutils-4.6.0-test-lock.patch
-
# implement the -noleaf option of find (#1252549)
-Patch5: findutils-4.6.0-leaf-opt.patch
-
-# fix find not obeying -ignore_readdir_race in symlink_loop (#2232278)
-Patch6: findutils-4.9.0-ignore_readdir_race-symlink_loop.patch
+Patch4: findutils-4.6.0-leaf-opt.patch
Conflicts: filesystem < 3
Provides: /bin/find
@@ -44,7 +38,7 @@ BuildRequires: make
BuildRequires: texinfo
# For gpg verification of source tarball
-BuildRequires: gnupg2
+BuildRequires: gpgverify
%description
The findutils package contains programs which will help you locate
@@ -59,7 +53,7 @@ useful for finding things on your system.
%prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -N -S git
+%autosetup -N -S git_am
# drop the source code of locate
git rm -q -r locate
@@ -118,6 +112,9 @@ rm -f %{buildroot}%{_infodir}/dir
%{_infodir}/find-maint.info.*
%changelog
+* Mon Jul 13 2026 Lukáš Zaoral <lzaoral@redhat.com> - 1:4.11.0-1
+- rebase to the latest upstream release (rhbz#2499353)
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.10.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
diff --git a/sources b/sources
index ac8f2fb..85c4063 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (findutils-4.10.0.tar.xz) = b8b683d21cd26c6da4f41c56e83cadbda4780f8610a2bbd4b4e34bb1f339c3209721974b03e076d5eef0331fd876d947b398197aad37c29bbcc2e0405c641b34
-SHA512 (findutils-4.10.0.tar.xz.sig) = a835153a0671309021be187bf78afee58d9682acb40545aaa9dd187f0ebdea0cfa5583bd03f363243633ea056ddb0a7a6603987ab5e34a608426cb4265ac6d8f
+SHA512 (findutils-4.11.0.tar.xz) = 1b667c5363b599135ceabab6b4b5388dbee6de4e7fa301f5dfefc854473e442fbfe7dda93a28a70505c026987acd375d13169f76d18da49d29c1fb2e09c83fef
+SHA512 (findutils-4.11.0.tar.xz.sig) = 00847206d4656ce6aed297b675493d9cc7c052656aaca27feaccea432dc8274de1a39bb306b031209427c59e62497e7201f464df8fe32191f4cb711c929e46f4
reply other threads:[~2026-07-13 10:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178393818654.1.8079096293370402364.rpms-findutils-26e61a105842@fedoraproject.org \
--to=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox