From 5c1131bc94d20dd7ac1380961467a53652aa687e Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 15 Nov 2022 17:21:49 +0000
Subject: [PATCH] Add obfs4proxy-0.0.14-tor2, use latest Go and NDK versions.
---
build-binary.py | 2 ++
versions.json | 44 ++++++++++++++++++++++++++++++++++++++------
2 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/build-binary.py b/build-binary.py
index affc707..440d8f2 100755
--- a/build-binary.py
+++ b/build-binary.py
@@ -105,6 +105,8 @@ def build_android_arch(tool, versions, env, clang_arch, ndk_arch, abi):
toolchain = os.path.join("toolchain", ndk_arch)
if not os.path.isdir(toolchain):
toolchain_maker = os.path.join(NDK_DIR, "build", "tools", "make-standalone-toolchain.sh")
+ if not os.path.exists(toolchain_maker):
+ toolchain_maker = os.path.join(NDK_DIR, "build", "tools", "make_standalone_toolchain.py")
ex([toolchain_maker, "--arch=%s" % ndk_arch, "--install-dir=%s" % toolchain])
env['CC'] = "%s/bin/%s-clang" % (os.path.abspath(toolchain), clang_arch)
diff --git a/versions.json b/versions.json
index 1b01284..b760f9d 100644
--- a/versions.json
+++ b/versions.json
@@ -1,5 +1,21 @@
{
"obfs4proxy": {
+ "0.0.14-tor2": {
+ "repo_url": "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs4.git",
+ "revision": "b9e04fd9e241b0530e05511ec6895e698a25575f",
+ "build_path": "obfs4proxy",
+ "repo_dir": "obfs4",
+ "go": {
+ "version": "go1.19.3",
+ "sha256": "18ac263e39210bcf68d85f4370e97fb1734166995a1f63fb38b4f6e07d90d212"
+ },
+ "ndk": {
+ "url": "https://dl.google.com/android/repository/android-ndk-r25b-linux.zip",
+ "revision": "25.1.8937393",
+ "sha256": "403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005"
+ },
+ "timestamp": "201001010000.00"
+ },
"0.0.14-tor1": {
"repo_url": "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs4.git",
"revision": "ed46c23917b55c4b274d6986daeaf6bec7963115",
@@ -112,21 +128,37 @@
}
},
"snowflake": {
- "2.3.1": {
+ "2.3.1-1": {
"repo_url": "https://git.torproject.org/pluggable-transports/snowflake.git",
"revision": "36f03dfd4483922b3e7400dedc71df9cf2f30b6b",
"build_path": "client",
"repo_dir": "snowflake",
"go": {
- "version": "go1.16",
- "sha256": "7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a"
+ "version": "go1.19.3",
+ "sha256": "18ac263e39210bcf68d85f4370e97fb1734166995a1f63fb38b4f6e07d90d212"
},
"ndk": {
- "url": "https://dl.google.com/android/repository/android-ndk-r18-linux-x86_64.zip",
- "revision": "18.0.5002713",
- "sha256": "c413dd014edc37f822d0dc88fabc05b64232d07d5c6e9345224e47073fdf140b"
+ "url": "https://dl.google.com/android/repository/android-ndk-r25b-linux.zip",
+ "revision": "25.1.8937393",
+ "sha256": "403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005"
},
"timestamp": "201001010000.00"
}
+ },
+ "2.3.1": {
+ "repo_url": "https://git.torproject.org/pluggable-transports/snowflake.git",
+ "revision": "36f03dfd4483922b3e7400dedc71df9cf2f30b6b",
+ "build_path": "client",
+ "repo_dir": "snowflake",
+ "go": {
+ "version": "go1.16",
+ "sha256": "7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a"
+ },
+ "ndk": {
+ "url": "https://dl.google.com/android/repository/android-ndk-r18-linux-x86_64.zip",
+ "revision": "18.0.5002713",
+ "sha256": "c413dd014edc37f822d0dc88fabc05b64232d07d5c6e9345224e47073fdf140b"
+ },
+ "timestamp": "201001010000.00"
}
}
--
GitLab