diff --git a/tor/README.md b/tor/README.md index 6a940b8..724c458 100644 --- a/tor/README.md +++ b/tor/README.md @@ -11,13 +11,13 @@ git clone https://code.briarproject.org/briar/tor-reproducer.git Either edit the tor-versions.json or copy in the one from this directory ``` -docker build --tag tor-reproducer:0.4.4.6 . -docker run tor-reproducer:0.4.4.6 ./build-tor.py 0.4.4.6 +docker build --tag tor-reproducer:0.4.4.9 . +docker run tor-reproducer:0.4.4.9 ./build-tor.py 0.4.4.9 docker ps -a -docker cp 937d81a46c33:/opt/tor-reproducer/tor_arm_pie.zip tor-0.4.4.6-arm_pie.zip -docker cp 937d81a46c33:/opt/tor-reproducer/tor_arm64_pie.zip tor_arm64_pie.zip -docker cp 937d81a46c33:/opt/tor-reproducer/tor_linux-x86_64.zip tor-0.4.4.6-linux-x86_64.zip -docker cp 937d81a46c33:/opt/tor-reproducer/tor_linux-aarch64.zip tor_linux-aarch64.zip +docker cp 2798b62ed756:/opt/tor-reproducer/tor_arm_pie.zip tor-0.4.4.9-arm_pie.zip +docker cp 2798b62ed756:/opt/tor-reproducer/tor_arm64_pie.zip tor-0.4.4.9-arm64_pie.zip +docker cp 2798b62ed756:/opt/tor-reproducer/tor_linux-x86_64.zip tor-0.4.4.9-linux-x86_64.zip +docker cp 2798b62ed756:/opt/tor-reproducer/tor_linux-aarch64.zip tor-0.4.4.9-linux-aarch64.zip ``` Where 937d81a46c33 is the container ID from `docker ps -a`. @@ -26,9 +26,13 @@ Cleanup with ``` docker container prune -docker rmi tor-reproducer:0.4.4.6 +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 the [Tor Windows Expert Bundle](https://www.torproject.org/download/tor/). diff --git a/tor/tor b/tor/tor index d772170..5f973b7 100755 Binary files a/tor/tor and b/tor/tor differ diff --git a/tor/tor-0.4.4.9-arm64_pie b/tor/tor-0.4.4.9-arm64_pie new file mode 100755 index 0000000..fb4a918 Binary files /dev/null and b/tor/tor-0.4.4.9-arm64_pie differ diff --git a/tor/tor-0.4.4.9-arm_pie b/tor/tor-0.4.4.9-arm_pie new file mode 100755 index 0000000..e075145 Binary files /dev/null and b/tor/tor-0.4.4.9-arm_pie differ diff --git a/tor/tor-0.4.4.9-linux-x86_64 b/tor/tor-0.4.4.9-linux-x86_64 new file mode 100755 index 0000000..40ec380 Binary files /dev/null and b/tor/tor-0.4.4.9-linux-x86_64 differ diff --git a/tor/tor-0.4.5.9-linux-x86_64 b/tor/tor-0.4.5.9-linux-x86_64 new file mode 100755 index 0000000..5f973b7 Binary files /dev/null and b/tor/tor-0.4.5.9-linux-x86_64 differ diff --git a/tor/tor-versions.json b/tor/tor-versions.json index f477a4b..1bc377d 100644 --- a/tor/tor-versions.json +++ b/tor/tor-versions.json @@ -1,6 +1,23 @@ -{ - "0.4.4.6": { - "tor": "tor-0.4.4.6", +{ + "0.4.5.9": { + "tor": "tor-0.4.5.9", + "libevent": "release-2.1.8-stable", + "openssl": "OpenSSL_1_0_2u", + "xz": "v5.2.4", + "zlib": "v1.2.11", + "zstd": "v1.3.8", + "tor-android": "55791c108d4b732b1c12866e4db3b8b1fd826bf1", + "tor_android_repo_url": "https://github.com/n8fr8/tor-android", + "ndk": { + "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip", + "revision": "15.2.4203891", + "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c" + }, + "timestamp": "201001010000.00" + }, + + "0.4.4.9": { + "tor": "tor-0.4.4.9", "libevent": "release-2.1.8-stable", "openssl": "OpenSSL_1_0_2u", "xz": "v5.2.4",