phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-10 19:52:50 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Upgrade Tor version to 10.0.10 and fix macOS code signing

Browse source
This commit is contained in:
Micah Lee 2021-02-07 11:51:12 -08:00
parent acceed9782
commit 13756e79d5
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
3 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
desktop/package/macos/build.py
View file

@ -5,6 +5,7 @@ import subprocess
import argparse import argparse
import shutil import shutil
import glob import glob
import itertools
root = os.path.dirname( root = os.path.dirname(
os.path.dirname( os.path.dirname(
@ -15,6 +16,24 @@ root = os.path.dirname(
) )
def codesign(path, entitlements, identity):
run(
[
"codesign",
"--sign",
identity,
"--entitlements",
str(entitlements),
"--timestamp",
"--deep",
str(path),
"--force",
"--options",
"runtime",
]
)
def run(cmd, cwd=None): def run(cmd, cwd=None):
subprocess.run(cmd, cwd=cwd, check=True) subprocess.run(cmd, cwd=cwd, check=True)
@ -53,39 +72,29 @@ def main():
if args.with_codesign: if args.with_codesign:
identity_name_application = "Developer ID Application: Micah Lee (N9B95FDWH4)" identity_name_application = "Developer ID Application: Micah Lee (N9B95FDWH4)"
entitlements_child_filename = os.path.join( entitlements_child_plist_path = os.path.join(
desktop_dir, "package", "macos", "ChildEntitlements.plist" desktop_dir, "package", "macos", "ChildEntitlements.plist"
) )
entitlements_filename = os.path.join( entitlements_plist_path = os.path.join(
desktop_dir, "package", "macos", "Entitlements.plist" desktop_dir, "package", "macos", "Entitlements.plist"
) )
print("○ Code signing app bundle") print("○ Code signing app bundle")
run( for path in itertools.chain(
[ glob.glob(f"{app_path}/Contents/Resources/app_packages/**/*.dylib", recursive=True),
"codesign", glob.glob(f"{app_path}/Contents/Resources/app_packages/**/*.so", recursive=True),
"--deep", glob.glob(f"{app_path}/Contents/Resources/Support/**/*.dylib", recursive=True),
"-s", glob.glob(f"{app_path}/Contents/Resources/Support/**/*.so", recursive=True),
identity_name_application, glob.glob(f"{app_path}/Contents/Resources/app_packages/PySide2/Qt/lib/**/Versions/5/*", recursive=True),
"--force", ):
"--entitlements", codesign(path, entitlements_plist_path, identity_name_application)
entitlements_child_filename, # for path in [
"--timestamp", # f"{app_path}/Contents/Resources/app/onionshare/resources/tor/libevent-2.1.7.dylib",
app_path, # f"{app_path}/Contents/Resources/app/onionshare/resources/tor/obfs4proxy",
] # f"{app_path}/Contents/Resources/app/onionshare/resources/tor/tor",
) # ]:
run( # codesign(path, entitlements_child_plist_path, identity_name_application)
[ codesign(app_path, entitlements_plist_path, identity_name_application)
"codesign",
"-s",
identity_name_application,
"--force",
"--entitlements",
entitlements_filename,
"--timestamp",
app_path,
]
)
print(f"○ Signed app bundle: {app_path}") print(f"○ Signed app bundle: {app_path}")
if not os.path.exists("/usr/local/bin/create-dmg"): if not os.path.exists("/usr/local/bin/create-dmg"):

6
desktop/scripts/get-tor-osx.py
View file

@ -37,10 +37,10 @@ import requests
def main(): def main():
dmg_url = "https://archive.torproject.org/tor-package-archive/torbrowser/10.0.2/TorBrowser-10.0.2-osx64_en-US.dmg" dmg_url = "https://archive.torproject.org/tor-package-archive/torbrowser/10.0.10/TorBrowser-10.0.10-osx64_en-US.dmg"
dmg_filename = "TorBrowser-10.0.2-osx64_en-US.dmg" dmg_filename = "TorBrowser-10.0.10-osx64_en-US.dmg"
expected_dmg_sha256 = ( expected_dmg_sha256 = (
"ac8d28f6f8d92e220f72ef7b0cb2bba45d5e0d4b243dc50806e33e08278e7730" "7ed73e94ccdfab76b8d96ddbac7828d3a7c77dd73b54c34e55666f3b6274d12a"
) )
# Build paths # Build paths

4
desktop/scripts/get-tor-windows.py
View file

@ -34,10 +34,10 @@ import requests
def main(): def main():
exe_url = "https://archive.torproject.org/tor-package-archive/torbrowser/10.0.2/torbrowser-install-10.0.2_en-US.exe" exe_url = "https://archive.torproject.org/tor-package-archive/torbrowser/10.0.10/torbrowser-install-10.0.10_en-US.exe"
exe_filename = "torbrowser-install-10.0.2_en-US.exe" exe_filename = "torbrowser-install-10.0.2_en-US.exe"
expected_exe_sha256 = ( expected_exe_sha256 = (
"c685c550fc420c39cbe40e453f2201789af5f64e7b024c9339c2a3bd01e61c2d" "6cbd14a7232e4ae7f2718d9b7f377e1a7bb96506da21f1ac6f689a22fc5e53fe"
) )
# Build paths # Build paths
root_path = os.path.dirname( root_path = os.path.dirname(