source/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-02-09 01:59:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(deps): update rust crate hickory-resolver to v0.25.0-alpha.5 (#1870)

Browse Source 
* fix(deps): update rust crate hickory-resolver to v0.25.0-alpha.5

* fix: hickory-dns removed native-tls

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: zonyitoo <zonyitoo@gmail.com>
This commit is contained in:
renovate[bot]
2025-02-13 02:35:55 +08:00
committed by GitHub
parent fe1388da06
commit dccb3c4c4a
4 changed files with 124 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
Cargo.lock generated
View File

@@ -74,10 +74,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
"getrandom",
"getrandom 0.2.15",
"once_cell",
"version_check",
"zerocopy",
"zerocopy 0.7.35",
]
[[package]]
@@ -348,7 +348,7 @@ version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f6d7f06817e48ea4e17532fa61bc4e8b9a101437f0623f69d2ea54284f3a817"
dependencies = [
"getrandom",
"getrandom 0.2.15",
"siphasher",
]
@@ -386,7 +386,7 @@ dependencies = [
"indexmap",
"js-sys",
"once_cell",
"rand",
"rand 0.8.5",
"serde",
"serde_bytes",
"serde_json",
@@ -682,7 +682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
dependencies = [
"generic-array",
"rand_core",
"rand_core 0.6.4",
"subtle",
"zeroize",
]
@@ -694,7 +694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
dependencies = [
"generic-array",
"rand_core",
"rand_core 0.6.4",
"typenum",
]
@@ -887,7 +887,7 @@ dependencies = [
"ff",
"generic-array",
"group",
"rand_core",
"rand_core 0.6.4",
"sec1",
"subtle",
"zeroize",
@@ -960,7 +960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
dependencies = [
"libc",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -1005,7 +1005,7 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
dependencies = [
"rand_core",
"rand_core 0.6.4",
"subtle",
]
@@ -1227,10 +1227,22 @@ dependencies = [
"cfg-if",
"js-sys",
"libc",
"wasi",
"wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
]
[[package]]
name = "getrandom"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
dependencies = [
"cfg-if",
"libc",
"wasi 0.13.3+wasi-0.2.2",
"windows-targets 0.52.6",
]
[[package]]
name = "ghash"
version = "0.5.1"
@@ -1254,7 +1266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
dependencies = [
"ff",
"rand_core",
"rand_core 0.6.4",
"subtle",
]
@@ -1344,9 +1356,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "hickory-proto"
version = "0.25.0-alpha.4"
version = "0.25.0-alpha.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d063c0692ee669aa6d261988aa19ca5510f1cc40e4f211024f50c888499a35d7"
checksum = "1d00147af6310f4392a31680db52a3ed45a2e0f68eb18e8c3fe5537ecc96d9e2"
dependencies = [
"async-recursion",
"async-trait",
@@ -1363,18 +1375,15 @@ dependencies = [
"http",
"idna",
"ipnet",
"native-tls",
"once_cell",
"pin-project-lite",
"quinn",
"rand",
"rand 0.9.0",
"rustls",
"rustls-native-certs",
"serde",
"thiserror 2.0.11",
"tinyvec",
"tokio",
"tokio-native-tls",
"tokio-rustls",
"tracing",
"url",
@@ -1383,9 +1392,9 @@ dependencies = [
[[package]]
name = "hickory-resolver"
version = "0.25.0-alpha.4"
version = "0.25.0-alpha.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42bc352e4412fb657e795f79b4efcf2bd60b59ee5ca0187f3554194cd1107a27"
checksum = "5762f69ebdbd4ddb2e975cd24690bf21fe6b2604039189c26acddbc427f12887"
dependencies = [
"cfg-if",
"futures-util",
@@ -1395,15 +1404,13 @@ dependencies = [
"once_cell",
"parking_lot 0.12.3",
"quinn",
"rand",
"rand 0.9.0",
"resolv-conf",
"rustls",
"rustls-native-certs",
"serde",
"smallvec",
"thiserror 2.0.11",
"tokio",
"tokio-native-tls",
"tokio-rustls",
"tracing",
"webpki-roots",
@@ -1903,7 +1910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
dependencies = [
"cfg-if",
"windows-targets 0.48.5",
"windows-targets 0.52.6",
]
[[package]]
@@ -1982,7 +1989,7 @@ dependencies = [
"log-mdc",
"once_cell",
"parking_lot 0.12.3",
"rand",
"rand 0.8.5",
"serde",
"serde-value",
"serde_json",
@@ -2081,7 +2088,7 @@ checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
dependencies = [
"libc",
"log",
"wasi",
"wasi 0.11.0+wasi-snapshot-preview1",
"windows-sys 0.52.0",
]
@@ -2514,7 +2521,7 @@ version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
dependencies = [
"zerocopy",
"zerocopy 0.7.35",
]
[[package]]
@@ -2595,8 +2602,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
dependencies = [
"bytes",
"getrandom",
"rand",
"getrandom 0.2.15",
"rand 0.8.5",
"ring",
"rustc-hash",
"rustls",
@@ -2619,7 +2626,7 @@ dependencies = [
"once_cell",
"socket2",
"tracing",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -2644,8 +2651,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha",
"rand_core",
"rand_chacha 0.3.1",
"rand_core 0.6.4",
]
[[package]]
name = "rand"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
dependencies = [
"rand_chacha 0.9.0",
"rand_core 0.9.0",
"zerocopy 0.8.17",
]
[[package]]
@@ -2655,7 +2673,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
"rand_core",
"rand_core 0.6.4",
]
[[package]]
name = "rand_chacha"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
"rand_core 0.9.0",
]
[[package]]
@@ -2664,7 +2692,17 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
"getrandom",
"getrandom 0.2.15",
]
[[package]]
name = "rand_core"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff"
dependencies = [
"getrandom 0.3.1",
"zerocopy 0.8.17",
]
[[package]]
@@ -2691,7 +2729,7 @@ version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
dependencies = [
"getrandom",
"getrandom 0.2.15",
"libredox",
"thiserror 1.0.69",
]
@@ -2809,7 +2847,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
dependencies = [
"cc",
"cfg-if",
"getrandom",
"getrandom 0.2.15",
"libc",
"spin",
"untrusted",
@@ -2830,7 +2868,7 @@ dependencies = [
"p256",
"p384",
"pkcs8",
"rand_core",
"rand_core 0.6.4",
"ring",
"signature",
]
@@ -2907,7 +2945,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -3204,7 +3242,7 @@ dependencies = [
"once_cell",
"percent-encoding",
"pin-project",
"rand",
"rand 0.8.5",
"sendfd",
"serde",
"serde_json",
@@ -3241,7 +3279,7 @@ dependencies = [
"ghash",
"hkdf",
"md-5",
"rand",
"rand 0.8.5",
"ring-compat",
"sha1",
"sm4",
@@ -3271,7 +3309,7 @@ dependencies = [
"mimalloc",
"mime",
"qrcode",
"rand",
"rand 0.8.5",
"reqwest",
"rpassword",
"rpmalloc",
@@ -3321,7 +3359,7 @@ dependencies = [
"nix",
"once_cell",
"pin-project",
"rand",
"rand 0.8.5",
"regex",
"rustls-native-certs",
"serde",
@@ -3371,7 +3409,7 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
dependencies = [
"rand_core",
"rand_core 0.6.4",
]
[[package]]
@@ -3684,7 +3722,7 @@ dependencies = [
"fastrand",
"once_cell",
"rustix",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -4122,7 +4160,7 @@ version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
dependencies = [
"getrandom",
"getrandom 0.2.15",
"serde",
]
@@ -4205,6 +4243,15 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasi"
version = "0.13.3+wasi-0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
dependencies = [
"wit-bindgen-rt",
]
[[package]]
name = "wasm-bindgen"
version = "0.2.99"
@@ -4329,7 +4376,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
"windows-sys 0.48.0",
"windows-sys 0.59.0",
]
[[package]]
@@ -4617,6 +4664,15 @@ dependencies = [
"winreg2",
]
[[package]]
name = "wit-bindgen-rt"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
dependencies = [
"bitflags 2.7.0",
]
[[package]]
name = "write16"
version = "1.0.0"
@@ -4675,7 +4731,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
dependencies = [
"byteorder",
"zerocopy-derive",
"zerocopy-derive 0.7.35",
]
[[package]]
name = "zerocopy"
version = "0.8.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa91407dacce3a68c56de03abe2760159582b846c6a4acd2f456618087f12713"
dependencies = [
"zerocopy-derive 0.8.17",
]
[[package]]
@@ -4689,6 +4754,17 @@ dependencies = [
"syn 2.0.94",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06718a168365cad3d5ff0bb133aad346959a2074bd4a85c121255a11304a8626"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.94",
]
[[package]]
name = "zerofrom"
version = "0.1.5"

4
Cargo.toml
View File

@@ -120,10 +120,6 @@ hickory-dns = ["shadowsocks-service/hickory-dns"]
# Hickory-DNS was renamed from Trust-DNS, keep compatibility.
trust-dns = ["hickory-dns"]
dns-over-tls = ["shadowsocks-service/dns-over-tls"]
dns-over-native-tls = ["shadowsocks-service/dns-over-native-tls"]
dns-over-native-tls-vendored = [
"shadowsocks-service/dns-over-native-tls-vendored",
]
dns-over-https = ["shadowsocks-service/dns-over-https"]
dns-over-h3 = ["shadowsocks-service/dns-over-h3"]

16
crates/shadowsocks-service/Cargo.toml
View File

@@ -42,27 +42,13 @@ hickory-dns = ["hickory-resolver", "shadowsocks/trust-dns"]
trust-dns = ["hickory-dns"]
dns-over-tls = [
"hickory-dns",
"hickory-resolver/dns-over-tls",
"hickory-resolver/dns-over-rustls",
"hickory-resolver/webpki-roots",
"hickory-resolver/native-certs",
]
dns-over-native-tls = [
"hickory-dns",
"hickory-resolver/dns-over-tls",
"hickory-resolver/dns-over-native-tls",
]
dns-over-native-tls-vendored = [
"hickory-dns",
"hickory-resolver/dns-over-tls",
"hickory-resolver/dns-over-native-tls",
"native-tls/vendored",
]
dns-over-https = [
"hickory-dns",
"hickory-resolver/dns-over-https-rustls",
"hickory-resolver/webpki-roots",
"hickory-resolver/native-certs",
]
dns-over-h3 = ["hickory-dns", "hickory-resolver/dns-over-h3"]
@@ -180,7 +166,7 @@ http-body-util = { version = "0.1", optional = true }
http = { version = "1.1", optional = true }
httparse = { version = "1.9", optional = true }
hickory-resolver = { version = "=0.25.0-alpha.4", optional = true, features = [
hickory-resolver = { version = "=0.25.0-alpha.5", optional = true, features = [
"serde",
] }

2
crates/shadowsocks/Cargo.toml
View File

@@ -86,7 +86,7 @@ tokio = { version = "1.9.0", features = [
"time",
] }
hickory-resolver = { version = "=0.25.0-alpha.4", optional = true }
hickory-resolver = { version = "=0.25.0-alpha.5", optional = true }
arc-swap = { version = "1.7", optional = true }
notify = { version = "8.0", optional = true }