From a9d272e4143f7e8ed1f2d06d85f9d23a13a39f21 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Fri, 21 Jan 2022 18:48:34 -0500 Subject: [PATCH 1/2] bump android or to 0.4.6.9 --- fetch-tor.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fetch-tor.sh b/fetch-tor.sh index 90e26e33..925dd60c 100755 --- a/fetch-tor.sh +++ b/fetch-tor.sh @@ -4,9 +4,9 @@ wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor chmod a+x linux/tor mkdir -p android/app/src/main/jniLibs/arm64-v8a -wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.4.9-arm64_pie -O android/app/src/main/jniLibs/arm64-v8a/libtor.so +wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.6.9-arm64 -O android/app/src/main/jniLibs/arm64-v8a/libtor.so chmod a+x android/app/src/main/jniLibs/arm64-v8a/libtor.so mkdir -p android/app/src/main/jniLibs/armeabi-v7a -wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.4.9-arm_pie -O android/app/src/main/jniLibs/armeabi-v7a/libtor.so +wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.6.9-arm7 -O android/app/src/main/jniLibs/armeabi-v7a/libtor.so chmod a+x android/app/src/main/jniLibs/armeabi-v7a/libtor.so -- 2.25.1 From 23b6eddf6a25fef56011346fc37d5fc156d8b6f0 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Tue, 25 Jan 2022 10:52:18 -0500 Subject: [PATCH 2/2] bump windows tor --- .drone.yml | 5 ++--- fetch-tor-win.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3d3b96a7..71e49b10 100644 --- a/.drone.yml +++ b/.drone.yml @@ -197,10 +197,9 @@ steps: - name: fetch image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1 commands: - - powershell -command "Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-win64-0.4.6.5.zip -OutFile tor.zip" - - powershell -command "if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '7917561a7a063440a1ddfa9cb544ab9ffd09de84cea3dd66e3cc9cd349dd9f85b74a522ec390d7a974bc19b424c4d53af60e57bbc47e763d13cab6a203c4592f' ) { Write-Error 'tor.zip sha512sum mismatch' }" - git describe --tags --abbrev=1 > VERSION - powershell -command "Get-Date -Format 'yyyy-MM-dd-HH-mm'" > BUILDDATE + - .\fetch-tor-win.ps1 - .\fetch-libcwtch-go.ps1 - name: build-windows @@ -361,4 +360,4 @@ trigger: branch: trunk event: - push - - pull_request \ No newline at end of file + - pull_request diff --git a/fetch-tor-win.ps1 b/fetch-tor-win.ps1 index ba275cbc..1827f3b5 100644 --- a/fetch-tor-win.ps1 +++ b/fetch-tor-win.ps1 @@ -1,6 +1,6 @@ -Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-win64-0.4.6.5.zip -OutFile tor.zip +Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-win64-0.4.6.9.zip -OutFile tor.zip -if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '7917561a7a063440a1ddfa9cb544ab9ffd09de84cea3dd66e3cc9cd349dd9f85b74a522ec390d7a974bc19b424c4d53af60e57bbc47e763d13cab6a203c4592f' ) { Write-Error 'tor.zip sha512sum mismatch' } +if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne 'bd99de56ef5ef9516410783ce48d52311093b26e718bf3d0a94efbd754d1cf2d12543f096139d9c289985349d26ee89b2308be5927fa1b410ff4f7f3129d6830' ) { Write-Error 'tor.zip sha512sum mismatch' } Expand-Archive -Path tor.zip -DestinationPath Tor -- 2.25.1