From ab57f6b29f7eefaed26a9a2bac5e4e84a1b79032 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 9 Mar 2026 16:11:29 +0000 Subject: [PATCH] deps: Update cap-std-ext from git pin to released 5.1 We were pinning a cap-std-ext commit via git but that's no longer needed. The git pin breaks cargo-deny in bootc which is vendoring the qemu code for testing anaconda. Assisted-by: OpenCode (Claude claude-opus-4-6) Signed-off-by: Colin Walters --- Cargo.lock | 82 ++++++++++++++----------------------- Cargo.toml | 1 + crates/bcvk-qemu/Cargo.toml | 2 +- crates/kit/Cargo.toml | 3 +- 4 files changed, 33 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0a765cb0..307ef39b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -177,7 +177,7 @@ dependencies = [ "notify", "oci-spec", "quick-xml", - "rand 0.9.2", + "rand", "regex", "reqwest", "rustix", @@ -303,38 +303,39 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "3.4.5" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6cf3aea8a5081171859ef57bc1606b1df6999df4f1110f8eef68b30098d1d3a" +checksum = "cdadbd7c002d3a484b35243669abdae85a0ebaded5a61117169dc3400f9a7ff0" dependencies = [ "ambient-authority", "fs-set-times", "io-extras", - "io-lifetimes", + "io-lifetimes 3.0.1", "ipnet", "maybe-owned", "rustix", "rustix-linux-procfs", - "windows-sys 0.52.0", + "windows-sys 0.61.1", "winx", ] [[package]] name = "cap-std" -version = "3.4.5" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6dc3090992a735d23219de5c204927163d922f42f575a0189b005c62d37549a" +checksum = "7281235d6e96d3544ca18bba9049be92f4190f8d923e3caef1b5f66cfa752608" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes", + "io-lifetimes 3.0.1", "rustix", ] [[package]] name = "cap-std-ext" -version = "4.0.6" -source = "git+https://github.com/coreos/cap-std-ext?rev=cfdb25d51ffc697e70aa0d8d3cefe9ec2133bd0a#cfdb25d51ffc697e70aa0d8d3cefe9ec2133bd0a" +version = "5.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f9d7cf114dea582f663f03f4c563d0fc5ca2c8fa4c496eb538d8f01981ea51" dependencies = [ "cap-primitives", "cap-tempfile", @@ -344,15 +345,16 @@ dependencies = [ [[package]] name = "cap-tempfile" -version = "3.4.5" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68d8ad5cfac469e58e632590f033d45c66415ef7a8aa801409884818036706f5" +checksum = "42f22d5c0b1147e8bd9105fa004450f673c139d7e632f7edc3980f94a51f20f3" dependencies = [ "cap-std", - "rand 0.8.5", + "rand", "rustix", "rustix-linux-procfs", "uuid", + "windows-sys 0.61.1", ] [[package]] @@ -850,7 +852,7 @@ version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a" dependencies = [ - "io-lifetimes", + "io-lifetimes 2.0.4", "rustix", "windows-sys 0.59.0", ] @@ -1344,7 +1346,7 @@ dependencies = [ "libtest-mimic", "linkme", "paste", - "rand 0.9.2", + "rand", "regex", "scopeguard", "serde", @@ -1359,12 +1361,12 @@ dependencies = [ [[package]] name = "io-extras" -version = "0.18.4" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65" +checksum = "20fd6de4ccfcc187e38bc21cfa543cb5a302cb86a8b114eb7f0bf0dc9f8ac00f" dependencies = [ - "io-lifetimes", - "windows-sys 0.52.0", + "io-lifetimes 3.0.1", + "windows-sys 0.60.2", ] [[package]] @@ -1373,6 +1375,12 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06432fb54d3be7964ecd3649233cddf80db2832f47fec34c01f65b3d9d774983" +[[package]] +name = "io-lifetimes" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f0fb0570afe1fed943c5c3d4102d5358592d8625fda6a0007fdbe65a92fba96" + [[package]] name = "io-uring" version = "0.7.10" @@ -1917,35 +1925,14 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - [[package]] name = "rand" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "rand_chacha 0.9.0", - "rand_core 0.9.3", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", + "rand_chacha", + "rand_core", ] [[package]] @@ -1955,16 +1942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.3", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.16", + "rand_core", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 8f5fd071..f4efd3f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,7 @@ rand = "0.9" tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] } tracing-error = { version = "0.2.0" } +cap-std-ext = "5.1" xshell = "0.2.7" [workspace.lints.rust] diff --git a/crates/bcvk-qemu/Cargo.toml b/crates/bcvk-qemu/Cargo.toml index b867c927..f4dbe364 100644 --- a/crates/bcvk-qemu/Cargo.toml +++ b/crates/bcvk-qemu/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] camino = "1.1" -cap-std-ext = { git = "https://github.com/coreos/cap-std-ext", rev = "cfdb25d51ffc697e70aa0d8d3cefe9ec2133bd0a" } +cap-std-ext = { workspace = true } color-eyre = { workspace = true } data-encoding = "2.9" libc = "0.2" diff --git a/crates/kit/Cargo.toml b/crates/kit/Cargo.toml index 167c4e57..fae9acdc 100644 --- a/crates/kit/Cargo.toml +++ b/crates/kit/Cargo.toml @@ -47,8 +47,7 @@ cpio = "0.4" # Linux-only dependencies [target.'cfg(target_os = "linux")'.dependencies] bcvk-qemu = { path = "../bcvk-qemu" } -# For some recent APIs, TODO switch back to published version -cap-std-ext = { git = "https://github.com/coreos/cap-std-ext", rev = "cfdb25d51ffc697e70aa0d8d3cefe9ec2133bd0a" } +cap-std-ext = { workspace = true } bootc-mount = { git = "https://github.com/bootc-dev/bootc", rev = "93b22f4dbc2d54f7cca7c1df3ee59fcdec0b2cf1" } bootc-utils = { git = "https://github.com/bootc-dev/bootc", rev = "93b22f4dbc2d54f7cca7c1df3ee59fcdec0b2cf1" } rustix = { version = "1", features = ["thread", "net", "fs", "pipe", "system", "process", "mount"] }