Merge pull request #2019 from webern/rust-updates

update rust dependencies
bottlerocket-os · Mar 24, 2022 · 372d897 · 372d897
2 parents 7e0a918 + c9e6294
commit 372d897
Show file tree

Hide file tree

Showing 8 changed files with 301 additions and 272 deletions.
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/api/apiclient/Cargo.toml b/sources/api/apiclient/Cargo.toml
@@ -16,9 +16,7 @@ futures = { version = "0.3", default-features = false }
 futures-channel = { version = "0.3", default-features = false }
 http = "0.2"
 httparse = "1.5"
-# Ensure we use exactly hyper 0.14.2 which is the last version that does not emit a cdylib
-# See this issue for tracking /~https://github.com/bottlerocket-os/bottlerocket/issues/1471
-hyper = { version = "=0.14.2", default-features = false, features = [ "client", "http1", "http2" ] }
+hyper = { version = "0.14.2", default-features = false, features = [ "client", "http1", "http2" ] }
 hyper-unix-connector = "0.2"
 libc = "0.2"
 log = "0.4"

diff --git a/sources/api/bootstrap-containers/README.md b/sources/api/bootstrap-containers/README.md
@@ -74,4 +74,4 @@ journalctl -u bootstrap-containers@bear.service
 
 ## Colophon
 
-This text was generated using [cargo-readme](https://crates.io/crates/cargo-readme), and includes the rustdoc from `src/main.rs`.
+This text was generated using [cargo-readme](https://crates.io/crates/cargo-readme), and includes the rustdoc from `src/main.rs`.
diff --git a/sources/api/certdog/Cargo.toml b/sources/api/certdog/Cargo.toml
@@ -22,7 +22,7 @@ serde_json = "1"
 simplelog = "0.11"
 snafu = "0.7"
 tokio = { version = "~1.14", default-features = false, features = ["macros", "rt-multi-thread"] } # LTS
-x509-parser = "0.12"
+x509-parser = "0.13"
 
 [dev-dependencies]
 tempfile = "3.2.0"

diff --git a/sources/cfsignal/Cargo.toml b/sources/cfsignal/Cargo.toml
@@ -17,7 +17,7 @@ tokio = { version = "~1.14", default-features = false, features = ["macros", "rt
 rusoto_core = { version = "0.47.0", default-features = false, features = ["rustls"] }
 rusoto_cloudformation = { version = "0.47.0", default-features = false, features = ["rustls"] }
 imdsclient = { path = "../imdsclient", version = "0.1.0" }
-hyper = "=0.14.2"
+hyper = "0.14.2"
 
 [build-dependencies]
 cargo-readme = "3.1"
diff --git a/sources/deny.toml b/sources/deny.toml
@@ -59,9 +59,6 @@ skip = [
     # older version used by clap 2.33.3, via cargo-readme and structopt
     { name = "strsim", version = "0.8.0" },
 
-    # older version used by hyper 0.14.2
-    { name = "socket2", version = "0.3.19" },
-
     # older version used by webpki-roots 0.21.1
     { name = "pem", version = "0.8.3" },
 

diff --git a/sources/models/Cargo.toml b/sources/models/Cargo.toml
@@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_plain = "1.0"
 snafu = "0.7"
 toml = "0.5"
-x509-parser = "0.12"
+x509-parser = "0.13"
 url = "2.1"
 
 [build-dependencies]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -74,4 +74,4 @@ journalctl -u bootstrap-containers@bear.service

		## Colophon

		This text was generated using [cargo-readme](https://crates.io/crates/cargo-readme), and includes the rustdoc from `src/main.rs`.
		This text was generated using [cargo-readme](https://crates.io/crates/cargo-readme), and includes the rustdoc from `src/main.rs`.