Skip to content

Commit

Permalink
feat(deps): Trust-DNS rebranded to Hickory-DNS
Browse files Browse the repository at this point in the history
  • Loading branch information
zonyitoo committed Oct 15, 2023
1 parent 0fdcf27 commit 52f525d
Show file tree
Hide file tree
Showing 16 changed files with 203 additions and 201 deletions.
130 changes: 63 additions & 67 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shadowsocks-rust"
version = "1.16.2"
version = "1.17.0"
authors = ["Shadowsocks Contributors"]
description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
repository = "https://github.com/shadowsocks/shadowsocks-rust"
Expand Down Expand Up @@ -57,7 +57,7 @@ strip = true
[features]
default = [
"logging",
"trust-dns",
"hickory-dns",
"local",
"server",
"manager",
Expand All @@ -83,8 +83,10 @@ service = ["local", "server", "manager"]
# Enable Windows Service
winservice = ["service", "windows-service"]

# Enables trust-dns for replacing tokio's builtin DNS resolver
trust-dns = ["shadowsocks-service/trust-dns"]
# Enables Hickory-DNS for replacing tokio's builtin DNS resolver
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 = [
Expand Down Expand Up @@ -189,7 +191,7 @@ jemallocator = { version = "0.5", optional = true }
snmalloc-rs = { version = "0.3", optional = true }
rpmalloc = { version = "0.2", optional = true }

shadowsocks-service = { version = "1.16.2", path = "./crates/shadowsocks-service" }
shadowsocks-service = { version = "1.17.0", path = "./crates/shadowsocks-service" }

windows-service = { version = "0.6", optional = true }

Expand Down
40 changes: 21 additions & 19 deletions crates/shadowsocks-service/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shadowsocks-service"
version = "1.16.2"
version = "1.17.0"
authors = ["Shadowsocks Contributors"]
description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
repository = "https://github.com/shadowsocks/shadowsocks-rust"
Expand All @@ -18,7 +18,7 @@ full = [
"local",
"server",
"manager",
"trust-dns",
"hickory-dns",
"local-http",
"local-redir",
"local-tunnel",
Expand All @@ -32,32 +32,34 @@ server = []
# Enable manager server
manager = ["server"]

# Enables trust-dns for replacing tokio's builtin DNS resolver
trust-dns = ["trust-dns-resolver", "shadowsocks/trust-dns"]
# Enables Hickory-DNS for replacing tokio's builtin DNS resolver
hickory-dns = ["hickory-resolver", "shadowsocks/trust-dns"]
# Hickory-DNS was renamed from Trust-DNS, keep compatibility.
trust-dns = ["hickory-dns"]
dns-over-tls = [
"trust-dns",
"trust-dns-resolver/dns-over-tls",
"trust-dns-resolver/dns-over-rustls",
"hickory-dns",
"hickory-resolver/dns-over-tls",
"hickory-resolver/dns-over-rustls",
]
dns-over-native-tls = [
"trust-dns",
"trust-dns-resolver/dns-over-tls",
"trust-dns-resolver/dns-over-native-tls",
"hickory-dns",
"hickory-resolver/dns-over-tls",
"hickory-resolver/dns-over-native-tls",
]
dns-over-native-tls-vendored = [
"trust-dns",
"trust-dns-resolver/dns-over-tls",
"trust-dns-resolver/dns-over-native-tls",
"hickory-dns",
"hickory-resolver/dns-over-tls",
"hickory-resolver/dns-over-native-tls",
"native-tls/vendored",
]
dns-over-https = [
"trust-dns",
"trust-dns-resolver/dns-over-https",
"trust-dns-resolver/dns-over-https-rustls",
"hickory-dns",
"hickory-resolver/dns-over-https",
"hickory-resolver/dns-over-https-rustls",
]

# Enable DNS-relay
local-dns = ["local", "trust-dns"]
local-dns = ["local", "hickory-dns"]
# Backward compatibility, DO NOT USE
local-dns-relay = ["local-dns"]
# Enable client flow statistic report
Expand Down Expand Up @@ -144,7 +146,7 @@ libc = "0.2.141"
hyper = { version = "0.14.25", optional = true, features = ["full"] }
tower = { version = "0.4", optional = true }

trust-dns-resolver = { version = "0.23.0-alpha", optional = true, features = [
hickory-resolver = { version = "0.24", optional = true, features = [
"serde-config",
] }

Expand All @@ -169,7 +171,7 @@ smoltcp = { version = "0.10", optional = true, default-features = false, feature
serde = { version = "1.0", features = ["derive"] }
json5 = "0.4"

shadowsocks = { version = "1.16.0", path = "../shadowsocks", default-features = false }
shadowsocks = { version = "1.17.0", path = "../shadowsocks", default-features = false }

# Just for the ioctl call macro
[target.'cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies]
Expand Down
Loading

0 comments on commit 52f525d

Please sign in to comment.