chore(deps): update compatible dependencies

p5 · p5 · commit 40cac1d44cb7 · 2025-08-07T21:45:32.000+01:00
Signed-off-by: Robert Sturla &lt;robertsturla@outlook.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,34 +32,34 @@ lto = "yes"
 
 [workspace.dependencies]
 anstream = "0.6"
-anyhow = "1.0.82"
-camino = "1.1.6"
+anyhow = "1.0.98"
+camino = "1.1.11"
 canon-json = "0.2.1"
-cap-std-ext = "4.0.3"
+cap-std-ext = "4.0.6"
 composefs = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs", features = ["rhel9"] }
 composefs-boot = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs-boot" }
 composefs-oci = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs-oci" }
-chrono = { version = "0.4.38", default-features = false }
-clap = "4.5.4"
-clap_mangen = { version = "0.2.20" }
+chrono = { version = "0.4.41", default-features = false }
+clap = "4.5.43"
+clap_mangen = { version = "0.2.29" }
 hex = "0.4.3"
-indoc = "2.0.5"
-indicatif = "0.17.0"
+indoc = "2.0.6"
+indicatif = "0.17.11"
 fn-error-context = "0.2.1"
-libc = "0.2.154"
-openssl = "0.10.72"
+libc = "0.2.174"
+openssl = "0.10.73"
 owo-colors = { version = "4" }
 # For the same rationale as https://github.com/coreos/rpm-ostree/commit/27f3f4b77a15f6026f7e1da260408d42ccb657b3
 rustix = { "version" = "1", features = ["use-libc", "thread", "net", "fs", "system", "process", "mount"] }
-serde = "1.0.199"
-serde_json = "1.0.116"
-similar-asserts = "1.5.0"
+serde = "1.0.219"
+serde_json = "1.0.142"
+similar-asserts = "1.7.0"
 static_assertions = "1.1.0"
-tempfile = "3.10.1"
-tracing = "0.1.40"
-thiserror = "2.0.11"
+tempfile = "3.20.0"
+tracing = "0.1.41"
+thiserror = "2.0.12"
 tokio = ">= 1.37.0"
-tokio-util = { features = ["io-util"], version = "0.7.10" }
+tokio-util = { features = ["io-util"], version = "0.7.16" }
 
 # See https://github.com/coreos/cargo-vendor-filterer
 [workspace.metadata.vendor-filter]
diff --git a/crates/blockdev/Cargo.toml b/crates/blockdev/Cargo.toml
@@ -12,7 +12,7 @@ bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "
 camino = { workspace = true, features = ["serde1"] }
 fn-error-context = { workspace = true }
 libc = { workspace = true }
-regex = "1.10.4"
+regex = "1.11.1"
 rustix = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
@@ -21,7 +21,7 @@ tokio = { workspace = true, features = ["signal"] }
 tracing = { workspace = true }
 
 [dev-dependencies]
-indoc = "2.0.5"
+indoc = "2.0.6"
 
 [lib]
-path = "src/blockdev.rs"
+path = "src/blockdev.rs"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -19,7 +19,7 @@ anyhow = { workspace = true }
 bootc-lib = { version = "1.6", path = "../lib" }
 bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 tokio = { workspace = true, features = ["macros"] }
-log = "0.4.21"
+log = "0.4.27"
 owo-colors = { workspace = true }
 tracing = { workspace = true }
 
diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml
@@ -14,8 +14,8 @@ rust-version = "1.82.0"
 include = ["/src", "LICENSE-APACHE", "LICENSE-MIT"]
 
 [dependencies]
-anstream = "0.6.13"
-anstyle = "1.0.6"
+anstream = "0.6.20"
+anstyle = "1.0.11"
 anyhow = { workspace = true }
 bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 bootc-blockdev = { package = "bootc-internal-blockdev", path = "../blockdev", version = "0.0.0" }
@@ -28,7 +28,7 @@ composefs-boot = { workspace = true }
 composefs-oci = { workspace = true }
 ostree-ext = { path = "../ostree-ext", features = ["bootc"] }
 chrono = { workspace = true, features = ["serde"] }
-clap = { workspace = true, features = ["derive","cargo"] }
+clap = { workspace = true, features = ["derive", "cargo"] }
 clap_mangen = { workspace = true, optional = true }
 #composefs = "0.2.0"
 cap-std-ext = { workspace = true, features = ["fs_utf8"] }
