From a0ff9eb966e3f29242b4677a9cd434b13bb723d9 Mon Sep 17 00:00:00 2001 From: Marco D'Aleo Date: Sat, 21 Oct 2023 09:36:16 +0100 Subject: [PATCH 1/2] fix linux platform name to reflect the current one, fix libcrypto/libssl old file names --- desktop/scripts/get-tor.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/desktop/scripts/get-tor.py b/desktop/scripts/get-tor.py index fab70b7e..48236124 100644 --- a/desktop/scripts/get-tor.py +++ b/desktop/scripts/get-tor.py @@ -233,16 +233,16 @@ def get_tor_linux64(gpg, torkey, linux64_url, linux64_filename, expected_linux64 ) os.chmod(os.path.join(dist_path, "tor"), 0o755) shutil.copyfile( - os.path.join(tarball_tor_path, "Tor", "libcrypto.so.1.1"), - os.path.join(dist_path, "libcrypto.so.1.1"), + os.path.join(tarball_tor_path, "Tor", "libcrypto.so.3"), + os.path.join(dist_path, "libcrypto.so.3"), ) shutil.copyfile( os.path.join(tarball_tor_path, "Tor", "libevent-2.1.so.7"), os.path.join(dist_path, "libevent-2.1.so.7"), ) shutil.copyfile( - os.path.join(tarball_tor_path, "Tor", "libssl.so.1.1"), - os.path.join(dist_path, "libssl.so.1.1"), + os.path.join(tarball_tor_path, "Tor", "libssl.so.3"), + os.path.join(dist_path, "libssl.so.3"), ) shutil.copyfile( os.path.join(tarball_tor_path, "Tor", "libstdc++", "libstdc++.so.6"), @@ -310,7 +310,7 @@ def main(platform): """ Download Tor Browser and extract tor binaries """ - valid_platforms = ["win64", "macos", "linux64"] + valid_platforms = ["win64", "macos", "linux-x86_64"] if platform not in valid_platforms: click.echo(f"platform must be one of: {valid_platforms}") return @@ -335,7 +335,7 @@ def main(platform): get_tor_macos( gpg, torkey, platform_url, platform_filename, expected_platform_sig ) - elif platform == "linux64": + elif platform == "linux-x86_64": get_tor_linux64( gpg, torkey, platform_url, platform_filename, expected_platform_sig ) From e00d395ce5d5b79cc4476415ab040f3f3afca96b Mon Sep 17 00:00:00 2001 From: Marco D'Aleo Date: Tue, 24 Oct 2023 07:59:31 +0100 Subject: [PATCH 2/2] edit README to reflect the new platform attribute --- desktop/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/README.md b/desktop/README.md index 5814f08f..829bc99e 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -35,7 +35,7 @@ poetry install - Download and install 7-Zip (x64) from https://7-zip.org/download.html. [Add](https://medium.com/@kevinmarkvi/how-to-add-executables-togit fethc-your-path-in-windows-5ffa4ce61a53) `C:\Program Files\7-Zip` to your path. - Download and install gpg4win from https://gpg4win.org/. Add `C:\Program Files (x86)\GnuPG\bin` to your path too. -Download Tor Browser and extract the binaries for your platform. The platform must be `win64`, `macos`, or `linux64`. +Download Tor Browser and extract the binaries for your platform. The platform must be `win64`, `macos`, or `linux-x86_64`. ```sh poetry run python ./scripts/get-tor.py [platform]