From 9f57d9291943611541a590395132c606218cc380 Mon Sep 17 00:00:00 2001 From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 11:54:43 +0100 Subject: [PATCH] build: Sync with eclipse-zenoh/zenoh@bb24e95 from 2024-10-31 (#262) Co-authored-by: eclipse-zenoh-bot --- Cargo.lock | 70 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d8b10b5..7289773 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2125,9 +2125,9 @@ dependencies = [ [[package]] name = "ntex-service" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02daa9c4fc8b5382b24dd69d504599a72774d6828e4fc21e9013cb62096db7aa" +checksum = "690a43ea671c928c2bc5265abc5edae5b95f92a37efefa501013880c361d77d8" dependencies = [ "slab", ] @@ -3813,6 +3813,19 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tls-listener" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f1d8809f604e448c7bc53a5a0e4c2a0a20ba44cb1fb407314c8eeccb92127f9" +dependencies = [ + "futures-util", + "pin-project-lite 0.2.14", + "thiserror", + "tokio", + "tokio-rustls", +] + [[package]] name = "token-cell" version = "1.5.0" @@ -4529,7 +4542,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "ahash", "async-trait", @@ -4592,7 +4605,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "zenoh-collections", ] @@ -4600,7 +4613,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "tracing", "uhlc", @@ -4611,12 +4624,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" [[package]] name = "zenoh-config" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "json5", "num_cpus", @@ -4637,7 +4650,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "lazy_static", "tokio", @@ -4648,7 +4661,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "aes 0.8.4", "hmac 0.12.1", @@ -4661,7 +4674,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "hashbrown 0.14.5", "keyed-set", @@ -4675,7 +4688,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -4692,7 +4705,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "async-trait", "flume", @@ -4715,7 +4728,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "async-trait", "base64 0.22.1", @@ -4740,7 +4753,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4757,7 +4770,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "async-trait", "base64 0.22.1", @@ -4767,6 +4780,7 @@ dependencies = [ "rustls-webpki", "secrecy", "socket2 0.5.7", + "tls-listener", "tokio", "tokio-rustls", "tokio-util", @@ -4784,7 +4798,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "async-trait", "socket2 0.5.7", @@ -4803,7 +4817,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "async-trait", "nix", @@ -4821,7 +4835,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "async-trait", "futures-util", @@ -4841,7 +4855,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "proc-macro2", "quote", @@ -4882,7 +4896,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "anyhow", "async-std", @@ -4907,7 +4921,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "git-version", "libloading", @@ -4923,7 +4937,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "const_format", "rand 0.8.5", @@ -4937,7 +4951,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "anyhow", ] @@ -4945,7 +4959,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "lazy_static", "ron", @@ -4958,7 +4972,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "event-listener 5.3.1", "futures", @@ -4971,7 +4985,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "futures", "tokio", @@ -4984,7 +4998,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "async-trait", "crossbeam-utils", @@ -5017,7 +5031,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.0.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#b1c0a6ba3b64b3e029a514b5c032499e992693c2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#bb24e956516fd53d0dc0b9faef38a74a940fc0ba" dependencies = [ "async-trait", "const_format",