uutils-coreutils: upgrade 0.0.30 -> 0.1.0

See https://github.com/uutils/coreutils/releases/tag/0.1.0

- major performance gains
- SELinux support
- expanded GNU compatibility
- "features_os_unix" now also works for musl builds

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Etienne Cordonnier 2025-05-25 00:55:40 +02:00 committed by Khem Raj
parent d352240425
commit 2413f11ab3
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 456 additions and 242 deletions

View File

@ -0,0 +1,131 @@
From a0cf06ea8c3b698bda57dfdb181274078a489cf0 Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Sat, 24 May 2025 07:43:10 +0200
Subject: [PATCH] Bump onig from 6.4.0 to 6.5.1
Upstream-Status: Backport [https://github.com/uutils/coreutils/commit/04e7de1546c0f1e6908416fd09f0e2153ec95901]
Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
Cargo.lock | 10 +++++-----
Cargo.toml | 2 +-
fuzz/Cargo.lock | 22 ++++++++--------------
3 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 63ec9c208..5a6fac168 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1620,11 +1620,11 @@ checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
[[package]]
name = "onig"
-version = "6.4.0"
+version = "6.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
+checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.9.0",
"libc",
"once_cell",
"onig_sys",
@@ -1632,9 +1632,9 @@ dependencies = [
[[package]]
name = "onig_sys"
-version = "69.8.1"
+version = "69.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
+checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc"
dependencies = [
"cc",
"pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index a4c9d3200..9d1b732be 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -318,7 +318,7 @@ num-bigint = "0.4.4"
num-prime = "0.4.4"
num-traits = "0.2.19"
number_prefix = "0.4"
-onig = { version = "~6.4", default-features = false }
+onig = { version = "~6.5.1", default-features = false }
parse_datetime = "0.9.0"
phf = "0.11.2"
phf_codegen = "0.11.2"
diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
index 06faf0f5f..c946c3225 100644
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
@@ -122,12 +122,6 @@ dependencies = [
"compare",
]
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
[[package]]
name = "bitflags"
version = "2.9.1"
@@ -660,7 +654,7 @@ version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags",
"cfg-if",
"cfg_aliases",
"libc",
@@ -723,11 +717,11 @@ checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
[[package]]
name = "onig"
-version = "6.4.0"
+version = "6.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
+checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
"libc",
"once_cell",
"onig_sys",
@@ -735,9 +729,9 @@ dependencies = [
[[package]]
name = "onig_sys"
-version = "69.8.1"
+version = "69.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
+checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc"
dependencies = [
"cc",
"pkg-config",
@@ -969,7 +963,7 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags",
"errno",
"libc",
"linux-raw-sys",
@@ -1632,7 +1626,7 @@ version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags",
]
[[package]]
--
2.43.0

View File

@ -8,13 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e74349878141b240070458d414ab3b64"
inherit cargo cargo-update-recipe-crates
SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main \
file://0001-do-not-compile-stdbuf.patch"
file://0001-do-not-compile-stdbuf.patch \
file://0002-Bump-onig-from-6.4.0-to-6.5.1.patch \
"
# musl not supported because the libc crate does not support functions like "endutxent" at the moment,
# so src/uucore/src/lib/features.rs disables utmpx when targetting musl.
COMPATIBLE_HOST:libc-musl = "null"
SRCREV = "088599f41602e0b0505543a010ec59f5f81e74b1"
SRCREV = "18b963ed6f612ac30ebca92426280cf4c1451f6a"
S = "${WORKDIR}/git"
require ${BPN}-crates.inc
@ -64,3 +62,8 @@ python __anonymous() {
for prog in d.getVar('sbindir_progs').split():
d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog))
}
do_compile:prepend() {
# In principle this is supposed to be exported by the project's .cargo/config.toml file, but for some reason it's not working
export PROJECT_NAME_FOR_VERSION_STRING="uutils coreutils"
}