From 359926950b7936bec3d8990c138705eba992d8d7 Mon Sep 17 00:00:00 2001 From: zopencommunity Date: Tue, 15 Sep 2026 07:20:31 +0000 Subject: [PATCH 1/2] Update coreutils-version to 9.12 from 9.11 --- buildenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildenv b/buildenv index 4460acd16..e59e7ae96 100644 --- a/buildenv +++ b/buildenv @@ -1,5 +1,5 @@ # bump: coreutils-version /COREUTILS_VERSION="(.*)"/ https://ftp.gnu.org/gnu/coreutils/|re:/href="coreutils-([\d.]+).tar.gz"/$1/|semver:* -COREUTILS_VERSION="9.11" +COREUTILS_VERSION="9.12" export ZOPEN_BUILD_LINE="STABLE" export ZOPEN_STABLE_URL="https://ftp.gnu.org/gnu/coreutils/coreutils-${COREUTILS_VERSION}.tar.gz" From c20ed33592bc400859aa3555ce46d3d853af76ca Mon Sep 17 00:00:00 2001 From: sachintu47 Date: Tue, 15 Sep 2026 03:31:57 -0400 Subject: [PATCH 2/2] Update patches to fix upstream --- stable-patches/src/copy.c.patch | 12 +++++------ stable-patches/src/stat.c.patch | 36 ++++++++++++++++----------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/stable-patches/src/copy.c.patch b/stable-patches/src/copy.c.patch index 245fafdc0..b01fd8ebb 100644 --- a/stable-patches/src/copy.c.patch +++ b/stable-patches/src/copy.c.patch @@ -1,5 +1,5 @@ diff --git a/src/copy.c b/src/copy.c -index 4af66c8..90a8c1b 100644 +index aedbd0d..90513b9 100644 --- a/src/copy.c +++ b/src/copy.c @@ -102,6 +102,10 @@ @@ -13,7 +13,7 @@ index 4af66c8..90a8c1b 100644 struct dir_list { struct dir_list *parent; -@@ -745,7 +749,7 @@ copy_reg (char const *src_name, char const *dst_name, +@@ -732,7 +736,7 @@ copy_reg (char const *src_name, char const *dst_name, struct stat src_open_sb; bool return_val = true; bool data_copy_required = x->data_copy_required; @@ -22,7 +22,7 @@ index 4af66c8..90a8c1b 100644 copy_debug.offload = COPY_DEBUG_UNKNOWN; copy_debug.reflink = x->reflink_mode ? COPY_DEBUG_UNKNOWN : COPY_DEBUG_NO; -@@ -760,7 +764,11 @@ copy_reg (char const *src_name, char const *dst_name, +@@ -747,7 +751,11 @@ copy_reg (char const *src_name, char const *dst_name, return false; } @@ -35,7 +35,7 @@ index 4af66c8..90a8c1b 100644 { error (0, errno, _("cannot fstat %s"), quoteaf (src_name)); return_val = false; -@@ -1007,6 +1015,12 @@ copy_reg (char const *src_name, char const *dst_name, +@@ -994,6 +1002,12 @@ copy_reg (char const *src_name, char const *dst_name, goto close_src_desc; } @@ -48,7 +48,7 @@ index 4af66c8..90a8c1b 100644 /* --attributes-only overrides --reflink. */ if (data_copy_required && x->reflink_mode) { -@@ -1090,9 +1104,49 @@ copy_reg (char const *src_name, char const *dst_name, +@@ -1077,9 +1091,49 @@ copy_reg (char const *src_name, char const *dst_name, if (preserve_xattr) { @@ -92,7 +92,7 @@ index 4af66c8..90a8c1b 100644 + } +#else if (!copy_attr (src_name, source_desc, dst_name, dest_desc, x) - && x->require_preserve_xattr) + && x->require_preserve_xattr && ! x->move_mode) return_val = false; +#endif } diff --git a/stable-patches/src/stat.c.patch b/stable-patches/src/stat.c.patch index 26007dee1..060ba045c 100644 --- a/stable-patches/src/stat.c.patch +++ b/stable-patches/src/stat.c.patch @@ -1,7 +1,7 @@ -diff --git i/src/stat.c w/src/stat.c -index 3ea7da7..1de574c 100644 ---- i/src/stat.c -+++ w/src/stat.c +diff --git a/src/stat.c b/src/stat.c +index a29e9a0..36699d4 100644 +--- a/src/stat.c ++++ b/src/stat.c @@ -18,6 +18,7 @@ #include @@ -10,9 +10,9 @@ index 3ea7da7..1de574c 100644 /* Keep this conditional in sync with the similar conditional in ../m4/stat-prog.m4. */ #if ((STAT_STATVFS || STAT_STATVFS64) \ -@@ -57,6 +58,37 @@ - - #include "system.h" +@@ -73,6 +74,37 @@ + #include "xvasprintf.h" + #include "statx.h" +#ifdef __MVS__ +#include @@ -45,9 +45,9 @@ index 3ea7da7..1de574c 100644 +} +#endif + - #include "areadlink.h" - #include "argmatch.h" - #include "c-ctype.h" + #if HAVE_STATX && defined STATX_INO + # define USE_STATX 1 + #else @@ -100,7 +132,14 @@ # elif HAVE_STRUCT_STATFS_F_NAMEMAX # define SB_F_NAMEMAX(S) ((S)->f_namemax) @@ -90,7 +90,7 @@ index 3ea7da7..1de574c 100644 #else switch (statfsbuf->f_type) { -@@ -873,6 +920,9 @@ print_statfs (char *pformat, size_t prefix_len, MAYBE_UNUSED char mod, char m, +@@ -897,6 +944,9 @@ print_statfs (char *pformat, size_t prefix_len, MAYBE_UNUSED char mod, char m, { #if STRUCT_STATXFS_F_FSID_IS_INTEGER uintmax_t fsid = statfsbuf->f_fsid; @@ -100,7 +100,7 @@ index 3ea7da7..1de574c 100644 #else typedef unsigned int fsid_word; static_assert (alignof (STRUCT_STATVFS) % alignof (fsid_word) == 0); -@@ -890,8 +940,8 @@ print_statfs (char *pformat, size_t prefix_len, MAYBE_UNUSED char mod, char m, +@@ -914,8 +964,8 @@ print_statfs (char *pformat, size_t prefix_len, MAYBE_UNUSED char mod, char m, uintmax_t u = p[words - 1 - i]; fsid |= u << (i * CHAR_BIT * sizeof *p); } @@ -110,7 +110,7 @@ index 3ea7da7..1de574c 100644 } break; -@@ -909,30 +959,44 @@ print_statfs (char *pformat, size_t prefix_len, MAYBE_UNUSED char mod, char m, +@@ -933,30 +983,44 @@ print_statfs (char *pformat, size_t prefix_len, MAYBE_UNUSED char mod, char m, out_string (pformat, prefix_len, human_fstype (statfsbuf)); break; case 'b': @@ -155,7 +155,7 @@ index 3ea7da7..1de574c 100644 break; default: fputc ('?', stdout); -@@ -1267,12 +1331,14 @@ do_statfs (char const *filename, char const *format) +@@ -1266,12 +1330,14 @@ do_statfs (char const *filename, char const *format) return false; } @@ -170,7 +170,7 @@ index 3ea7da7..1de574c 100644 bool fail = print_it (format, -1, filename, print_statfs, &statfsbuf); return ! fail; -@@ -1648,6 +1714,30 @@ print_stat (char *pformat, size_t prefix_len, char mod, char m, +@@ -1652,6 +1718,30 @@ print_stat (char *pformat, size_t prefix_len, char mod, char m, case 'C': fail |= out_file_context (pformat, prefix_len, filename); break; @@ -201,7 +201,7 @@ index 3ea7da7..1de574c 100644 default: fputc ('?', stdout); break; -@@ -1698,18 +1788,14 @@ default_format (bool fs, bool terse, bool device) +@@ -1702,18 +1792,14 @@ default_format (bool fs, bool terse, bool device) temp = format; if (device) { @@ -227,7 +227,7 @@ index 3ea7da7..1de574c 100644 ")); } free (temp); -@@ -1741,6 +1827,12 @@ default_format (bool fs, bool terse, bool device) +@@ -1745,6 +1831,12 @@ default_format (bool fs, bool terse, bool device) "Change: %z\n" " Birth: %w\n")); free (temp); @@ -240,7 +240,7 @@ index 3ea7da7..1de574c 100644 } } return format; -@@ -1831,6 +1923,10 @@ The valid format sequences for files (without --file-system):\n\ +@@ -1848,6 +1940,10 @@ The valid format sequences for files (without --file-system):\n\ %Y time of last data modification, seconds since Epoch\n\ %z time of last status change, human-readable\n\ %Z time of last status change, seconds since Epoch\n\