diff --git a/Cargo.lock b/Cargo.lock index cc109470836..b8e2766463c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2042,8 +2042,8 @@ dependencies = [ "tokio", "toml 0.8.6", "trust-dns-client", - "trust-dns-proto", - "trust-dns-resolver", + "trust-dns-proto 0.23.2", + "trust-dns-resolver 0.23.2", "trust-dns-server", "uuid", ] @@ -2128,6 +2128,15 @@ dependencies = [ "uuid", ] +[[package]] +name = "drain" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f1a0abf3fcefad9b4dd0e414207a7408e12b68414a01e6bb19b897d5bd7632d" +dependencies = [ + "tokio", +] + [[package]] name = "dropshot" version = "0.9.1-dev" @@ -2306,7 +2315,7 @@ dependencies = [ "serde_json", "tokio", "toml 0.8.6", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", "uuid", ] @@ -2328,6 +2337,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "env_logger" version = "0.9.3" @@ -3618,8 +3639,8 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "trust-dns-proto", - "trust-dns-resolver", + "trust-dns-proto 0.23.2", + "trust-dns-resolver 0.23.2", "uuid", ] @@ -3637,8 +3658,8 @@ dependencies = [ "reqwest", "slog", "thiserror", - "trust-dns-proto", - "trust-dns-resolver", + "trust-dns-proto 0.22.0", + "trust-dns-resolver 0.22.0", "uuid", ] @@ -3654,7 +3675,7 @@ dependencies = [ "omicron-workspace-hack", "slog", "tokio", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", ] [[package]] @@ -4525,8 +4546,8 @@ dependencies = [ "serde_urlencoded", "slog", "tempfile", - "trust-dns-proto", - "trust-dns-resolver", + "trust-dns-proto 0.23.2", + "trust-dns-resolver 0.23.2", "uuid", ] @@ -5158,7 +5179,7 @@ dependencies = [ "tokio-postgres", "toml 0.8.6", "tough", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", "usdt", "uuid", ] @@ -5494,7 +5515,7 @@ dependencies = [ "toml_datetime", "toml_edit 0.19.15", "tracing", - "trust-dns-proto", + "trust-dns-proto 0.23.2", "unicode-bidi", "unicode-normalization", "unicode-xid", @@ -5714,7 +5735,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", "uuid", ] @@ -9358,22 +9379,21 @@ dependencies = [ [[package]] name = "trust-dns-client" -version = "0.22.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c408c32e6a9dbb38037cece35740f2cf23c875d8ca134d33631cec83f74d3fe" +checksum = "14135e72c7e6d4c9b6902d4437881a8598f0145dbb2e3f86f92dbad845b61e63" dependencies = [ "cfg-if 1.0.0", "data-encoding", "futures-channel", "futures-util", - "lazy_static", + "once_cell", "radix_trie", "rand 0.8.5", "thiserror", - "time", "tokio", "tracing", - "trust-dns-proto", + "trust-dns-proto 0.23.2", ] [[package]] @@ -9385,7 +9405,7 @@ dependencies = [ "async-trait", "cfg-if 1.0.0", "data-encoding", - "enum-as-inner", + "enum-as-inner 0.5.1", "futures-channel", "futures-io", "futures-util", @@ -9401,6 +9421,31 @@ dependencies = [ "url", ] +[[package]] +name = "trust-dns-proto" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" +dependencies = [ + "async-trait", + "cfg-if 1.0.0", + "data-encoding", + "enum-as-inner 0.6.0", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "smallvec 1.11.0", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + [[package]] name = "trust-dns-resolver" version = "0.22.0" @@ -9418,29 +9463,50 @@ dependencies = [ "thiserror", "tokio", "tracing", - "trust-dns-proto", + "trust-dns-proto 0.22.0", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" +dependencies = [ + "cfg-if 1.0.0", + "futures-util", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot 0.12.1", + "rand 0.8.5", + "resolv-conf", + "smallvec 1.11.0", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto 0.23.2", ] [[package]] name = "trust-dns-server" -version = "0.22.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99022f9befa6daec2a860be68ac28b1f0d9d7ccf441d8c5a695e35a58d88840d" +checksum = "c540f73c2b2ec2f6c54eabd0900e7aafb747a820224b742f556e8faabb461bc7" dependencies = [ "async-trait", "bytes", "cfg-if 1.0.0", - "enum-as-inner", + "drain", + "enum-as-inner 0.6.0", "futures-executor", "futures-util", "serde", "thiserror", "time", "tokio", - "toml 0.5.11", + "toml 0.7.8", "tracing", - "trust-dns-client", - "trust-dns-proto", + "trust-dns-proto 0.23.2", ] [[package]] @@ -10247,7 +10313,7 @@ dependencies = [ "tokio-util", "toml 0.8.6", "tough", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", "tufaceous", "tufaceous-lib", "update-engine", diff --git a/Cargo.toml b/Cargo.toml index 63b18a9f9af..88a56b6ecdb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -367,10 +367,10 @@ toml = "0.8.6" toml_edit = "0.20.7" topological-sort = "0.2.2" tough = { version = "0.14", features = [ "http" ] } -trust-dns-client = "0.22" -trust-dns-proto = "0.22" -trust-dns-resolver = "0.22" -trust-dns-server = "0.22" +trust-dns-client = "0.23" +trust-dns-proto = "0.23" +trust-dns-resolver = "0.23" +trust-dns-server = "0.23" trybuild = "1.0.85" tufaceous = { path = "tufaceous" } tufaceous-lib = { path = "tufaceous-lib" } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 43276ef15bb..07c82233e73 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -95,7 +95,7 @@ tokio-postgres = { version = "0.7.10", features = ["with-chrono-0_4", "with-serd tokio-stream = { version = "0.1.14", features = ["net"] } toml = { version = "0.7.8" } tracing = { version = "0.1.37", features = ["log"] } -trust-dns-proto = { version = "0.22.0" } +trust-dns-proto = { version = "0.23.2", features = ["text-parsing"] } unicode-bidi = { version = "0.3.13" } unicode-normalization = { version = "0.1.22" } usdt = { version = "0.3.5" } @@ -189,7 +189,7 @@ tokio-postgres = { version = "0.7.10", features = ["with-chrono-0_4", "with-serd tokio-stream = { version = "0.1.14", features = ["net"] } toml = { version = "0.7.8" } tracing = { version = "0.1.37", features = ["log"] } -trust-dns-proto = { version = "0.22.0" } +trust-dns-proto = { version = "0.23.2", features = ["text-parsing"] } unicode-bidi = { version = "0.3.13" } unicode-normalization = { version = "0.1.22" } unicode-xid = { version = "0.2.4" }