diff options
7 files changed, 16 insertions, 415 deletions
diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index ad3642923c..a0e1f8962c 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/findutils/" | |||
6 | BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils" | 6 | BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils" |
7 | SECTION = "console/utils" | 7 | SECTION = "console/utils" |
8 | 8 | ||
9 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" | 9 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz" |
10 | 10 | ||
11 | inherit autotools gettext texinfo update-alternatives upstream-version-is-even | 11 | inherit autotools gettext texinfo update-alternatives upstream-version-is-even |
12 | 12 | ||
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 deleted file mode 100644 index 6064d18854..0000000000 --- a/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 86db2a5f3b7ef8113e5384b4e02d2b299c87a047 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 13 Apr 2015 17:02:13 -0700 | ||
4 | Subject: [PATCH] Unset need_charset_alias when building for musl | ||
5 | |||
6 | localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 | ||
7 | which actually shoudl be fixed in gnulib and then all downstream | ||
8 | projects will get it eventually. For now we apply the fix to | ||
9 | coreutils | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | |||
15 | --- | ||
16 | gl/lib/Makefile.am | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/gl/lib/Makefile.am b/gl/lib/Makefile.am | ||
20 | index a9e2fe4..1c6ea9c 100644 | ||
21 | --- a/gl/lib/Makefile.am | ||
22 | +++ b/gl/lib/Makefile.am | ||
23 | @@ -1234,7 +1234,7 @@ install-exec-localcharset: all-local | ||
24 | case '$(host_os)' in \ | ||
25 | darwin[56]*) \ | ||
26 | need_charset_alias=true ;; \ | ||
27 | - darwin* | cygwin* | mingw* | pw32* | cegcc*) \ | ||
28 | + darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ | ||
29 | need_charset_alias=false ;; \ | ||
30 | *) \ | ||
31 | 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 deleted file mode 100644 index a570473ccb..0000000000 --- a/meta/recipes-extended/findutils/findutils/0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch +++ /dev/null | |||
@@ -1,144 +0,0 @@ | |||
1 | From a3f4821c4a3f723d21c9298d54bee8a656bfd7fb Mon Sep 17 00:00:00 2001 | ||
2 | From: Bernhard Voelker <mail@bernhard-voelker.de> | ||
3 | Date: Tue, 30 Jan 2018 23:30:09 +0100 | ||
4 | Subject: [PATCH] find: make -delete honour the -ignore_readdir_race option | ||
5 | |||
6 | * find/pred.c (pred_delete): Return true when the -ignore_readdir_race | ||
7 | option is active and unlinkat() came back with ENOENT. | ||
8 | * doc/find.texi (Option -ignore_readdir_race): Document the change. | ||
9 | (Action -delete): Likewise. | ||
10 | * find/find.1: Likewise. | ||
11 | * NEWS (Bug Fixes): Mention the fix. | ||
12 | |||
13 | For now, it seems a bit hard to add a proper test for this, | ||
14 | so the following shell snippet demonstrates the race: | ||
15 | |||
16 | $ seq 10 | xargs touch | ||
17 | $ env time -f 'find exit status: %x\nfind time: %e' \ | ||
18 | find -ignore_readdir_race -type f \ | ||
19 | -delete \ | ||
20 | -exec sh -c 'sleep $(basename {})' \; \ | ||
21 | -printf 'find deleted: %p\n' \ | ||
22 | & \ | ||
23 | sleep 20; \ | ||
24 | seq 10 | xargs rm -fv; \ | ||
25 | wait $! | ||
26 | |||
27 | Reported by Alexander Golubev in | ||
28 | https://savannah.gnu.org/bugs/?52981 | ||
29 | |||
30 | Upstream-Status: Backport | ||
31 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
32 | |||
33 | --- | ||
34 | NEWS | 4 ++++ | ||
35 | doc/find.texi | 15 ++++++++++++++- | ||
36 | find/find.1 | 22 ++++++++++++++++++++++ | ||
37 | find/pred.c | 6 ++++++ | ||
38 | 4 files changed, 46 insertions(+), 1 deletion(-) | ||
39 | |||
40 | diff --git a/NEWS b/NEWS | ||
41 | index 660c241..b86ec1e 100644 | ||
42 | --- a/NEWS | ||
43 | +++ b/NEWS | ||
44 | @@ -42,6 +42,10 @@ Updated the Danish translation. | ||
45 | |||
46 | ** Bug Fixes: | ||
47 | |||
48 | +#52981: find: the '-delete' action no longer complains about disappeared files | ||
49 | + when the '-ignore_readdir_race' option is given, too. That action will | ||
50 | + also returns true in such a case now. | ||
51 | + | ||
52 | Applied patch #8688: Spelling fixes. | ||
53 | |||
54 | * Major changes in release 4.5.18, 2015-12-27 | ||
55 | diff --git a/doc/find.texi b/doc/find.texi | ||
56 | index fdeb841..247c19a 100644 | ||
57 | --- a/doc/find.texi | ||
58 | +++ b/doc/find.texi | ||
59 | @@ -1418,7 +1418,15 @@ gives a significant increase in search speed. | ||
60 | If a file disappears after its name has been read from a directory but | ||
61 | before @code{find} gets around to examining the file with @code{stat}, | ||
62 | don't issue an error message. If you don't specify this option, an | ||
63 | -error message will be issued. This option can be useful in system | ||
64 | +error message will be issued. | ||
65 | + | ||
66 | +Furthermore, @code{find} with the @samp{-ignore_readdir_race} option | ||
67 | +will ignore errors of the @samp{-delete} action in the case the file | ||
68 | +has disappeared since the parent directory was read: it will not output | ||
69 | +an error diagnostic, and the return code of the @samp{-delete} action | ||
70 | +will be true. | ||
71 | + | ||
72 | +This option can be useful in system | ||
73 | scripts (cron scripts, for example) that examine areas of the | ||
74 | filesystem that change frequently (mail queues, temporary directories, | ||
75 | and so forth), because this scenario is common for those sorts of | ||
76 | @@ -2779,6 +2787,11 @@ explicitly. | ||
77 | |||
78 | If @samp{-delete} fails, @code{find}'s exit status will be nonzero | ||
79 | (when it eventually exits). | ||
80 | + | ||
81 | +Together with the @samp{-ignore_readdir_race} option, @code{find} will | ||
82 | +ignore errors of the @samp{-delete} action in the case the file has disappeared | ||
83 | +since the parent directory was read: it will not output an error diagnostic, and | ||
84 | +the return code of the @samp{-delete} action will be true. | ||
85 | @end deffn | ||
86 | |||
87 | @node Adding Tests | ||
88 | diff --git a/find/find.1 b/find/find.1 | ||
89 | index 7b141b8..0eec41c 100644 | ||
90 | --- a/find/find.1 | ||
91 | +++ b/find/find.1 | ||
92 | @@ -479,6 +479,17 @@ one part of the filesystem with this option on and part of it with this option | ||
93 | off (if you need to do that, you will need to issue two \fBfind\fR commands | ||
94 | instead, one with the option and one without it). | ||
95 | |||
96 | +Furthermore, | ||
97 | +.B find | ||
98 | +with the | ||
99 | +.B \-ignore_readdir_race | ||
100 | +option will ignore errors of the | ||
101 | +.B \-delete | ||
102 | +action in the case the file has disappeared since the parent directory was read: | ||
103 | +it will not output an error diagnostic, and the return code of the | ||
104 | +.B \-delete | ||
105 | +action will be true. | ||
106 | + | ||
107 | .IP "\-maxdepth \fIlevels\fR" | ||
108 | Descend at most \fIlevels\fR (a non-negative integer) levels of | ||
109 | directories below the starting-points. | ||
110 | @@ -1030,6 +1041,17 @@ and | ||
111 | .B \-delete | ||
112 | together. | ||
113 | |||
114 | +Together with the | ||
115 | +.B \-ignore_readdir_race | ||
116 | +option, | ||
117 | +.B find | ||
118 | +will ignore errors of the | ||
119 | +.B \-delete | ||
120 | +action in the case the file has disappeared since the parent directory was | ||
121 | +read: it will not output an error diagnostic, and the return code of the | ||
122 | +.B \-delete | ||
123 | +action will be true. | ||
124 | + | ||
125 | .IP "\-exec \fIcommand\fR ;" | ||
126 | Execute \fIcommand\fR; true if 0 status is returned. All following | ||
127 | arguments to | ||
128 | diff --git a/find/pred.c b/find/pred.c | ||
129 | index 32938fb..431f065 100644 | ||
130 | --- a/find/pred.c | ||
131 | +++ b/find/pred.c | ||
132 | @@ -324,6 +324,12 @@ pred_delete (const char *pathname, struct stat *stat_buf, struct predicate *pred | ||
133 | } | ||
134 | else | ||
135 | { | ||
136 | + if (ENOENT == errno && options.ignore_readdir_race) | ||
137 | + { | ||
138 | + /* Ignore unlink() error for vanished files. */ | ||
139 | + errno = 0; | ||
140 | + return true; | ||
141 | + } | ||
142 | if (EISDIR == errno) | ||
143 | { | ||
144 | if ((flags & AT_REMOVEDIR) == 0) | ||
diff --git a/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-fflush.patch b/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-fflush.patch deleted file mode 100644 index d13e8ed3cf..0000000000 --- a/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-fflush.patch +++ /dev/null | |||
@@ -1,140 +0,0 @@ | |||
1 | From 80cdfba079627e15129a926a133825b961d41e36 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggert <eggert@cs.ucla.edu> | ||
3 | Date: Mon, 5 Mar 2018 10:56:29 -0800 | ||
4 | Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Problem reported by Daniel P. Berrangé in: | ||
10 | https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html | ||
11 | * lib/fflush.c (clear_ungetc_buffer_preserving_position) | ||
12 | (disable_seek_optimization, rpl_fflush): | ||
13 | * lib/fpurge.c (fpurge): | ||
14 | * lib/freadahead.c (freadahead): | ||
15 | * lib/freading.c (freading): | ||
16 | * lib/fseeko.c (fseeko): | ||
17 | * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: | ||
18 | Define if not already defined. | ||
19 | |||
20 | Upstream-commit: 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e | ||
21 | Signed-off-by: Kamil Dudka <kdudka@redhat.com> | ||
22 | Upstream-Status: Backport [4af4a4a71827c0bc5e0ec67af23edef4f15cee8e] | ||
23 | --- | ||
24 | gl/lib/fflush.c | 6 +++--- | ||
25 | gl/lib/fpurge.c | 2 +- | ||
26 | gl/lib/freadahead.c | 2 +- | ||
27 | gl/lib/freading.c | 2 +- | ||
28 | gl/lib/fseeko.c | 4 ++-- | ||
29 | gl/lib/stdio-impl.h | 6 ++++++ | ||
30 | 6 files changed, 14 insertions(+), 8 deletions(-) | ||
31 | |||
32 | Index: findutils-4.6.0/gl/lib/fflush.c | ||
33 | =================================================================== | ||
34 | --- findutils-4.6.0.orig/gl/lib/fflush.c | ||
35 | +++ findutils-4.6.0/gl/lib/fflush.c | ||
36 | @@ -33,7 +33,7 @@ | ||
37 | #undef fflush | ||
38 | |||
39 | |||
40 | -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
41 | +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
42 | |||
43 | /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ | ||
44 | static void | ||
45 | @@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) | ||
46 | |||
47 | #endif | ||
48 | |||
49 | -#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) | ||
50 | +#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) | ||
51 | |||
52 | # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT | ||
53 | /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ | ||
54 | @@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) | ||
55 | if (stream == NULL || ! freading (stream)) | ||
56 | return fflush (stream); | ||
57 | |||
58 | -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
59 | +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
60 | |||
61 | clear_ungetc_buffer_preserving_position (stream); | ||
62 | |||
63 | Index: findutils-4.6.0/gl/lib/fpurge.c | ||
64 | =================================================================== | ||
65 | --- findutils-4.6.0.orig/gl/lib/fpurge.c | ||
66 | +++ findutils-4.6.0/gl/lib/fpurge.c | ||
67 | @@ -62,7 +62,7 @@ fpurge (FILE *fp) | ||
68 | /* Most systems provide FILE as a struct and the necessary bitmask in | ||
69 | <stdio.h>, because they need it for implementing getc() and putc() as | ||
70 | fast macros. */ | ||
71 | -# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
72 | +# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
73 | fp->_IO_read_end = fp->_IO_read_ptr; | ||
74 | fp->_IO_write_ptr = fp->_IO_write_base; | ||
75 | /* Avoid memory leak when there is an active ungetc buffer. */ | ||
76 | Index: findutils-4.6.0/gl/lib/freadahead.c | ||
77 | =================================================================== | ||
78 | --- findutils-4.6.0.orig/gl/lib/freadahead.c | ||
79 | +++ findutils-4.6.0/gl/lib/freadahead.c | ||
80 | @@ -25,7 +25,7 @@ | ||
81 | size_t | ||
82 | freadahead (FILE *fp) | ||
83 | { | ||
84 | -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
85 | +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
86 | if (fp->_IO_write_ptr > fp->_IO_write_base) | ||
87 | return 0; | ||
88 | return (fp->_IO_read_end - fp->_IO_read_ptr) | ||
89 | Index: findutils-4.6.0/gl/lib/freading.c | ||
90 | =================================================================== | ||
91 | --- findutils-4.6.0.orig/gl/lib/freading.c | ||
92 | +++ findutils-4.6.0/gl/lib/freading.c | ||
93 | @@ -31,7 +31,7 @@ freading (FILE *fp) | ||
94 | /* Most systems provide FILE as a struct and the necessary bitmask in | ||
95 | <stdio.h>, because they need it for implementing getc() and putc() as | ||
96 | fast macros. */ | ||
97 | -# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
98 | +# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
99 | return ((fp->_flags & _IO_NO_WRITES) != 0 | ||
100 | || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 | ||
101 | && fp->_IO_read_base != NULL)); | ||
102 | Index: findutils-4.6.0/gl/lib/fseeko.c | ||
103 | =================================================================== | ||
104 | --- findutils-4.6.0.orig/gl/lib/fseeko.c | ||
105 | +++ findutils-4.6.0/gl/lib/fseeko.c | ||
106 | @@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when | ||
107 | #endif | ||
108 | |||
109 | /* These tests are based on fpurge.c. */ | ||
110 | -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
111 | +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
112 | if (fp->_IO_read_end == fp->_IO_read_ptr | ||
113 | && fp->_IO_write_ptr == fp->_IO_write_base | ||
114 | && fp->_IO_save_base == NULL) | ||
115 | @@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when | ||
116 | return -1; | ||
117 | } | ||
118 | |||
119 | -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
120 | +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
121 | fp->_flags &= ~_IO_EOF_SEEN; | ||
122 | fp->_offset = pos; | ||
123 | #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ | ||
124 | Index: findutils-4.6.0/gl/lib/stdio-impl.h | ||
125 | =================================================================== | ||
126 | --- findutils-4.6.0.orig/gl/lib/stdio-impl.h | ||
127 | +++ findutils-4.6.0/gl/lib/stdio-impl.h | ||
128 | @@ -18,6 +18,12 @@ | ||
129 | the same implementation of stdio extension API, except that some fields | ||
130 | have different naming conventions, or their access requires some casts. */ | ||
131 | |||
132 | +/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this | ||
133 | + problem by defining it ourselves. FIXME: Do not rely on glibc | ||
134 | + internals. */ | ||
135 | +#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN | ||
136 | +# define _IO_IN_BACKUP 0x100 | ||
137 | +#endif | ||
138 | |||
139 | /* BSD stdio derived implementations. */ | ||
140 | |||
diff --git a/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-makedev.patch b/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-makedev.patch deleted file mode 100644 index 0fb3953cf3..0000000000 --- a/meta/recipes-extended/findutils/findutils/findutils-4.6.0-gnulib-makedev.patch +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | From 80628047a6cc83f82e0c410a82b8f7facd9d50f2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Eric Blake <eblake@redhat.com> | ||
3 | Date: Wed, 14 Sep 2016 19:21:42 -0500 | ||
4 | Subject: [PATCH] mountlist: include sysmacros.h for glibc | ||
5 | |||
6 | On Fedora rawhide (glibc 2.25), './gnulib-tool --test mountlist' | ||
7 | reports: | ||
8 | ../../gllib/mountlist.c: In function 'read_file_system_list': | ||
9 | ../../gllib/mountlist.c:534:13: warning: '__makedev_from_sys_types' is deprecated: | ||
10 | In the GNU C Library, `makedev' is defined by <sys/sysmacros.h>. | ||
11 | For historical compatibility, it is currently defined by | ||
12 | <sys/types.h> as well, but we plan to remove this soon. | ||
13 | To use `makedev', include <sys/sysmacros.h> directly. | ||
14 | If you did not intend to use a system-defined macro `makedev', | ||
15 | you should #undef it after including <sys/types.h>. | ||
16 | [-Wdeprecated-declarations] | ||
17 | me->me_dev = makedev (devmaj, devmin); | ||
18 | ^~ | ||
19 | In file included from /usr/include/features.h:397:0, | ||
20 | from /usr/include/sys/types.h:25, | ||
21 | from ./sys/types.h:28, | ||
22 | from ../../gllib/mountlist.h:23, | ||
23 | from ../../gllib/mountlist.c:20: | ||
24 | /usr/include/sys/sysmacros.h:89:1: note: declared here | ||
25 | __SYSMACROS_DEFINE_MAKEDEV (__SYSMACROS_FST_IMPL_TEMPL) | ||
26 | ^ | ||
27 | |||
28 | Fix it by including the right headers. We also need a fix to | ||
29 | autoconf's AC_HEADER_MAJOR, but that's a separate patch. | ||
30 | |||
31 | * m4/mountlist.m4 (gl_PREREQ_MOUTLIST_EXTRA): Include | ||
32 | AC_HEADER_MAJOR. | ||
33 | * lib/mountlist.c (includes): Use correct headers. | ||
34 | |||
35 | Signed-off-by: Eric Blake <eblake@redhat.com> | ||
36 | |||
37 | Upstream-commit: 4da63c5881f60f71999a943612da9112232b9161 | ||
38 | Signed-off-by: Kamil Dudka <kdudka@redhat.com> | ||
39 | Upstream-Status: Backport [4da63c5881f60f71999a943612da9112232b9161] | ||
40 | --- | ||
41 | gl/lib/mountlist.c | 6 ++++++ | ||
42 | gl/m4/mountlist.m4 | 3 ++- | ||
43 | 2 files changed, 8 insertions(+), 1 deletion(-) | ||
44 | |||
45 | Index: findutils-4.6.0/gl/lib/mountlist.c | ||
46 | =================================================================== | ||
47 | --- findutils-4.6.0.orig/gl/lib/mountlist.c | ||
48 | +++ findutils-4.6.0/gl/lib/mountlist.c | ||
49 | @@ -37,6 +37,12 @@ | ||
50 | # include <sys/param.h> | ||
51 | #endif | ||
52 | |||
53 | +#if MAJOR_IN_MKDEV | ||
54 | +# include <sys/mkdev.h> | ||
55 | +#elif MAJOR_IN_SYSMACROS | ||
56 | +# include <sys/sysmacros.h> | ||
57 | +#endif | ||
58 | + | ||
59 | #if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */ | ||
60 | # if HAVE_SYS_UCRED_H | ||
61 | # include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS, | ||
62 | Index: findutils-4.6.0/gl/m4/mountlist.m4 | ||
63 | =================================================================== | ||
64 | --- findutils-4.6.0.orig/gl/m4/mountlist.m4 | ||
65 | +++ findutils-4.6.0/gl/m4/mountlist.m4 | ||
66 | @@ -1,4 +1,4 @@ | ||
67 | -# serial 11 | ||
68 | +# serial 12 | ||
69 | dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc. | ||
70 | dnl This file is free software; the Free Software Foundation | ||
71 | dnl gives unlimited permission to copy and/or distribute it, | ||
72 | @@ -15,5 +15,6 @@ AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA], | ||
73 | [ | ||
74 | dnl Note gl_LIST_MOUNTED_FILE_SYSTEMS checks for mntent.h, not sys/mntent.h. | ||
75 | AC_CHECK_HEADERS([sys/mntent.h]) | ||
76 | + AC_HEADER_MAJOR()dnl for use of makedev () | ||
77 | gl_FSTYPENAME | ||
78 | ]) | ||
diff --git a/meta/recipes-extended/findutils/findutils_4.6.0.bb b/meta/recipes-extended/findutils/findutils_4.6.0.bb deleted file mode 100644 index 3b62ed9962..0000000000 --- a/meta/recipes-extended/findutils/findutils_4.6.0.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | require findutils.inc | ||
2 | |||
3 | # GPLv2+ (<< 4.2.32), GPLv3+ (>= 4.2.32) | ||
4 | LICENSE = "GPLv3+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" | ||
6 | |||
7 | DEPENDS = "bison-native" | ||
8 | |||
9 | SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ | ||
10 | file://0001-find-make-delete-honour-the-ignore_readdir_race-opti.patch \ | ||
11 | file://findutils-4.6.0-gnulib-fflush.patch \ | ||
12 | file://findutils-4.6.0-gnulib-makedev.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI[md5sum] = "9936aa8009438ce185bea2694a997fc1" | ||
16 | SRC_URI[sha256sum] = "ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d" | ||
17 | |||
18 | # http://savannah.gnu.org/bugs/?27299 | ||
19 | CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" | ||
20 | |||
21 | EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" | ||
diff --git a/meta/recipes-extended/findutils/findutils_4.7.0.bb b/meta/recipes-extended/findutils/findutils_4.7.0.bb new file mode 100644 index 0000000000..59688e528a --- /dev/null +++ b/meta/recipes-extended/findutils/findutils_4.7.0.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require findutils.inc | ||
2 | |||
3 | # GPLv2+ (<< 4.2.32), GPLv3+ (>= 4.2.32) | ||
4 | LICENSE = "GPLv3+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" | ||
6 | |||
7 | DEPENDS = "bison-native" | ||
8 | |||
9 | SRC_URI[md5sum] = "731356dec4b1109b812fecfddfead6b2" | ||
10 | SRC_URI[sha256sum] = "c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a" | ||
11 | |||
12 | # http://savannah.gnu.org/bugs/?27299 | ||
13 | CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" | ||
14 | |||
15 | EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" | ||