Browse Source
coreutils: update to 9.0
Removed unneed patch: 002-ls-restore-831-behavior-on-removed-directories.patch After updating ran `make package/coreutils/refresh` from $BUILDROOT to clean dirty patches. Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia <graysky@archlinux.us>lilik-openwrt-22.03
John Audia
3 years ago
committed by
Rosen Penev
Rosen Penev
3 changed files with 19 additions and 127 deletions
Split View
Diff Options
-
+3 -3utils/coreutils/Makefile
-
+16 -16utils/coreutils/patches/001-no_docs_man_tests.patch
-
+0 -108utils/coreutils/patches/002-ls-restore-831-behavior-on-removed-directories.patch
+ 3
- 3
utils/coreutils/Makefile
View File
+ 16
- 16
utils/coreutils/patches/001-no_docs_man_tests.patch
View File
+ 0
- 108
utils/coreutils/patches/002-ls-restore-831-behavior-on-removed-directories.patch
View File
| @ -1,108 +0,0 @@ | |||
| From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001 | |||
| From: Paul Eggert <eggert@cs.ucla.edu> | |||
| Date: Thu, 5 Mar 2020 17:25:29 -0800 | |||
| Subject: ls: restore 8.31 behavior on removed directories | |||
| * NEWS: Mention this. | |||
| * src/ls.c: Do not include <sys/sycall.h> | |||
| (print_dir): Don't worry about whether the directory is removed. | |||
| * tests/ls/removed-directory.sh: Adjust to match new (i.e., old) | |||
| behavior. | |||
| --- | |||
| NEWS | 6 ++++++ | |||
| src/ls.c | 22 ---------------------- | |||
| tests/ls/removed-directory.sh | 10 ++-------- | |||
| 3 files changed, 8 insertions(+), 30 deletions(-) | |||
| --- a/NEWS | |||
| +++ b/NEWS | |||
| @@ -97,6 +97,12 @@ GNU coreutils NEWS | |||
| gzip-compressed tarballs are distributed once again | |||
| +** Changes in behavior | |||
| + | |||
| + On GNU/Linux systems, ls no longer issues an error message on | |||
| + directory merely because it was removed. This reverts a change | |||
| + that was made in release 8.32. | |||
| + | |||
| * Noteworthy changes in release 8.31 (2019-03-10) [stable] | |||
| --- a/src/ls.c | |||
| +++ b/src/ls.c | |||
| @@ -49,10 +49,6 @@ | |||
| # include <sys/ptem.h> | |||
| #endif | |||
| -#ifdef __linux__ | |||
| -# include <sys/syscall.h> | |||
| -#endif | |||
| - | |||
| #include <stdio.h> | |||
| #include <assert.h> | |||
| #include <setjmp.h> | |||
| @@ -2896,7 +2892,6 @@ print_dir (char const *name, char const | |||
| struct dirent *next; | |||
| uintmax_t total_blocks = 0; | |||
| static bool first = true; | |||
| - bool found_any_entries = false; | |||
| errno = 0; | |||
| dirp = opendir (name); | |||
| @@ -2972,7 +2967,6 @@ print_dir (char const *name, char const | |||
| next = readdir (dirp); | |||
| if (next) | |||
| { | |||
| - found_any_entries = true; | |||
| if (! file_ignored (next->d_name)) | |||
| { | |||
| enum filetype type = unknown; | |||
| @@ -3018,22 +3012,6 @@ print_dir (char const *name, char const | |||
| if (errno != EOVERFLOW) | |||
| break; | |||
| } | |||
| -#ifdef __linux__ | |||
| - else if (! found_any_entries) | |||
| - { | |||
| - /* If readdir finds no directory entries at all, not even "." or | |||
| - "..", then double check that the directory exists. */ | |||
| - if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1 | |||
| - && errno != EINVAL) | |||
| - { | |||
| - /* We exclude EINVAL as that pertains to buffer handling, | |||
| - and we've passed NULL as the buffer for simplicity. | |||
| - ENOENT is returned if appropriate before buffer handling. */ | |||
| - file_failure (command_line_arg, _("reading directory %s"), name); | |||
| - } | |||
| - break; | |||
| - } | |||
| -#endif | |||
| else | |||
| break; | |||
| --- a/tests/ls/removed-directory.sh | |||
| +++ b/tests/ls/removed-directory.sh | |||
| @@ -26,20 +26,14 @@ case $host_triplet in | |||
| *) skip_ 'non linux kernel' ;; | |||
| esac | |||
| -LS_FAILURE=2 | |||
| - | |||
| -cat <<\EOF >exp-err || framework_failure_ | |||
| -ls: reading directory '.': No such file or directory | |||
| -EOF | |||
| - | |||
| cwd=$(pwd) | |||
| mkdir d || framework_failure_ | |||
| cd d || framework_failure_ | |||
| rmdir ../d || framework_failure_ | |||
| -returns_ $LS_FAILURE ls >../out 2>../err || fail=1 | |||
| +ls >../out 2>../err || fail=1 | |||
| cd "$cwd" || framework_failure_ | |||
| compare /dev/null out || fail=1 | |||
| -compare exp-err err || fail=1 | |||
| +compare /dev/null err || fail=1 | |||
| Exit $fail | |||