From 9216846afca1bed38ed7b09754ec5f2a55e9a659 Mon Sep 17 00:00:00 2001 From: utam0k Date: Sun, 22 Jan 2023 17:39:41 +0900 Subject: [PATCH 1/2] Releax the version of fastrand Signed-off-by: utam0k --- crates/libcontainer/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/libcontainer/Cargo.toml b/crates/libcontainer/Cargo.toml index a4df9aa3..71a51b61 100644 --- a/crates/libcontainer/Cargo.toml +++ b/crates/libcontainer/Cargo.toml @@ -27,7 +27,7 @@ bitflags = "1.3.2" caps = "0.5.5" chrono = { version = "0.4", features = ["serde"] } crossbeam-channel = "0.5" -fastrand = "1.8.0" +fastrand = "^1.7.0" futures = { version = "0.3", features = ["thread-pool"] } libc = "0.2.139" log = "0.4" From 70b5d9fe84a1165ce1ef44b7e5fb26fcc532c270 Mon Sep 17 00:00:00 2001 From: utam0k Date: Sun, 22 Jan 2023 17:39:49 +0900 Subject: [PATCH 2/2] Relax the version of oci-spec-rs Signed-off-by: utam0k --- Cargo.lock | 62 +++++++++++++++++++++++++++++----- crates/libcgroups/Cargo.toml | 4 +-- crates/libcontainer/Cargo.toml | 4 +-- crates/youki/Cargo.toml | 2 +- 4 files changed, 58 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f15a1b21..38df71be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -810,13 +810,34 @@ dependencies = [ "winapi", ] +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro 0.11.2", +] + [[package]] name = "derive_builder" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ - "derive_builder_macro", + "derive_builder_macro 0.12.0", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -831,13 +852,23 @@ dependencies = [ "syn", ] +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core 0.11.2", + "syn", +] + [[package]] name = "derive_builder_macro" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ - "derive_builder_core", + "derive_builder_core 0.12.0", "syn", ] @@ -1422,7 +1453,7 @@ dependencies = [ "log", "nix", "num_cpus", - "oci-spec", + "oci-spec 0.6.0", "once_cell", "pnet_datalink", "procfs", @@ -1584,7 +1615,7 @@ dependencies = [ "log", "mockall", "nix", - "oci-spec", + "oci-spec 0.5.8", "procfs", "quickcheck", "rbpf", @@ -1610,7 +1641,7 @@ dependencies = [ "log", "mio", "nix", - "oci-spec", + "oci-spec 0.5.8", "path-clean", "prctl", "procfs", @@ -1995,15 +2026,28 @@ dependencies = [ "memchr", ] +[[package]] +name = "oci-spec" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98135224dd4faeb24c05a2fac911ed53ea6b09ecb09d7cada1cb79963ab2ee34" +dependencies = [ + "derive_builder 0.11.2", + "getset", + "quickcheck", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "oci-spec" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "214b837f7dde5026f2028ead5ae720073277c19f82ff85623b142c39d4b843e7" dependencies = [ - "derive_builder", + "derive_builder 0.12.0", "getset", - "quickcheck", "serde", "serde_json", "thiserror", @@ -2512,7 +2556,7 @@ name = "runtimetest" version = "0.0.1" dependencies = [ "nix", - "oci-spec", + "oci-spec 0.6.0", ] [[package]] @@ -4100,7 +4144,7 @@ dependencies = [ "liboci-cli", "log", "nix", - "oci-spec", + "oci-spec 0.5.8", "once_cell", "pentacle", "procfs", diff --git a/crates/libcgroups/Cargo.toml b/crates/libcgroups/Cargo.toml index 3b2c1233..618e1c18 100644 --- a/crates/libcgroups/Cargo.toml +++ b/crates/libcgroups/Cargo.toml @@ -24,7 +24,7 @@ nix = "0.25.0" procfs = "0.14.2" log = "0.4" anyhow = "1.0" -oci-spec = { version = "0.6.0", features = ["runtime"] } +oci-spec = { version = "^0.5.5", features = ["runtime"] } dbus = { version = "0.9.7", optional = true } fixedbitset = "0.4.2" serde = { version = "1.0", features = ["derive"] } @@ -34,7 +34,7 @@ errno = { version = "0.2.8", optional = true } libc = { version = "0.2.139", optional = true } [dev-dependencies] -oci-spec = { version = "0.6.0", features = ["proptests", "runtime"] } +oci-spec = { version = "^0.5.5", features = ["proptests", "runtime"] } quickcheck = "1" mockall = { version = "0.11.3", features = [] } clap = "4.0.32" diff --git a/crates/libcontainer/Cargo.toml b/crates/libcontainer/Cargo.toml index 71a51b61..6fe7c428 100644 --- a/crates/libcontainer/Cargo.toml +++ b/crates/libcontainer/Cargo.toml @@ -33,7 +33,7 @@ libc = "0.2.139" log = "0.4" mio = { version = "0.8.5", features = ["os-ext", "os-poll"] } nix = "0.25.0" -oci-spec = { version = "0.6.0", features = ["runtime"] } +oci-spec = { version = "^0.5.5", features = ["runtime"] } path-clean = "0.1.0" procfs = "0.14.2" prctl = "1.0.0" @@ -50,7 +50,7 @@ wasmtime = {version = "4.0.0", optional = true } wasmtime-wasi = {version = "4.0.0", optional = true } [dev-dependencies] -oci-spec = { version = "0.6.0", features = ["proptests", "runtime"] } +oci-spec = { version = "^0.5.5", features = ["proptests", "runtime"] } quickcheck = "1" serial_test = "1.0.0" rand = "0.8.5" diff --git a/crates/youki/Cargo.toml b/crates/youki/Cargo.toml index 0fd48bad..60c296db 100644 --- a/crates/youki/Cargo.toml +++ b/crates/youki/Cargo.toml @@ -33,7 +33,7 @@ libcontainer = { version = "0.0.4", path = "../libcontainer", default-features = liboci-cli = { version = "0.0.4", path = "../liboci-cli" } log = { version = "0.4", features = ["std"] } nix = "0.25.0" -oci-spec = { version = "0.6.0", features = ["runtime"] } +oci-spec = { version = "^0.5.5", features = ["runtime"] } once_cell = "1.17.0" pentacle = "1.0.0" procfs = "0.14.2"