diff --git a/tor/README.md b/tor/README.md index f093e1d..df32139 100644 --- a/tor/README.md +++ b/tor/README.md @@ -1,5 +1,9 @@ # Build processes +## Android + +We are now using The Guardian Project's [tor-android](https://github.com/guardianproject/tor-android) to build Android tor libs directly. The results we want aren't the `.aar` or `.jar` in `output` but the direct libraries in `tor-android-binary/src/main/libs`. + ## Linux and Android We use [Briar's Tor Reproducer](https://code.briarproject.org/briar/tor-reproducer) to build our tor linux and android binaries. @@ -29,14 +33,14 @@ docker container prune docker rmi tor-reproducer:0.4.4.9 ``` -## 0.4.5.x and Beyond - -As of testing (2021.06) some issues with tor-reproducer and newer tor have been causing build fails. Some warnings around `tput` have solutions, but the final error of `glob.h: No such file or directory` doesn't yet have a solution. As such tor reproducer will complete linux builds but fail durring android. - ## Windows For Window we are bundling binaries from the [Tor Windows Expert Bundle](https://www.torproject.org/download/tor/). +## Mac + +For Mac we are bundling the binaries from [Tor Browser](https://www.torproject.org/download/). `harvet/harvest.sh` can be used to fetch, extract and package them. + ## Historical Previously we used some scripts that have been moved to `oldscripts`. They did not generate correct android binaries. diff --git a/tor/harvest/harvest.sh b/tor/harvest/harvest.sh index 2fa2e4b..580388d 100755 --- a/tor/harvest/harvest.sh +++ b/tor/harvest/harvest.sh @@ -3,8 +3,6 @@ WINDOWS="https://www.torproject.org/dist/torbrowser/11.0.4/torbrowser-install-win64-11.0.4_en-US.exe" MAC="https://www.torproject.org/dist/torbrowser/11.0.4/TorBrowser-11.0.4-osx64_en-US.dmg" LINUX="https://www.torproject.org/dist/torbrowser/11.0.4/tor-browser-linux64-11.0.4_en-US.tar.xz" -ARM64="https://dist.torproject.org/torbrowser/10.5.10/tor-browser-10.5.10-android-aarch64-multi.apk" -ARM7="https://dist.torproject.org/torbrowser/10.5.10/tor-browser-10.5.10-android-armv7-multi.apk" echo "Fetching..." @@ -20,28 +18,13 @@ if [ ! -f $(basename $LINUX) ]; then wget $LINUX fi -if [ ! -f $(basename $ARM64) ]; then - wget $ARM64 -fi - -if [ ! -f $(basename $ARM7) ]; then - wget $ARM7 -fi - echo "Extracting..." 7z x $(basename $MAC) tar -xf $(basename $LINUX) -unzip $(basename $ARM7) -d arm7 -unzip $(basename $ARM64) -d arm64 echo "Packaging..." -cp arm64/lib/arm64-v8a/libTor.so ./tor-0.4.5.10-arm64 -chmod a+x tor-0.4.5.10-arm64 -cp arm7/lib/armeabi-v7a//libTor.so ./tor-0.4.5.10-arm7 -chmod a+x tor-0.4.5.10-arm7 - cd Tor\ Browser.app/Contents/MacOS/ tar -czf tor-macos-0.4.6.9.tar.gz Tor cd ../../.. diff --git a/tor/tor-0.4.5.10-arm64 b/tor/tor-0.4.6.9-arm64 similarity index 53% rename from tor/tor-0.4.5.10-arm64 rename to tor/tor-0.4.6.9-arm64 index 1225d96..12304c5 100755 Binary files a/tor/tor-0.4.5.10-arm64 and b/tor/tor-0.4.6.9-arm64 differ diff --git a/tor/tor-0.4.5.10-arm7 b/tor/tor-0.4.6.9-arm7 similarity index 54% rename from tor/tor-0.4.5.10-arm7 rename to tor/tor-0.4.6.9-arm7 index 91b0748..68d847a 100755 Binary files a/tor/tor-0.4.5.10-arm7 and b/tor/tor-0.4.6.9-arm7 differ