Skip to content

Commit

Permalink
Merge branch 'rumenov/upgehrf' into 'master'
Browse files Browse the repository at this point in the history
chore: add quinn-udp external dep in preparation of the rustls upgrade and bump the versions of some core external deps

 

See merge request dfinity-lab/public/ic!19518
  • Loading branch information
rumenov committed May 29, 2024
2 parents e7ca1a2 + 1a83813 commit 522341a
Show file tree
Hide file tree
Showing 13 changed files with 799 additions and 1,023 deletions.
747 changes: 287 additions & 460 deletions Cargo.Bazel.Fuzzing.json.lock

Large diffs are not rendered by default.

158 changes: 75 additions & 83 deletions Cargo.Bazel.Fuzzing.toml.lock

Large diffs are not rendered by default.

642 changes: 292 additions & 350 deletions Cargo.Bazel.json.lock

Large diffs are not rendered by default.

126 changes: 64 additions & 62 deletions Cargo.Bazel.toml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ dependencies = [
"http 1.0.0",
"http-body 1.0.0",
"http-body-util",
"hyper 1.2.0",
"hyper 1.3.1",
"hyper-util",
"itoa",
"matchit",
Expand Down Expand Up @@ -911,7 +911,7 @@ dependencies = [
"http 1.0.0",
"http-body 1.0.0",
"http-body-util",
"hyper 1.2.0",
"hyper 1.3.1",
"hyper-util",
"pin-project-lite",
"rustls 0.21.12",
Expand Down Expand Up @@ -2987,7 +2987,7 @@ dependencies = [
"httptest",
"humantime",
"hyper 0.14.27",
"hyper 1.2.0",
"hyper 1.3.1",
"hyper-rustls 0.24.2",
"hyper-rustls 0.27.1",
"hyper-socks2",
Expand Down Expand Up @@ -3103,6 +3103,7 @@ dependencies = [
"publicsuffix",
"quickcheck",
"quinn",
"quinn-udp 0.5.1",
"quote 1.0.35",
"rand 0.8.5",
"rand_chacha 0.3.1",
Expand Down Expand Up @@ -3163,7 +3164,7 @@ dependencies = [
"slog-json",
"slog-scope",
"slog-term",
"socket2 0.5.6",
"socket2 0.5.7",
"ssh2",
"strum 0.26.2",
"strum_macros 0.26.2",
Expand Down Expand Up @@ -3235,7 +3236,7 @@ dependencies = [
"x509-parser",
"yansi",
"zeroize",
"zstd 0.13.0",
"zstd 0.13.1",
]

[[package]]
Expand Down Expand Up @@ -4668,9 +4669,9 @@ dependencies = [

[[package]]
name = "hyper"
version = "1.2.0"
version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
dependencies = [
"bytes",
"futures-channel",
Expand Down Expand Up @@ -4711,7 +4712,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
dependencies = [
"futures-util",
"http 1.0.0",
"hyper 1.2.0",
"hyper 1.3.1",
"hyper-util",
"log",
"rustls 0.22.2",
Expand All @@ -4731,7 +4732,7 @@ checksum = "908bb38696d7a037a01ebcc68a00634112ac2bbf8ca74e30a2c3d2f4f021302b"
dependencies = [
"futures-util",
"http 1.0.0",
"hyper 1.2.0",
"hyper 1.3.1",
"hyper-util",
"rustls 0.23.8",
"rustls-native-certs 0.7.0",
Expand Down Expand Up @@ -4781,9 +4782,9 @@ dependencies = [
"futures-util",
"http 1.0.0",
"http-body 1.0.0",
"hyper 1.2.0",
"hyper 1.3.1",
"pin-project-lite",
"socket2 0.5.6",
"socket2 0.5.7",
"tokio",
"tower",
"tower-service",
Expand All @@ -4798,7 +4799,7 @@ checksum = "acf569d43fa9848e510358c07b80f4adf34084ddc28c6a4a651ee8474c070dcc"
dependencies = [
"hex",
"http-body-util",
"hyper 1.2.0",
"hyper 1.3.1",
"hyper-util",
"pin-project-lite",
"tokio",
Expand Down Expand Up @@ -4845,7 +4846,7 @@ dependencies = [
"http-body 1.0.0",
"http-body-to-bytes",
"http-body-util",
"hyper 1.2.0",
"hyper 1.3.1",
"hyper-rustls 0.26.0",
"hyper-util",
"ic-certification",
Expand Down Expand Up @@ -5526,7 +5527,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
dependencies = [
"socket2 0.5.6",
"socket2 0.5.7",
"widestring",
"windows-sys 0.48.0",
"winreg 0.50.0",
Expand Down Expand Up @@ -6178,12 +6179,6 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"

[[package]]
name = "linux-raw-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"

[[package]]
name = "linux-raw-sys"
version = "0.3.8"
Expand Down Expand Up @@ -6470,7 +6465,7 @@ dependencies = [
"http 1.0.0",
"http-body 1.0.0",
"http-body-util",
"hyper 1.2.0",
"hyper 1.3.1",
"hyper-rustls 0.24.2",
"hyper-util",
"itertools 0.11.0",
Expand Down Expand Up @@ -8115,30 +8110,40 @@ dependencies = [

[[package]]
name = "procfs"
version = "0.14.2"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69"
checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
dependencies = [
"bitflags 1.3.2",
"byteorder",
"bitflags 2.4.1",
"hex",
"lazy_static",
"rustix 0.36.15",
"procfs-core",
"rustix 0.38.32",
]

[[package]]
name = "procfs-core"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
dependencies = [
"bitflags 2.4.1",
"hex",
]

[[package]]
name = "prometheus"
version = "0.13.3"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
dependencies = [
"cfg-if 1.0.0",
"fnv",
"lazy_static",
"libc",
"memchr",
"parking_lot 0.12.1",
"procfs 0.14.2",
"procfs 0.16.0",
"protobuf",
"thiserror",
]
Expand Down Expand Up @@ -8376,7 +8381,7 @@ dependencies = [
"bytes",
"pin-project-lite",
"quinn-proto",
"quinn-udp",
"quinn-udp 0.4.0",
"rustc-hash",
"rustls 0.21.12",
"thiserror",
Expand Down Expand Up @@ -8410,11 +8415,24 @@ checksum = "6df19e284d93757a9fb91d63672f7741b129246a669db09d1c0063071debc0c0"
dependencies = [
"bytes",
"libc",
"socket2 0.5.6",
"socket2 0.5.7",
"tracing",
"windows-sys 0.48.0",
]

[[package]]
name = "quinn-udp"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4f0def2590301f4f667db5a77f9694fb004f82796dc1a8b1508fafa3d0e8b72"
dependencies = [
"libc",
"once_cell",
"socket2 0.5.7",
"tracing",
"windows-sys 0.52.0",
]

[[package]]
name = "quote"
version = "0.6.13"
Expand Down Expand Up @@ -8884,7 +8902,7 @@ dependencies = [
"http 1.0.0",
"http-body 1.0.0",
"http-body-util",
"hyper 1.2.0",
"hyper 1.3.1",
"hyper-rustls 0.26.0",
"hyper-util",
"ipnet",
Expand Down Expand Up @@ -9230,20 +9248,6 @@ dependencies = [
"nom",
]

[[package]]
name = "rustix"
version = "0.36.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941"
dependencies = [
"bitflags 1.3.2",
"errno 0.3.8",
"io-lifetimes",
"libc",
"linux-raw-sys 0.1.4",
"windows-sys 0.45.0",
]

[[package]]
name = "rustix"
version = "0.37.23"
Expand Down Expand Up @@ -10267,9 +10271,9 @@ dependencies = [

[[package]]
name = "socket2"
version = "0.5.6"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
dependencies = [
"libc",
"windows-sys 0.52.0",
Expand Down Expand Up @@ -10909,7 +10913,7 @@ dependencies = [
"parking_lot 0.12.1",
"pin-project-lite",
"signal-hook-registry",
"socket2 0.5.6",
"socket2 0.5.7",
"tokio-macros",
"windows-sys 0.48.0",
]
Expand Down Expand Up @@ -11045,9 +11049,9 @@ dependencies = [

[[package]]
name = "tokio-util"
version = "0.7.10"
version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
dependencies = [
"bytes",
"futures-core",
Expand All @@ -11057,7 +11061,6 @@ dependencies = [
"pin-project-lite",
"slab",
"tokio",
"tracing",
]

[[package]]
Expand Down Expand Up @@ -11518,9 +11521,9 @@ dependencies = [

[[package]]
name = "turmoil"
version = "0.6.0"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "181ee1366231313f06f613c278fe595e7369a1714bd3dae0b2cb1c9c0ab9ae69"
checksum = "c1a6d72d6f78941e759159d1080436847926852d5250455fecbbfab203832eac"
dependencies = [
"bytes",
"futures",
Expand Down Expand Up @@ -12801,11 +12804,11 @@ dependencies = [

[[package]]
name = "zstd"
version = "0.13.0"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
dependencies = [
"zstd-safe 7.0.0",
"zstd-safe 7.1.0",
]

[[package]]
Expand All @@ -12820,20 +12823,19 @@ dependencies = [

[[package]]
name = "zstd-safe"
version = "7.0.0"
version = "7.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
dependencies = [
"zstd-sys",
]

[[package]]
name = "zstd-sys"
version = "2.0.8+zstd.1.5.5"
version = "2.0.10+zstd.1.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
dependencies = [
"cc",
"libc",
"pkg-config",
]
Loading

0 comments on commit 522341a

Please sign in to comment.