From 930a5dc634aff9217edcc6531117ecba306875d8 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 11 Dec 2020 16:53:44 +0800 Subject: [PATCH 1/6] Update shadowsocks-rust to 1.9.0 --- .circleci/config.yml | 3 +++ core/build.gradle.kts | 9 +-------- .../main/java/com/github/shadowsocks/bg/ProxyInstance.kt | 4 ++-- core/src/main/rust/shadowsocks-rust | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 770209a77d..a2d1f940fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,6 +7,9 @@ jobs: environment: GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process" steps: + - run: rustup toolchain install nightly + - run: rustup override set nightly + - run: rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android - checkout - run: git submodule update --init --recursive - restore_cache: diff --git a/core/build.gradle.kts b/core/build.gradle.kts index ce41440723..160f1e5fb6 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -38,16 +38,9 @@ cargo { profile = findProperty("CARGO_PROFILE")?.toString() ?: currentFlavor extraCargoBuildArguments = listOf("--bin", libname!!) featureSpec.noDefaultBut(arrayOf( - "ring-aead-ciphers", - "sodium", - "rc4", - "aes-cfb", - "aes-ctr", - "camellia-cfb", - "openssl-vendored", "single-threaded", "local-flow-stat", - "local-dns-relay")) + "local-dns")) exec = { spec, toolchain -> spec.environment("RUST_ANDROID_GRADLE_LINKER_WRAPPER_PY", "$projectDir/$module/../linker-wrapper.py") spec.environment("RUST_ANDROID_GRADLE_TARGET", "target/${toolchain.target}/$profile/lib$libname.so") diff --git a/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt b/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt index 856beae0c4..7c7ab5dc77 100644 --- a/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt +++ b/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt @@ -90,8 +90,8 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro throw BaseService.ExpectedExceptionWrapper(e) }.let { dns -> cmd += arrayListOf( - "--dns-relay", "${DataStore.listenAddress}:${DataStore.portLocalDns}", - "--remote-dns", "${dns.host ?: "0.0.0.0"}:${if (dns.port < 0) 53 else dns.port}") + "--dns-addr", "${DataStore.listenAddress}:${DataStore.portLocalDns}", + "--remote-dns-addr", "${dns.host ?: "0.0.0.0"}:${if (dns.port < 0) 53 else dns.port}") } if (route != Acl.ALL) { diff --git a/core/src/main/rust/shadowsocks-rust b/core/src/main/rust/shadowsocks-rust index 2a6451f0fe..b0aeb128ab 160000 --- a/core/src/main/rust/shadowsocks-rust +++ b/core/src/main/rust/shadowsocks-rust @@ -1 +1 @@ -Subproject commit 2a6451f0feef2abbcf961be38edf13abdada11b5 +Subproject commit b0aeb128ab0a57c3378d1de11ebcd50718e5cb2c From 9f3e984291841f2cc53e0ddbcca19f0e341c328d Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 14 Dec 2020 12:29:02 +0800 Subject: [PATCH 2/6] Enable single-threaded --- core/src/main/rust/shadowsocks-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/rust/shadowsocks-rust b/core/src/main/rust/shadowsocks-rust index b0aeb128ab..3a658e6d54 160000 --- a/core/src/main/rust/shadowsocks-rust +++ b/core/src/main/rust/shadowsocks-rust @@ -1 +1 @@ -Subproject commit b0aeb128ab0a57c3378d1de11ebcd50718e5cb2c +Subproject commit 3a658e6d54904dfbd8b6b130cef076ef1b0317f3 From daba1ae77da2f18a77fae108e2ab760201c0e432 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 21 Dec 2020 08:14:59 +0800 Subject: [PATCH 3/6] Fix the rust toolchain version to nightly-2020-12-20 --- .circleci/config.yml | 4 ++-- core/src/main/rust/shadowsocks-rust | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a2d1f940fa..6d5e40256f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,8 +7,8 @@ jobs: environment: GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process" steps: - - run: rustup toolchain install nightly - - run: rustup override set nightly + - run: rustup toolchain install nightly-2020-12-20 + - run: rustup override set nightly-2020-12-20 - run: rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android - checkout - run: git submodule update --init --recursive diff --git a/core/src/main/rust/shadowsocks-rust b/core/src/main/rust/shadowsocks-rust index 3a658e6d54..bc33723107 160000 --- a/core/src/main/rust/shadowsocks-rust +++ b/core/src/main/rust/shadowsocks-rust @@ -1 +1 @@ -Subproject commit 3a658e6d54904dfbd8b6b130cef076ef1b0317f3 +Subproject commit bc33723107dce4d128ba53457228ecb3a0c6c5a5 From eaadbad25c470e29b2c95375c5f8d2d1547244c6 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 21 Dec 2020 08:16:35 +0800 Subject: [PATCH 4/6] Bump version --- buildSrc/src/main/kotlin/Helpers.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Helpers.kt b/buildSrc/src/main/kotlin/Helpers.kt index 8bc80be2d9..148834e226 100644 --- a/buildSrc/src/main/kotlin/Helpers.kt +++ b/buildSrc/src/main/kotlin/Helpers.kt @@ -56,8 +56,8 @@ fun Project.setupCore() { setupCommon() android.apply { defaultConfig { - versionCode = 5010750 - versionName = "5.1.7-nightly" + versionCode = 5010850 + versionName = "5.1.8-nightly" } compileOptions.isCoreLibraryDesugaringEnabled = true lintOptions { From dfadb3ec605fee65e3e7b76ea4dd3461cc37fd79 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 21 Dec 2020 10:47:25 +0800 Subject: [PATCH 5/6] Update README --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b376c7f6bb..12e51f795a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,12 @@ for Android TV ([beta](https://play.google.com/apps/testing/com.github.shadowsoc * Android SDK - Android NDK * Rust with Android targets installed - `$ rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android` + +```bash + $ rustup toolchain install nightly-2020-12-20 + $ rustup override set nightly-2020-12-20 + $ rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android +``` ### BUILD From 1b27bee1f5333caaff9f914784dd48bf66d7880e Mon Sep 17 00:00:00 2001 From: Max Lv Date: Tue, 22 Dec 2020 16:30:10 +0800 Subject: [PATCH 6/6] Update shadowsocks-rust --- core/src/main/rust/shadowsocks-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/rust/shadowsocks-rust b/core/src/main/rust/shadowsocks-rust index bc33723107..3a1054acc5 160000 --- a/core/src/main/rust/shadowsocks-rust +++ b/core/src/main/rust/shadowsocks-rust @@ -1 +1 @@ -Subproject commit bc33723107dce4d128ba53457228ecb3a0c6c5a5 +Subproject commit 3a1054acc54cfc23a1cd232aa0a45b66af4bd612