From 8148afe9123d296cdf8f7597c4dd0b32a991a401 Mon Sep 17 00:00:00 2001 From: Renbo Date: Fri, 27 Sep 2024 10:35:19 +0800 Subject: [PATCH 1/3] update to findutils-4.6.0-23.src.rpm Signed-off-by: Renbo --- dist | 2 +- findutils-4.4.2-xautofs.patch | 60 +++++++++++++++++++++-------------- findutils.spec | 23 +++----------- 3 files changed, 41 insertions(+), 44 deletions(-) diff --git a/dist b/dist index 9c0e36e..1fe92cf 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8 +an8_10 diff --git a/findutils-4.4.2-xautofs.patch b/findutils-4.4.2-xautofs.patch index c1ea81e..8761229 100644 --- a/findutils-4.4.2-xautofs.patch +++ b/findutils-4.4.2-xautofs.patch @@ -1,19 +1,19 @@ -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 -Subject: [PATCH 3/4] findutils-4.4.2-xautofs.patch +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 | 11 ++++++++++- - find/util.c | 1 + - 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 | 11 ++++++++++- + find/util.c | 1 + + 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/doc/find.texi b/doc/find.texi -index c584298..9731b71 100644 +index b32db8c..1691d2d 100644 --- a/doc/find.texi +++ b/doc/find.texi @@ -1446,6 +1446,10 @@ them. @@ -28,7 +28,7 @@ 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 ba0b855..7e6d4bb 100644 --- a/find/defs.h +++ b/find/defs.h @@ -557,6 +557,9 @@ struct options @@ -42,7 +42,7 @@ 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 7b141b8..a36a0bc 100644 --- a/find/find.1 +++ b/find/find.1 @@ -520,6 +520,9 @@ to stat them; this gives a significant increase in search speed. @@ -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 414327b..6620bdb 100644 --- a/find/ftsfind.c +++ b/find/ftsfind.c -@@ -485,6 +485,12 @@ consider_visiting (FTS *p, FTSENT *ent) +@@ -331,8 +331,8 @@ show_outstanding_execdirs (FILE *fp) + 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) +@@ -485,6 +485,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,7 +85,7 @@ 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 b57cdda..91e914a 100644 --- a/find/parser.c +++ b/find/parser.c @@ -146,6 +146,7 @@ static bool parse_user (const struct parser_table*, char *argv[], int * @@ -101,22 +113,22 @@ index 52a1ef6..995aec3 100644 puts (_("\ tests (N can be +N or -N or N): -amin N -anewer FILE -atime N -cmin N\n\ -cnewer FILE -ctime N -empty -false -fstype TYPE -gid N -group NAME\n\ -@@ -2683,6 +2685,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) +@@ -2682,6 +2684,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) + return parse_noop (entry, argv, arg_ptr); } - static bool ++static bool +parse_xautofs (const struct parser_table* entry, char **argv, int *arg_ptr) +{ + options.bypass_autofs = true; + return parse_noop (entry, argv, arg_ptr); +} + -+static bool + static bool parse_ignore_race (const struct parser_table* entry, char **argv, int *arg_ptr) { - options.ignore_readdir_race = true; diff --git a/find/util.c b/find/util.c -index 8577396..4d45f84 100644 +index 5ffe140..3448a67 100644 --- a/find/util.c +++ b/find/util.c @@ -1017,6 +1017,7 @@ set_option_defaults (struct options *p) @@ -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 d0fc027..a66a304 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,8 +1,7 @@ -%define anolis_release .0.1 Summary: The GNU versions of find utilities (find and xargs) Name: findutils Version: 4.6.0 -Release: 22%{anolis_release}%{?dist} +Release: 23%{?dist} Epoch: 1 License: GPLv3+ Group: Applications/File @@ -70,9 +69,6 @@ BuildRequires: git BuildRequires: libselinux-devel BuildRequires: texinfo -Requires: glibc -Provides: /usr/bin/xargs - %description The findutils package contains programs which will help you locate files on your system. The find utility searches through a hierarchy @@ -84,14 +80,6 @@ names generated by the find command). You should install findutils because it includes tools that are very useful for finding things on your system. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{epoch}:%{version}-%{release} - - -%description doc -Doc pages for %{name} %prep %autosetup -N -S git @@ -159,6 +147,7 @@ fi %files -f %{name}.lang %{!?_licensedir:%global license %%doc} %license COPYING +%doc AUTHORS NEWS README THANKS TODO %{_bindir}/find %{_bindir}/xargs %{_mandir}/man1/find.1* @@ -166,13 +155,9 @@ fi %{_infodir}/find.info* %{_infodir}/find-maint.info.gz -%files doc -%doc AUTHORS NEWS README THANKS TODO - %changelog -* Wed Jun 26 2024 Chang Gao - 4.6.0-22.0.1 -- Add doc sub package -- Fix the doc package requirement +* Thu Jul 04 2024 Lukáš Zaoral - 1:4.6.0-23 +- fix autofs patch when stat was not performed (RHEL-45720) * Mon Aug 21 2023 Lukáš Zaoral - 1:4.6.0-22 - improve description of printf options in find manpage (#1882695) -- Gitee From eba3c7d81cee3e55c51cd82f2aaeb32ea13cf9c0 Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Sun, 17 Jul 2022 16:57:57 +0800 Subject: [PATCH 2/3] spec: add doc sub package --- findutils.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/findutils.spec b/findutils.spec index a66a304..e191e12 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,7 +1,8 @@ +%define anolis_release .0.1 Summary: The GNU versions of find utilities (find and xargs) Name: findutils Version: 4.6.0 -Release: 23%{?dist} +Release: 23%{anolis_release}%{?dist} Epoch: 1 License: GPLv3+ Group: Applications/File @@ -69,6 +70,9 @@ BuildRequires: git BuildRequires: libselinux-devel BuildRequires: texinfo +Requires: glibc +Provides: /usr/bin/xargs + %description The findutils package contains programs which will help you locate files on your system. The find utility searches through a hierarchy @@ -80,6 +84,14 @@ names generated by the find command). You should install findutils because it includes tools that are very useful for finding things on your system. +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + + +%description doc +Doc pages for %{name} %prep %autosetup -N -S git @@ -147,7 +159,6 @@ fi %files -f %{name}.lang %{!?_licensedir:%global license %%doc} %license COPYING -%doc AUTHORS NEWS README THANKS TODO %{_bindir}/find %{_bindir}/xargs %{_mandir}/man1/find.1* @@ -155,7 +166,13 @@ fi %{_infodir}/find.info* %{_infodir}/find-maint.info.gz +%files doc +%doc AUTHORS NEWS README THANKS TODO + %changelog +* Fri Sep 27 2024 Chang Gao - 1:4.6.0-23.0.1 +- Add doc sub package + * Thu Jul 04 2024 Lukáš Zaoral - 1:4.6.0-23 - fix autofs patch when stat was not performed (RHEL-45720) -- Gitee From 7effe412e72dbd996d8d997b3b15480fd627d3a6 Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Thu, 3 Nov 2022 19:10:39 +0800 Subject: [PATCH 3/3] Fix the doc package requirement --- findutils.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/findutils.spec b/findutils.spec index e191e12..152700c 100644 --- a/findutils.spec +++ b/findutils.spec @@ -87,7 +87,7 @@ useful for finding things on your system. %package doc Summary: Documents for %{name} BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} %description doc @@ -172,6 +172,7 @@ fi %changelog * Fri Sep 27 2024 Chang Gao - 1:4.6.0-23.0.1 - Add doc sub package +- Fix the doc package requirement * Thu Jul 04 2024 Lukáš Zaoral - 1:4.6.0-23 - fix autofs patch when stat was not performed (RHEL-45720) -- Gitee