rm bad harvested arm tors, add manually built 0.4.6.9 arm tors; update harvest and README
This commit is contained in:
parent
9d93cc10e8
commit
f32ba4f4fc
|
@ -1,5 +1,9 @@
|
||||||
# Build processes
|
# 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
|
## Linux and Android
|
||||||
|
|
||||||
We use [Briar's Tor Reproducer](https://code.briarproject.org/briar/tor-reproducer) to build our tor linux and android binaries.
|
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
|
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
|
## Windows
|
||||||
|
|
||||||
For Window we are bundling binaries from the [Tor Windows Expert Bundle](https://www.torproject.org/download/tor/).
|
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
|
## Historical
|
||||||
|
|
||||||
Previously we used some scripts that have been moved to `oldscripts`. They did not generate correct android binaries.
|
Previously we used some scripts that have been moved to `oldscripts`. They did not generate correct android binaries.
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
WINDOWS="https://www.torproject.org/dist/torbrowser/11.0.4/torbrowser-install-win64-11.0.4_en-US.exe"
|
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"
|
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"
|
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..."
|
echo "Fetching..."
|
||||||
|
|
||||||
|
@ -20,28 +18,13 @@ if [ ! -f $(basename $LINUX) ]; then
|
||||||
wget $LINUX
|
wget $LINUX
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -f $(basename $ARM64) ]; then
|
|
||||||
wget $ARM64
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f $(basename $ARM7) ]; then
|
|
||||||
wget $ARM7
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Extracting..."
|
echo "Extracting..."
|
||||||
|
|
||||||
7z x $(basename $MAC)
|
7z x $(basename $MAC)
|
||||||
tar -xf $(basename $LINUX)
|
tar -xf $(basename $LINUX)
|
||||||
unzip $(basename $ARM7) -d arm7
|
|
||||||
unzip $(basename $ARM64) -d arm64
|
|
||||||
|
|
||||||
echo "Packaging..."
|
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/
|
cd Tor\ Browser.app/Contents/MacOS/
|
||||||
tar -czf tor-macos-0.4.6.9.tar.gz Tor
|
tar -czf tor-macos-0.4.6.9.tar.gz Tor
|
||||||
cd ../../..
|
cd ../../..
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue