summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-06-24 12:09:06 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-27 13:55:21 +0100
commit0507645e3b7956e9edb2b47ffef6010b89988a12 (patch)
treea2773a4a5f995c6c80c27e47f4c691f9257d5852
parentf7b03cebfeb9101b0b7eadfbe8027159b8978f04 (diff)
downloadpoky-0507645e3b7956e9edb2b47ffef6010b89988a12.tar.gz
findutils: Refresh patches with devtool
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>
-rw-r--r--meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch15
-rw-r--r--meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch29
2 files changed, 22 insertions, 22 deletions
diff --git a/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
index 8729e1b447..6064d18854 100644
--- a/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ b/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
@@ -1,4 +1,4 @@
1From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 1From 86db2a5f3b7ef8113e5384b4e02d2b299c87a047 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Apr 2015 17:02:13 -0700 3Date: Mon, 13 Apr 2015 17:02:13 -0700
4Subject: [PATCH] Unset need_charset_alias when building for musl 4Subject: [PATCH] Unset need_charset_alias when building for musl
@@ -11,15 +11,16 @@ coreutils
11Upstream-Status: Pending 11Upstream-Status: Pending
12 12
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
14--- 15---
15 lib/gnulib.mk | 2 +- 16 gl/lib/Makefile.am | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
17 18
18Index: findutils-4.5.14/gl/lib/Makefile.am 19diff --git a/gl/lib/Makefile.am b/gl/lib/Makefile.am
19=================================================================== 20index a9e2fe4..1c6ea9c 100644
20--- findutils-4.5.14.orig/gl/lib/Makefile.am 21--- a/gl/lib/Makefile.am
21+++ findutils-4.5.14/gl/lib/Makefile.am 22+++ b/gl/lib/Makefile.am
22@@ -1220,7 +1220,7 @@ install-exec-localcharset: all-local 23@@ -1234,7 +1234,7 @@ install-exec-localcharset: all-local
23 case '$(host_os)' in \ 24 case '$(host_os)' in \
24 darwin[56]*) \ 25 darwin[56]*) \
25 need_charset_alias=true ;; \ 26 need_charset_alias=true ;; \
diff --git a/meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch b/meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch
index 420e10da02..a570473ccb 100644
--- a/meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch
+++ b/meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch
@@ -1,7 +1,7 @@
1From 0afb2efada7e435ae18ef7d3db0758464189f44f Mon Sep 17 00:00:00 2001 1From a3f4821c4a3f723d21c9298d54bee8a656bfd7fb Mon Sep 17 00:00:00 2001
2From: Bernhard Voelker <mail@bernhard-voelker.de> 2From: Bernhard Voelker <mail@bernhard-voelker.de>
3Date: Tue, 30 Jan 2018 23:30:09 +0100 3Date: Tue, 30 Jan 2018 23:30:09 +0100
4Subject: find: make -delete honour the -ignore_readdir_race option 4Subject: [PATCH] find: make -delete honour the -ignore_readdir_race option
5 5
6* find/pred.c (pred_delete): Return true when the -ignore_readdir_race 6* find/pred.c (pred_delete): Return true when the -ignore_readdir_race
7option is active and unlinkat() came back with ENOENT. 7option is active and unlinkat() came back with ENOENT.
@@ -29,6 +29,7 @@ https://savannah.gnu.org/bugs/?52981
29 29
30Upstream-Status: Backport 30Upstream-Status: Backport
31Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> 31Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
32
32--- 33---
33 NEWS | 4 ++++ 34 NEWS | 4 ++++
34 doc/find.texi | 15 ++++++++++++++- 35 doc/find.texi | 15 ++++++++++++++-
@@ -37,22 +38,22 @@ Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
37 4 files changed, 46 insertions(+), 1 deletion(-) 38 4 files changed, 46 insertions(+), 1 deletion(-)
38 39
39diff --git a/NEWS b/NEWS 40diff --git a/NEWS b/NEWS
40index 88cf17d..9809bf4 100644 41index 660c241..b86ec1e 100644
41--- a/NEWS 42--- a/NEWS
42+++ b/NEWS 43+++ b/NEWS
43@@ -42,6 +42,10 @@ 44@@ -42,6 +42,10 @@ Updated the Danish translation.
44 45
45 ** Bug Fixes 46 ** Bug Fixes:
46 47
47+#52981: find: the '-delete' action no longer complains about disappeared files 48+#52981: find: the '-delete' action no longer complains about disappeared files
48+ when the '-ignore_readdir_race' option is given, too. That action will 49+ when the '-ignore_readdir_race' option is given, too. That action will
49+ also returns true in such a case now. 50+ also returns true in such a case now.
50+ 51+
51 Applied patch #8688: Spelling fixes. 52 Applied patch #8688: Spelling fixes.
52 53
53 * Major changes in release 4.5.18, 2015-12-27 54 * Major changes in release 4.5.18, 2015-12-27
54diff --git a/doc/find.texi b/doc/find.texi 55diff --git a/doc/find.texi b/doc/find.texi
55index 3580be7..0089193 100644 56index fdeb841..247c19a 100644
56--- a/doc/find.texi 57--- a/doc/find.texi
57+++ b/doc/find.texi 58+++ b/doc/find.texi
58@@ -1418,7 +1418,15 @@ gives a significant increase in search speed. 59@@ -1418,7 +1418,15 @@ gives a significant increase in search speed.
@@ -85,11 +86,11 @@ index 3580be7..0089193 100644
85 86
86 @node Adding Tests 87 @node Adding Tests
87diff --git a/find/find.1 b/find/find.1 88diff --git a/find/find.1 b/find/find.1
88index 0437cd8..0d44c37 100644 89index 7b141b8..0eec41c 100644
89--- a/find/find.1 90--- a/find/find.1
90+++ b/find/find.1 91+++ b/find/find.1
91@@ -479,6 +479,17 @@ this option on and part of it with this option off 92@@ -479,6 +479,17 @@ one part of the filesystem with this option on and part of it with this option
92 (if you need to do that, you will need to issue two \fBfind\fR commands 93 off (if you need to do that, you will need to issue two \fBfind\fR commands
93 instead, one with the option and one without it). 94 instead, one with the option and one without it).
94 95
95+Furthermore, 96+Furthermore,
@@ -125,7 +126,7 @@ index 0437cd8..0d44c37 100644
125 Execute \fIcommand\fR; true if 0 status is returned. All following 126 Execute \fIcommand\fR; true if 0 status is returned. All following
126 arguments to 127 arguments to
127diff --git a/find/pred.c b/find/pred.c 128diff --git a/find/pred.c b/find/pred.c
128index 7e2a7bd..af3bacb 100644 129index 32938fb..431f065 100644
129--- a/find/pred.c 130--- a/find/pred.c
130+++ b/find/pred.c 131+++ b/find/pred.c
131@@ -324,6 +324,12 @@ pred_delete (const char *pathname, struct stat *stat_buf, struct predicate *pred 132@@ -324,6 +324,12 @@ pred_delete (const char *pathname, struct stat *stat_buf, struct predicate *pred
@@ -141,5 +142,3 @@ index 7e2a7bd..af3bacb 100644
141 if (EISDIR == errno) 142 if (EISDIR == errno)
142 { 143 {
143 if ((flags & AT_REMOVEDIR) == 0) 144 if ((flags & AT_REMOVEDIR) == 0)
144--
145cgit v1.0-41-gc330