From 17b9e11a8f7a57aec3b33079a4b110c47fbbd12c Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Sat, 12 Mar 2022 16:45:33 +0000
Subject: [PATCH] Remove Guardian Project patches.
The binaries before and after this change are identical.
---
build_tor_android.py | 11 -----------
tor-build/Makefile | 14 +++++++++-----
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/build_tor_android.py b/build_tor_android.py
index 3dda3c0..3fd75da 100755
--- a/build_tor_android.py
+++ b/build_tor_android.py
@@ -57,10 +57,6 @@ def setup_android_ndk(versions):
def build_android(versions):
- # apply tor-android patches first
- apply_tor_patch("6522c8a2ae9b2f9c4c488188f88d38728ee487a7")
- apply_tor_patch("fbd64bbed2848eb17c559a4c599a6834eb7db33a")
-
# use default PIE flags, if not present
os.environ.pop("PIEFLAGS", None)
@@ -105,13 +101,6 @@ def build_android_arch(name, env, versions):
os.remove(tor_path)
-def apply_tor_patch(commit):
- tor_path = os.path.join(BUILD_DIR, 'tor')
- check_call(['wget', '--no-verbose', 'https://github.com/guardianproject/tor/commit/' + commit + '.patch'],
- cwd=tor_path)
- check_call(['git', 'apply', commit + '.patch'], cwd=tor_path)
-
-
def package_android(versions, jar_name):
# zip binaries together
output_dir = get_output_dir(PLATFORM)
diff --git a/tor-build/Makefile b/tor-build/Makefile
index 1a49c05..546f0c1 100644
--- a/tor-build/Makefile
+++ b/tor-build/Makefile
@@ -165,7 +165,7 @@ libevent/Makefile: libevent/Makefile.am libevent/configure.ac
--disable-libevent-regress \
--disable-samples \
--disable-shared \
- --prefix=/
+ --prefix=/
libevent-build-stamp: openssl-build-stamp libevent/Makefile
$(MAKE) -C libevent install DESTDIR=$(EXTERNAL_ROOT)
@@ -255,16 +255,20 @@ tor/Makefile: tor/configure.ac tor/Makefile.am
cd tor && \
./configure \
--host=$(ALTHOST) \
- --enable-android \
--enable-lzma \
--enable-pic \
--enable-static-libevent --with-libevent-dir=$(EXTERNAL_ROOT) \
--enable-static-openssl --with-openssl-dir=$(EXTERNAL_ROOT) \
--enable-zstd \
--disable-module-dirauth \
- --disable-module-relay \
- --disable-unittests \
- --disable-asciidoc \
+ --disable-module-relay \
+ --disable-unittests \
+ --disable-asciidoc \
+ --disable-html-manual \
+ --disable-manpage \
+ --disable-system-torrc \
+ --disable-tool-name-check \
+ --disable-systemd \
--prefix=$(EXTERNAL_ROOT)
tor-build-stamp: tor/Makefile
--
GitLab