Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-08-05 21:04:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Completed merge

Browse source
This commit is contained in:
NoisyCoil 2022-12-30 19:55:47 +01:00
commit e3613c39fe
29 changed files with 132 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop/scripts/build-pt-obfs4proxy.ps1
View file

@ -1,4 +1,4 @@
$env:OBFS4PROXY_TAG = 'obfs4proxy-0.0.13'
$env:OBFS4PROXY_TAG = 'obfs4proxy-0.0.14'
New-Item -ItemType Directory -Force -Path .\build\obfs4proxy
cd .\build\obfs4proxy

4
desktop/scripts/build-pt-obfs4proxy.sh
View file

@ -1,9 +1,9 @@
#!/bin/bash
OBFS4PROXY_TAG=obfs4proxy-0.0.13
OBFS4PROXY_TAG=obfs4proxy-0.0.14
mkdir -p ./build/obfs4proxy
cd ./build/obfs4proxy
git clone https://gitlab.com/yawning/obfs4 || echo "already cloned"
cd obfs4
git checkout $OBFS4PROXY_TAG
go build -o ../../../onionshare/resources/tor/obfs4proxy ./obfs4proxy
go build -o ../../../onionshare/resources/tor/obfs4proxy ./obfs4proxy

2
desktop/scripts/build-pt-snowflake.ps1
View file

@ -1,4 +1,4 @@
$env:SNOWFLAKE_TAG = 'v2.2.0'
$env:SNOWFLAKE_TAG = 'v2.3.1'
New-Item -ItemType Directory -Force -Path .\build\snowflake
cd .\build\snowflake

2
desktop/scripts/build-pt-snowflake.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash
SNOWFLAKE_TAG=v2.2.0
SNOWFLAKE_TAG=v2.3.1
mkdir -p ./build/snowflake
cd ./build/snowflake

48
desktop/scripts/get-tor.py
View file

@ -9,28 +9,28 @@ import subprocess
import requests
import click
torbrowser_version = "11.5.2"
torbrowser_version = "12.0"
expected_win32_sha256 = (
"07e721ae76bc7eefe25f20792091009238e9568d500331fc64bdd8796fec8c0f"
"a9cc0f0af2ce8ca0d7a27d65c7efa37f6419cfc793fa80371e7db73d44b4cc02"
)
expected_win64_sha256 = (
"8237bca22b5fa545de21f84ba8c9270c84442d0fc50a2e626f757d069e4bc7a8"
"f496cc0219c8b73f1f100124d6514bad55f503ff76202747f23620a6677e83c2"
)
expected_macos_sha256 = (
"b80d3dba83b343fab7a6c8fc08440b2751da1ac12f86fe593da8e74069e4d7f6"
"11c8360187356e6c0837612a320f1a117303fc449602c9fd73f4faf9f9bbcfc9"
)
expected_linux64_sha256 = (
"90cdce3854e9114ee7232aaa74672a2d9f3a40b6fa8ac33971f586ee3a3cf75a"
"850ce601d815bac63e4f5937646d2b497173be28b27b30a7526ebb946a459874"
)
win32_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/torbrowser-install-{torbrowser_version}_en-US.exe"
win32_filename = f"torbrowser-install-{torbrowser_version}_en-US.exe"
win64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/torbrowser-install-win64-{torbrowser_version}_en-US.exe"
win64_filename = f"torbrowser-install-win64-{torbrowser_version}_en-US.exe"
macos_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/TorBrowser-{torbrowser_version}-osx64_en-US.dmg"
macos_filename = f"TorBrowser-{torbrowser_version}-osx64_en-US.dmg"
linux64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/tor-browser-linux64-{torbrowser_version}_en-US.tar.xz"
linux64_filename = f"tor-browser-linux64-{torbrowser_version}_en-US.tar.xz"
win32_filename = f"torbrowser-install-{torbrowser_version}_ALL.exe"
win32_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{win32_filename}"
win64_filename = f"torbrowser-install-win64-{torbrowser_version}_ALL.exe"
win64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{win64_filename}"
macos_filename = f"TorBrowser-{torbrowser_version}-macos_ALL.dmg"
macos_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{macos_filename}"
linux64_filename = f"tor-browser-linux64-{torbrowser_version}_ALL.tar.xz"
linux64_url = f"https://dist.torproject.org/torbrowser/{torbrowser_version}/{linux64_filename}"
# Common paths
@ -46,32 +46,14 @@ def get_tor_windows(platform):
win_filename = win32_filename
expected_win_sha256 = expected_win32_sha256
bin_filenames = [
"libcrypto-1_1.dll",
"libevent-2-1-7.dll",
"libevent_core-2-1-7.dll",
"libevent_extra-2-1-7.dll",
"libgcc_s_dw2-1.dll",
"libssl-1_1.dll",
"libssp-0.dll",
"libwinpthread-1.dll",
"tor.exe",
"zlib1.dll",
"tor.exe"
]
elif platform == "win64":
win_url = win64_url
win_filename = win64_filename
expected_win_sha256 = expected_win64_sha256
bin_filenames = [
"libcrypto-1_1-x64.dll",
"libevent-2-1-7.dll",
"libevent_core-2-1-7.dll",
"libevent_extra-2-1-7.dll",
"libgcc_s_seh-1.dll",
"libssl-1_1-x64.dll",
"libssp-0.dll",
"libwinpthread-1.dll",
"tor.exe",
"zlib1.dll",
"tor.exe"
]
else:
click.echo("invalid platform")