Merge branch 'main' into seccomp-cleanup

roypat · web-flow · commit 0f4a6cb7736b · 2024-12-11T15:39:58.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/deny.toml b/deny.toml
@@ -5,7 +5,7 @@ allow = [
     "Apache-2.0",
     "BSD-3-Clause",
     "ISC",
-    "Unicode-DFS-2016",
+    "Unicode-3.0",
     "OpenSSL"
 ]
 
diff --git a/src/acpi-tables/Cargo.toml b/src/acpi-tables/Cargo.toml
@@ -8,9 +8,9 @@ license = "Apache-2.0"
 
 [dependencies]
 displaydoc = "0.2.5"
-thiserror = "2.0.3"
+thiserror = "2.0.6"
 vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
-zerocopy = { version = "0.8.11", features = ["derive"] }
+zerocopy = { version = "0.8.13", features = ["derive"] }
 
 [lib]
 bench = false
diff --git a/src/clippy-tracing/Cargo.toml b/src/clippy-tracing/Cargo.toml
@@ -10,7 +10,7 @@ name = "clippy-tracing"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.21", features = ["derive"] }
+clap = { version = "4.5.23", features = ["derive"] }
 itertools = "0.13.0"
 proc-macro2 = { version = "1.0.92", features = ["span-locations"] }
 quote = "1.0.37"
diff --git a/src/cpu-template-helper/Cargo.toml b/src/cpu-template-helper/Cargo.toml
@@ -10,13 +10,13 @@ name = "cpu-template-helper"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.21", features = ["derive", "string"] }
+clap = { version = "4.5.23", features = ["derive", "string"] }
 displaydoc = "0.2.5"
-libc = "0.2.167"
+libc = "0.2.168"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.133"
-thiserror = "2.0.3"
+thiserror = "2.0.6"
 
 vmm = { path = "../vmm" }
 vmm-sys-util = "0.12.1"
diff --git a/src/firecracker/Cargo.toml b/src/firecracker/Cargo.toml
@@ -18,23 +18,23 @@ bench = false
 [dependencies]
 displaydoc = "0.2.5"
 event-manager = "0.4.0"
-libc = "0.2.167"
+libc = "0.2.168"
 log-instrument = { path = "../log-instrument", optional = true }
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
 
 seccompiler = { path = "../seccompiler" }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_derive = "1.0.136"
 serde_json = "1.0.133"
-thiserror = "2.0.3"
+thiserror = "2.0.6"
 timerfd = "1.6.0"
 utils = { path = "../utils" }
 vmm = { path = "../vmm" }
 vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
 
 [dev-dependencies]
-cargo_toml = "0.20.5"
-libc = "0.2.167"
+cargo_toml = "0.21.0"
+libc = "0.2.168"
 regex = { version = "1.11.1", default-features = false, features = ["std", "unicode-perl"] }
 
 # Dev-Dependencies for uffd examples
diff --git a/src/jailer/Cargo.toml b/src/jailer/Cargo.toml
@@ -12,11 +12,11 @@ name = "jailer"
 bench = false
 
 [dependencies]
-libc = "0.2.167"
+libc = "0.2.168"
 log-instrument = { path = "../log-instrument", optional = true }
 nix = { version = "0.29.0", default-features = false, features = ["dir"] }
 regex = { version = "1.11.1", default-features = false, features = ["std"] }
-thiserror = "2.0.3"
+thiserror = "2.0.6"
 vmm-sys-util = "0.12.1"
 
 utils = { path = "../utils" }
diff --git a/src/rebase-snap/Cargo.toml b/src/rebase-snap/Cargo.toml
@@ -11,9 +11,9 @@ bench = false
 
 [dependencies]
 displaydoc = "0.2.5"
-libc = "0.2.167"
+libc = "0.2.168"
 log-instrument = { path = "../log-instrument", optional = true }
-thiserror = "2.0.3"
+thiserror = "2.0.6"
 vmm-sys-util = "0.12.1"
 
 utils = { path = "../utils" }
diff --git a/src/seccompiler/Cargo.toml b/src/seccompiler/Cargo.toml
@@ -18,11 +18,11 @@ bench = false
 [dependencies]
 bincode = "1.2.1"
 displaydoc = "0.2.5"
-libc = "0.2.167"
+libc = "0.2.168"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.133"
-thiserror = "2.0.3"
+thiserror = "2.0.6"
 
 utils = { path = "../utils" }
 
diff --git a/src/snapshot-editor/Cargo.toml b/src/snapshot-editor/Cargo.toml
@@ -10,14 +10,14 @@ name = "snapshot-editor"
 bench = false
 
 [dependencies]
-clap = { version = "4.5.21", features = ["derive", "string"] }
+clap = { version = "4.5.23", features = ["derive", "string"] }
 displaydoc = "0.2.5"
 
 fc_utils = { package = "utils", path = "../utils" }
-libc = "0.2.167"
+libc = "0.2.168"
 log-instrument = { path = "../log-instrument", optional = true }
 semver = "1.0.23"
-thiserror = "2.0.3"
+thiserror = "2.0.6"
 vmm = { path = "../vmm" }
 vmm-sys-util = "0.12.1"
 
diff --git a/src/utils/Cargo.toml b/src/utils/Cargo.toml
@@ -11,10 +11,10 @@ bench = false
 [dependencies]
 derive_more = { version = "1.0.0", default-features = false, features = ["from"] }
 displaydoc = "0.2.5"
-libc = "0.2.167"
+libc = "0.2.168"
 log-instrument = { path = "../log-instrument", optional = true }
 serde = { version = "1.0.215", features = ["derive"] }
-thiserror = "2.0.3"
+thiserror = "2.0.6"
 vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
 vmm-sys-util = "0.12.1"
 
diff --git a/src/vmm/Cargo.toml b/src/vmm/Cargo.toml
diff --git a/tests/integration_tests/functional/test_cpu_features_host_vs_guest.py b/tests/integration_tests/functional/test_cpu_features_host_vs_guest.py
diff --git a/tools/release-prepare.sh b/tools/release-prepare.sh

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ allow = [`
`5`	`5`	`"Apache-2.0",`
`6`	`6`	`"BSD-3-Clause",`
`7`	`7`	`"ISC",`
`8`		`- "Unicode-DFS-2016",`
	`8`	`+ "Unicode-3.0",`
`9`	`9`	`"OpenSSL"`
`10`	`10`	`]`
`11`	`11`