From 0b81c464ccd78109225ff572e3cfec864060f62b Mon Sep 17 00:00:00 2001 From: DecFox <33030671+DecFox@users.noreply.github.com> Date: Wed, 7 Aug 2024 17:32:58 +0530 Subject: [PATCH] chore: update C dependencies (#1644) ## Checklist - [x] I have read the [contribution guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md) - [x] reference issue for this pull request: https://github.com/ooni/probe/issues/2783 - [ ] if you changed anything related to how experiments work and you need to reflect these changes in the ooni/spec repository, please link to the related ooni/spec pull request: - [ ] if you changed code inside an experiment, make sure you bump its version number ## Description This diff updates the engine C dependencies. --- internal/cmd/buildtool/android_test.go | 32 +++++++++++------------ internal/cmd/buildtool/cdepsopenssl.go | 10 +++---- internal/cmd/buildtool/cdepstor.go | 10 +++---- internal/cmd/buildtool/ios_test.go | 24 ++++++++--------- internal/cmd/buildtool/linuxcdeps_test.go | 8 +++--- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/internal/cmd/buildtool/android_test.go b/internal/cmd/buildtool/android_test.go index 63e666eee..13b577148 100644 --- a/internal/cmd/buildtool/android_test.go +++ b/internal/cmd/buildtool/android_test.go @@ -702,12 +702,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.3.0.tar.gz", + "tar", "-xf", "openssl-3.3.1.tar.gz", }, }, { Env: []string{}, @@ -757,12 +757,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.3.0.tar.gz", + "tar", "-xf", "openssl-3.3.1.tar.gz", }, }, { Env: []string{}, @@ -812,12 +812,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.3.0.tar.gz", + "tar", "-xf", "openssl-3.3.1.tar.gz", }, }, { Env: []string{}, @@ -867,12 +867,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.3.0.tar.gz", + "tar", "-xf", "openssl-3.3.1.tar.gz", }, }, { Env: []string{}, @@ -1738,12 +1738,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.11.tar.gz", + "tar", "-xf", "tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, @@ -1827,12 +1827,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.11.tar.gz", + "tar", "-xf", "tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, @@ -1916,12 +1916,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.11.tar.gz", + "tar", "-xf", "tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, @@ -2005,12 +2005,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.11.tar.gz", + "tar", "-xf", "tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, diff --git a/internal/cmd/buildtool/cdepsopenssl.go b/internal/cmd/buildtool/cdepsopenssl.go index 1a7ac3a04..1119dcc61 100644 --- a/internal/cmd/buildtool/cdepsopenssl.go +++ b/internal/cmd/buildtool/cdepsopenssl.go @@ -27,13 +27,13 @@ func cdepsOpenSSLBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencie defer restore() // See https://github.com/Homebrew/homebrew-core/blob/master/Formula/o/openssl@3.rb - cdepsMustFetch("https://www.openssl.org/source/openssl-3.3.0.tar.gz") + cdepsMustFetch("https://www.openssl.org/source/openssl-3.3.1.tar.gz") deps.VerifySHA256( // must be mockable - "53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02", - "openssl-3.3.0.tar.gz", + "777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e", + "openssl-3.3.1.tar.gz", ) - must.Run(log.Log, "tar", "-xf", "openssl-3.3.0.tar.gz") - _ = deps.MustChdir("openssl-3.3.0") // must be mockable + must.Run(log.Log, "tar", "-xf", "openssl-3.3.1.tar.gz") + _ = deps.MustChdir("openssl-3.3.1") // must be mockable mydir := filepath.Join(topdir, "CDEPS", "openssl") for _, patch := range cdepsMustListPatches(mydir) { diff --git a/internal/cmd/buildtool/cdepstor.go b/internal/cmd/buildtool/cdepstor.go index 6189eed5e..129ec9f4f 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.11.tar.gz") + cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.12.tar.gz") deps.VerifySHA256( // must be mockable - "8f2bdf90e63380781235aa7d604e159570f283ecee674670873d8bb7052c8e07", - "tor-0.4.8.11.tar.gz", + "ca7cc735d98e3747b58f2f3cc14f804dd789fa0fb333a84dcb6bd70adbb8c874", + "tor-0.4.8.12.tar.gz", ) - must.Run(log.Log, "tar", "-xf", "tor-0.4.8.11.tar.gz") - _ = deps.MustChdir("tor-0.4.8.11") // must be mockable + must.Run(log.Log, "tar", "-xf", "tor-0.4.8.12.tar.gz") + _ = deps.MustChdir("tor-0.4.8.12") // 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 45fee77b9..6a0cb67fe 100644 --- a/internal/cmd/buildtool/ios_test.go +++ b/internal/cmd/buildtool/ios_test.go @@ -349,12 +349,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.3.0.tar.gz", + "tar", "-xf", "openssl-3.3.1.tar.gz", }, }, { Env: []string{}, @@ -399,12 +399,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.3.0.tar.gz", + "tar", "-xf", "openssl-3.3.1.tar.gz", }, }, { Env: []string{}, @@ -449,12 +449,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.3.0.tar.gz", + "tar", "-xf", "openssl-3.3.1.tar.gz", }, }, { Env: []string{}, @@ -1142,12 +1142,12 @@ func TestIOSBuildCdepsTor(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.11.tar.gz", + "tar", "-xf", "tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, @@ -1232,12 +1232,12 @@ func TestIOSBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.11.tar.gz", + "tar", "-xf", "tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, @@ -1322,12 +1322,12 @@ func TestIOSBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.11.tar.gz", + "tar", "-xf", "tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, diff --git a/internal/cmd/buildtool/linuxcdeps_test.go b/internal/cmd/buildtool/linuxcdeps_test.go index 1978fd840..9527f09d0 100644 --- a/internal/cmd/buildtool/linuxcdeps_test.go +++ b/internal/cmd/buildtool/linuxcdeps_test.go @@ -92,12 +92,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.3.0.tar.gz", + "tar", "-xf", "openssl-3.3.1.tar.gz", }, }, { Env: []string{}, @@ -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.11.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.12.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.11.tar.gz", + "tar", "-xf", "tor-0.4.8.12.tar.gz", }, }, { Env: []string{},