From 65d79519f97577f3cc1ce60b9a8f72f0fb5421d1 Mon Sep 17 00:00:00 2001
From: jiaxiao zhou <jiazho@microsoft.com>
Date: Mon, 30 Oct 2023 20:43:03 +0000
Subject: [PATCH] chore: bump containerd-shim to 0.6.0

Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
---
 Cargo.lock | 47 ++++++++++++++++++++++++++++-------------------
 Cargo.toml |  2 +-
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 650d7d7de..13f0d3d29 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -454,14 +454,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cgroups-rs"
-version = "0.2.11"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3845d8ddaca63e9975f07b7a32262afe284561c2f0f620aa968913a65f671fd2"
+checksum = "6db7c2f5545da4c12c5701455d9471da5f07db52e49b9cccb4f5512226dd0836"
 dependencies = [
  "libc",
  "log",
- "nix 0.24.3",
+ "nix 0.25.1",
  "regex",
+ "thiserror",
 ]
 
 [[package]]
@@ -569,9 +570,9 @@ dependencies = [
 
 [[package]]
 name = "containerd-shim"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a08af6d8436b911bd47f34dd3478fe28cfbe40e8e3b2c1d61f3abb264e053d"
+checksum = "063d0e137d508846210c2f8b6c6dc3db9f1abd4c20b0a9aecdb962385dcb7899"
 dependencies = [
  "cgroups-rs",
  "command-fds",
@@ -581,14 +582,12 @@ dependencies = [
  "libc",
  "log",
  "mio",
- "nix 0.26.4",
+ "nix 0.27.1",
  "oci-spec",
  "os_pipe",
  "page_size",
  "prctl",
- "regex",
  "serde",
- "serde_derive",
  "serde_json",
  "signal-hook",
  "thiserror",
@@ -598,9 +597,9 @@ dependencies = [
 
 [[package]]
 name = "containerd-shim-protos"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "105ad6d5b553163181f33abdb172e1b1f5f567570632258be016acb09ab9578c"
+checksum = "967dbd2804aceb398bd7d867410342d68b9d74c1fead823ad8353b3ab5f23eb7"
 dependencies = [
  "protobuf 3.2.0",
  "ttrpc",
@@ -609,7 +608,7 @@ dependencies = [
 
 [[package]]
 name = "containerd-shim-wasm"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "caps",
@@ -641,7 +640,7 @@ dependencies = [
 
 [[package]]
 name = "containerd-shim-wasm-test-modules"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "env_logger",
@@ -656,7 +655,7 @@ dependencies = [
 
 [[package]]
 name = "containerd-shim-wasmedge"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "containerd-shim",
@@ -672,7 +671,7 @@ dependencies = [
 
 [[package]]
 name = "containerd-shim-wasmer"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "containerd-shim",
@@ -689,7 +688,7 @@ dependencies = [
 
 [[package]]
 name = "containerd-shim-wasmtime"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "containerd-shim",
@@ -2207,6 +2206,9 @@ name = "log"
 version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+dependencies = [
+ "value-bag",
+]
 
 [[package]]
 name = "mach"
@@ -2376,10 +2378,11 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.24.3"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
 dependencies = [
+ "autocfg",
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
  "libc",
@@ -2507,7 +2510,7 @@ dependencies = [
 
 [[package]]
 name = "oci-tar-builder"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -4398,6 +4401,12 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 
+[[package]]
+name = "value-bag"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe"
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -4658,7 +4667,7 @@ dependencies = [
 
 [[package]]
 name = "wasi-demo-app"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "env_logger",
diff --git a/Cargo.toml b/Cargo.toml
index fcef05c85..4ea232d0b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ homepage = "https://github.com/containerd/runwasi"
 anyhow = "1.0"
 cap-std = "1.0"
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
-containerd-shim = "0.5.0"
+containerd-shim = "0.6.0"
 containerd-shim-wasm = { path = "crates/containerd-shim-wasm" }
 containerd-shim-wasm-test-modules = { path = "crates/containerd-shim-wasm-test-modules" }
 crossbeam = { version = "0.8.2", default-features = false }