diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index 4bc41b5a6f..6c6c216479 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -2000,7 +2000,7 @@ dependencies = [ "netlink-packet-core", "netlink-packet-route", "netlink-sys 0.7.0", - "nix 0.24.3", + "nix 0.26.4", "oci-spec", "opentelemetry", "procfs 0.12.0", @@ -2069,7 +2069,7 @@ dependencies = [ "lazy_static", "libc", "mockall", - "nix 0.24.3", + "nix 0.26.4", "oci-spec", "once_cell", "pci-ids", @@ -3669,7 +3669,7 @@ dependencies = [ "lazy_static", "libc", "libseccomp", - "nix 0.24.3", + "nix 0.26.4", "oci-spec", "path-absolutize", "protobuf 3.7.2", @@ -4233,7 +4233,7 @@ checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" name = "test-utils" version = "0.1.0" dependencies = [ - "nix 0.24.3", + "nix 0.26.4", ] [[package]] diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index 7d6c164045..d2580909ea 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml @@ -13,7 +13,8 @@ lazy_static = "1.3.0" ttrpc = { version = "0.8.4", features = ["async"], default-features = false } protobuf = "3.7.2" libc = "0.2.94" -nix = "0.24.2" +# Notes: nix needs to stay in sync with libs +nix = "0.26.4" capctl = "0.2.0" scan_fmt = "0.2.6" scopeguard = "1.0.0" diff --git a/src/libs/kata-sys-util/Cargo.toml b/src/libs/kata-sys-util/Cargo.toml index 9afad958e8..b8b7608e57 100644 --- a/src/libs/kata-sys-util/Cargo.toml +++ b/src/libs/kata-sys-util/Cargo.toml @@ -18,7 +18,7 @@ common-path = "=1.0.0" fail = "0.5.0" lazy_static = "1.4.0" libc = "0.2.100" -nix = "0.24.2" +nix = "0.26.4" once_cell = "1.9.0" serde = { version = "1.0.138", features = ["derive"] } serde_json = "1.0.73" diff --git a/src/libs/kata-types/Cargo.toml b/src/libs/kata-types/Cargo.toml index 842b3b8d85..c59f0a1986 100644 --- a/src/libs/kata-types/Cargo.toml +++ b/src/libs/kata-types/Cargo.toml @@ -37,7 +37,7 @@ safe-path = { path = "../safe-path" } [dev-dependencies] tempfile = "3.19.1" test-utils = { path = "../test-utils" } -nix = "0.24.2" +nix = "0.26.4" [features] default = [] diff --git a/src/libs/shim-interface/Cargo.toml b/src/libs/shim-interface/Cargo.toml index aa28ea2b82..cff3334072 100644 --- a/src/libs/shim-interface/Cargo.toml +++ b/src/libs/shim-interface/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" [dependencies] anyhow = "^1.0" -nix = "0.24.0" +nix = "0.26.4" tokio = { version = "1.44.2", features = ["rt-multi-thread"] } hyper = { version = "0.14.20", features = ["stream", "server", "http1"] } hyperlocal = "0.8" diff --git a/src/libs/test-utils/Cargo.toml b/src/libs/test-utils/Cargo.toml index 2bfb652e42..5395a3e80e 100644 --- a/src/libs/test-utils/Cargo.toml +++ b/src/libs/test-utils/Cargo.toml @@ -12,4 +12,4 @@ license = "Apache-2.0" edition = "2018" [dependencies] -nix = "0.24.2" +nix = "0.26.4" diff --git a/src/runtime-rs/Cargo.lock b/src/runtime-rs/Cargo.lock index e18621e9ae..afdeefe3c8 100644 --- a/src/runtime-rs/Cargo.lock +++ b/src/runtime-rs/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ "kata-types", "log", "logging", - "nix 0.24.3", + "nix 0.26.4", "oci-spec 0.8.1", "protobuf 3.7.2", "protocols", @@ -519,7 +519,7 @@ dependencies = [ "api_client", "kata-sys-util", "kata-types", - "nix 0.26.2", + "nix 0.26.4", "serde", "serde_json", "thiserror 1.0.69", @@ -570,7 +570,7 @@ dependencies = [ "kata-sys-util", "kata-types", "lazy_static", - "nix 0.24.3", + "nix 0.26.4", "oci-spec 0.8.1", "persist", "protobuf 3.7.2", @@ -1745,7 +1745,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1799,7 +1799,7 @@ dependencies = [ "lazy_static", "libc", "logging", - "nix 0.24.3", + "nix 0.26.4", "oci-spec 0.8.1", "path-clean", "persist", @@ -1818,6 +1818,7 @@ dependencies = [ "shim-interface", "slog", "slog-scope", + "tempfile", "test-utils", "tests_utils", "thiserror 1.0.69", @@ -2107,7 +2108,7 @@ dependencies = [ "lazy_static", "libc", "mockall", - "nix 0.24.3", + "nix 0.26.4", "oci-spec 0.8.1", "once_cell", "pci-ids", @@ -2545,16 +2546,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.7.1", "pin-utils", - "static_assertions", ] [[package]] @@ -3757,7 +3757,7 @@ dependencies = [ "netlink-packet-route", "netlink-sys", "netns-rs", - "nix 0.24.3", + "nix 0.26.4", "oci-spec 0.8.1", "persist", "rand 0.8.5", @@ -4251,7 +4251,7 @@ dependencies = [ "libc", "log", "logging", - "nix 0.24.3", + "nix 0.26.4", "oci-spec 0.8.1", "protobuf 3.7.2", "rand 0.8.5", @@ -4293,7 +4293,7 @@ dependencies = [ "hyperlocal", "kata-sys-util", "kata-types", - "nix 0.24.3", + "nix 0.26.4", "tokio", ] @@ -4452,12 +4452,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.11.1" @@ -4643,7 +4637,7 @@ checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" name = "test-utils" version = "0.1.0" dependencies = [ - "nix 0.24.3", + "nix 0.26.4", ] [[package]] @@ -5000,7 +4994,7 @@ dependencies = [ "home", "libc", "log", - "nix 0.26.2", + "nix 0.26.4", "protobuf 3.7.2", "protobuf-codegen 3.7.2", "thiserror 1.0.69", @@ -5213,7 +5207,7 @@ dependencies = [ "lazy_static", "libc", "logging", - "nix 0.24.3", + "nix 0.26.4", "oci-spec 0.8.1", "persist", "protobuf 3.7.2", diff --git a/src/runtime-rs/Cargo.toml b/src/runtime-rs/Cargo.toml index 1f87406771..2d4eb4edc8 100644 --- a/src/runtime-rs/Cargo.toml +++ b/src/runtime-rs/Cargo.toml @@ -58,7 +58,8 @@ lazy_static = "1.4" libc = "0.2" log = "0.4.14" netns-rs = "0.1.0" -nix = "0.24.2" +# Note: nix needs to stay sync'd with libs versions +nix = "0.26.4" oci-spec = { version = "0.8.1", features = ["runtime"] } protobuf = "3.7.2" rand = "0.8.4" diff --git a/src/tools/trace-forwarder/Cargo.lock b/src/tools/trace-forwarder/Cargo.lock index 8a79e54c23..7d7f894143 100644 --- a/src/tools/trace-forwarder/Cargo.lock +++ b/src/tools/trace-forwarder/Cargo.lock @@ -150,6 +150,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.41" @@ -525,7 +531,7 @@ dependencies = [ "futures", "libc", "logging", - "nix", + "nix 0.30.1", "opentelemetry 0.14.0", "opentelemetry-jaeger", "privdrop", @@ -606,9 +612,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ "bitflags 1.3.2", "cc", @@ -617,6 +623,18 @@ dependencies = [ "memoffset", ] +[[package]] +name = "nix" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" +dependencies = [ + "bitflags 2.9.0", + "cfg-if", + "cfg_aliases", + "libc", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -768,7 +786,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c02cf257b10e4b807bccadb19630d5dea7e0369c3c5e84673ee8e58dc8da6a5" dependencies = [ "libc", - "nix", + "nix 0.23.2", ] [[package]] @@ -1260,7 +1278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e32675ee2b3ce5df274c0ab52d19b28789632406277ca26bffee79a8e27dc133" dependencies = [ "libc", - "nix", + "nix 0.23.2", ] [[package]] diff --git a/src/tools/trace-forwarder/Cargo.toml b/src/tools/trace-forwarder/Cargo.toml index 1bb87f12ac..ab9e41653a 100644 --- a/src/tools/trace-forwarder/Cargo.toml +++ b/src/tools/trace-forwarder/Cargo.toml @@ -14,7 +14,7 @@ license = "Apache-2.0" futures = "0.3.15" clap = { version = "4.5.40", features = ["cargo"] } vsock = "0.2.3" -nix = "0.23.0" +nix = { version = "0.30.1", features = ["fs", "user"] } libc = "0.2.94" serde = { version = "1.0.126", features = ["derive"] } bincode = "1.3.3"