summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2024-10-29 17:06:13 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2024-10-29 17:06:57 +0100
commit694e8c6318d571e3c206aad1a8e2a643195e6dc2 (patch)
tree1aff9cd35c8c4448362c27b993575d643ee833cb /sys-apps/coreutils/files
parentapp-containers/runc: add 1.2.0 (diff)
downloadgentoo-694e8c6318d571e3c206aad1a8e2a643195e6dc2.tar.gz
gentoo-694e8c6318d571e3c206aad1a8e2a643195e6dc2.tar.bz2
gentoo-694e8c6318d571e3c206aad1a8e2a643195e6dc2.zip
sys-apps/coreutils: drop 8.32-r1
Bug: https://bugs.gentoo.org/882741 Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'sys-apps/coreutils/files')
-rw-r--r--sys-apps/coreutils/files/coreutils-8.32-ls-restore-8.31-behavior.patch94
-rw-r--r--sys-apps/coreutils/files/coreutils-8.32-sandbox-env-test.patch64
2 files changed, 0 insertions, 158 deletions
diff --git a/sys-apps/coreutils/files/coreutils-8.32-ls-restore-8.31-behavior.patch b/sys-apps/coreutils/files/coreutils-8.32-ls-restore-8.31-behavior.patch
deleted file mode 100644
index 62a35cd85ad1..000000000000
--- a/sys-apps/coreutils/files/coreutils-8.32-ls-restore-8.31-behavior.patch
+++ /dev/null
@@ -1,94 +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
-
-* 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.
-
-diff --git a/src/ls.c b/src/ls.c
-index 24b983287..4acf5f44d 100644
---- 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 *realname, bool command_line_arg)
- 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 *realname, bool command_line_arg)
- 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 *realname, bool command_line_arg)
- 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;
-
-diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
-index e8c835dab..fe8f929a1 100755
---- 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
---
-cgit v1.2.1
-
diff --git a/sys-apps/coreutils/files/coreutils-8.32-sandbox-env-test.patch b/sys-apps/coreutils/files/coreutils-8.32-sandbox-env-test.patch
deleted file mode 100644
index 40b1554d948a..000000000000
--- a/sys-apps/coreutils/files/coreutils-8.32-sandbox-env-test.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Skip tests known to fail when running under Gentoo sandbox.
-
---- a/tests/du/long-from-unreadable.sh
-+++ b/tests/du/long-from-unreadable.sh
-@@ -29,6 +29,9 @@
- # unnecessarily to using FTS_NOCHDIR mode in this corner case.
-
- . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+# Avoid #413621 until #548250 is resolved
-+test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)"
-+
- print_ver_ du
-
- require_perl_
---- a/tests/ls/removed-directory.sh
-+++ b/tests/ls/removed-directory.sh
-@@ -19,6 +19,9 @@
- # along with this program. If not, see <https://www.gnu.org/licenses/>.
-
- . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+# Avoid #413621 until #548250 is resolved
-+test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)"
-+
- print_ver_ ls
-
- case $host_triplet in
---- a/tests/ls/stat-free-symlinks.sh
-+++ b/tests/ls/stat-free-symlinks.sh
-@@ -17,6 +17,9 @@
- # along with this program. If not, see <https://www.gnu.org/licenses/>.
-
- . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+# Avoid #413621 until #548250 is resolved
-+test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)"
-+
- print_ver_ ls
- require_strace_ stat
-
---- a/tests/misc/env-S.pl
-+++ b/tests/misc/env-S.pl
-@@ -30,6 +30,11 @@ $env = $1;
- # Turn off localization of executable's output.
- @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
-
-+# Skip if sandbox is enabled
-+if ($ENV{SANDBOX_ACTIVE}) {
-+ CuSkip::skip "Gentoo: Test known bad under sandbox (#675802)\n";
-+}
-+
- my @Tests =
- (
- # Test combination of -S and regular arguments
---- a/tests/rm/deep-2.sh
-+++ b/tests/rm/deep-2.sh
-@@ -17,6 +17,9 @@
- # along with this program. If not, see <https://www.gnu.org/licenses/>.
-
- . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+# Avoid #413621 until #548250 is resolved
-+test -n "$SANDBOX_ACTIVE" && skip_ "Gentoo: Test known bad under sandbox (#413621)"
-+
- print_ver_ rm
- require_perl_
-