mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

findutils: Refresh patches with devtool

Browse Source 
We get fuzz warnings when applying these patches and devtool
reports it

(From OE-Core rev: cb3c0343becc8bb2ebf4e9c12782c509a3d7754d)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2018-06-24 12:09:06 -07:00
committed by Richard Purdie
parent f7b03cebfe
commit 0507645e3b
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
+8 -7
View File
@@ -1,4 +1,4 @@
From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
From 86db2a5f3b7ef8113e5384b4e02d2b299c87a047 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 13 Apr 2015 17:02:13 -0700
Subject: [PATCH] Unset need_charset_alias when building for musl
@@ -11,15 +11,16 @@ coreutils
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lib/gnulib.mk | 2 +-
gl/lib/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: findutils-4.5.14/gl/lib/Makefile.am
===================================================================
--- findutils-4.5.14.orig/gl/lib/Makefile.am
+++ findutils-4.5.14/gl/lib/Makefile.am
@@ -1220,7 +1220,7 @@ install-exec-localcharset: all-local
diff --git a/gl/lib/Makefile.am b/gl/lib/Makefile.am
index a9e2fe4..1c6ea9c 100644
--- a/gl/lib/Makefile.am
+++ b/gl/lib/Makefile.am
@@ -1234,7 +1234,7 @@ install-exec-localcharset: all-local
case '$(host_os)' in \
darwin[56]*) \
need_charset_alias=true ;; \
meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch
+14 -15
View File
@@ -1,7 +1,7 @@
From 0afb2efada7e435ae18ef7d3db0758464189f44f Mon Sep 17 00:00:00 2001
From a3f4821c4a3f723d21c9298d54bee8a656bfd7fb Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <mail@bernhard-voelker.de>
Date: Tue, 30 Jan 2018 23:30:09 +0100
Subject: find: make -delete honour the -ignore_readdir_race option
Subject: [PATCH] find: make -delete honour the -ignore_readdir_race option
* find/pred.c (pred_delete): Return true when the -ignore_readdir_race
option is active and unlinkat() came back with ENOENT.
@@ -29,6 +29,7 @@ https://savannah.gnu.org/bugs/?52981
Upstream-Status: Backport
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
---
NEWS | 4 ++++
doc/find.texi | 15 ++++++++++++++-
@@ -37,22 +38,22 @@ Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
4 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 88cf17d..9809bf4 100644
index 660c241..b86ec1e 100644
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,10 @@
** Bug Fixes
@@ -42,6 +42,10 @@ Updated the Danish translation.
** Bug Fixes:
+#52981: find: the '-delete' action no longer complains about disappeared files
+ when the '-ignore_readdir_race' option is given, too. That action will
+ also returns true in such a case now.
+
Applied patch #8688: Spelling fixes.
* Major changes in release 4.5.18, 2015-12-27
diff --git a/doc/find.texi b/doc/find.texi
index 3580be7..0089193 100644
index fdeb841..247c19a 100644
--- a/doc/find.texi
+++ b/doc/find.texi
@@ -1418,7 +1418,15 @@ gives a significant increase in search speed.
@@ -85,11 +86,11 @@ index 3580be7..0089193 100644
@node Adding Tests
diff --git a/find/find.1 b/find/find.1
index 0437cd8..0d44c37 100644
index 7b141b8..0eec41c 100644
--- a/find/find.1
+++ b/find/find.1
@@ -479,6 +479,17 @@ this option on and part of it with this option off
(if you need to do that, you will need to issue two \fBfind\fR commands
@@ -479,6 +479,17 @@ one part of the filesystem with this option on and part of it with this option
off (if you need to do that, you will need to issue two \fBfind\fR commands
instead, one with the option and one without it).
+Furthermore,
@@ -125,7 +126,7 @@ index 0437cd8..0d44c37 100644
Execute \fIcommand\fR; true if 0 status is returned. All following
arguments to
diff --git a/find/pred.c b/find/pred.c
index 7e2a7bd..af3bacb 100644
index 32938fb..431f065 100644
--- a/find/pred.c
+++ b/find/pred.c
@@ -324,6 +324,12 @@ pred_delete (const char *pathname, struct stat *stat_buf, struct predicate *pred
@@ -141,5 +142,3 @@ index 7e2a7bd..af3bacb 100644
if (EISDIR == errno)
{
if ((flags & AT_REMOVEDIR) == 0)
--
cgit v1.0-41-gc330