diff mbox series

coreutils: upgrade from 9.6 to 9.7

Message ID 20250527040912.3704461-1-Qi.Chen@windriver.com
State Accepted, archived
Commit 5760d1fb2553e598e5d6405d8fe748edfaa64b94
Headers show
Series coreutils: upgrade from 9.6 to 9.7 | expand

Commit Message

Chen, Qi May 27, 2025, 4:09 a.m. UTC 
From: Chen Qi <Qi.Chen@windriver.com>

The following patches are dropped as they are merged in new release:
- 0001-cksum-port-to-32-bit-uint_fast32_t.patch
- 0001-ls-fix-crash-with-context.patch
- intermittent-testfailure.patch

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 ...1-cksum-port-to-32-bit-uint_fast32_t.patch |  47 --------
 .../0001-ls-fix-crash-with-context.patch      | 101 ------------------
 .../coreutils/intermittent-testfailure.patch  |  30 ------
 .../{coreutils_9.6.bb => coreutils_9.7.bb}    |   5 +-
 4 files changed, 1 insertion(+), 182 deletions(-)
 delete mode 100644 meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch
 delete mode 100644 meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch
 delete mode 100644 meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch
 rename meta/recipes-core/coreutils/{coreutils_9.6.bb => coreutils_9.7.bb} (97%)
diff mbox series

Patch

