From d4f2230094519eeb9f0a02a884b7ff517f0a9e67 Mon Sep 17 00:00:00 2001
From: zonyitoo <zonyitoo@gmail.com>
Date: Sun, 8 May 2022 21:32:17 +0800
Subject: [PATCH] nix 0.24.0 build failed on mips*-unknown-linux-musl targets

- https://github.com/nix-rust/nix/issues/1719
---
 Cargo.lock                    | 9 ++++-----
 Cargo.toml                    | 2 +-
 crates/shadowsocks/Cargo.toml | 6 +-----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1a65b52a8ca4..35d300443d14 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2058,7 +2058,6 @@ dependencies = [
  "libc",
  "log",
  "lru_time_cache",
- "nix",
  "notify",
  "once_cell",
  "pin-project",
@@ -2102,7 +2101,7 @@ dependencies = [
 
 [[package]]
 name = "shadowsocks-rust"
-version = "1.15.0"
+version = "1.15.0-alpha.2"
 dependencies = [
  "build-time",
  "byte_string",
@@ -2473,9 +2472,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-tfo"
-version = "0.1.9"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4279aec5ded232170bf39130dd0e0deaed2c9f31cd3b5db1f2021056bcf5f94a"
+checksum = "be94e60e867516c53352c93b4b7762b68464bd24c62588f7f10c22fb9d02b6c9"
 dependencies = [
  "cfg-if",
  "futures",
@@ -2485,7 +2484,7 @@ dependencies = [
  "pin-project",
  "socket2",
  "tokio",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 234f6c1aa71f..62582c5ecb5b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shadowsocks-rust"
-version = "1.15.0-alpha.1"
+version = "1.15.0-alpha.2"
 authors = ["Shadowsocks Contributors"]
 description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
 repository = "https://github.com/shadowsocks/shadowsocks-rust"
diff --git a/crates/shadowsocks/Cargo.toml b/crates/shadowsocks/Cargo.toml
index 474a889745ca..fb9aa3f93a75 100644
--- a/crates/shadowsocks/Cargo.toml
+++ b/crates/shadowsocks/Cargo.toml
@@ -72,7 +72,7 @@ async-trait = "0.1"
 
 socket2 = { version = "0.4", features = ["all"] }
 tokio = { version = "1.9.0", features = ["io-util", "macros", "net", "parking_lot", "process", "rt", "sync", "time"] }
-tokio-tfo = "0.1.8"
+tokio-tfo = "0.2.0"
 
 trust-dns-resolver = { version = "0.21", optional = true }
 arc-swap = { version = "1.3", optional = true }
@@ -92,9 +92,5 @@ windows-sys = { version = "0.36", features = ["Win32_Foundation", "Win32_Network
 [target.'cfg(unix)'.dependencies]
 sendfd = { version = "0.4", features = ["tokio"] }
 
-# Just for the ioctl call macro
-[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
-nix = "0.24"
-
 [dev-dependencies]
 env_logger = "0.9"