Re: [PR PATCH] [Updated] coreutils 9.3

[dkwo <dkwo@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages core
https://github.com/void-linux/void-packages/pull/45305

coreutils 9.3
- I tested the changes in this PR: yes, using it since July 28
- I built this PR locally for my native architecture, (x86_64-glibc)
- cross-built to armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/45305.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-core-45305.patch --]
[-- Type: text/x-diff, Size: 11810 bytes --]

From d457fa4c7c58bc5822a9b24998aae8c72faef495 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 28 Jul 2023 15:10:31 -0400
Subject: [PATCH] coreutils: update to 9.3

---
 srcpkgs/coreutils/patches/cksum.patch |  64 -------------
 srcpkgs/coreutils/patches/copy.patch  | 130 --------------------------
 srcpkgs/coreutils/template            |  30 +++---
 3 files changed, 16 insertions(+), 208 deletions(-)
 delete mode 100644 srcpkgs/coreutils/patches/cksum.patch
 delete mode 100644 srcpkgs/coreutils/patches/copy.patch

diff --git a/srcpkgs/coreutils/patches/cksum.patch b/srcpkgs/coreutils/patches/cksum.patch
deleted file mode 100644
index d2e1a98c193fa..0000000000000
--- a/srcpkgs/coreutils/patches/cksum.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index 68384992ed755..0000000000000
--- a/srcpkgs/coreutils/patches/copy.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-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 af027c615380e..c158130abf1f8 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,6 +1,6 @@
 # Template file for 'coreutils'
 pkgname=coreutils
-version=9.2
+version=9.3
 revision=1
 bootstrap=yes
 makedepends="gmp-devel acl-devel libcap-devel"
@@ -10,8 +10,10 @@ 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=6885ff47b9cdb211de47d368c17853f406daaf98b148aaecdf10de29cc04b0b3
-
+checksum=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
+alternatives="
+ hostname:hostname:/usr/bin/hostname-coreutils
+ hostname:hostname.1:/usr/share/man/man1/hostname-coreutils.1"
 replaces="chroot-coreutils>=0 coreutils-doc>=0 b2sum>=0"
 
 if [ "$CHROOT_READY" ]; then
@@ -27,10 +29,6 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_header_sys_cdefs_h=no
 fi
 
-alternatives="
- hostname:hostname:/usr/bin/hostname-coreutils
- hostname:hostname.1:/usr/share/man/man1/hostname-coreutils.1"
-
 pre_configure() {
 	# Build natively all utils for the host, we need this to generate
 	# the manpages via help2man.
@@ -57,6 +55,12 @@ do_configure() {
 		# XXX syncfs() in src/sync.c expects a return value.
 		*-musl) configure_args+=" ac_cv_func_syncfs=no";;
 	esac
+	case "$XBPS_TARGET_MACHINE" in
+		arm*-musl)
+		# musl 1.1
+		configure_args+=" ac_year2038_required=no"
+		# this does not work: --disable-year2038
+	esac
 	#
 	# Do not install kill: provided by util-linux.
 	# Do not install uptime: provided by procps-ng.
@@ -101,17 +105,15 @@ do_check() {
 	# Tests that fail due to being inside a chroot
 	exeext_tests="chown lchown fchownat"
 
-	# 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
 
+	if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+		vsed -i '/tests\/tail-2\/inotify-dir-recreate/d' Makefile
+		vsed -i '/tests\/du\/long-from-unreadable/d' Makefile
+	fi
+
 	make check
 }