tor/README.md

@@ -1,9 +1,5 @@
 # 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. 
@@ -33,14 +29,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.

tor/harvest/harvest.sh

@@ -1,64 +0,0 @@
-#!/bin/sh
-
-WINDOWS="https://dist.torproject.org/torbrowser/13.0.5/tor-expert-bundle-windows-x86_64-13.0.5.tar.gz"
-MAC="https://www.torproject.org/dist/torbrowser/13.0.5/tor-browser-macos-13.0.5.dmg"
-LINUX="https://www.torproject.org/dist/torbrowser/13.0.5/tor-browser-linux-x86_64-13.0.5.tar.xz"
-ARM7="https://archive.torproject.org/tor-package-archive/torbrowser/13.0.4/tor-expert-bundle-android-armv7-13.0.4.tar.gz"
-ARM64="https://archive.torproject.org/tor-package-archive/torbrowser/13.0.4/tor-expert-bundle-android-aarch64-13.0.4.tar.gz"
-TORVERSION="0.4.8.9"
-
-echo "Fetching..."
-
-if [ ! -f $(basename $WINDOWS) ]; then
-  wget $WINDOWS
-fi
-
-if [ ! -f $(basename $MAC) ]; then
-  wget $MAC
-fi
-
-if [ ! -f $(basename $LINUX) ]; then
-  wget $LINUX
-fi
-
-if [ ! -f $(basename $ARM7) ]; then
-  wget $ARM7
-fi
-
-if [ ! -f $(basename $ARM64) ]; then
-  wget $ARM64
-fi
-
-echo "Extracting..."
-
-7z x $(basename $MAC)
-tar -xf $(basename $LINUX)
-tar -xf $(basename $WINDOWS)
-
-
-echo "Packaging..."
-
-cd Tor\ Browser/Tor\ Browser.app/Contents/MacOS/
-rm -r Tor/PluggableTransports
-chmod a+x Tor/tor
-chmod a+x Tor/libevent-2.1.7.dylib
-tar -czf tor-$TORVERSION-macos.tar.gz Tor
-cd  ../../../..
-mv Tor\ Browser/Tor\ Browser.app/Contents/MacOS/tor-$TORVERSION-macos.tar.gz .
-
-cd tor-browser/Browser/TorBrowser
-tar -czf tor-$TORVERSION-linux-x86_64.tar.gz Tor
-cd ../../..
-mv  tor-browser/Browser/TorBrowser/tor-$TORVERSION-linux-x86_64.tar.gz .
-
-rm -r Tor
-rm -r Data
-mv tor Tor
-mv data Data
-zip tor-$TORVERSION-win64.zip -r Tor Data
-
-tar -xzf $(basename $ARM7)
-mv tor/libTor.so tor-$TORVERSION-android-arm7
-
-tar -xzf $(basename $ARM64)
-mv tor/libTor.so tor-$TORVERSION-android-arm64