* [PR PATCH] coreutils: update to 9.1
@ 2022-12-06 15:45 dkwo
2022-12-06 17:22 ` dkwo
` (19 more replies)
0 siblings, 20 replies; 21+ messages in thread
From: dkwo @ 2022-12-06 15:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
There is a new pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages coreu
https://github.com/void-linux/void-packages/pull/40932
coreutils: update to 9.1
- skip test-getcwd.sh test-getlogin: is this ok?
- Add [.1 man page symlink so "man [" works. @ericonr
- I tested the changes in this PR: YES
- I built this PR locally for my native architecture, (x86_64-musl)
- @leahneukirchen what should backport?
A patch file from https://github.com/void-linux/void-packages/pull/40932.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreu-40932.patch --]
[-- Type: text/x-diff, Size: 6144 bytes --]
From 5441bdf7af48941cbd666f2e8ef562200efea4d5 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 5 Dec 2022 20:16:46 -0500
Subject: [PATCH] coreutils: update to 9.1
skip test-getcwd.sh test-getlogin
Add [.1 man page symlink so "man [" works.
---
...8.31-behavior-on-removed-directories.patch | 120 ------------------
srcpkgs/coreutils/template | 12 +-
2 files changed, 9 insertions(+), 123 deletions(-)
delete mode 100644 srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
diff --git a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch b/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
deleted file mode 100644
index 93ec0fd84c74..000000000000
--- a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
+++ /dev/null
@@ -1,120 +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: [PATCH] ls: restore 8.31 behavior on removed directories
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* 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(-)
-
-diff --git NEWS NEWS
-index fdc8bf5db..653e7178b 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*-
-
- * Noteworthy changes in release ?.? (????-??-??) [?]
-
-+** 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.32 (2020-03-05) [stable]
-
-diff --git src/ls.c 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 tests/ls/removed-directory.sh 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
---
-2.24.0.375.geb5ae68d41
-
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index b9148c854960..420206e7451f 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,7 +1,7 @@
# Template file for 'coreutils'
pkgname=coreutils
-version=8.32
-revision=4
+version=9.1
+revision=1
bootstrap=yes
makedepends="gmp-devel acl-devel libcap-devel"
short_desc="GNU core utilities"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/coreutils"
changelog="https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob_plain;f=NEWS;hb=HEAD"
distfiles="${GNU_SITE}/coreutils/coreutils-${version}.tar.xz"
-checksum=4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa
+checksum=61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423
replaces="chroot-coreutils>=0 coreutils-doc>=0 b2sum>=0"
@@ -104,6 +104,10 @@ do_check() {
# Tests that depend on the tests removed
exeext_tests+=" fchmodat fchdir"
+ # temporarily disable two tests (coreutils9.1)
+ vsed -i "s/test-getcwd.sh //" gnulib-tests/Makefile
+ exeext_tests+=" getlogin"
+
for test in $exeext_tests ; do
vsed -i "s/test-$test\$(EXEEXT) //" gnulib-tests/Makefile
done
@@ -121,4 +125,6 @@ do_install() {
fi
mv ${DESTDIR}/usr/bin/hostname ${DESTDIR}/usr/bin/hostname-coreutils
mv ${DESTDIR}/usr/share/man/man1/hostname.1 ${DESTDIR}/usr/share/man/man1/hostname-coreutils.1
+
+ ln -s test.1 "${DESTDIR}/usr/share/man/man1/[.1"
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
@ 2022-12-06 17:22 ` dkwo
2022-12-06 18:23 ` leahneukirchen
` (18 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: dkwo @ 2022-12-06 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1339718170
Comment:
I cannot reproduce the CI failure locally with `XBPS_CHECK_PKGS=full`.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
2022-12-06 17:22 ` dkwo
@ 2022-12-06 18:23 ` leahneukirchen
2022-12-06 19:15 ` [PR PATCH] [Updated] " dkwo
` (17 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2022-12-06 18:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 613 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1339792339
Comment:
There are some bugs mentioned in https://git.savannah.gnu.org/cgit/coreutils.git/tree/NEWS
```
'cp -rx / /mnt' no longer complains "cannot create directory /mnt/".
[bug introduced in coreutils-9.1]
'mv --backup=simple f d/' no longer mistakenly backs up d/f to f~.
[bug introduced in coreutils-9.1]
```
https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=b54da709a1f3a6f10ed3150b0ae5269002a1053c
https://bugs.archlinux.org/task/74544
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
2022-12-06 17:22 ` dkwo
2022-12-06 18:23 ` leahneukirchen
@ 2022-12-06 19:15 ` dkwo
2022-12-06 19:15 ` dkwo
` (16 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: dkwo @ 2022-12-06 19:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages coreu
https://github.com/void-linux/void-packages/pull/40932
coreutils: update to 9.1
- skip test-getcwd.sh test-getlogin: is this ok?
- Add [.1 man page symlink so "man [" works. @ericonr
- I tested the changes in this PR: YES
- I built this PR locally for my native architectures `x86_64-musl` and `aarch64`
- @leahneukirchen what should backport?
A patch file from https://github.com/void-linux/void-packages/pull/40932.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreu-40932.patch --]
[-- Type: text/x-diff, Size: 17772 bytes --]
From 1965574eedd3284037fcf9ebedbc77b60781881b Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 5 Dec 2022 20:16:46 -0500
Subject: [PATCH] coreutils: update to 9.1
skip test-getcwd.sh test-getlogin
Add [.1 man page symlink so "man [" works.
backport two bugfixes
---
...8.31-behavior-on-removed-directories.patch | 120 -----------
.../patches/01-gnulib-simple-backup-fix.patch | 36 ++++
srcpkgs/coreutils/patches/02-fixcp.patch | 197 ++++++++++++++++++
srcpkgs/coreutils/template | 12 +-
4 files changed, 242 insertions(+), 123 deletions(-)
delete mode 100644 srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
create mode 100644 srcpkgs/coreutils/patches/01-gnulib-simple-backup-fix.patch
create mode 100644 srcpkgs/coreutils/patches/02-fixcp.patch
diff --git a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch b/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
deleted file mode 100644
index 93ec0fd84c74..000000000000
--- a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
+++ /dev/null
@@ -1,120 +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: [PATCH] ls: restore 8.31 behavior on removed directories
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* 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(-)
-
-diff --git NEWS NEWS
-index fdc8bf5db..653e7178b 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*-
-
- * Noteworthy changes in release ?.? (????-??-??) [?]
-
-+** 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.32 (2020-03-05) [stable]
-
-diff --git src/ls.c 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 tests/ls/removed-directory.sh 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
---
-2.24.0.375.geb5ae68d41
-
diff --git a/srcpkgs/coreutils/patches/01-gnulib-simple-backup-fix.patch b/srcpkgs/coreutils/patches/01-gnulib-simple-backup-fix.patch
new file mode 100644
index 000000000000..9c2d8a7cc0fc
--- /dev/null
+++ b/srcpkgs/coreutils/patches/01-gnulib-simple-backup-fix.patch
@@ -0,0 +1,36 @@
+commit 7347caeb9d902d3fca2c11f69a55a3e578d93bfe
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date: Wed Apr 20 19:34:57 2022 -0700
+
+ backupfile: fix bug when renaming simple backups
+
+ * lib/backupfile.c (backupfile_internal): Fix bug when RENAME
+ and when doing simple backups. Problem reported by Steve Ward in:
+ https://bugs.gnu.org/55029
+
+diff --git a/lib/backupfile.c b/lib/backupfile.c
+index 1e9290a187..d9f465a3e0 100644
+--- a/lib/backupfile.c
++++ b/lib/backupfile.c
+@@ -332,7 +332,7 @@ backupfile_internal (int dir_fd, char const *file,
+ return s;
+
+ DIR *dirp = NULL;
+- int sdir = AT_FDCWD;
++ int sdir = dir_fd;
+ idx_t base_max = 0;
+ while (true)
+ {
+@@ -371,10 +371,9 @@ backupfile_internal (int dir_fd, char const *file,
+ if (! rename)
+ break;
+
+- int olddirfd = sdir < 0 ? dir_fd : sdir;
+- idx_t offset = sdir < 0 ? 0 : base_offset;
++ idx_t offset = backup_type == simple_backups ? 0 : base_offset;
+ unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE;
+- if (renameatu (olddirfd, file + offset, sdir, s + offset, flags) == 0)
++ if (renameatu (sdir, file + offset, sdir, s + offset, flags) == 0)
+ break;
+ int e = errno;
+ if (! (e == EEXIST && extended))
diff --git a/srcpkgs/coreutils/patches/02-fixcp.patch b/srcpkgs/coreutils/patches/02-fixcp.patch
new file mode 100644
index 000000000000..1d89d3a5fc60
--- /dev/null
+++ b/srcpkgs/coreutils/patches/02-fixcp.patch
@@ -0,0 +1,197 @@
+From b54da709a1f3a6f10ed3150b0ae5269002a1053c Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 11 Jun 2022 10:49:18 -0700
+Subject: =?UTF-8?q?cp:=20fix=20=E2=80=98cp=20-rx=20/=20/mnt=E2=80=99?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by pkoraou@gmail.com (Bug#55910).
+* src/copy.c (copy_internal): Treat a relative destination name ""
+as if it were "." for the purpose of directory-relative syscalls
+like fstatat that might might refer to the destination directory.
+
+diff --git a/src/copy.c b/src/copy.c
+index b15d919..edc8221 100644
+--- a/src/copy.c
++++ b/src/copy.c
+@@ -1954,6 +1954,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ bool restore_dst_mode = false;
+ char *earlier_file = NULL;
+ char *dst_backup = NULL;
++ char const *drelname = *dst_relname ? dst_relname : ".";
+ bool delayed_ok;
+ bool copied_as_regular = false;
+ bool dest_is_symlink = false;
+@@ -1971,7 +1972,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ if (x->move_mode)
+ {
+ if (rename_errno < 0)
+- rename_errno = (renameatu (AT_FDCWD, src_name, dst_dirfd, dst_relname,
++ rename_errno = (renameatu (AT_FDCWD, src_name, dst_dirfd, drelname,
+ RENAME_NOREPLACE)
+ ? errno : 0);
+ nonexistent_dst = *rename_succeeded = new_dst = rename_errno == 0;
+@@ -1983,7 +1984,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ {
+ char const *name = rename_errno == 0 ? dst_name : src_name;
+ int dirfd = rename_errno == 0 ? dst_dirfd : AT_FDCWD;
+- char const *relname = rename_errno == 0 ? dst_relname : src_name;
++ char const *relname = rename_errno == 0 ? drelname : src_name;
+ int fstatat_flags
+ = x->dereference == DEREF_NEVER ? AT_SYMLINK_NOFOLLOW : 0;
+ if (follow_fstatat (dirfd, relname, &src_sb, fstatat_flags) != 0)
+@@ -2051,8 +2052,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ int fstatat_flags = use_lstat ? AT_SYMLINK_NOFOLLOW : 0;
+ if (!use_lstat && nonexistent_dst < 0)
+ new_dst = true;
+- else if (follow_fstatat (dst_dirfd, dst_relname, &dst_sb,
+- fstatat_flags)
++ else if (follow_fstatat (dst_dirfd, drelname, &dst_sb, fstatat_flags)
+ == 0)
+ {
+ have_dst_lstat = use_lstat;
+@@ -2077,7 +2077,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ bool return_now = false;
+
+ if (x->interactive != I_ALWAYS_NO
+- && ! same_file_ok (src_name, &src_sb, dst_dirfd, dst_relname,
++ && ! same_file_ok (src_name, &src_sb, dst_dirfd, drelname,
+ &dst_sb, x, &return_now))
+ {
+ error (0, 0, _("%s and %s are the same file"),
+@@ -2140,7 +2140,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ cp and mv treat -i and -f differently. */
+ if (x->move_mode)
+ {
+- if (abandon_move (x, dst_name, dst_dirfd, dst_relname, &dst_sb))
++ if (abandon_move (x, dst_name, dst_dirfd, drelname, &dst_sb))
+ {
+ /* Pretend the rename succeeded, so the caller (mv)
+ doesn't end up removing the source file. */
+@@ -2321,14 +2321,11 @@ copy_internal (char const *src_name, char const *dst_name,
+ Otherwise, use AT_SYMLINK_NOFOLLOW, in case dst_name is a symlink. */
+ if (have_dst_lstat)
+ dst_lstat_sb = &dst_sb;
++ else if (fstatat (dst_dirfd, drelname, &tmp_buf, AT_SYMLINK_NOFOLLOW)
++ == 0)
++ dst_lstat_sb = &tmp_buf;
+ else
+- {
+- if (fstatat (dst_dirfd, dst_relname, &tmp_buf,
+- AT_SYMLINK_NOFOLLOW) == 0)
+- dst_lstat_sb = &tmp_buf;
+- else
+- lstat_ok = false;
+- }
++ lstat_ok = false;
+
+ /* Never copy through a symlink we've just created. */
+ if (lstat_ok
+@@ -2475,8 +2472,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ if (x->move_mode)
+ {
+ if (rename_errno == EEXIST)
+- rename_errno = ((renameat (AT_FDCWD, src_name, dst_dirfd, dst_relname)
+- == 0)
++ rename_errno = (renameat (AT_FDCWD, src_name, dst_dirfd, drelname) == 0
+ ? 0 : errno);
+
+ if (rename_errno == 0)
+@@ -2576,7 +2572,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ or not, and this is enforced above. Therefore we check the src_mode
+ and operate on dst_name here as a tighter constraint and also because
+ src_mode is readily available here. */
+- if ((unlinkat (dst_dirfd, dst_relname,
++ if ((unlinkat (dst_dirfd, drelname,
+ S_ISDIR (src_mode) ? AT_REMOVEDIR : 0)
+ != 0)
+ && errno != ENOENT)
+@@ -2646,7 +2642,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ to ask mkdir to copy all the CHMOD_MODE_BITS, letting mkdir
+ decide what to do with S_ISUID | S_ISGID | S_ISVTX. */
+ mode_t mode = dst_mode_bits & ~omitted_permissions;
+- if (mkdirat (dst_dirfd, dst_relname, mode) != 0)
++ if (mkdirat (dst_dirfd, drelname, mode) != 0)
+ {
+ error (0, errno, _("cannot create directory %s"),
+ quoteaf (dst_name));
+@@ -2657,8 +2653,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ for writing the directory's contents. Check if these
+ permissions are there. */
+
+- if (fstatat (dst_dirfd, dst_relname, &dst_sb,
+- AT_SYMLINK_NOFOLLOW) != 0)
++ if (fstatat (dst_dirfd, drelname, &dst_sb, AT_SYMLINK_NOFOLLOW) != 0)
+ {
+ error (0, errno, _("cannot stat %s"), quoteaf (dst_name));
+ goto un_backup;
+@@ -2670,7 +2665,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ dst_mode = dst_sb.st_mode;
+ restore_dst_mode = true;
+
+- if (lchmodat (dst_dirfd, dst_relname, dst_mode | S_IRWXU) != 0)
++ if (lchmodat (dst_dirfd, drelname, dst_mode | S_IRWXU) != 0)
+ {
+ error (0, errno, _("setting permissions for %s"),
+ quoteaf (dst_name));
+@@ -2924,7 +2919,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ /* Now that the destination file is very likely to exist,
+ add its info to the set. */
+ struct stat sb;
+- if (fstatat (dst_dirfd, dst_relname, &sb, AT_SYMLINK_NOFOLLOW) == 0)
++ if (fstatat (dst_dirfd, drelname, &sb, AT_SYMLINK_NOFOLLOW) == 0)
+ record_file (x->dest_info, dst_relname, &sb);
+ }
+
+@@ -2957,7 +2952,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ timespec[1] = get_stat_mtime (&src_sb);
+
+ int utimensat_flags = dest_is_symlink ? AT_SYMLINK_NOFOLLOW : 0;
+- if (utimensat (dst_dirfd, dst_relname, timespec, utimensat_flags) != 0)
++ if (utimensat (dst_dirfd, drelname, timespec, utimensat_flags) != 0)
+ {
+ error (0, errno, _("preserving times for %s"), quoteaf (dst_name));
+ if (x->require_preserve)
+@@ -2969,7 +2964,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ if (!dest_is_symlink && x->preserve_ownership
+ && (new_dst || !SAME_OWNER_AND_GROUP (src_sb, dst_sb)))
+ {
+- switch (set_owner (x, dst_name, dst_dirfd, dst_relname, -1,
++ switch (set_owner (x, dst_name, dst_dirfd, drelname, -1,
+ &src_sb, new_dst, &dst_sb))
+ {
+ case -1:
+@@ -3024,8 +3019,9 @@ copy_internal (char const *src_name, char const *dst_name,
+ the lstat, but deducing the current destination mode
+ is tricky in the presence of implementation-defined
+ rules for special mode bits. */
+- if (new_dst && fstatat (dst_dirfd, dst_relname, &dst_sb,
+- AT_SYMLINK_NOFOLLOW) != 0)
++ if (new_dst && (fstatat (dst_dirfd, drelname, &dst_sb,
++ AT_SYMLINK_NOFOLLOW)
++ != 0))
+ {
+ error (0, errno, _("cannot stat %s"), quoteaf (dst_name));
+ return false;
+@@ -3038,7 +3034,7 @@ copy_internal (char const *src_name, char const *dst_name,
+
+ if (restore_dst_mode)
+ {
+- if (lchmodat (dst_dirfd, dst_relname, dst_mode | omitted_permissions)
++ if (lchmodat (dst_dirfd, drelname, dst_mode | omitted_permissions)
+ != 0)
+ {
+ error (0, errno, _("preserving permissions for %s"),
+@@ -3068,7 +3064,7 @@ un_backup:
+ if (dst_backup)
+ {
+ char const *dst_relbackup = &dst_backup[dst_relname - dst_name];
+- if (renameat (dst_dirfd, dst_relbackup, dst_dirfd, dst_relname) != 0)
++ if (renameat (dst_dirfd, dst_relbackup, dst_dirfd, drelname) != 0)
+ error (0, errno, _("cannot un-backup %s"), quoteaf (dst_name));
+ else
+ {
+--
+cgit v1.1
+
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index b9148c854960..420206e7451f 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,7 +1,7 @@
# Template file for 'coreutils'
pkgname=coreutils
-version=8.32
-revision=4
+version=9.1
+revision=1
bootstrap=yes
makedepends="gmp-devel acl-devel libcap-devel"
short_desc="GNU core utilities"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/coreutils"
changelog="https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob_plain;f=NEWS;hb=HEAD"
distfiles="${GNU_SITE}/coreutils/coreutils-${version}.tar.xz"
-checksum=4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa
+checksum=61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423
replaces="chroot-coreutils>=0 coreutils-doc>=0 b2sum>=0"
@@ -104,6 +104,10 @@ do_check() {
# Tests that depend on the tests removed
exeext_tests+=" fchmodat fchdir"
+ # temporarily disable two tests (coreutils9.1)
+ vsed -i "s/test-getcwd.sh //" gnulib-tests/Makefile
+ exeext_tests+=" getlogin"
+
for test in $exeext_tests ; do
vsed -i "s/test-$test\$(EXEEXT) //" gnulib-tests/Makefile
done
@@ -121,4 +125,6 @@ do_install() {
fi
mv ${DESTDIR}/usr/bin/hostname ${DESTDIR}/usr/bin/hostname-coreutils
mv ${DESTDIR}/usr/share/man/man1/hostname.1 ${DESTDIR}/usr/share/man/man1/hostname-coreutils.1
+
+ ln -s test.1 "${DESTDIR}/usr/share/man/man1/[.1"
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (2 preceding siblings ...)
2022-12-06 19:15 ` [PR PATCH] [Updated] " dkwo
@ 2022-12-06 19:15 ` dkwo
2022-12-17 9:48 ` [PR PATCH] [Updated] " dkwo
` (15 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: dkwo @ 2022-12-06 19:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1339853651
Comment:
Added the two patches, one of them taken from Fedora.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (3 preceding siblings ...)
2022-12-06 19:15 ` dkwo
@ 2022-12-17 9:48 ` dkwo
2022-12-20 18:32 ` leahneukirchen
` (14 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: dkwo @ 2022-12-17 9:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages coreu
https://github.com/void-linux/void-packages/pull/40932
coreutils: update to 9.1
- skip test-getcwd.sh test-getlogin: is this ok?
- Add [.1 man page symlink so "man [" works. @ericonr
- I tested the changes in this PR: YES
- I built this PR locally for my native architectures `x86_64-musl` and `aarch64`
- @leahneukirchen what should backport?
A patch file from https://github.com/void-linux/void-packages/pull/40932.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreu-40932.patch --]
[-- Type: text/x-diff, Size: 17772 bytes --]
From d667a0c0bd5c9928bda9ff201f5454db9851c7f4 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 5 Dec 2022 20:16:46 -0500
Subject: [PATCH] coreutils: update to 9.1
skip test-getcwd.sh test-getlogin
Add [.1 man page symlink so "man [" works.
backport two bugfixes
---
...8.31-behavior-on-removed-directories.patch | 120 -----------
.../patches/01-gnulib-simple-backup-fix.patch | 36 ++++
srcpkgs/coreutils/patches/02-fixcp.patch | 197 ++++++++++++++++++
srcpkgs/coreutils/template | 12 +-
4 files changed, 242 insertions(+), 123 deletions(-)
delete mode 100644 srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
create mode 100644 srcpkgs/coreutils/patches/01-gnulib-simple-backup-fix.patch
create mode 100644 srcpkgs/coreutils/patches/02-fixcp.patch
diff --git a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch b/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
deleted file mode 100644
index 93ec0fd84c74..000000000000
--- a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
+++ /dev/null
@@ -1,120 +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: [PATCH] ls: restore 8.31 behavior on removed directories
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* 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(-)
-
-diff --git NEWS NEWS
-index fdc8bf5db..653e7178b 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*-
-
- * Noteworthy changes in release ?.? (????-??-??) [?]
-
-+** 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.32 (2020-03-05) [stable]
-
-diff --git src/ls.c 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 tests/ls/removed-directory.sh 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
---
-2.24.0.375.geb5ae68d41
-
diff --git a/srcpkgs/coreutils/patches/01-gnulib-simple-backup-fix.patch b/srcpkgs/coreutils/patches/01-gnulib-simple-backup-fix.patch
new file mode 100644
index 000000000000..9c2d8a7cc0fc
--- /dev/null
+++ b/srcpkgs/coreutils/patches/01-gnulib-simple-backup-fix.patch
@@ -0,0 +1,36 @@
+commit 7347caeb9d902d3fca2c11f69a55a3e578d93bfe
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date: Wed Apr 20 19:34:57 2022 -0700
+
+ backupfile: fix bug when renaming simple backups
+
+ * lib/backupfile.c (backupfile_internal): Fix bug when RENAME
+ and when doing simple backups. Problem reported by Steve Ward in:
+ https://bugs.gnu.org/55029
+
+diff --git a/lib/backupfile.c b/lib/backupfile.c
+index 1e9290a187..d9f465a3e0 100644
+--- a/lib/backupfile.c
++++ b/lib/backupfile.c
+@@ -332,7 +332,7 @@ backupfile_internal (int dir_fd, char const *file,
+ return s;
+
+ DIR *dirp = NULL;
+- int sdir = AT_FDCWD;
++ int sdir = dir_fd;
+ idx_t base_max = 0;
+ while (true)
+ {
+@@ -371,10 +371,9 @@ backupfile_internal (int dir_fd, char const *file,
+ if (! rename)
+ break;
+
+- int olddirfd = sdir < 0 ? dir_fd : sdir;
+- idx_t offset = sdir < 0 ? 0 : base_offset;
++ idx_t offset = backup_type == simple_backups ? 0 : base_offset;
+ unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE;
+- if (renameatu (olddirfd, file + offset, sdir, s + offset, flags) == 0)
++ if (renameatu (sdir, file + offset, sdir, s + offset, flags) == 0)
+ break;
+ int e = errno;
+ if (! (e == EEXIST && extended))
diff --git a/srcpkgs/coreutils/patches/02-fixcp.patch b/srcpkgs/coreutils/patches/02-fixcp.patch
new file mode 100644
index 000000000000..1d89d3a5fc60
--- /dev/null
+++ b/srcpkgs/coreutils/patches/02-fixcp.patch
@@ -0,0 +1,197 @@
+From b54da709a1f3a6f10ed3150b0ae5269002a1053c Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 11 Jun 2022 10:49:18 -0700
+Subject: =?UTF-8?q?cp:=20fix=20=E2=80=98cp=20-rx=20/=20/mnt=E2=80=99?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by pkoraou@gmail.com (Bug#55910).
+* src/copy.c (copy_internal): Treat a relative destination name ""
+as if it were "." for the purpose of directory-relative syscalls
+like fstatat that might might refer to the destination directory.
+
+diff --git a/src/copy.c b/src/copy.c
+index b15d919..edc8221 100644
+--- a/src/copy.c
++++ b/src/copy.c
+@@ -1954,6 +1954,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ bool restore_dst_mode = false;
+ char *earlier_file = NULL;
+ char *dst_backup = NULL;
++ char const *drelname = *dst_relname ? dst_relname : ".";
+ bool delayed_ok;
+ bool copied_as_regular = false;
+ bool dest_is_symlink = false;
+@@ -1971,7 +1972,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ if (x->move_mode)
+ {
+ if (rename_errno < 0)
+- rename_errno = (renameatu (AT_FDCWD, src_name, dst_dirfd, dst_relname,
++ rename_errno = (renameatu (AT_FDCWD, src_name, dst_dirfd, drelname,
+ RENAME_NOREPLACE)
+ ? errno : 0);
+ nonexistent_dst = *rename_succeeded = new_dst = rename_errno == 0;
+@@ -1983,7 +1984,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ {
+ char const *name = rename_errno == 0 ? dst_name : src_name;
+ int dirfd = rename_errno == 0 ? dst_dirfd : AT_FDCWD;
+- char const *relname = rename_errno == 0 ? dst_relname : src_name;
++ char const *relname = rename_errno == 0 ? drelname : src_name;
+ int fstatat_flags
+ = x->dereference == DEREF_NEVER ? AT_SYMLINK_NOFOLLOW : 0;
+ if (follow_fstatat (dirfd, relname, &src_sb, fstatat_flags) != 0)
+@@ -2051,8 +2052,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ int fstatat_flags = use_lstat ? AT_SYMLINK_NOFOLLOW : 0;
+ if (!use_lstat && nonexistent_dst < 0)
+ new_dst = true;
+- else if (follow_fstatat (dst_dirfd, dst_relname, &dst_sb,
+- fstatat_flags)
++ else if (follow_fstatat (dst_dirfd, drelname, &dst_sb, fstatat_flags)
+ == 0)
+ {
+ have_dst_lstat = use_lstat;
+@@ -2077,7 +2077,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ bool return_now = false;
+
+ if (x->interactive != I_ALWAYS_NO
+- && ! same_file_ok (src_name, &src_sb, dst_dirfd, dst_relname,
++ && ! same_file_ok (src_name, &src_sb, dst_dirfd, drelname,
+ &dst_sb, x, &return_now))
+ {
+ error (0, 0, _("%s and %s are the same file"),
+@@ -2140,7 +2140,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ cp and mv treat -i and -f differently. */
+ if (x->move_mode)
+ {
+- if (abandon_move (x, dst_name, dst_dirfd, dst_relname, &dst_sb))
++ if (abandon_move (x, dst_name, dst_dirfd, drelname, &dst_sb))
+ {
+ /* Pretend the rename succeeded, so the caller (mv)
+ doesn't end up removing the source file. */
+@@ -2321,14 +2321,11 @@ copy_internal (char const *src_name, char const *dst_name,
+ Otherwise, use AT_SYMLINK_NOFOLLOW, in case dst_name is a symlink. */
+ if (have_dst_lstat)
+ dst_lstat_sb = &dst_sb;
++ else if (fstatat (dst_dirfd, drelname, &tmp_buf, AT_SYMLINK_NOFOLLOW)
++ == 0)
++ dst_lstat_sb = &tmp_buf;
+ else
+- {
+- if (fstatat (dst_dirfd, dst_relname, &tmp_buf,
+- AT_SYMLINK_NOFOLLOW) == 0)
+- dst_lstat_sb = &tmp_buf;
+- else
+- lstat_ok = false;
+- }
++ lstat_ok = false;
+
+ /* Never copy through a symlink we've just created. */
+ if (lstat_ok
+@@ -2475,8 +2472,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ if (x->move_mode)
+ {
+ if (rename_errno == EEXIST)
+- rename_errno = ((renameat (AT_FDCWD, src_name, dst_dirfd, dst_relname)
+- == 0)
++ rename_errno = (renameat (AT_FDCWD, src_name, dst_dirfd, drelname) == 0
+ ? 0 : errno);
+
+ if (rename_errno == 0)
+@@ -2576,7 +2572,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ or not, and this is enforced above. Therefore we check the src_mode
+ and operate on dst_name here as a tighter constraint and also because
+ src_mode is readily available here. */
+- if ((unlinkat (dst_dirfd, dst_relname,
++ if ((unlinkat (dst_dirfd, drelname,
+ S_ISDIR (src_mode) ? AT_REMOVEDIR : 0)
+ != 0)
+ && errno != ENOENT)
+@@ -2646,7 +2642,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ to ask mkdir to copy all the CHMOD_MODE_BITS, letting mkdir
+ decide what to do with S_ISUID | S_ISGID | S_ISVTX. */
+ mode_t mode = dst_mode_bits & ~omitted_permissions;
+- if (mkdirat (dst_dirfd, dst_relname, mode) != 0)
++ if (mkdirat (dst_dirfd, drelname, mode) != 0)
+ {
+ error (0, errno, _("cannot create directory %s"),
+ quoteaf (dst_name));
+@@ -2657,8 +2653,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ for writing the directory's contents. Check if these
+ permissions are there. */
+
+- if (fstatat (dst_dirfd, dst_relname, &dst_sb,
+- AT_SYMLINK_NOFOLLOW) != 0)
++ if (fstatat (dst_dirfd, drelname, &dst_sb, AT_SYMLINK_NOFOLLOW) != 0)
+ {
+ error (0, errno, _("cannot stat %s"), quoteaf (dst_name));
+ goto un_backup;
+@@ -2670,7 +2665,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ dst_mode = dst_sb.st_mode;
+ restore_dst_mode = true;
+
+- if (lchmodat (dst_dirfd, dst_relname, dst_mode | S_IRWXU) != 0)
++ if (lchmodat (dst_dirfd, drelname, dst_mode | S_IRWXU) != 0)
+ {
+ error (0, errno, _("setting permissions for %s"),
+ quoteaf (dst_name));
+@@ -2924,7 +2919,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ /* Now that the destination file is very likely to exist,
+ add its info to the set. */
+ struct stat sb;
+- if (fstatat (dst_dirfd, dst_relname, &sb, AT_SYMLINK_NOFOLLOW) == 0)
++ if (fstatat (dst_dirfd, drelname, &sb, AT_SYMLINK_NOFOLLOW) == 0)
+ record_file (x->dest_info, dst_relname, &sb);
+ }
+
+@@ -2957,7 +2952,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ timespec[1] = get_stat_mtime (&src_sb);
+
+ int utimensat_flags = dest_is_symlink ? AT_SYMLINK_NOFOLLOW : 0;
+- if (utimensat (dst_dirfd, dst_relname, timespec, utimensat_flags) != 0)
++ if (utimensat (dst_dirfd, drelname, timespec, utimensat_flags) != 0)
+ {
+ error (0, errno, _("preserving times for %s"), quoteaf (dst_name));
+ if (x->require_preserve)
+@@ -2969,7 +2964,7 @@ copy_internal (char const *src_name, char const *dst_name,
+ if (!dest_is_symlink && x->preserve_ownership
+ && (new_dst || !SAME_OWNER_AND_GROUP (src_sb, dst_sb)))
+ {
+- switch (set_owner (x, dst_name, dst_dirfd, dst_relname, -1,
++ switch (set_owner (x, dst_name, dst_dirfd, drelname, -1,
+ &src_sb, new_dst, &dst_sb))
+ {
+ case -1:
+@@ -3024,8 +3019,9 @@ copy_internal (char const *src_name, char const *dst_name,
+ the lstat, but deducing the current destination mode
+ is tricky in the presence of implementation-defined
+ rules for special mode bits. */
+- if (new_dst && fstatat (dst_dirfd, dst_relname, &dst_sb,
+- AT_SYMLINK_NOFOLLOW) != 0)
++ if (new_dst && (fstatat (dst_dirfd, drelname, &dst_sb,
++ AT_SYMLINK_NOFOLLOW)
++ != 0))
+ {
+ error (0, errno, _("cannot stat %s"), quoteaf (dst_name));
+ return false;
+@@ -3038,7 +3034,7 @@ copy_internal (char const *src_name, char const *dst_name,
+
+ if (restore_dst_mode)
+ {
+- if (lchmodat (dst_dirfd, dst_relname, dst_mode | omitted_permissions)
++ if (lchmodat (dst_dirfd, drelname, dst_mode | omitted_permissions)
+ != 0)
+ {
+ error (0, errno, _("preserving permissions for %s"),
+@@ -3068,7 +3064,7 @@ un_backup:
+ if (dst_backup)
+ {
+ char const *dst_relbackup = &dst_backup[dst_relname - dst_name];
+- if (renameat (dst_dirfd, dst_relbackup, dst_dirfd, dst_relname) != 0)
++ if (renameat (dst_dirfd, dst_relbackup, dst_dirfd, drelname) != 0)
+ error (0, errno, _("cannot un-backup %s"), quoteaf (dst_name));
+ else
+ {
+--
+cgit v1.1
+
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index b9148c854960..420206e7451f 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,7 +1,7 @@
# Template file for 'coreutils'
pkgname=coreutils
-version=8.32
-revision=4
+version=9.1
+revision=1
bootstrap=yes
makedepends="gmp-devel acl-devel libcap-devel"
short_desc="GNU core utilities"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/coreutils"
changelog="https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob_plain;f=NEWS;hb=HEAD"
distfiles="${GNU_SITE}/coreutils/coreutils-${version}.tar.xz"
-checksum=4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa
+checksum=61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423
replaces="chroot-coreutils>=0 coreutils-doc>=0 b2sum>=0"
@@ -104,6 +104,10 @@ do_check() {
# Tests that depend on the tests removed
exeext_tests+=" fchmodat fchdir"
+ # temporarily disable two tests (coreutils9.1)
+ vsed -i "s/test-getcwd.sh //" gnulib-tests/Makefile
+ exeext_tests+=" getlogin"
+
for test in $exeext_tests ; do
vsed -i "s/test-$test\$(EXEEXT) //" gnulib-tests/Makefile
done
@@ -121,4 +125,6 @@ do_install() {
fi
mv ${DESTDIR}/usr/bin/hostname ${DESTDIR}/usr/bin/hostname-coreutils
mv ${DESTDIR}/usr/share/man/man1/hostname.1 ${DESTDIR}/usr/share/man/man1/hostname-coreutils.1
+
+ ln -s test.1 "${DESTDIR}/usr/share/man/man1/[.1"
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (4 preceding siblings ...)
2022-12-17 9:48 ` [PR PATCH] [Updated] " dkwo
@ 2022-12-20 18:32 ` leahneukirchen
2022-12-21 9:26 ` dkwo
` (13 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2022-12-20 18:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1359965291
Comment:
Locally I get a fail in tests/cp/sparse-2.sh, but I'm on ZFS...
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (5 preceding siblings ...)
2022-12-20 18:32 ` leahneukirchen
@ 2022-12-21 9:26 ` dkwo
2023-01-24 23:51 ` motorto
` (12 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: dkwo @ 2022-12-21 9:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1339718170
Comment:
I cannot reproduce the CI failure (`FAIL: tests/tail-2/inotify-dir-recreate.sh`) locally with `XBPS_CHECK_PKGS=full`.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (6 preceding siblings ...)
2022-12-21 9:26 ` dkwo
@ 2023-01-24 23:51 ` motorto
2023-01-25 13:40 ` leahneukirchen
` (11 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: motorto @ 2023-01-24 23:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 257 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1402840611
Comment:
Is this PR looking for testers (meaning that works is done the only thing missing is people checking if it works) ?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (7 preceding siblings ...)
2023-01-24 23:51 ` motorto
@ 2023-01-25 13:40 ` leahneukirchen
2023-01-25 15:34 ` dkwo
` (10 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2023-01-25 13:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1403637225
Comment:
feel free to test :)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (8 preceding siblings ...)
2023-01-25 13:40 ` leahneukirchen
@ 2023-01-25 15:34 ` dkwo
2023-01-26 22:59 ` motorto
` (9 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: dkwo @ 2023-01-25 15:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1403807957
Comment:
I've been using this for about two months. Please test if you like.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (9 preceding siblings ...)
2023-01-25 15:34 ` dkwo
@ 2023-01-26 22:59 ` motorto
2023-01-26 22:59 ` motorto
` (8 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: motorto @ 2023-01-26 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1405783579
Comment:
Just commenting that using this since yesterday and don't have any issues to report !
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.1
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (10 preceding siblings ...)
2023-01-26 22:59 ` motorto
@ 2023-01-26 22:59 ` motorto
2023-03-21 16:27 ` coreutils: update to 9.2 dkwo
` (7 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: motorto @ 2023-01-26 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1405783579
Comment:
Just commenting that I am using this since yesterday and don't have any issues to report !
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.2
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (11 preceding siblings ...)
2023-01-26 22:59 ` motorto
@ 2023-03-21 16:27 ` dkwo
2023-03-21 16:34 ` [PR PATCH] [Updated] " dkwo
` (6 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: dkwo @ 2023-03-21 16:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 149 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1478171473
Comment:
9.2 is out
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] coreutils: update to 9.2
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (12 preceding siblings ...)
2023-03-21 16:27 ` coreutils: update to 9.2 dkwo
@ 2023-03-21 16:34 ` dkwo
2023-03-30 14:50 ` dkwo
` (5 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: dkwo @ 2023-03-21 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages coreu
https://github.com/void-linux/void-packages/pull/40932
coreutils: update to 9.2
- skip test-getcwd.sh test-getlogin: is this ok?
- Add [.1 man page symlink so "man [" works.
- I tested the changes in this PR: YES
- I built this PR locally for my native architectures `x86_64-musl` and `aarch64`
A patch file from https://github.com/void-linux/void-packages/pull/40932.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreu-40932.patch --]
[-- Type: text/x-diff, Size: 6144 bytes --]
From 2d48a75f7f1218661e24f647ec6a146500651541 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 5 Dec 2022 20:16:46 -0500
Subject: [PATCH] coreutils: update to 9.2
skip test-getcwd.sh test-getlogin
Add [.1 man page symlink so "man [" works.
---
...8.31-behavior-on-removed-directories.patch | 120 ------------------
srcpkgs/coreutils/template | 12 +-
2 files changed, 9 insertions(+), 123 deletions(-)
delete mode 100644 srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
diff --git a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch b/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
deleted file mode 100644
index 93ec0fd84c74..000000000000
--- a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
+++ /dev/null
@@ -1,120 +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: [PATCH] ls: restore 8.31 behavior on removed directories
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* 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(-)
-
-diff --git NEWS NEWS
-index fdc8bf5db..653e7178b 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*-
-
- * Noteworthy changes in release ?.? (????-??-??) [?]
-
-+** 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.32 (2020-03-05) [stable]
-
-diff --git src/ls.c 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 tests/ls/removed-directory.sh 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
---
-2.24.0.375.geb5ae68d41
-
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index b9148c854960..af027c615380 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,7 +1,7 @@
# Template file for 'coreutils'
pkgname=coreutils
-version=8.32
-revision=4
+version=9.2
+revision=1
bootstrap=yes
makedepends="gmp-devel acl-devel libcap-devel"
short_desc="GNU core utilities"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/coreutils"
changelog="https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob_plain;f=NEWS;hb=HEAD"
distfiles="${GNU_SITE}/coreutils/coreutils-${version}.tar.xz"
-checksum=4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa
+checksum=6885ff47b9cdb211de47d368c17853f406daaf98b148aaecdf10de29cc04b0b3
replaces="chroot-coreutils>=0 coreutils-doc>=0 b2sum>=0"
@@ -104,6 +104,10 @@ do_check() {
# Tests that depend on the tests removed
exeext_tests+=" fchmodat fchdir"
+ # temporarily disable two tests (coreutils9.1)
+ vsed -i "s/test-getcwd.sh //" gnulib-tests/Makefile
+ exeext_tests+=" getlogin"
+
for test in $exeext_tests ; do
vsed -i "s/test-$test\$(EXEEXT) //" gnulib-tests/Makefile
done
@@ -121,4 +125,6 @@ do_install() {
fi
mv ${DESTDIR}/usr/bin/hostname ${DESTDIR}/usr/bin/hostname-coreutils
mv ${DESTDIR}/usr/share/man/man1/hostname.1 ${DESTDIR}/usr/share/man/man1/hostname-coreutils.1
+
+ ln -s test.1 "${DESTDIR}/usr/share/man/man1/[.1"
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.2
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (13 preceding siblings ...)
2023-03-21 16:34 ` [PR PATCH] [Updated] " dkwo
@ 2023-03-30 14:50 ` dkwo
2023-03-30 14:58 ` leahneukirchen
` (4 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: dkwo @ 2023-03-30 14:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1490444185
Comment:
been testing 9.2 for some days, no issues.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.2
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (14 preceding siblings ...)
2023-03-30 14:50 ` dkwo
@ 2023-03-30 14:58 ` leahneukirchen
2023-03-30 14:59 ` leahneukirchen
` (3 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2023-03-30 14:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1490456946
Comment:
We need to backport https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62403
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.2
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (15 preceding siblings ...)
2023-03-30 14:58 ` leahneukirchen
@ 2023-03-30 14:59 ` leahneukirchen
2023-03-30 15:52 ` [PR PATCH] [Updated] " dkwo
` (2 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2023-03-30 14:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1490456946
Comment:
We need to backport https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62403
https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=76f2fb627118a26c25003dbd98c22c153b7ee1d2
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] coreutils: update to 9.2
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (16 preceding siblings ...)
2023-03-30 14:59 ` leahneukirchen
@ 2023-03-30 15:52 ` dkwo
2023-03-30 15:54 ` dkwo
2023-03-30 16:15 ` [PR PATCH] [Merged]: " leahneukirchen
19 siblings, 0 replies; 21+ messages in thread
From: dkwo @ 2023-03-30 15:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages coreu
https://github.com/void-linux/void-packages/pull/40932
coreutils: update to 9.2
- skip test-getcwd.sh test-getlogin: is this ok?
- Add [.1 man page symlink so "man [" works.
- I tested the changes in this PR: YES
- I built this PR locally for my native architectures `x86_64-musl` and `aarch64`
A patch file from https://github.com/void-linux/void-packages/pull/40932.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-coreu-40932.patch --]
[-- Type: text/x-diff, Size: 15264 bytes --]
From 34d13369e198edadaafe7712e331d0e0cabeebfb Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 5 Dec 2022 20:16:46 -0500
Subject: [PATCH] coreutils: update to 9.2
skip test-getcwd.sh test-getlogin
Add [.1 man page symlink so "man [" works.
---
...8.31-behavior-on-removed-directories.patch | 120 ----------------
srcpkgs/coreutils/patches/cksum.patch | 64 +++++++++
srcpkgs/coreutils/patches/copy.patch | 130 ++++++++++++++++++
srcpkgs/coreutils/template | 12 +-
4 files changed, 203 insertions(+), 123 deletions(-)
delete mode 100644 srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
create mode 100644 srcpkgs/coreutils/patches/cksum.patch
create mode 100644 srcpkgs/coreutils/patches/copy.patch
diff --git a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch b/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
deleted file mode 100644
index 93ec0fd84c74..000000000000
--- a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
+++ /dev/null
@@ -1,120 +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: [PATCH] ls: restore 8.31 behavior on removed directories
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* 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(-)
-
-diff --git NEWS NEWS
-index fdc8bf5db..653e7178b 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*-
-
- * Noteworthy changes in release ?.? (????-??-??) [?]
-
-+** 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.32 (2020-03-05) [stable]
-
-diff --git src/ls.c 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 tests/ls/removed-directory.sh 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
---
-2.24.0.375.geb5ae68d41
-
diff --git a/srcpkgs/coreutils/patches/cksum.patch b/srcpkgs/coreutils/patches/cksum.patch
new file mode 100644
index 000000000000..d2e1a98c193f
--- /dev/null
+++ b/srcpkgs/coreutils/patches/cksum.patch
@@ -0,0 +1,64 @@
+From 76f2fb627118a26c25003dbd98c22c153b7ee1d2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Thu, 23 Mar 2023 12:31:24 +0000
+Subject: cksum: fix reporting of failed checks
+
+This applies to all checksumming utilities,
+where we incorrectly report all subsequent files as checking 'OK'
+once any file has passed a digest check.
+The exit status was not impacted, only the printed status.
+
+* src/digest.c (digest_check): Use the correct state variable
+to determine if the _current_ file has passed or not.
+* tests/misc/md5sum.pl: Add a test case.
+Fixes https://bugs.gnu.org/62403
+---
+ src/digest.c | 4 ++--
+ tests/misc/md5sum.pl | 10 ++++++++++
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/digest.c b/src/digest.c
+index 6ee8a48..ab32968 100644
+--- a/src/digest.c
++++ b/src/digest.c
+@@ -1254,14 +1254,14 @@ digest_check (char const *checkfile_name)
+
+ if (!status_only)
+ {
+- if ( ! matched_checksums || ! quiet)
++ if (! match || ! quiet)
+ {
+ if (needs_escape)
+ putchar ('\\');
+ print_filename (filename, needs_escape);
+ }
+
+- if ( ! matched_checksums)
++ if (! match)
+ printf (": %s\n", _("FAILED"));
+ else if (!quiet)
+ printf (": %s\n", _("OK"));
+diff --git a/tests/misc/md5sum.pl b/tests/misc/md5sum.pl
+index 186aca9..d712664 100755
+--- a/tests/misc/md5sum.pl
++++ b/tests/misc/md5sum.pl
+@@ -101,6 +101,16 @@ my @Tests =
+ . "md5sum: WARNING: 1 line is improperly formatted\n"
+ . "md5sum: WARNING: 2 computed checksums did NOT match\n"},
+ {EXIT=> 1}],
++ # Ensure we use appropriate state to track failures (broken in 9.2)
++ ['check-multifail-state', '--check', '--warn',
++ {IN=>{'f.md5' =>
++ "$degenerate f\n"
++ . "$degenerate g\n"
++ . "$degenerate f\n" }},
++ {AUX=> {f=> ''}}, {AUX=> {g=> 'a'}},
++ {OUT=>"f: OK\ng: FAILED\nf: OK\n"},
++ {ERR=>"md5sum: WARNING: 1 computed checksum did NOT match\n"},
++ {EXIT=> 1}],
+ # The sha1sum and md5sum drivers share a lot of code.
+ # Ensure that md5sum does *not* share the part that makes
+ # sha1sum accept BSD format.
+--
+cgit v1.1
+
diff --git a/srcpkgs/coreutils/patches/copy.patch b/srcpkgs/coreutils/patches/copy.patch
new file mode 100644
index 000000000000..68384992ed75
--- /dev/null
+++ b/srcpkgs/coreutils/patches/copy.patch
@@ -0,0 +1,130 @@
+From 093a8b4bfaba60005f14493ce7ef11ed665a0176 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Thu, 23 Mar 2023 13:19:04 +0000
+Subject: copy: fix --reflink=auto to fallback in more cases
+
+On restricted systems like android or some containers,
+FICLONE could return EPERM, EACCES, or ENOTTY,
+which would have induced the command to fail to copy
+rather than falling back to a more standard copy.
+
+* src/copy.c (is_terminal_failure): A new function refactored
+from handle_clone_fail().
+(is_CLONENOTSUP): Merge in the handling of EACCES, ENOTTY, EPERM
+as they also pertain to determination of whether cloning is supported
+if we ever use this function in that context.
+(handle_clone_fail): Use is_terminal_failure() in all cases,
+so that we assume a terminal failure in less errno cases.
+* NEWS: Mention the bug fix.
+Addresses https://bugs.gnu.org/62404
+
+--- a/src/copy.c
++++ b/src/copy.c
+@@ -278,15 +278,27 @@ create_hole (int fd, char const *name, bool punch_holes, off_t size)
+ }
+
+
+-/* Whether the errno from FICLONE, or copy_file_range
+- indicates operation is not supported for this file or file system. */
++/* Whether the errno indicates the operation is a transient failure.
++ I.e., a failure that would indicate the operation _is_ supported,
++ but has failed in a terminal way. */
++
++static bool
++is_terminal_error (int err)
++{
++ return err == EIO || err == ENOMEM || err == ENOSPC || err == EDQUOT;
++}
++
++
++/* Whether the errno from FICLONE, or copy_file_range indicates
++ the operation is not supported/allowed for this file or process. */
+
+ static bool
+ is_CLONENOTSUP (int err)
+ {
+- return err == ENOSYS || is_ENOTSUP (err)
++ return err == ENOSYS || err == ENOTTY || is_ENOTSUP (err)
+ || err == EINVAL || err == EBADF
+- || err == EXDEV || err == ETXTBSY;
++ || err == EXDEV || err == ETXTBSY
++ || err == EPERM || err == EACCES;
+ }
+
+
+@@ -339,20 +351,18 @@ sparse_copy (int src_fd, int dest_fd, char **abuf, size_t buf_size,
+ {
+ copy_debug.offload = COPY_DEBUG_UNSUPPORTED;
+
+- if (is_CLONENOTSUP (errno))
+- break;
+-
+- /* copy_file_range might not be enabled in seccomp filters,
+- so retry with a standard copy. EPERM can also occur
+- for immutable files, but that would only be in the edge case
+- where the file is made immutable after creating/truncating,
++ /* Consider operation unsupported only if no data copied.
++ For example, EPERM could occur if copy_file_range not enabled
++ in seccomp filters, so retry with a standard copy. EPERM can
++ also occur for immutable files, but that would only be in the
++ edge case where the file is made immutable after creating,
+ in which case the (more accurate) error is still shown. */
+- if (errno == EPERM && *total_n_read == 0)
++ if (*total_n_read == 0 && is_CLONENOTSUP (errno))
+ break;
+
+ /* ENOENT was seen sometimes across CIFS shares, resulting in
+ no data being copied, but subsequent standard copies succeed. */
+- if (errno == ENOENT && *total_n_read == 0)
++ if (*total_n_read == 0 && errno == ENOENT)
+ break;
+
+ if (errno == EINTR)
+@@ -1172,17 +1182,15 @@ handle_clone_fail (int dst_dirfd, char const* dst_relname,
+ char const* src_name, char const* dst_name,
+ int dest_desc, bool new_dst, enum Reflink_type reflink_mode)
+ {
+- /* If the clone operation is creating the destination,
+- then don't try and cater for all non transient file system errors,
+- and instead only cater for specific transient errors. */
+- bool transient_failure;
+- if (dest_desc < 0) /* currently for fclonefileat(). */
+- transient_failure = errno == EIO || errno == ENOMEM
+- || errno == ENOSPC || errno == EDQUOT;
+- else /* currently for FICLONE. */
+- transient_failure = ! is_CLONENOTSUP (errno);
+-
+- if (reflink_mode == REFLINK_ALWAYS || transient_failure)
++ /* When the clone operation fails, report failure only with errno values
++ known to mean trouble when the clone is supported and called properly.
++ Do not report failure merely because !is_CLONENOTSUP (errno),
++ as systems may yield oddball errno values here with FICLONE.
++ Also is_CLONENOTSUP() is not appropriate for the range of errnos
++ possible from fclonefileat(), so it's more consistent to avoid. */
++ bool report_failure = is_terminal_error (errno);
++
++ if (reflink_mode == REFLINK_ALWAYS || report_failure)
+ error (0, errno, _("failed to clone %s from %s"),
+ quoteaf_n (0, dst_name), quoteaf_n (1, src_name));
+
+@@ -1190,14 +1198,14 @@ handle_clone_fail (int dst_dirfd, char const* dst_relname,
+ but cloned no data. */
+ if (new_dst /* currently not for fclonefileat(). */
+ && reflink_mode == REFLINK_ALWAYS
+- && ((! transient_failure) || lseek (dest_desc, 0, SEEK_END) == 0)
++ && ((! report_failure) || lseek (dest_desc, 0, SEEK_END) == 0)
+ && unlinkat (dst_dirfd, dst_relname, 0) != 0 && errno != ENOENT)
+ error (0, errno, _("cannot remove %s"), quoteaf (dst_name));
+
+- if (! transient_failure)
++ if (! report_failure)
+ copy_debug.reflink = COPY_DEBUG_UNSUPPORTED;
+
+- if (reflink_mode == REFLINK_ALWAYS || transient_failure)
++ if (reflink_mode == REFLINK_ALWAYS || report_failure)
+ return false;
+
+ return true;
+--
+cgit v1.1
+
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index b9148c854960..af027c615380 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,7 +1,7 @@
# Template file for 'coreutils'
pkgname=coreutils
-version=8.32
-revision=4
+version=9.2
+revision=1
bootstrap=yes
makedepends="gmp-devel acl-devel libcap-devel"
short_desc="GNU core utilities"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/coreutils"
changelog="https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob_plain;f=NEWS;hb=HEAD"
distfiles="${GNU_SITE}/coreutils/coreutils-${version}.tar.xz"
-checksum=4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa
+checksum=6885ff47b9cdb211de47d368c17853f406daaf98b148aaecdf10de29cc04b0b3
replaces="chroot-coreutils>=0 coreutils-doc>=0 b2sum>=0"
@@ -104,6 +104,10 @@ do_check() {
# Tests that depend on the tests removed
exeext_tests+=" fchmodat fchdir"
+ # temporarily disable two tests (coreutils9.1)
+ vsed -i "s/test-getcwd.sh //" gnulib-tests/Makefile
+ exeext_tests+=" getlogin"
+
for test in $exeext_tests ; do
vsed -i "s/test-$test\$(EXEEXT) //" gnulib-tests/Makefile
done
@@ -121,4 +125,6 @@ do_install() {
fi
mv ${DESTDIR}/usr/bin/hostname ${DESTDIR}/usr/bin/hostname-coreutils
mv ${DESTDIR}/usr/share/man/man1/hostname.1 ${DESTDIR}/usr/share/man/man1/hostname-coreutils.1
+
+ ln -s test.1 "${DESTDIR}/usr/share/man/man1/[.1"
}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: coreutils: update to 9.2
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (17 preceding siblings ...)
2023-03-30 15:52 ` [PR PATCH] [Updated] " dkwo
@ 2023-03-30 15:54 ` dkwo
2023-03-30 16:15 ` [PR PATCH] [Merged]: " leahneukirchen
19 siblings, 0 replies; 21+ messages in thread
From: dkwo @ 2023-03-30 15:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/40932#issuecomment-1490543103
Comment:
Done: added that, as well as another one. I get one more test failure `FAIL: tests/dd/no-allocate`, which seems to be known to Gentoo https://bugs.gentoo.org/629660
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Merged]: coreutils: update to 9.2
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
` (18 preceding siblings ...)
2023-03-30 15:54 ` dkwo
@ 2023-03-30 16:15 ` leahneukirchen
19 siblings, 0 replies; 21+ messages in thread
From: leahneukirchen @ 2023-03-30 16:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 375 bytes --]
There's a merged pull request on the void-packages repository
coreutils: update to 9.2
https://github.com/void-linux/void-packages/pull/40932
Description:
- skip test-getcwd.sh test-getlogin: is this ok?
- Add [.1 man page symlink so "man [" works.
- I tested the changes in this PR: YES
- I built this PR locally for my native architectures `x86_64-musl` and `aarch64`
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2023-03-30 16:15 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
2022-12-06 17:22 ` dkwo
2022-12-06 18:23 ` leahneukirchen
2022-12-06 19:15 ` [PR PATCH] [Updated] " dkwo
2022-12-06 19:15 ` dkwo
2022-12-17 9:48 ` [PR PATCH] [Updated] " dkwo
2022-12-20 18:32 ` leahneukirchen
2022-12-21 9:26 ` dkwo
2023-01-24 23:51 ` motorto
2023-01-25 13:40 ` leahneukirchen
2023-01-25 15:34 ` dkwo
2023-01-26 22:59 ` motorto
2023-01-26 22:59 ` motorto
2023-03-21 16:27 ` coreutils: update to 9.2 dkwo
2023-03-21 16:34 ` [PR PATCH] [Updated] " dkwo
2023-03-30 14:50 ` dkwo
2023-03-30 14:58 ` leahneukirchen
2023-03-30 14:59 ` leahneukirchen
2023-03-30 15:52 ` [PR PATCH] [Updated] " dkwo
2023-03-30 15:54 ` dkwo
2023-03-30 16:15 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).