From fbe81b76ca22ed9f1049d05220626d5e2b97a874 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 14:26:51 +0000 Subject: [PATCH] chore(deps): bump nix from 0.26.2 to 0.27.1 (#1284) --- Cargo.lock | 24 ++---------- Cargo.toml | 18 +++++---- crates/shadowsocks-service/Cargo.toml | 54 +++++++++++++++++++++++---- 3 files changed, 60 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index defcb1ee9964..ac67b8c25b57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1390,15 +1390,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "mimalloc" version = "0.1.38" @@ -1449,16 +1440,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "libc", - "memoffset", - "pin-utils", - "static_assertions", ] [[package]] @@ -2507,12 +2495,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.10.0" diff --git a/Cargo.toml b/Cargo.toml index 6cc0c35ca904..bf5d5f5a8c61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" @@ -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) @@ -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" diff --git a/crates/shadowsocks-service/Cargo.toml b/crates/shadowsocks-service/Cargo.toml index db0a9244af78..dd340a206fa3 100644 --- a/crates/shadowsocks-service/Cargo.toml +++ b/crates/shadowsocks-service/Cargo.toml @@ -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"] @@ -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"] @@ -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 } @@ -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" @@ -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" @@ -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"] } @@ -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", +]