@@ -41,22 +41,22 @@ liboverdrop = "0.1.0"
 libsystemd = "0.7"
 linkme = "0.3"
 openssl = { workspace = true }
-regex = "1.10.4"
+regex = "1.11.1"
 rustix = { workspace = true }
-schemars = { version = "0.8.17", features = ["chrono"] }
+schemars = { version = "0.8.22", features = ["chrono"] }
 serde = { workspace = true, features = ["derive"] }
-serde_ignored = "0.1.10"
+serde_ignored = "0.1.12"
 serde_json = { workspace = true }
 serde_yaml = "0.9.34"
 tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"] }
 tokio-util = { workspace = true }
 tracing = { workspace = true }
 tempfile = { workspace = true }
-toml = "0.8.12"
-xshell = { version = "0.2.6", optional = true }
-uuid = { version = "1.8.0", features = ["v4"] }
+toml = "0.8.23"
+xshell = { version = "0.2.7", optional = true }
+uuid = { version = "1.17.0", features = ["v4"] }
 tini = "1.3.0"
-comfy-table = "7.1.1"
+comfy-table = "7.1.4"
 thiserror = { workspace = true }
 canon-json = { workspace = true }
 nom = "8.0.0"
diff --git a/crates/lib/src/imgstorage.rs b/crates/lib/src/imgstorage.rs
@@ -104,7 +104,7 @@ fn bind_storage_roots(cmd: &mut Command, storage_root: &Dir, run_root: &Dir) ->
                 Mode::empty(),
             )?;
             rustix::process::fchdir(&storage_root)?;
-            rustix::thread::unshare(rustix::thread::UnshareFlags::NEWNS)?;
+            rustix::thread::unshare_unsafe(rustix::thread::UnshareFlags::NEWNS)?;
             rustix::mount::mount_bind(".", STORAGE_ALIAS_DIR)?;
             rustix::process::fchdir(&oldwd)?;
             Ok(())
