From 0ad01987d9c2dff5f46ae2262e39516e986e13a6 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Thu, 21 Mar 2024 18:17:02 +0100 Subject: [PATCH] chore: upgrade C dependencies (#1524) See https://github.com/ooni/probe/issues/2690 --- NDKVERSION | 2 +- internal/cmd/buildtool/android_test.go | 16 ++++++++-------- internal/cmd/buildtool/cdepsopenssl.go | 10 +++++----- internal/cmd/buildtool/ios_test.go | 12 ++++++------ internal/cmd/buildtool/linuxcdeps_test.go | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NDKVERSION b/NDKVERSION index fef6a6fdf9..9aad9ae5c5 100644 --- a/NDKVERSION +++ b/NDKVERSION @@ -1 +1 @@ -26.1.10909125 +26.2.11394342 diff --git a/internal/cmd/buildtool/android_test.go b/internal/cmd/buildtool/android_test.go index 8b4a921148..ccfd818997 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.2.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.2.0.tar.gz", + "tar", "-xf", "openssl-3.2.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.2.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.2.0.tar.gz", + "tar", "-xf", "openssl-3.2.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.2.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.2.0.tar.gz", + "tar", "-xf", "openssl-3.2.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.2.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.2.0.tar.gz", + "tar", "-xf", "openssl-3.2.1.tar.gz", }, }, { Env: []string{}, diff --git a/internal/cmd/buildtool/cdepsopenssl.go b/internal/cmd/buildtool/cdepsopenssl.go index d873746c7a..11b8cb2b31 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.2.0.tar.gz") + cdepsMustFetch("https://www.openssl.org/source/openssl-3.2.1.tar.gz") deps.VerifySHA256( // must be mockable - "14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e", - "openssl-3.2.0.tar.gz", + "83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39", + "openssl-3.2.1.tar.gz", ) - must.Run(log.Log, "tar", "-xf", "openssl-3.2.0.tar.gz") - _ = deps.MustChdir("openssl-3.2.0") // must be mockable + must.Run(log.Log, "tar", "-xf", "openssl-3.2.1.tar.gz") + _ = deps.MustChdir("openssl-3.2.1") // must be mockable mydir := filepath.Join(topdir, "CDEPS", "openssl") for _, patch := range cdepsMustListPatches(mydir) { diff --git a/internal/cmd/buildtool/ios_test.go b/internal/cmd/buildtool/ios_test.go index 609983ad06..910badbd94 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.2.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.2.0.tar.gz", + "tar", "-xf", "openssl-3.2.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.2.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.2.0.tar.gz", + "tar", "-xf", "openssl-3.2.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.2.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.2.0.tar.gz", + "tar", "-xf", "openssl-3.2.1.tar.gz", }, }, { Env: []string{}, diff --git a/internal/cmd/buildtool/linuxcdeps_test.go b/internal/cmd/buildtool/linuxcdeps_test.go index 785c93d713..2d349a36bc 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.2.0.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.2.0.tar.gz", + "tar", "-xf", "openssl-3.2.1.tar.gz", }, }, { Env: []string{},