github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-09 20:07:49 +00:00
Code Issues Projects Releases Wiki Activity

versions: Bump oci-spec

Browse Source 
Try bumping oci-spec to 0.8.1 as it included fixes for vulnerabilities
including RUSTSEC-2024-0370

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman 2025-07-10 17:01:52 +01:00 committed by Steve Horsman
parent 579d373623
commit 661d88b11f
11 changed files with 143 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/agent/Cargo.lock generated
View File

@ -657,7 +657,7 @@ dependencies = [
"libc", "libc",
"nix 0.24.3", "nix 0.24.3",
"notify", "notify",
"oci-spec", "oci-spec 0.6.8",
"once_cell", "once_cell",
"path-clean", "path-clean",
"regex", "regex",
@ -2007,8 +2007,8 @@ dependencies = [
"slog-scope", "slog-scope",
"slog-stdlog", "slog-stdlog",
"slog-term", "slog-term",
"strum", "strum 0.26.3",
"strum_macros", "strum_macros 0.26.4",
"tempfile", "tempfile",
"test-utils", "test-utils",
"thiserror 1.0.69", "thiserror 1.0.69",
@ -2053,7 +2053,7 @@ dependencies = [
"libc", "libc",
"mockall", "mockall",
"nix 0.24.3", "nix 0.24.3",
"oci-spec", "oci-spec 0.8.1",
"once_cell", "once_cell",
"pci-ids", "pci-ids",
"rand", "rand",
@ -2080,7 +2080,7 @@ dependencies = [
"hex", "hex",
"lazy_static", "lazy_static",
"num_cpus", "num_cpus",
"oci-spec", "oci-spec 0.8.1",
"regex", "regex",
"safe-path", "safe-path",
"serde", "serde",
@ -2674,11 +2674,28 @@ dependencies = [
"regex", "regex",
"serde", "serde",
"serde_json", "serde_json",
"strum", "strum 0.26.3",
"strum_macros", "strum_macros 0.26.4",
"thiserror 1.0.69", "thiserror 1.0.69",
] ]
[[package]]
name = "oci-spec"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57e9beda9d92fac7bf4904c34c83340ef1024159faee67179a04e0277523da33"
dependencies = [
"const_format",
"derive_builder",
"getset",
"regex",
"serde",
"serde_json",
"strum 0.27.1",
"strum_macros 0.27.1",
"thiserror 2.0.12",
]
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.19.0" version = "1.19.0"
@ -3255,7 +3272,7 @@ name = "protocols"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"oci-spec", "oci-spec 0.8.1",
"protobuf 3.7.2", "protobuf 3.7.2",
"serde", "serde",
"serde_json", "serde_json",
@ -3659,7 +3676,7 @@ dependencies = [
"libc", "libc",
"libseccomp", "libseccomp",
"nix 0.24.3", "nix 0.24.3",
"oci-spec", "oci-spec 0.8.1",
"path-absolutize", "path-absolutize",
"protobuf 3.7.2", "protobuf 3.7.2",
"protocols", "protocols",
@ -4079,6 +4096,12 @@ version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
[[package]]
name = "strum"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
[[package]] [[package]]
name = "strum_macros" name = "strum_macros"
version = "0.26.4" version = "0.26.4"
@ -4092,6 +4115,19 @@ dependencies = [
"syn 2.0.101", "syn 2.0.101",
] ]
[[package]]
name = "strum_macros"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.101",
]
[[package]] [[package]]
name = "subprocess" name = "subprocess"
version = "0.2.9" version = "0.2.9"

2
src/agent/Cargo.toml
View File

@ -8,7 +8,7 @@ license = "Apache-2.0"
rust-version = "1.85.1" rust-version = "1.85.1"
[workspace.dependencies] [workspace.dependencies]
oci-spec = { version = "0.6.8", features = ["runtime"] } oci-spec = { version = "0.8.1", features = ["runtime"] }
lazy_static = "1.3.0" lazy_static = "1.3.0"
ttrpc = { version = "0.8.4", features = ["async"], default-features = false } ttrpc = { version = "0.8.4", features = ["async"], default-features = false }
protobuf = "3.7.2" protobuf = "3.7.2"

2
src/libs/kata-sys-util/Cargo.toml
View File

@ -32,7 +32,7 @@ pci-ids = "0.2.5"
mockall = "0.13.1" mockall = "0.13.1"
kata-types = { path = "../kata-types" } kata-types = { path = "../kata-types" }
oci-spec = { version = "0.6.8", features = ["runtime"] } oci-spec = { version = "0.8.1", features = ["runtime"] }
runtime-spec = { path = "../runtime-spec" } runtime-spec = { path = "../runtime-spec" }
safe-path = { path = "../safe-path" } safe-path = { path = "../safe-path" }

2
src/libs/kata-types/Cargo.toml
View File

@ -31,7 +31,7 @@ sha2 = "0.10.8"
flate2 = { version = "1.0", features = ["zlib"] } flate2 = { version = "1.0", features = ["zlib"] }
hex = "0.4" hex = "0.4"
oci-spec = { version = "0.6.8", features = ["runtime"] } oci-spec = { version = "0.8.1", features = ["runtime"] }
safe-path = { path = "../safe-path" } safe-path = { path = "../safe-path" }
[dev-dependencies] [dev-dependencies]

2
src/libs/protocols/Cargo.toml
View File

@ -16,7 +16,7 @@ async-trait = { version = "0.1.42", optional = true }
protobuf = { version = "3.7.2" } protobuf = { version = "3.7.2" }
serde = { version = "1.0.130", features = ["derive"] } serde = { version = "1.0.130", features = ["derive"] }
serde_json = "1.0.68" serde_json = "1.0.68"
oci-spec = { version = "0.6.8", features = ["runtime"] } oci-spec = { version = "0.8.1", features = ["runtime"] }
[build-dependencies] [build-dependencies]
ttrpc-codegen = "0.5.0" ttrpc-codegen = "0.5.0"

110
src/runtime-rs/Cargo.lock generated
View File

@ -49,7 +49,7 @@ dependencies = [
"log", "log",
"logging", "logging",
"nix 0.24.3", "nix 0.24.3",
"oci-spec", "oci-spec 0.8.1",
"protobuf 3.7.2", "protobuf 3.7.2",
"protocols", "protocols",
"serde", "serde",
@ -571,7 +571,7 @@ dependencies = [
"kata-types", "kata-types",
"lazy_static", "lazy_static",
"nix 0.24.3", "nix 0.24.3",
"oci-spec", "oci-spec 0.8.1",
"persist", "persist",
"protobuf 3.7.2", "protobuf 3.7.2",
"protocols", "protocols",
@ -601,6 +601,26 @@ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]]
name = "const_format"
version = "0.2.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
dependencies = [
"const_format_proc_macros",
]
[[package]]
name = "const_format_proc_macros"
version = "0.2.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
]
[[package]] [[package]]
name = "constant_time_eq" name = "constant_time_eq"
version = "0.3.0" version = "0.3.0"
@ -624,7 +644,7 @@ dependencies = [
"log", "log",
"mio 0.8.11", "mio 0.8.11",
"nix 0.27.1", "nix 0.27.1",
"oci-spec", "oci-spec 0.6.8",
"os_pipe", "os_pipe",
"page_size", "page_size",
"prctl", "prctl",
@ -1509,14 +1529,14 @@ dependencies = [
[[package]] [[package]]
name = "getset" name = "getset"
version = "0.1.2" version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" checksum = "9cf0fc11e47561d47397154977bc219f4cf809b2974facc3ccb3b89e2436f912"
dependencies = [ dependencies = [
"proc-macro-error", "proc-macro-error2",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 1.0.109", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -1780,7 +1800,7 @@ dependencies = [
"libc", "libc",
"logging", "logging",
"nix 0.24.3", "nix 0.24.3",
"oci-spec", "oci-spec 0.8.1",
"path-clean", "path-clean",
"persist", "persist",
"protobuf 3.7.2", "protobuf 3.7.2",
@ -2088,7 +2108,7 @@ dependencies = [
"libc", "libc",
"mockall", "mockall",
"nix 0.24.3", "nix 0.24.3",
"oci-spec", "oci-spec 0.8.1",
"once_cell", "once_cell",
"pci-ids", "pci-ids",
"rand 0.8.5", "rand 0.8.5",
@ -2115,7 +2135,7 @@ dependencies = [
"hex", "hex",
"lazy_static", "lazy_static",
"num_cpus", "num_cpus",
"oci-spec", "oci-spec 0.8.1",
"regex", "regex",
"safe-path 0.1.0", "safe-path 0.1.0",
"serde", "serde",
@ -2739,6 +2759,23 @@ dependencies = [
"thiserror 1.0.69", "thiserror 1.0.69",
] ]
[[package]]
name = "oci-spec"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57e9beda9d92fac7bf4904c34c83340ef1024159faee67179a04e0277523da33"
dependencies = [
"const_format",
"derive_builder",
"getset",
"regex",
"serde",
"serde_json",
"strum 0.27.1",
"strum_macros 0.27.1",
"thiserror 2.0.11",
]
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.19.0" version = "1.19.0"
@ -3211,27 +3248,25 @@ dependencies = [
] ]
[[package]] [[package]]
name = "proc-macro-error" name = "proc-macro-error-attr2"
version = "1.0.4" version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
dependencies = [ dependencies = [
"proc-macro-error-attr",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 1.0.109",
"version_check",
] ]
[[package]] [[package]]
name = "proc-macro-error-attr" name = "proc-macro-error2"
version = "1.0.4" version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
dependencies = [ dependencies = [
"proc-macro-error-attr2",
"proc-macro2", "proc-macro2",
"quote", "quote",
"version_check", "syn 2.0.96",
] ]
[[package]] [[package]]
@ -3410,7 +3445,7 @@ name = "protocols"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"oci-spec", "oci-spec 0.8.1",
"protobuf 3.7.2", "protobuf 3.7.2",
"serde", "serde",
"serde_json", "serde_json",
@ -3723,7 +3758,7 @@ dependencies = [
"netlink-sys", "netlink-sys",
"netns-rs", "netns-rs",
"nix 0.24.3", "nix 0.24.3",
"oci-spec", "oci-spec 0.8.1",
"persist", "persist",
"rand 0.8.5", "rand 0.8.5",
"rtnetlink", "rtnetlink",
@ -3824,7 +3859,7 @@ dependencies = [
"logging", "logging",
"netns-rs", "netns-rs",
"nix 0.25.1", "nix 0.25.1",
"oci-spec", "oci-spec 0.8.1",
"opentelemetry", "opentelemetry",
"opentelemetry-jaeger", "opentelemetry-jaeger",
"persist", "persist",
@ -4217,7 +4252,7 @@ dependencies = [
"log", "log",
"logging", "logging",
"nix 0.24.3", "nix 0.24.3",
"oci-spec", "oci-spec 0.8.1",
"protobuf 3.7.2", "protobuf 3.7.2",
"rand 0.8.5", "rand 0.8.5",
"runtime-spec", "runtime-spec",
@ -4444,6 +4479,12 @@ version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
[[package]]
name = "strum"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
[[package]] [[package]]
name = "strum_macros" name = "strum_macros"
version = "0.24.3" version = "0.24.3"
@ -4470,6 +4511,19 @@ dependencies = [
"syn 2.0.96", "syn 2.0.96",
] ]
[[package]]
name = "strum_macros"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.96",
]
[[package]] [[package]]
name = "subprocess" name = "subprocess"
version = "0.2.9" version = "0.2.9"
@ -5029,6 +5083,12 @@ version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
[[package]]
name = "unicode-xid"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]] [[package]]
name = "unix_socket2" name = "unix_socket2"
version = "0.5.4" version = "0.5.4"
@ -5154,7 +5214,7 @@ dependencies = [
"libc", "libc",
"logging", "logging",
"nix 0.24.3", "nix 0.24.3",
"oci-spec", "oci-spec 0.8.1",
"persist", "persist",
"protobuf 3.7.2", "protobuf 3.7.2",
"resource", "resource",

2
src/runtime-rs/Cargo.toml
View File

@ -59,7 +59,7 @@ libc = "0.2"
log = "0.4.14" log = "0.4.14"
netns-rs = "0.1.0" netns-rs = "0.1.0"
nix = "0.24.2" nix = "0.24.2"
oci-spec = { version = "0.6.8", features = ["runtime"] } oci-spec = { version = "0.8.1", features = ["runtime"] }
protobuf = "3.7.2" protobuf = "3.7.2"
rand = "0.8.4" rand = "0.8.4"
serde = { version = "1.0.145", features = ["derive"] } serde = { version = "1.0.145", features = ["derive"] }

2
src/tools/agent-ctl/Cargo.toml
View File

@ -13,7 +13,7 @@ license = "Apache-2.0"
[dependencies] [dependencies]
protocols = { path = "../../libs/protocols", features = ["with-serde"] } protocols = { path = "../../libs/protocols", features = ["with-serde"] }
rustjail = { path = "../../agent/rustjail" } rustjail = { path = "../../agent/rustjail" }
oci-spec = { version = "0.6.8", features = ["runtime"] } oci-spec = { version = "0.8.1", features = ["runtime"] }
clap = { version = "4.5.40", features = ["derive", "cargo"] } clap = { version = "4.5.40", features = ["derive", "cargo"] }
lazy_static = "1.4.0" lazy_static = "1.4.0"

2
src/tools/genpolicy/Cargo.toml
View File

@ -52,7 +52,7 @@ serde-transcode = "1.1.1"
tokio = { version = "1.38.0", features = ["rt-multi-thread"] } tokio = { version = "1.38.0", features = ["rt-multi-thread"] }
# OCI container specs. # OCI container specs.
oci-spec = { version = "0.6.8", features = ["runtime"] } oci-spec = { version = "0.8.1", features = ["runtime"] }
# Kata Agent protocol. # Kata Agent protocol.
protocols = { path = "../../libs/protocols", features = ["with-serde"] } protocols = { path = "../../libs/protocols", features = ["with-serde"] }

2
src/tools/runk/Cargo.toml
View File

@ -12,7 +12,7 @@ rustjail = { path = "../../agent/rustjail", features = [
"standard-oci-runtime", "standard-oci-runtime",
] } ] }
runtime-spec = { path = "../../libs/runtime-spec" } runtime-spec = { path = "../../libs/runtime-spec" }
oci-spec = { version = "0.6.8", features = ["runtime"] } oci-spec = { version = "0.8.1", features = ["runtime"] }
logging = { path = "../../libs/logging" } logging = { path = "../../libs/logging" }
liboci-cli = "0.0.4" liboci-cli = "0.0.4"
clap = { version = "4.5.40", features = ["derive", "cargo"] } clap = { version = "4.5.40", features = ["derive", "cargo"] }

8
src/tools/runk/libcontainer/Cargo.toml
View File

@ -7,9 +7,11 @@ license = "Apache-2.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
rustjail = { path = "../../../agent/rustjail", features = ["standard-oci-runtime"] } rustjail = { path = "../../../agent/rustjail", features = [
"standard-oci-runtime",
] }
runtime-spec = { path = "../../../libs/runtime-spec" } runtime-spec = { path = "../../../libs/runtime-spec" }
oci-spec = { version = "0.6.8", features = ["runtime"] } oci-spec = { version = "0.8.1", features = ["runtime"] }
kata-sys-util = { path = "../../../libs/kata-sys-util" } kata-sys-util = { path = "../../../libs/kata-sys-util" }
logging = { path = "../../../libs/logging" } logging = { path = "../../../libs/logging" }
derive_builder = "0.10.2" derive_builder = "0.10.2"
@ -27,4 +29,4 @@ procfs = "0.14.0"
[dev-dependencies] [dev-dependencies]
tempfile = "3.19.1" tempfile = "3.19.1"
test-utils = { path = "../../../libs/test-utils" } test-utils = { path = "../../../libs/test-utils" }
protocols = { path ="../../../libs/protocols" } protocols = { path = "../../../libs/protocols" }