From 2319d2f206c35e4b3d2c2be62971d6f83d3ca891 Mon Sep 17 00:00:00 2001 From: "bootc-bot[bot]" <225049296+bootc-bot[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2026 19:41:49 +0000 Subject: [PATCH 1/4] fix(deps): update rust Signed-off-by: bootc-bot[bot] <225049296+bootc-bot[bot]@users.noreply.github.com> --- Cargo.toml | 2 +- crates/composefs-boot/Cargo.toml | 2 +- crates/composefs-ctl/Cargo.toml | 2 +- crates/composefs-http/Cargo.toml | 2 +- crates/composefs-integration-tests/Cargo.toml | 2 +- crates/composefs-oci/Cargo.toml | 6 +++--- crates/composefs-ostree/Cargo.toml | 4 ++-- crates/composefs-setup-root/Cargo.toml | 2 +- crates/composefs-storage/Cargo.toml | 8 ++++---- crates/composefs/Cargo.toml | 2 +- crates/composefs/fuzz/Cargo.lock | 8 ++++---- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a7b26166..ff24a0af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ composefs-fuse = { version = "0.7.0", path = "crates/composefs-fuse", default-fe composefs-http = { version = "0.7.0", path = "crates/composefs-http", default-features = false } composefs-ostree = { version = "0.7.0", path = "crates/composefs-ostree", default-features = false } cap-std-ext = "5.1.2" -ocidir = "0.7.2" +ocidir = "0.8.0" # JSON-RPC with FD passing for userns helper jsonrpc-fdpass = { version = "0.1.0", default-features = false } diff --git a/crates/composefs-boot/Cargo.toml b/crates/composefs-boot/Cargo.toml index 4f970763..0e32b453 100644 --- a/crates/composefs-boot/Cargo.toml +++ b/crates/composefs-boot/Cargo.toml @@ -25,7 +25,7 @@ zerocopy = { version = "0.8.0", default-features = false, features = ["derive"] composefs = { workspace = true, features = ["test"] } indoc = "2" proptest = "1" -similar-asserts = "1.7.0" +similar-asserts = "2.0.0" [lints] workspace = true diff --git a/crates/composefs-ctl/Cargo.toml b/crates/composefs-ctl/Cargo.toml index c5f8d851..97b90bc2 100644 --- a/crates/composefs-ctl/Cargo.toml +++ b/crates/composefs-ctl/Cargo.toml @@ -43,7 +43,7 @@ composefs-fuse = { workspace = true, optional = true } composefs-ostree = { workspace = true, optional = true } env_logger = { version = "0.11.0", default-features = false } hex = { version = "0.4.0", default-features = false } -indicatif = { version = "0.17.0", default-features = false } +indicatif = { version = "0.18.0", default-features = false } libsystemd = { version = "0.7" } log = { version = "0.4", default-features = false } rustix = { version = "1.0.0", default-features = false, features = ["fs", "pipe", "process", "thread"] } diff --git a/crates/composefs-http/Cargo.toml b/crates/composefs-http/Cargo.toml index f7048327..9d0f4618 100644 --- a/crates/composefs-http/Cargo.toml +++ b/crates/composefs-http/Cargo.toml @@ -20,7 +20,7 @@ sha2 = { version = "0.11.0", default-features = false } tokio = { version = "1.24.2", default-features = false } [dev-dependencies] -similar-asserts = "1.7.0" +similar-asserts = "2.0.0" [lints] workspace = true diff --git a/crates/composefs-integration-tests/Cargo.toml b/crates/composefs-integration-tests/Cargo.toml index d946ae7c..09771fbd 100644 --- a/crates/composefs-integration-tests/Cargo.toml +++ b/crates/composefs-integration-tests/Cargo.toml @@ -49,7 +49,7 @@ paste = "1" rustix = { version = "1", features = ["fs", "mount", "process"] } serde = { version = "1", features = ["derive"] } serde_json = "1" -similar-asserts = "1" +similar-asserts = "2" tar = "0.4" tempfile = "3" tokio = { version = "1", features = ["rt-multi-thread", "macros"] } diff --git a/crates/composefs-oci/Cargo.toml b/crates/composefs-oci/Cargo.toml index 317ff197..230daa79 100644 --- a/crates/composefs-oci/Cargo.toml +++ b/crates/composefs-oci/Cargo.toml @@ -27,10 +27,10 @@ composefs = { workspace = true } zlink-core = { workspace = true, optional = true } composefs-boot = { workspace = true, optional = true } flate2 = { version = "1.0", default-features = false, features = ["zlib"] } -containers-image-proxy = { version = "0.10", default-features = false } +containers-image-proxy = { version = "0.11", default-features = false } cstorage = { package = "composefs-storage", path = "../composefs-storage", version = "0.7.0", optional = true } hex = { version = "0.4.0", default-features = false } -indicatif = { version = "0.17.0", default-features = false } +indicatif = { version = "0.18.0", default-features = false } rustix = { version = "1.0.0", features = ["fs"] } serde = { version = "1.0", default-features = false, features = ["derive"] } thiserror = { version = "2.0.0", default-features = false } @@ -49,7 +49,7 @@ ocidir = { workspace = true } [dev-dependencies] cap-std = { version = "4.0.0", default-features = false } cap-tempfile = { version = "4.0.0", default-features = false } -similar-asserts = "1.7.0" +similar-asserts = "2.0.0" tar = { version = "0.4.38", default-features = false } rand = { version = "0.10.0", default-features = false } composefs = { workspace = true, features = ["test"] } diff --git a/crates/composefs-ostree/Cargo.toml b/crates/composefs-ostree/Cargo.toml index af1783d0..8dfa3b6b 100644 --- a/crates/composefs-ostree/Cargo.toml +++ b/crates/composefs-ostree/Cargo.toml @@ -23,14 +23,14 @@ hex = { version = "0.4.0", default-features = false, features = ["std"] } rustix = { version = "1.0.0", default-features = false, features = ["fs", "mount", "process", "std"] } sha2 = { version = "0.11.0", default-features = false } zerocopy = { version = "0.8.0", default-features = false, features = ["derive", "std"] } -reqwest = { version = "0.12.15", features = ["stream", "zstd"] } +reqwest = { version = "0.13.0", features = ["stream", "zstd"] } tokio = { version = "1.24.2", default-features = false, features = ["rt", "sync"] } tokio-stream = "0.1.18" tokio-util = { version = "0.7", default-features = false, features = ["io", "io-util"] } xz2 = { version = "0.1.7", default-features = false } [dev-dependencies] -similar-asserts = "1.7.0" +similar-asserts = "2.0.0" [lints] workspace = true diff --git a/crates/composefs-setup-root/Cargo.toml b/crates/composefs-setup-root/Cargo.toml index 3f4d7370..4a432a0d 100644 --- a/crates/composefs-setup-root/Cargo.toml +++ b/crates/composefs-setup-root/Cargo.toml @@ -28,7 +28,7 @@ serde = { version = "1.0.145", default-features = false, features = ["derive"] } toml = { version = "1.0.0", default-features = false, features = ["parse", "serde"] } [dev-dependencies] -similar-asserts = "1.7.0" +similar-asserts = "2.0.0" [lints] workspace = true diff --git a/crates/composefs-storage/Cargo.toml b/crates/composefs-storage/Cargo.toml index 904551a5..07b48fb0 100644 --- a/crates/composefs-storage/Cargo.toml +++ b/crates/composefs-storage/Cargo.toml @@ -14,19 +14,19 @@ version.workspace = true anyhow = { version = "1.0", default-features = false, features = ["std"] } base64 = { version = "0.22", default-features = false, features = ["std"] } cap-std = { version = "4.0", default-features = false } -cap-std-ext = { version = "4.0", default-features = false } +cap-std-ext = { version = "5.0", default-features = false } crc = { version = "3.0", default-features = false } flate2 = { version = "1.0", default-features = false, features = ["rust_backend"] } jsonrpc-fdpass = { workspace = true, optional = true } -oci-spec = { version = "0.9", default-features = false, features = ["image"] } +oci-spec = { version = "0.10", default-features = false, features = ["image"] } rustix = { version = "1.0", default-features = false, features = ["fs", "std", "process", "thread"] } serde = { version = "1.0", default-features = false, features = ["derive"] } serde_json = { version = "1.0", default-features = false, features = ["std"] } -sha2 = { version = "0.10", default-features = false, features = ["std"] } +sha2 = { version = "0.11", default-features = false, features = ["std"] } tar-core = "0.1.0" thiserror = { version = "2.0", default-features = false } tokio = { version = "1.40", default-features = false, features = ["rt", "net", "sync"], optional = true } -toml = { version = "0.8", default-features = false, features = ["parse"] } +toml = { version = "1.0", default-features = false, features = ["parse"] } tracing = { version = "0.1", default-features = false, optional = true } zstd = { version = "0.13", default-features = false } diff --git a/crates/composefs/Cargo.toml b/crates/composefs/Cargo.toml index a14695eb..8e1d1db9 100644 --- a/crates/composefs/Cargo.toml +++ b/crates/composefs/Cargo.toml @@ -43,7 +43,7 @@ cap-std = { version = "4.0.0", default-features = false } cap-tempfile = { version = "4.0.0", default-features = false } insta = "1.42.2" proptest = "1" -similar-asserts = "1.7.0" +similar-asserts = "2.0.0" tempfile = { version = "3.8.0", default-features = false } test-with = { version = "0.16", default-features = false, features = ["executable", "runtime"] } tokio-test = "0.4.4" diff --git a/crates/composefs/fuzz/Cargo.lock b/crates/composefs/fuzz/Cargo.lock index 98909985..d5039dc4 100644 --- a/crates/composefs/fuzz/Cargo.lock +++ b/crates/composefs/fuzz/Cargo.lock @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "composefs" -version = "0.4.0" +version = "0.7.0" dependencies = [ "anyhow", "composefs-ioctls", @@ -98,7 +98,7 @@ dependencies = [ [[package]] name = "composefs-ioctls" -version = "0.4.0" +version = "0.7.0" dependencies = [ "rustix", "thiserror", @@ -287,9 +287,9 @@ checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libfuzzer-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12a681b7dd8ce12bff52488013ba614b869148d54dd79836ab85aafdd53f08d" +checksum = "a9fd2f41a1cba099f79a0b6b6c35656cf7c03351a7bae8ff0f28f25270f929d2" dependencies = [ "arbitrary", "cc", From 89eecf704237a0d7f59a55f0a6bf8f46bf2c3f79 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 1 Jul 2026 16:24:23 -0400 Subject: [PATCH 2/4] sha2 0.11 no longer has a `std` feature Signed-off-by: John Eckersberg --- crates/composefs-storage/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/composefs-storage/Cargo.toml b/crates/composefs-storage/Cargo.toml index 07b48fb0..d15fc02a 100644 --- a/crates/composefs-storage/Cargo.toml +++ b/crates/composefs-storage/Cargo.toml @@ -22,7 +22,7 @@ oci-spec = { version = "0.10", default-features = false, features = ["image"] } rustix = { version = "1.0", default-features = false, features = ["fs", "std", "process", "thread"] } serde = { version = "1.0", default-features = false, features = ["derive"] } serde_json = { version = "1.0", default-features = false, features = ["std"] } -sha2 = { version = "0.11", default-features = false, features = ["std"] } +sha2 = { version = "0.11", default-features = false } tar-core = "0.1.0" thiserror = { version = "2.0", default-features = false } tokio = { version = "1.40", default-features = false, features = ["rt", "net", "sync"], optional = true } From 10ca0c7dfa3683a0cc39e2e2be21b801603c633a Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 1 Jul 2026 16:29:38 -0400 Subject: [PATCH 3/4] oci: Use OciRead trait with ocidir 0.8 update Signed-off-by: John Eckersberg --- crates/composefs-oci/src/oci_layout.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/composefs-oci/src/oci_layout.rs b/crates/composefs-oci/src/oci_layout.rs index 9ff37446..514aebdc 100644 --- a/crates/composefs-oci/src/oci_layout.rs +++ b/crates/composefs-oci/src/oci_layout.rs @@ -24,7 +24,7 @@ use anyhow::{Context, Result}; use cap_std_ext::cap_std; use containers_image_proxy::oci_spec::image::{Descriptor, Digest as OciDigest, MediaType}; use fn_error_context::context; -use ocidir::{OciDir, ResolvedManifest}; +use ocidir::{OciDir, OciRead, ResolvedManifest}; use tokio::sync::Semaphore; use tokio::task::JoinSet; use tracing::debug; From 29a1764b4f3b511ade10a8f95cbfab8f3dca3f3a Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 1 Jul 2026 16:42:20 -0400 Subject: [PATCH 4/4] storage: toml 1.0 gates `from_str` behind the `serde` feature Signed-off-by: John Eckersberg --- crates/composefs-storage/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/composefs-storage/Cargo.toml b/crates/composefs-storage/Cargo.toml index d15fc02a..1a55c518 100644 --- a/crates/composefs-storage/Cargo.toml +++ b/crates/composefs-storage/Cargo.toml @@ -26,7 +26,7 @@ sha2 = { version = "0.11", default-features = false } tar-core = "0.1.0" thiserror = { version = "2.0", default-features = false } tokio = { version = "1.40", default-features = false, features = ["rt", "net", "sync"], optional = true } -toml = { version = "1.0", default-features = false, features = ["parse"] } +toml = { version = "1.0", default-features = false, features = ["parse", "serde"] } tracing = { version = "0.1", default-features = false, optional = true } zstd = { version = "0.13", default-features = false }