Skip to content

Commit

Permalink
chore(deps): bump nix from 0.26.2 to 0.27.1 (#1284)
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot[bot] authored Aug 28, 2023
1 parent 0be60a3 commit fbe81b7
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 36 deletions.
24 changes: 3 additions & 21 deletions Cargo.lock

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

18 changes: 11 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ path = "bin/ssservice.rs"
required-features = ["service"]

[workspace]
members = [
"crates/shadowsocks",
"crates/shadowsocks-service",
]
members = ["crates/shadowsocks", "crates/shadowsocks-service"]

[profile.release]
lto = "fat"
Expand Down Expand Up @@ -94,7 +91,10 @@ local-dns = ["local", "shadowsocks-service/local-dns"]
local-flow-stat = ["local", "shadowsocks-service/local-flow-stat"]
# Enable HTTP protocol for sslocal
local-http = ["local", "shadowsocks-service/local-http"]
local-http-native-tls = ["local-http", "shadowsocks-service/local-http-native-tls"]
local-http-native-tls = [
"local-http",
"shadowsocks-service/local-http-native-tls",
]
local-http-rustls = ["local-http", "shadowsocks-service/local-http-rustls"]
# Enable REDIR protocol for sslocal
# (transparent proxy)
Expand Down Expand Up @@ -133,8 +133,12 @@ aead-cipher-2022 = ["shadowsocks-service/aead-cipher-2022"]
aead-cipher-2022-extra = ["shadowsocks-service/aead-cipher-2022-extra"]

# Enable detection against replay attack (Stream / AEAD)
security-replay-attack-detect = ["shadowsocks-service/security-replay-attack-detect"]
replay-attack-detect = ["security-replay-attack-detect"] # Backward compatibility. DO NOT USE.
security-replay-attack-detect = [
"shadowsocks-service/security-replay-attack-detect",
]
replay-attack-detect = [
"security-replay-attack-detect",
] # Backward compatibility. DO NOT USE.

[dependencies]
log = "0.4"
Expand Down
54 changes: 46 additions & 8 deletions crates/shadowsocks-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,16 @@ manager = ["server"]

# Enables trust-dns for replacing tokio's builtin DNS resolver
trust-dns = ["trust-dns-resolver", "shadowsocks/trust-dns"]
dns-over-tls = ["trust-dns", "trust-dns-resolver/dns-over-tls", "trust-dns-resolver/dns-over-rustls"]
dns-over-https = ["trust-dns", "trust-dns-resolver/dns-over-https", "trust-dns-resolver/dns-over-https-rustls"]
dns-over-tls = [
"trust-dns",
"trust-dns-resolver/dns-over-tls",
"trust-dns-resolver/dns-over-rustls",
]
dns-over-https = [
"trust-dns",
"trust-dns-resolver/dns-over-https",
"trust-dns-resolver/dns-over-https-rustls",
]

# Enable DNS-relay
local-dns = ["local", "trust-dns"]
Expand All @@ -47,7 +55,12 @@ local-flow-stat = ["local"]
# Enable HTTP protocol for sslocal
local-http = ["local", "hyper", "tower"]
local-http-native-tls = ["local-http", "tokio-native-tls", "native-tls"]
local-http-rustls = ["local-http", "tokio-rustls", "webpki-roots", "rustls-native-certs"]
local-http-rustls = [
"local-http",
"tokio-rustls",
"webpki-roots",
"rustls-native-certs",
]
# Enable REDIR protocol for sslocal
# (transparent proxy)
local-redir = ["local"]
Expand Down Expand Up @@ -93,7 +106,15 @@ byteorder = "1.3"
rand = { version = "0.8", features = ["small_rng"] }

futures = "0.3"
tokio = { version = "1.5", features = ["io-util", "macros", "net", "parking_lot", "rt", "sync", "time"] }
tokio = { version = "1.5", features = [
"io-util",
"macros",
"net",
"parking_lot",
"rt",
"sync",
"time",
] }
tokio-native-tls = { version = "0.3", optional = true }
native-tls = { version = "0.2.8", optional = true, features = ["alpn"] }
tokio-rustls = { version = "0.24", optional = true }
Expand All @@ -107,7 +128,9 @@ 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 = ["serde-config"] }
trust-dns-resolver = { version = "0.23.0-alpha", optional = true, features = [
"serde-config",
] }

idna = "0.4"
ipnet = "2.7"
Expand All @@ -116,7 +139,16 @@ regex = "1.4"

tun = { version = "0.5.5", optional = true, features = ["async"] }
etherparse = { version = "0.13", optional = true }
smoltcp = { version = "0.10", optional = true, default-features = false, features = ["std", "log", "medium-ip", "proto-ipv4", "proto-ipv6", "socket-icmp", "socket-udp", "socket-tcp"] }
smoltcp = { version = "0.10", optional = true, default-features = false, features = [
"std",
"log",
"medium-ip",
"proto-ipv4",
"proto-ipv6",
"socket-icmp",
"socket-udp",
"socket-tcp",
] }

serde = { version = "1.0", features = ["derive"] }
json5 = "0.4"
Expand All @@ -125,7 +157,7 @@ shadowsocks = { version = "1.16.0", path = "../shadowsocks", default-features =

# 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]
nix = "0.26"
nix = { version = "0.27", features = ["ioctl"] }

[target.'cfg(windows)'.dependencies]
windows-sys = { version = "0.48", features = ["Win32_Networking_WinSock"] }
Expand All @@ -135,4 +167,10 @@ byteorder = "1.3"
env_logger = "0.10"

[package.metadata.docs.rs]
features = ["full", "local-http-rustls", "local-dns", "dns-over-tls", "dns-over-https"]
features = [
"full",
"local-http-rustls",
"local-dns",
"dns-over-tls",
"dns-over-https",
]

0 comments on commit fbe81b7

Please sign in to comment.