diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-02 21:53:52 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-03 15:41:40 +0100 |
commit | f372ddb776265c7e8c6e134763f6d9fd81b5a756 (patch) | |
tree | 9242a20bc1166711b19b129ce5f188943ff0726b /meta/recipes-core/coreutils | |
parent | 97216d023f496c831898620bf953a21a3a9d42be (diff) | |
download | poky-f372ddb776265c7e8c6e134763f6d9fd81b5a756.tar.gz |
coreutils: update to 8.32
License-Update: copyright years, http changed to https
(From OE-Core rev: 6e1052d401da5a9fa7f535786d76e033a39bc30a)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/coreutils')
-rw-r--r-- | meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch | 99 | ||||
-rw-r--r-- | meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch | 13 | ||||
-rw-r--r-- | meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch | 23 | ||||
-rw-r--r-- | meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch | 56 | ||||
-rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.32.bb (renamed from meta/recipes-core/coreutils/coreutils_8.31.bb) | 14 |
5 files changed, 128 insertions, 77 deletions
diff --git a/meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch b/meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch new file mode 100644 index 0000000000..fa900e3a76 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch | |||
@@ -0,0 +1,99 @@ | |||
1 | From 7c273e5c6041f8c70f73f5b280fbb8f27d9b5a36 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggert <eggert@cs.ucla.edu> | ||
3 | Date: Thu, 5 Mar 2020 17:25:29 -0800 | ||
4 | Subject: [PATCH] ls: restore 8.31 behavior on removed directories | ||
5 | |||
6 | * NEWS: Mention this. | ||
7 | * src/ls.c: Do not include <sys/sycall.h> | ||
8 | (print_dir): Don't worry about whether the directory is removed. | ||
9 | * tests/ls/removed-directory.sh: Adjust to match new (i.e., old) | ||
10 | behavior. | ||
11 | |||
12 | Upstream-Status: Backport [https://github.com/coreutils/coreutils/commit/10fcb97bd728f09d4a027eddf8ad2900f0819b0a] | ||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | --- | ||
15 | src/ls.c | 22 ---------------------- | ||
16 | tests/ls/removed-directory.sh | 10 ++-------- | ||
17 | 2 files changed, 2 insertions(+), 30 deletions(-) | ||
18 | |||
19 | diff --git a/src/ls.c b/src/ls.c | ||
20 | index 637fe7a..0111f49 100644 | ||
21 | --- a/src/ls.c | ||
22 | +++ b/src/ls.c | ||
23 | @@ -49,10 +49,6 @@ | ||
24 | # include <sys/ptem.h> | ||
25 | #endif | ||
26 | |||
27 | -#ifdef __linux__ | ||
28 | -# include <sys/syscall.h> | ||
29 | -#endif | ||
30 | - | ||
31 | #include <stdio.h> | ||
32 | #include <assert.h> | ||
33 | #include <setjmp.h> | ||
34 | @@ -2895,7 +2891,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) | ||
35 | struct dirent *next; | ||
36 | uintmax_t total_blocks = 0; | ||
37 | static bool first = true; | ||
38 | - bool found_any_entries = false; | ||
39 | |||
40 | errno = 0; | ||
41 | dirp = opendir (name); | ||
42 | @@ -2971,7 +2966,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) | ||
43 | next = readdir (dirp); | ||
44 | if (next) | ||
45 | { | ||
46 | - found_any_entries = true; | ||
47 | if (! file_ignored (next->d_name)) | ||
48 | { | ||
49 | enum filetype type = unknown; | ||
50 | @@ -3017,22 +3011,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) | ||
51 | if (errno != EOVERFLOW) | ||
52 | break; | ||
53 | } | ||
54 | -#ifdef __linux__ | ||
55 | - else if (! found_any_entries) | ||
56 | - { | ||
57 | - /* If readdir finds no directory entries at all, not even "." or | ||
58 | - "..", then double check that the directory exists. */ | ||
59 | - if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1 | ||
60 | - && errno != EINVAL) | ||
61 | - { | ||
62 | - /* We exclude EINVAL as that pertains to buffer handling, | ||
63 | - and we've passed NULL as the buffer for simplicity. | ||
64 | - ENOENT is returned if appropriate before buffer handling. */ | ||
65 | - file_failure (command_line_arg, _("reading directory %s"), name); | ||
66 | - } | ||
67 | - break; | ||
68 | - } | ||
69 | -#endif | ||
70 | else | ||
71 | break; | ||
72 | |||
73 | diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh | ||
74 | index e8c835d..fe8f929 100755 | ||
75 | --- a/tests/ls/removed-directory.sh | ||
76 | +++ b/tests/ls/removed-directory.sh | ||
77 | @@ -26,20 +26,14 @@ case $host_triplet in | ||
78 | *) skip_ 'non linux kernel' ;; | ||
79 | esac | ||
80 | |||
81 | -LS_FAILURE=2 | ||
82 | - | ||
83 | -cat <<\EOF >exp-err || framework_failure_ | ||
84 | -ls: reading directory '.': No such file or directory | ||
85 | -EOF | ||
86 | - | ||
87 | cwd=$(pwd) | ||
88 | mkdir d || framework_failure_ | ||
89 | cd d || framework_failure_ | ||
90 | rmdir ../d || framework_failure_ | ||
91 | |||
92 | -returns_ $LS_FAILURE ls >../out 2>../err || fail=1 | ||
93 | +ls >../out 2>../err || fail=1 | ||
94 | cd "$cwd" || framework_failure_ | ||
95 | compare /dev/null out || fail=1 | ||
96 | -compare exp-err err || fail=1 | ||
97 | +compare /dev/null err || fail=1 | ||
98 | |||
99 | Exit $fail | ||
diff --git a/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch index 9d1ae55d47..173a57925b 100644 --- a/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch +++ b/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:00 2001 | 1 | From 7e20a7242ba2657f73311bbf5278093da67f0721 Mon Sep 17 00:00:00 2001 |
2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
3 | Date: Tue, 16 Sep 2014 01:59:08 -0700 | 3 | Date: Tue, 16 Sep 2014 01:59:08 -0700 |
4 | Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to | 4 | Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to |
@@ -13,20 +13,20 @@ compilation terminated. | |||
13 | Upstream-Status: Pending | 13 | Upstream-Status: Pending |
14 | 14 | ||
15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
16 | |||
16 | --- | 17 | --- |
17 | m4/gnulib-comp.m4 | 2 +- | 18 | m4/gnulib-comp.m4 | 2 +- |
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 20 | ||
20 | diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 | 21 | diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 |
21 | index 472d3a0..5f09734 100644 | 22 | index dead90e..0abf0bd 100644 |
22 | --- a/m4/gnulib-comp.m4 | 23 | --- a/m4/gnulib-comp.m4 |
23 | +++ b/m4/gnulib-comp.m4 | 24 | +++ b/m4/gnulib-comp.m4 |
24 | @@ -1730,11 +1730,11 @@ AC_DEFUN([gl_INIT], | 25 | @@ -1860,10 +1860,10 @@ AC_DEFUN([gl_INIT], |
25 | AC_LIBOBJ([select]) | 26 | AC_LIBOBJ([select]) |
26 | fi | 27 | fi |
27 | gl_SYS_SELECT_MODULE_INDICATOR([select]) | 28 | gl_SYS_SELECT_MODULE_INDICATOR([select]) |
28 | - AC_CHECK_HEADERS([selinux/flask.h]) | 29 | - AC_CHECK_HEADERS([selinux/flask.h]) |
29 | AC_LIBOBJ([selinux-at]) | ||
30 | gl_HEADERS_SELINUX_SELINUX_H | 30 | gl_HEADERS_SELINUX_SELINUX_H |
31 | gl_HEADERS_SELINUX_CONTEXT_H | 31 | gl_HEADERS_SELINUX_CONTEXT_H |
32 | if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then | 32 | if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then |
@@ -34,6 +34,3 @@ index 472d3a0..5f09734 100644 | |||
34 | AC_LIBOBJ([getfilecon]) | 34 | AC_LIBOBJ([getfilecon]) |
35 | fi | 35 | fi |
36 | gl_SERVENT | 36 | gl_SERVENT |
37 | -- | ||
38 | 1.7.9.5 | ||
39 | |||
diff --git a/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch index 2ef8a548ac..1a8a9b9983 100644 --- a/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch +++ b/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From a26530083a29eeee910bfd606ecc621acecd547a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 3 Aug 2011 14:12:30 -0700 | ||
4 | Subject: [PATCH] coreutils: Fix build on uclibc | ||
5 | |||
1 | We have problem using hardcoded directories like /usr/local here | 6 | We have problem using hardcoded directories like /usr/local here |
2 | which will be checked for cross builds. This is a special case which | 7 | which will be checked for cross builds. This is a special case which |
3 | is valid for AIX only. We do not have AIX as one of our supported | 8 | is valid for AIX only. We do not have AIX as one of our supported |
@@ -8,11 +13,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
8 | 13 | ||
9 | Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] | 14 | Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] |
10 | 15 | ||
11 | Index: coreutils-8.14/m4/getloadavg.m4 | 16 | --- |
12 | =================================================================== | 17 | m4/getloadavg.m4 | 12 ------------ |
13 | --- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19 08:09:24.000000000 -0700 | 18 | 1 file changed, 12 deletions(-) |
14 | +++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357 -0700 | 19 | |
15 | @@ -41,16 +41,6 @@ | 20 | diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 |
21 | index 8e96965..63782a2 100644 | ||
22 | --- a/m4/getloadavg.m4 | ||
23 | +++ b/m4/getloadavg.m4 | ||
24 | @@ -41,18 +41,6 @@ AC_CHECK_FUNC([getloadavg], [], | ||
16 | [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) | 25 | [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) |
17 | fi | 26 | fi |
18 | 27 | ||
@@ -20,7 +29,9 @@ Index: coreutils-8.14/m4/getloadavg.m4 | |||
20 | - # There is a commonly available library for RS/6000 AIX. | 29 | - # There is a commonly available library for RS/6000 AIX. |
21 | - # Since it is not a standard part of AIX, it might be installed locally. | 30 | - # Since it is not a standard part of AIX, it might be installed locally. |
22 | - gl_getloadavg_LIBS=$LIBS | 31 | - gl_getloadavg_LIBS=$LIBS |
23 | - LIBS="-L/usr/local/lib $LIBS" | 32 | - if test $cross_compiling != yes; then |
33 | - LIBS="-L/usr/local/lib $LIBS" | ||
34 | - fi | ||
24 | - AC_CHECK_LIB([getloadavg], [getloadavg], | 35 | - AC_CHECK_LIB([getloadavg], [getloadavg], |
25 | - [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], | 36 | - [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], |
26 | - [LIBS=$gl_getloadavg_LIBS]) | 37 | - [LIBS=$gl_getloadavg_LIBS]) |
diff --git a/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch b/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch deleted file mode 100644 index 77770093cd..0000000000 --- a/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 0562b040fa17f1722ba2b3096067b45d0582ca53 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggert <eggert@cs.ucla.edu> | ||
3 | Date: Mon, 11 Mar 2019 16:40:29 -0700 | ||
4 | Subject: [PATCH] strtod: fix clash with strtold | ||
5 | |||
6 | Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817). | ||
7 | * lib/strtod.c (compute_minus_zero, minus_zero): | ||
8 | Simplify by remving the macro / external variable, | ||
9 | and having just a function. User changed. This avoids | ||
10 | the need for an external variable that might clash. | ||
11 | |||
12 | Upstream-Status: Backport [rhel5] | ||
13 | |||
14 | Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | ||
15 | |||
16 | --- | ||
17 | ChangeLog | 9 +++++++++ | ||
18 | lib/strtod.c | 11 +++++------ | ||
19 | 2 files changed, 14 insertions(+), 6 deletions(-) | ||
20 | |||
21 | diff --git a/lib/strtod.c b/lib/strtod.c | ||
22 | index b9eaa51b4..69b1564e1 100644 | ||
23 | --- a/lib/strtod.c | ||
24 | +++ b/lib/strtod.c | ||
25 | @@ -294,16 +294,15 @@ parse_number (const char *nptr, | ||
26 | ICC 10.0 has a bug when optimizing the expression -zero. | ||
27 | The expression -MIN * MIN does not work when cross-compiling | ||
28 | to PowerPC on Mac OS X 10.5. */ | ||
29 | -#if defined __hpux || defined __sgi || defined __ICC | ||
30 | static DOUBLE | ||
31 | -compute_minus_zero (void) | ||
32 | +minus_zero (void) | ||
33 | { | ||
34 | +#if defined __hpux || defined __sgi || defined __ICC | ||
35 | return -MIN * MIN; | ||
36 | -} | ||
37 | -# define minus_zero compute_minus_zero () | ||
38 | #else | ||
39 | -DOUBLE minus_zero = -0.0; | ||
40 | + return -0.0; | ||
41 | #endif | ||
42 | +} | ||
43 | |||
44 | /* Convert NPTR to a DOUBLE. If ENDPTR is not NULL, a pointer to the | ||
45 | character after the last one used in the number is put in *ENDPTR. */ | ||
46 | @@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr) | ||
47 | /* Special case -0.0, since at least ICC miscompiles negation. We | ||
48 | can't use copysign(), as that drags in -lm on some platforms. */ | ||
49 | if (!num && negative) | ||
50 | - return minus_zero; | ||
51 | + return minus_zero (); | ||
52 | return negative ? -num : num; | ||
53 | } | ||
54 | -- | ||
55 | 2.20.1 | ||
56 | |||
diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.32.bb index 2b196b7512..2422f8634e 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.32.bb | |||
@@ -5,8 +5,9 @@ every system." | |||
5 | HOMEPAGE = "http://www.gnu.org/software/coreutils/" | 5 | HOMEPAGE = "http://www.gnu.org/software/coreutils/" |
6 | BUGTRACKER = "http://debbugs.gnu.org/coreutils" | 6 | BUGTRACKER = "http://debbugs.gnu.org/coreutils" |
7 | LICENSE = "GPLv3+" | 7 | LICENSE = "GPLv3+" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ |
9 | file://src/ls.c;beginline=1;endline=15;md5=c456f9896277a0543e3866777ccc0255" | 9 | file://src/ls.c;beginline=1;endline=15;md5=b7d80abf5b279320fb0e4b1007ed108b \ |
10 | " | ||
10 | DEPENDS = "gmp libcap" | 11 | DEPENDS = "gmp libcap" |
11 | DEPENDS_class-native = "" | 12 | DEPENDS_class-native = "" |
12 | 13 | ||
@@ -19,12 +20,11 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ | |||
19 | file://disable-ls-output-quoting.patch \ | 20 | file://disable-ls-output-quoting.patch \ |
20 | file://0001-local.mk-fix-cross-compiling-problem.patch \ | 21 | file://0001-local.mk-fix-cross-compiling-problem.patch \ |
21 | file://run-ptest \ | 22 | file://run-ptest \ |
22 | " | 23 | file://0001-ls-restore-8.31-behavior-on-removed-directories.patch \ |
24 | " | ||
23 | 25 | ||
24 | SRC_URI_append_libc-musl = "file://strtod_fix_clash_with_strtold.patch" | 26 | SRC_URI[md5sum] = "022042695b7d5bcf1a93559a9735e668" |
25 | 27 | SRC_URI[sha256sum] = "4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa" | |
26 | SRC_URI[md5sum] = "0009a224d8e288e8ec406ef0161f9293" | ||
27 | SRC_URI[sha256sum] = "ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd" | ||
28 | 28 | ||
29 | EXTRA_OECONF_class-native = "--without-gmp" | 29 | EXTRA_OECONF_class-native = "--without-gmp" |
30 | EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}" | 30 | EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}" |