diff --git a/crates/lib/src/parsers/grub_menuconfig.rs b/crates/lib/src/parsers/grub_menuconfig.rs
@@ -142,7 +142,7 @@ pub fn take_until_balanced_allow_nested(
 
 /// Parses a single menuentry with title and body commands.
 #[allow(dead_code)]
-fn parse_menuentry(input: &str) -> IResult<&str, MenuEntry> {
+fn parse_menuentry(input: &str) -> IResult<&str, MenuEntry<'_>> {
     let (input, _) = tag("menuentry").parse(input)?;
 
     // Require at least one space after "menuentry"
@@ -198,7 +198,7 @@ fn skip_to_menuentry(input: &str) -> IResult<&str, ()> {
 
 /// Parses all menuentries from a GRUB configuration file.
 #[allow(dead_code)]
-fn parse_all(input: &str) -> IResult<&str, Vec<MenuEntry>> {
+fn parse_all(input: &str) -> IResult<&str, Vec<MenuEntry<'_>>> {
     let mut remaining = input;
     let mut entries = Vec::new();
 
@@ -230,7 +230,7 @@ fn parse_all(input: &str) -> IResult<&str, Vec<MenuEntry>> {
 
 /// Main entry point for parsing GRUB menuentry files.
 #[allow(dead_code)]
-pub(crate) fn parse_grub_menuentry_file(contents: &str) -> anyhow::Result<Vec<MenuEntry>> {
+pub(crate) fn parse_grub_menuentry_file(contents: &str) -> anyhow::Result<Vec<MenuEntry<'_>>> {
     let (_, entries) = parse_all(&contents)
         .map_err(|e| anyhow::anyhow!("Failed to parse GRUB menuentries: {e}"))?;
     // Validate that entries have reasonable structure
@@ -293,7 +293,7 @@ mod test {
                     search: Some("--no-floppy --set=root --fs-uuid \"${EFI_PART_UUID}\""),
                     chainloader: Some("/EFI/Linux/uki.efi"),
                     extra: vec![
-                        ("extra_field1", "this is extra"), 
+                        ("extra_field1", "this is extra"),
                         ("extra_field2", "this is also extra")
                     ]
                 },
@@ -483,21 +483,21 @@ mod test {
         let content = r#"
             # Some initial config
             set timeout=10
-            
+
             menuentry "First Entry" {
                 insmod fat
                 chainloader /EFI/Linux/first.efi
             }
-            
+
             # Some comments between entries
             set default=0
-            
+
             menuentry "Second Entry" {
                 insmod ext2
                 search --set=root --fs-uuid "some-uuid"
                 chainloader /EFI/Linux/second.efi
             }
-            
+
             # Trailing content
         "#;
 
diff --git a/crates/lib/src/utils.rs b/crates/lib/src/utils.rs
@@ -32,7 +32,7 @@ pub(crate) fn origin_has_rpmostree_stuff(kf: &glib::KeyFile) -> bool {
 
 // Access the file descriptor for a sysroot
 #[allow(unsafe_code)]
-pub(crate) fn sysroot_fd(sysroot: &ostree::Sysroot) -> BorrowedFd {
+pub(crate) fn sysroot_fd(sysroot: &ostree::Sysroot) -> BorrowedFd<'_> {
     unsafe { BorrowedFd::borrow_raw(sysroot.fd()) }
 }
 
diff --git a/crates/mount/Cargo.toml b/crates/mount/Cargo.toml
@@ -19,7 +19,7 @@ serde = { workspace = true, features = ["derive"] }
 tracing = { workspace = true }
 
 [dev-dependencies]
-indoc = "2.0.5"
+indoc = "2.0.6"
 
 [lib]
 path = "src/mount.rs"
diff --git a/crates/ostree-ext/Cargo.toml b/crates/ostree-ext/Cargo.toml
@@ -22,36 +22,36 @@ composefs-oci = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true, features = ["derive","cargo"] }
 clap_mangen = { workspace = true, optional = true }
-comfy-table = "7.1.1"
+comfy-table = "7.1.4"
 cap-std-ext = { workspace = true, features = ["fs_utf8"] }
-flate2 = { features = ["zlib"], default-features = false, version = "1.0.20" }
+flate2 = { features = ["zlib"], default-features = false, version = "1.1.2" }
 fn-error-context = { workspace = true }
-futures-util = "0.3.13"
-gvariant = "0.5.0"
+futures-util = "0.3.31"
+gvariant = "0.5.1"
 hex = { workspace = true }
 io-lifetimes = "2"
 indicatif = { workspace = true }
 libc = { workspace = true }
-libsystemd = "0.7.0"
+libsystemd = "0.7.2"
 openssl = { workspace = true }
 ocidir = "0.4.0"
-pin-project = "1.0"
-regex = "1.5.4"
+pin-project = "1.1"
+regex = "1.11.1"
 rustix = { workspace = true, features = ["fs", "process"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-tar = "0.4.43"
+tar = "0.4.44"
 tempfile = { workspace = true }
 tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"] }
 tokio-util = { workspace = true }
-tokio-stream = { features = ["sync"], version = "0.1.8" }
+tokio-stream = { features = ["sync"], version = "0.1.17" }
 tracing = "0.1"
-zstd = { version = "0.13.1", features = ["pkg-config"] }
-indexmap = { version = "2.2.2", features = ["serde"] }
+zstd = { version = "0.13.3", features = ["pkg-config"] }
+indexmap = { version = "2.10.0", features = ["serde"] }
 
 indoc = { version = "2", optional = true }
 xshell = { version = "0.2", optional = true }
-similar-asserts = { version = "1.5.0", optional = true }
+similar-asserts = { version = "1.7.0", optional = true }
 canon-json = { workspace = true }
 
 [dev-dependencies]
diff --git a/crates/ostree-ext/src/container/deploy.rs b/crates/ostree-ext/src/container/deploy.rs
@@ -56,7 +56,7 @@ pub struct DeployOpts<'a> {
 // Access the file descriptor for a sysroot
 #[allow(unsafe_code)]
 #[cfg(feature = "bootc")]
-pub(crate) fn sysroot_fd(sysroot: &ostree::Sysroot) -> BorrowedFd {
+pub(crate) fn sysroot_fd<'a>(sysroot: &'a ostree::Sysroot) -> BorrowedFd<'a> {
     unsafe { BorrowedFd::borrow_raw(sysroot.fd()) }
 }
 
diff --git a/crates/ostree-ext/src/tar/export.rs b/crates/ostree-ext/src/tar/export.rs
@@ -75,13 +75,13 @@ fn map_path_inner<'p>(
 }
 
 /// Convert /usr/etc back to /etc
-fn map_path(p: &Utf8Path) -> std::borrow::Cow<Utf8Path> {
+fn map_path<'a>(p: &'a Utf8Path) -> std::borrow::Cow<'a, Utf8Path> {
     map_path_inner(p, "./usr/etc", "./etc")
 }
 
 /// Convert etc to usr/etc
 /// Note: no leading '/' or './'
-fn unmap_path(p: &Utf8Path) -> std::borrow::Cow<Utf8Path> {
+fn unmap_path<'a>(p: &'a Utf8Path) -> std::borrow::Cow<'a, Utf8Path> {
     map_path_inner(p, "etc", "usr/etc")
 }
 
diff --git a/crates/ostree-ext/src/tar/write.rs b/crates/ostree-ext/src/tar/write.rs
@@ -142,7 +142,7 @@ pub(crate) struct TarImportConfig {
 }
 
 // If a path starts with /etc or ./etc or etc, remap it to be usr/etc.
-fn remap_etc_path(path: &Utf8Path) -> Cow<Utf8Path> {
+fn remap_etc_path<'a>(path: &'a Utf8Path) -> Cow<'a, Utf8Path> {
     let mut components = path.components();
     let Some(prefix) = components.next() else {
         return Cow::Borrowed(path);
diff --git a/crates/system-reinstall-bootc/Cargo.toml b/crates/system-reinstall-bootc/Cargo.toml
@@ -21,16 +21,16 @@ clap = { workspace = true, features = ["derive"] }
 crossterm = "0.29.0"
 dialoguer = "0.11.0"
 indoc = { workspace = true }
-log = "0.4.21"
+log = "0.4.27"
 openssh-keys = "0.6.4"
 rustix = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-serde_yaml = "0.9.22"
+serde_yaml = "0.9.34"
 tempfile = { workspace = true }
 tracing = { workspace = true }
 uzers = "0.12.1"
-which = "7.0.2"
+which = "7.0.3"
 
 [lints]
 workspace = true
diff --git a/crates/tests-integration/Cargo.toml b/crates/tests-integration/Cargo.toml
@@ -17,14 +17,14 @@ cap-std-ext = { workspace = true }
 clap = { workspace = true, features = ["derive","cargo"] }
 fn-error-context = { workspace = true }
 indoc = { workspace = true }
-libtest-mimic = "0.8.0"
-oci-spec = "0.8.0"
+libtest-mimic = "0.8.1"
+oci-spec = "0.8.1"
 rexpect = "0.5"
 rustix = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tempfile = { workspace = true }
-xshell = { version = "0.2.6" }
+xshell = { version = "0.2.7" }
 
 [lints]
 workspace = true
diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml
@@ -16,7 +16,7 @@ shlex = "1.3"
 tempfile = { workspace = true }
 tracing = { workspace = true }
 tokio = { workspace = true, features = ["process", "rt", "macros"] }
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 
 [dev-dependencies]
 similar-asserts = { workspace = true }
diff --git a/crates/xtask/Cargo.toml b/crates/xtask/Cargo.toml
@@ -19,8 +19,8 @@ fn-error-context = { workspace = true }
 tar = "0.4"
 toml = "0.8"
 tempfile = { workspace = true }
-mandown = "0.1.3"
-xshell = { version = "0.2.6" }
+mandown = "0.1.5"
+xshell = { version = "0.2.7" }
 
 [lints]
 workspace = true
diff --git a/crates/xtask/src/xtask.rs b/crates/xtask/src/xtask.rs
@@ -401,7 +401,7 @@ fn impl_srpm(sh: &Shell) -> Result<Utf8PathBuf> {
     }
     let pkg = impl_package(sh)?;
     let td = tempfile::tempdir_in("target").context("Allocating tmpdir")?;
-    let td = td.into_path();
+    let td = td.keep();
     let td: &Utf8Path = td.as_path().try_into().unwrap();
     let srcpath = &pkg.srcpath;
     cmd!(sh, "mv {srcpath} {td}").run()?;

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ pub(crate) fn origin_has_rpmostree_stuff(kf: &glib::KeyFile) -> bool {`
`32`	`32`
`33`	`33`	`// Access the file descriptor for a sysroot`
`34`	`34`	`#[allow(unsafe_code)]`
`35`		`-pub(crate) fn sysroot_fd(sysroot: &ostree::Sysroot) -> BorrowedFd {`
	`35`	`+pub(crate) fn sysroot_fd(sysroot: &ostree::Sysroot) -> BorrowedFd<'_> {`
`36`	`36`	`unsafe { BorrowedFd::borrow_raw(sysroot.fd()) }`
`37`	`37`	`}`
`38`	`38`