Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1060-upgrade-tor' into 'master'

Browse Source 
Upgrade Tor to 0.2.9.12

Closes #1060

See merge request !590
This commit is contained in:
Torsten Grote
2017-09-19 12:14:55 +00:00
parent 329a4c64f6 9591db2097
commit 6e0af7deda
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bramble-android/build.gradle
View File

@@ -32,31 +32,31 @@ dependencies {
def torBinaryDir = 'src/main/res/raw' def torBinaryDir = 'src/main/res/raw'
task downloadTorGeoIp(type: Download) { task downloadTorGeoIp(type: Download) {
src 'https://briarproject.org/build/geoip-2017-05-02.zip' src 'https://briarproject.org/build/geoip-2017-09-06.zip'
dest "$torBinaryDir/geoip.zip" dest "$torBinaryDir/geoip.zip"
onlyIfNewer true onlyIfNewer true
} }
task downloadTorBinaryArm(type: Download) { task downloadTorBinaryArm(type: Download) {
src 'https://briarproject.org/build/tor-0.2.9.11-arm.zip' src 'https://briarproject.org/build/tor-0.2.9.12-arm.zip'
dest "$torBinaryDir/tor_arm.zip" dest "$torBinaryDir/tor_arm.zip"
onlyIfNewer true onlyIfNewer true
} }
task downloadTorBinaryArmPie(type: Download) { task downloadTorBinaryArmPie(type: Download) {
src 'https://briarproject.org/build/tor-0.2.9.11-arm-pie.zip' src 'https://briarproject.org/build/tor-0.2.9.12-arm-pie.zip'
dest "$torBinaryDir/tor_arm_pie.zip" dest "$torBinaryDir/tor_arm_pie.zip"
onlyIfNewer true onlyIfNewer true
} }
task downloadTorBinaryX86(type: Download) { task downloadTorBinaryX86(type: Download) {
src 'https://briarproject.org/build/tor-0.2.9.11-x86.zip' src 'https://briarproject.org/build/tor-0.2.9.12-x86.zip'
dest "$torBinaryDir/tor_x86.zip" dest "$torBinaryDir/tor_x86.zip"
onlyIfNewer true onlyIfNewer true
} }
task downloadTorBinaryX86Pie(type: Download) { task downloadTorBinaryX86Pie(type: Download) {
src 'https://briarproject.org/build/tor-0.2.9.11-x86-pie.zip' src 'https://briarproject.org/build/tor-0.2.9.12-x86-pie.zip'
dest "$torBinaryDir/tor_x86_pie.zip" dest "$torBinaryDir/tor_x86_pie.zip"
onlyIfNewer true onlyIfNewer true
} }
@@ -64,31 +64,31 @@ task downloadTorBinaryX86Pie(type: Download) {
task verifyTorGeoIp(type: Verify, dependsOn: 'downloadTorGeoIp') { task verifyTorGeoIp(type: Verify, dependsOn: 'downloadTorGeoIp') {
src "$torBinaryDir/geoip.zip" src "$torBinaryDir/geoip.zip"
algorithm 'SHA-256' algorithm 'SHA-256'
checksum '51f4d1272fb867e1f3b36b67a584e2a33c40b40f62305457d799fd399cd77c9b' checksum 'fe49d3adb86d3c512373101422a017dbb86c85a570524663f09dd8ce143a24f3'
} }
task verifyTorBinaryArm(type: Verify, dependsOn: 'downloadTorBinaryArm') { task verifyTorBinaryArm(type: Verify, dependsOn: 'downloadTorBinaryArm') {
src "$torBinaryDir/tor_arm.zip" src "$torBinaryDir/tor_arm.zip"
algorithm 'SHA-256' algorithm 'SHA-256'
checksum '1da6008663a8ad98b349e62acbbf42c379f65ec504fa467cb119c187cd5a4c6b' checksum '8ed0b347ffed1d6a4d2fd14495118eb92be83e9cc06e057e15220dc288b31688'
} }
task verifyTorBinaryArmPie(type: Verify, dependsOn: 'downloadTorBinaryArmPie') { task verifyTorBinaryArmPie(type: Verify, dependsOn: 'downloadTorBinaryArmPie') {
src "$torBinaryDir/tor_arm_pie.zip" src "$torBinaryDir/tor_arm_pie.zip"
algorithm 'SHA-256' algorithm 'SHA-256'
checksum 'eb061f880829e05f104690ac744848133f2dacef04759d425a2cff0df32c271e' checksum '64403262511c29f462ca5e7c7621bfc3c944898364d1d5ad35a016bb8a034283'
} }
task verifyTorBinaryX86(type: Verify, dependsOn: 'downloadTorBinaryX86') { task verifyTorBinaryX86(type: Verify, dependsOn: 'downloadTorBinaryX86') {
src "$torBinaryDir/tor_x86.zip" src "$torBinaryDir/tor_x86.zip"
algorithm 'SHA-256' algorithm 'SHA-256'
checksum 'f5308aff8303daca082f82227d02b51ddedba4ab1d1420739ada0427ae5dbb41' checksum '61e014607a2079bcf1646289c67bff6372b1aded6e1d8d83d7791efda9a4d5ab'
} }
task verifyTorBinaryX86Pie(type: Verify, dependsOn: 'downloadTorBinaryX86Pie') { task verifyTorBinaryX86Pie(type: Verify, dependsOn: 'downloadTorBinaryX86Pie') {
src "$torBinaryDir/tor_x86_pie.zip" src "$torBinaryDir/tor_x86_pie.zip"
algorithm 'SHA-256' algorithm 'SHA-256'
checksum '889a6c81ac73d05d35ed610ca5a913cee44d333e4ae1749c2a107f2f7dd8197b' checksum '18fbc98356697dd0895836ab46d5c9877d1c539193464f7db1e82a65adaaf288'
} }
project.afterEvaluate { project.afterEvaluate {