diff --git a/meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch b/meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch
deleted file mode 100644
index 95d7aca809..0000000000
--- a/meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch
+++ /dev/null
@@ -1,47 +0,0 @@ 
-From 7eada35b4fbb48e7fe430d1b18dae7d191f84f8e Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 17 Feb 2025 02:27:09 -0800
-Subject: [PATCH 2/2] cksum: port to 32-bit uint_fast32_t
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* src/cksum_vmull.c (cksum_vmull): Don’t assume
-uint_fast32_t can hold 64 bits.
-Problem reported by Alyssa Ross (Bug#76360).
-
-Upstream-Status: Backport [7eada35b4fbb48e7fe430d1b18dae7d191f84f8e]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- NEWS              | 3 +++
- src/cksum_vmull.c | 7 +++++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/cksum_vmull.c b/src/cksum_vmull.c
-index 7611c4244..0ff81e225 100644
---- a/src/cksum_vmull.c
-+++ b/src/cksum_vmull.c
-@@ -92,7 +92,9 @@ cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out)
-           data = bswap_neon (data);
-           /* XOR in initial CRC value (for us 0 so no effect), or CRC value
-              calculated for previous BUFLEN buffer from fread */
--          xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (crc << 32));
-+
-+          uint64_t wcrc = crc;
-+          xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (wcrc << 32));
-           crc = 0;
-           data = veorq_u64 (data, xor_crc);
-           data3 = vld1q_u64 ((uint64_t *) (datap + 1));
-@@ -193,7 +195,8 @@ cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out)
-         {
-           data = vld1q_u64 ((uint64_t *) (datap));
-           data = bswap_neon (data);
--          xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (crc << 32));
-+          uint64_t wcrc = crc;
-+          xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (wcrc << 32));
-           crc = 0;
-           data = veorq_u64 (data, xor_crc);
-           while (bytes_read >= 32)
--- 
-2.45.2
-
diff --git a/meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch b/meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch
deleted file mode 100644
index b1a92875a6..0000000000
--- a/meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch
+++ /dev/null
@@ -1,101 +0,0 @@ 
-From 43a63408630e5064317823702518099f0ea652dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Fri, 17 Jan 2025 17:29:34 +0000
-Subject: [PATCH] ls: fix crash with --context
-
-* src/ls.c (main): Flag that we need to stat()
-if we're going to get security context (call file_has_aclinfo_cache).
-(file_has_aclinfo_cache): Be defensive and only lookup the device
-for the file if the stat has been performed.
-(has_capability_cache): Likewise.
-* tests/ls/selinux-segfault.sh: Add a test case.
-* NEWS: Mention the bug fix.
-Reported by Bruno Haible.
-
-Upstream-Status: Backport
-[https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=915004f403cb25fadb207ddfdbe6a2f43bd44fac]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- NEWS                         |  3 +++
- src/ls.c                     | 10 +++++-----
- tests/ls/selinux-segfault.sh |  3 +++
- 3 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 3799f75..65867f9 100644
---- a/NEWS
-+++ b/NEWS
-@@ -4,6 +4,9 @@ GNU coreutils NEWS                                    -*- outline -*-
- 
- ** Bug fixes
- 
-+  `ls -Z dir` would crash.
-+  [bug introduced in coreutils-9.6]
-+
-   cp fixes support for --update=none-fail, which would have been
-   rejected as an invalid option.
-   [bug introduced in coreutils-9.5]
-diff --git a/src/ls.c b/src/ls.c
-index 3215360..f67167f 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -1768,7 +1768,7 @@ main (int argc, char **argv)
- 
-   format_needs_stat = ((sort_type == sort_time) | (sort_type == sort_size)
-                        | (format == long_format)
--                       | print_block_size | print_hyperlink);
-+                       | print_block_size | print_hyperlink | print_scontext);
-   format_needs_type = ((! format_needs_stat)
-                        & (recursive | print_with_color | print_scontext
-                           | directories_first
-@@ -3309,7 +3309,7 @@ file_has_aclinfo_cache (char const *file, struct fileinfo *f,
-   static int unsupported_scontext_err;
-   static dev_t unsupported_device;
- 
--  if (f->stat.st_dev == unsupported_device)
-+  if (f->stat_ok && f->stat.st_dev == unsupported_device)
-     {
-       ai->buf = ai->u.__gl_acl_ch;
-       ai->size = 0;
-@@ -3322,7 +3322,7 @@ file_has_aclinfo_cache (char const *file, struct fileinfo *f,
-   errno = 0;
-   int n = file_has_aclinfo (file, ai, flags);
-   int err = errno;
--  if (n <= 0 && !acl_errno_valid (err))
-+  if (f->stat_ok && n <= 0 && !acl_errno_valid (err))
-     {
-       unsupported_return = n;
-       unsupported_scontext = ai->scontext;
-@@ -3342,14 +3342,14 @@ has_capability_cache (char const *file, struct fileinfo *f)
-      found that has_capability fails indicating lack of support.  */
-   static dev_t unsupported_device;
- 
--  if (f->stat.st_dev == unsupported_device)
-+  if (f->stat_ok && f->stat.st_dev == unsupported_device)
-     {
-       errno = ENOTSUP;
-       return 0;
-     }
- 
-   bool b = has_capability (file);
--  if ( !b && !acl_errno_valid (errno))
-+  if (f->stat_ok && !b && !acl_errno_valid (errno))
-     unsupported_device = f->stat.st_dev;
-   return b;
- }
-diff --git a/tests/ls/selinux-segfault.sh b/tests/ls/selinux-segfault.sh
-index 11623ac..1cac2b5 100755
---- a/tests/ls/selinux-segfault.sh
-+++ b/tests/ls/selinux-segfault.sh
-@@ -30,4 +30,7 @@ mkdir sedir || framework_failure_
- ln -sf missing sedir/broken || framework_failure_
- returns_ 1 ls -L -R -Z -m sedir > out || fail=1
- 
-+# ls 9.6 would segfault with the following
-+ls -Z . > out || fail=1
-+
- Exit $fail
--- 
-2.34.1
-
diff --git a/meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch b/meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch
deleted file mode 100644
index 0794532bdf..0000000000
--- a/meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-tests/df: Fix intermittent test failure
-
-The test writes to the disk and means the space used changes. If this
-crosses a number boundary, the heading spacing can change:
-
--Filesystem     1024-blocks  Used Available Capacity Mounted on
-+Filesystem     1024-blocks   Used Available Capacity Mounted on
-
-The test is to make sure the 1024 blocks element remains the same and
-the spacing doesn't matter. Therefore strip any duplicate spaces using tr.
-
-Submitted: https://github.com/coreutils/coreutils/pull/88
-Upstream-Status: Backport [https://github.com/coreutils/coreutils/commit/c5725c8c4bb21903490a48035286d0f94463642e]
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Index: coreutils-9.5/tests/df/df-P.sh
-===================================================================
---- coreutils-9.5.orig/tests/df/df-P.sh
-+++ coreutils-9.5/tests/df/df-P.sh
-@@ -20,8 +20,8 @@
- print_ver_ df
- 
- 
--              df -P . > t1 || fail=1
--BLOCK_SIZE=1M df -P . > t2 || fail=1
-+              df -P . | tr -s ' ' > t1 || fail=1
-+BLOCK_SIZE=1M df -P . | tr -s ' ' > t2 || fail=1
- 
- # Since file system utilization may be changing, compare only df's header line.
- # That records the block size.  E.g., for "1M", it would be:
diff --git a/meta/recipes-core/coreutils/coreutils_9.6.bb b/meta/recipes-core/coreutils/coreutils_9.7.bb
similarity index 97%
rename from meta/recipes-core/coreutils/coreutils_9.6.bb
rename to meta/recipes-core/coreutils/coreutils_9.7.bb
index a966c4b448..091e1ea2c5 100644
--- a/meta/recipes-core/coreutils/coreutils_9.6.bb
+++ b/meta/recipes-core/coreutils/coreutils_9.7.bb
@@ -15,12 +15,9 @@  inherit autotools gettext texinfo
 
 SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
            file://remove-usr-local-lib-from-m4.patch \
-           file://intermittent-testfailure.patch \
-           file://0001-ls-fix-crash-with-context.patch \
-           file://0001-cksum-port-to-32-bit-uint_fast32_t.patch \
            file://run-ptest \
            "
-SRC_URI[sha256sum] = "7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283"
+SRC_URI[sha256sum] = "e8bb26ad0293f9b5a1fc43fb42ba970e312c66ce92c1b0b16713d7500db251bf"
 
 # http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842
 #