From 9a2f78c309dcb34b12c59683052b28e1d82676d4 Mon Sep 17 00:00:00 2001 From: akwizgran <michael@briarproject.org> Date: Sat, 19 Mar 2022 16:42:41 +0000 Subject: [PATCH 1/2] Upgrade OpenSSL to 1.1.1n. --- tor-versions.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tor-versions.json b/tor-versions.json index 8bad0c7..2c8534e 100644 --- a/tor-versions.json +++ b/tor-versions.json @@ -1,4 +1,36 @@ { + "0.4.5.12-1": { + "tor": { + "url": "https://git.torproject.org/git/tor.git", + "commit": "tor-0.4.5.12" + }, + "libevent": { + "url": "https://github.com/libevent/libevent.git", + "commit": "release-2.1.12-stable" + }, + "openssl": { + "url": "https://github.com/openssl/openssl.git", + "commit": "OpenSSL_1_1_1n" + }, + "xz": { + "url": "https://git.tukaani.org/xz.git", + "commit": "v5.2.5" + }, + "zlib": { + "url": "https://github.com/madler/zlib.git", + "commit": "v1.2.11" + }, + "zstd": { + "url": "https://github.com/facebook/zstd.git", + "commit": "v1.4.8" + }, + "ndk": { + "url": "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip", + "revision": "21.4.7075529", + "sha256": "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e" + }, + "timestamp": "201001010000.00" + }, "0.4.5.12": { "tor": { "url": "https://git.torproject.org/git/tor.git", -- GitLab From dc281ff771de4c12603e099f1ba93b1b9fb57095 Mon Sep 17 00:00:00 2001 From: akwizgran <michael@briarproject.org> Date: Tue, 29 Mar 2022 13:06:44 +0100 Subject: [PATCH 2/2] Strip all the things. --- build_tor_linux.py | 2 +- build_tor_windows.py | 2 +- tor-build/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_tor_linux.py b/build_tor_linux.py index 0879403..23b8c09 100755 --- a/build_tor_linux.py +++ b/build_tor_linux.py @@ -117,7 +117,7 @@ def build_linux_arch(arch, gcc_arch, cc_env, openssl_target, autogen_host, versi output_dir = get_output_dir(PLATFORM) tor_path = os.path.join(output_dir, 'tor') copy(os.path.join(BUILD_DIR, 'tor', 'src', 'app', 'tor'), tor_path) - check_call(['strip', '-D', '--strip-unneeded', '--strip-debug', '-R', '.note*', '-R', '.comment', tor_path]) + check_call(['strip', '-D', tor_path]) reset_time(tor_path, versions) print("Sha256 hash of tor before zipping %s: %s" % (name, get_sha256(tor_path))) check_call(['zip', '--no-dir-entries', '--junk-paths', '-X', name, 'tor'], cwd=output_dir) diff --git a/build_tor_windows.py b/build_tor_windows.py index 9e45ba2..2046882 100755 --- a/build_tor_windows.py +++ b/build_tor_windows.py @@ -119,7 +119,7 @@ def build_windows_arch(arch, host, versions): output_dir = get_output_dir(PLATFORM) tor_path = os.path.join(output_dir, 'tor') copy(os.path.join(prefix_dir, 'bin', 'tor.exe'), tor_path) - check_call(['strip', '-D', '--strip-unneeded', '--strip-debug', '-R', '.note*', '-R', '.comment', tor_path]) + check_call(['strip', '-D', tor_path]) reset_time(tor_path, versions) print("Sha256 hash of tor before zipping %s: %s" % (name, get_sha256(tor_path))) check_call(['zip', '--no-dir-entries', '--junk-paths', '-X', name, 'tor'], cwd=output_dir) diff --git a/tor-build/Makefile b/tor-build/Makefile index 546f0c1..e265b28 100644 --- a/tor-build/Makefile +++ b/tor-build/Makefile @@ -273,7 +273,7 @@ tor/Makefile: tor/configure.ac tor/Makefile.am tor-build-stamp: tor/Makefile $(MAKE) -C tor - $(NDK_TOOLCHAIN_BASE)/bin/$(ALTHOST)-strip -D --strip-unneeded -R .note* -R .comment --strip-debug $(OUTPUT_FILE) + $(NDK_TOOLCHAIN_BASE)/bin/$(ALTHOST)-strip -D $(OUTPUT_FILE) touch $@ tor: lzma-build-stamp zstd-build-stamp libevent-build-stamp openssl-build-stamp tor-build-stamp -- GitLab