From 9eb5024d1e7532ec5674f85e92787e767df9ada4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 07:02:33 +0000 Subject: [PATCH] build(deps): bump ostree-ext from 0.13.4 to 0.14.1 Bumps [ostree-ext](https://github.com/ostreedev/ostree-rs-ext) from 0.13.4 to 0.14.1. - [Release notes](https://github.com/ostreedev/ostree-rs-ext/releases) - [Commits](https://github.com/ostreedev/ostree-rs-ext/compare/ostree-ext-v0.13.4...ostree-ext-v0.14.1) --- updated-dependencies: - dependency-name: ostree-ext dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 91 ++++++++++++++++++++++++------------------- Cargo.toml | 3 +- rust/src/compose.rs | 1 + rust/src/container.rs | 1 + 4 files changed, 55 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 78fec1482c..00347620d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -345,7 +345,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim", ] [[package]] @@ -428,17 +428,15 @@ dependencies = [ [[package]] name = "containers-image-proxy" -version = "0.5.8" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17da053ebe8d99edc9bfc5dcbdd74ec34e0657316ddcb6c6d4de6741fd4cac67" +checksum = "450ba7a168d28a978bed898a3303bb387aaafabea982a956689129cdb821920f" dependencies = [ "anyhow", "cap-std-ext", "fn-error-context", "futures-util", - "libc", "oci-spec", - "once_cell", "rustix", "semver", "serde", @@ -586,9 +584,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ "darling_core", "darling_macro", @@ -596,58 +594,58 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 1.0.109", + "strsim", + "syn 2.0.48", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "derive_builder" -version = "0.11.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.11.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "derive_builder_macro" -version = "0.11.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -1068,9 +1066,9 @@ dependencies = [ [[package]] name = "gvariant" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7a982b6b38ff2380ea1b1b480cb7f5b51dac917aceff2e16af0c207781e13a" +checksum = "bd8ea59586b3b91a49369121fb626b8afaa094baef5ea5569adec2d679b5460e" dependencies = [ "gvariant-macro", "memchr", @@ -1079,9 +1077,9 @@ dependencies = [ [[package]] name = "gvariant-macro" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9915719ccd7435a28103eea8dba78bcf35a25d5637c70273b47dbb49c6d2eb6d" +checksum = "26d6c33b3796d2656c765308a4b70b5f3176123c82174b96db351aeef549b9f1" dependencies = [ "syn 1.0.109", ] @@ -1752,9 +1750,9 @@ dependencies = [ [[package]] name = "oci-spec" -version = "0.5.8" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98135224dd4faeb24c05a2fac911ed53ea6b09ecb09d7cada1cb79963ab2ee34" +checksum = "e423c4f827362c0d8d8da4b1f571270f389ebde73bcd3240a3d23c6d6f61d0f0" dependencies = [ "derive_builder", "getset", @@ -1763,6 +1761,27 @@ dependencies = [ "thiserror", ] +[[package]] +name = "ocidir" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e545ae89c695346b4581fa67d31085abd7354f93208142113f72221872391" +dependencies = [ + "anyhow", + "camino", + "cap-std-ext", + "chrono", + "flate2", + "fn-error-context", + "hex", + "oci-spec", + "olpc-cjson", + "openssl", + "serde", + "serde_json", + "tar", +] + [[package]] name = "olpc-cjson" version = "0.1.3" @@ -1862,9 +1881,9 @@ dependencies = [ [[package]] name = "ostree-ext" -version = "0.13.4" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff8b8f8ba4825c6df7c9611bc7cb6415f8db876e071aec90b1a8e523e7679f" +checksum = "945ba054bf4c562f8720668f4963af30ead7621e1b72ffc03638a70d31917124" dependencies = [ "anyhow", "camino", @@ -1881,6 +1900,7 @@ dependencies = [ "io-lifetimes", "libc", "libsystemd", + "ocidir", "olpc-cjson", "once_cell", "openssl", @@ -2312,7 +2332,6 @@ dependencies = [ "cap-std-ext", "chrono", "clap", - "containers-image-proxy", "cxx", "either", "env_logger", @@ -2610,15 +2629,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" diff --git a/Cargo.toml b/Cargo.toml index 9566b7cf50..fe014d7eba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,6 @@ camino = "1.1.7" cap-std-ext = "4" cap-primitives = "3" cap-std = { version = "3", features = ["fs_utf8"] } -containers-image-proxy = { version = "0.5.8", features = ["proxy_v0_2_4"] } # Explicitly force on libc rustix = { version = "0.38", features = ["use-libc", "process", "fs"] } chrono = { version = "0.4.38", features = ["serde"] } @@ -73,7 +72,7 @@ nix = { version = "0.29.0", features = ["fs", "mount", "signal", "user"] } openssl = "0.10.64" once_cell = "1.19.0" os-release = "0.1.0" -ostree-ext = "0.13" +ostree-ext = "0.14" paste = "1.0" phf = { version = "0.11", features = ["macros"] } rand = "0.8.5" diff --git a/rust/src/compose.rs b/rust/src/compose.rs index 19a0eca4a4..ff6f0676cb 100644 --- a/rust/src/compose.rs +++ b/rust/src/compose.rs @@ -12,6 +12,7 @@ use clap::Parser; use oci_spec::image::ImageManifest; use ostree::gio; use ostree_ext::container as ostree_container; +use ostree_ext::containers_image_proxy; use ostree_ext::keyfileext::{map_keyfile_optional, KeyFileExt}; use ostree_ext::{oci_spec, ostree}; diff --git a/rust/src/container.rs b/rust/src/container.rs index 589ad0fad4..5a14c7b037 100644 --- a/rust/src/container.rs +++ b/rust/src/container.rs @@ -21,6 +21,7 @@ use fn_error_context::context; use ostree::glib; use ostree_ext::chunking::ObjectMetaSized; use ostree_ext::container::{Config, ExportOpts, ImageReference}; +use ostree_ext::containers_image_proxy; use ostree_ext::objectsource::{ ContentID, ObjectMeta, ObjectMetaMap, ObjectMetaSet, ObjectSourceMeta, };