From 79838d4b8286566fca42c416c512a04d3840e177 Mon Sep 17 00:00:00 2001 From: decfox Date: Wed, 19 Nov 2025 11:31:06 +0530 Subject: [PATCH] chore: revert tor version for ooni libtor --- internal/cmd/buildtool/android_test.go | 16 ++++++++-------- internal/cmd/buildtool/cdepstor.go | 10 +++++----- internal/cmd/buildtool/ios_test.go | 12 ++++++------ internal/cmd/buildtool/linuxcdeps_test.go | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/internal/cmd/buildtool/android_test.go b/internal/cmd/buildtool/android_test.go index 1bb629132..a02ced1a6 100644 --- a/internal/cmd/buildtool/android_test.go +++ b/internal/cmd/buildtool/android_test.go @@ -1752,12 +1752,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.20.tar.gz", + "tar", "-xf", "tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, @@ -1841,12 +1841,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.20.tar.gz", + "tar", "-xf", "tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, @@ -1930,12 +1930,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.20.tar.gz", + "tar", "-xf", "tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, @@ -2019,12 +2019,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.20.tar.gz", + "tar", "-xf", "tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, diff --git a/internal/cmd/buildtool/cdepstor.go b/internal/cmd/buildtool/cdepstor.go index 953a44aab..e9c162d82 100644 --- a/internal/cmd/buildtool/cdepstor.go +++ b/internal/cmd/buildtool/cdepstor.go @@ -27,13 +27,13 @@ func cdepsTorBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies) { defer restore() // See https://github.com/Homebrew/homebrew-core/blob/master/Formula/t/tor.rb - cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.20.tar.gz") + cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.17.tar.gz") deps.VerifySHA256( // must be mockable - "1bb22328cdd1ee948647bfced571efa78c12fc5064187b41d5254085b5282fa7", - "tor-0.4.8.20.tar.gz", + "b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9", + "tor-0.4.8.17.tar.gz", ) - must.Run(log.Log, "tar", "-xf", "tor-0.4.8.20.tar.gz") - _ = deps.MustChdir("tor-0.4.8.20") // must be mockable + must.Run(log.Log, "tar", "-xf", "tor-0.4.8.17.tar.gz") + _ = deps.MustChdir("tor-0.4.8.17") // must be mockable mydir := filepath.Join(topdir, "CDEPS", "tor") for _, patch := range cdepsMustListPatches(mydir) { diff --git a/internal/cmd/buildtool/ios_test.go b/internal/cmd/buildtool/ios_test.go index a5e864243..33756faa2 100644 --- a/internal/cmd/buildtool/ios_test.go +++ b/internal/cmd/buildtool/ios_test.go @@ -1154,12 +1154,12 @@ func TestIOSBuildCdepsTor(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.20.tar.gz", + "tar", "-xf", "tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, @@ -1244,12 +1244,12 @@ func TestIOSBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.20.tar.gz", + "tar", "-xf", "tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, @@ -1334,12 +1334,12 @@ func TestIOSBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.20.tar.gz", + "tar", "-xf", "tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, diff --git a/internal/cmd/buildtool/linuxcdeps_test.go b/internal/cmd/buildtool/linuxcdeps_test.go index 31eea763a..ea53a8248 100644 --- a/internal/cmd/buildtool/linuxcdeps_test.go +++ b/internal/cmd/buildtool/linuxcdeps_test.go @@ -322,12 +322,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.20.tar.gz", + "tar", "-xf", "tor-0.4.8.17.tar.gz", }, }, { Env: []string{},