From 65565816e49c1cbd20e0b24ca34addb8d44dbdfa Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Wed, 13 Dec 2023 11:12:13 +0100 Subject: [PATCH] chore: update C deps Part of https://github.com/ooni/probe/issues/2556 --- 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 30169927bf..e8192eeb62 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.1.3.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.3.tar.gz", + "tar", "-xf", "openssl-3.2.0.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.1.3.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.3.tar.gz", + "tar", "-xf", "openssl-3.2.0.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.1.3.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.3.tar.gz", + "tar", "-xf", "openssl-3.2.0.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.1.3.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.3.tar.gz", + "tar", "-xf", "openssl-3.2.0.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.7.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.7.tar.gz", + "tar", "-xf", "tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, @@ -1815,12 +1815,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.7.tar.gz", + "tar", "-xf", "tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, @@ -1892,12 +1892,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.7.tar.gz", + "tar", "-xf", "tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, @@ -1969,12 +1969,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.7.tar.gz", + "tar", "-xf", "tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, diff --git a/internal/cmd/buildtool/cdepsopenssl.go b/internal/cmd/buildtool/cdepsopenssl.go index fba0eb6535..d873746c7a 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.1.3.tar.gz") + cdepsMustFetch("https://www.openssl.org/source/openssl-3.2.0.tar.gz") deps.VerifySHA256( // must be mockable - "f0316a2ebd89e7f2352976445458689f80302093788c466692fb2a188b2eacf6", - "openssl-3.1.3.tar.gz", + "14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e", + "openssl-3.2.0.tar.gz", ) - must.Run(log.Log, "tar", "-xf", "openssl-3.1.3.tar.gz") - _ = deps.MustChdir("openssl-3.1.3") // must be mockable + must.Run(log.Log, "tar", "-xf", "openssl-3.2.0.tar.gz") + _ = deps.MustChdir("openssl-3.2.0") // 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 2c47aa7a22..6a181fb6dd 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.7.tar.gz") + cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.10.tar.gz") deps.VerifySHA256( // must be mockable - "b20d2b9c74db28a00c07f090ee5b0241b2b684f3afdecccc6b8008931c557491", - "tor-0.4.8.7.tar.gz", + "e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86", + "tor-0.4.8.10.tar.gz", ) - must.Run(log.Log, "tar", "-xf", "tor-0.4.8.7.tar.gz") - _ = deps.MustChdir("tor-0.4.8.7") // must be mockable + must.Run(log.Log, "tar", "-xf", "tor-0.4.8.10.tar.gz") + _ = deps.MustChdir("tor-0.4.8.10") // 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 13cc46bc88..82d928139e 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.1.3.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.3.tar.gz", + "tar", "-xf", "openssl-3.2.0.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.1.3.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.3.tar.gz", + "tar", "-xf", "openssl-3.2.0.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.1.3.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.3.tar.gz", + "tar", "-xf", "openssl-3.2.0.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.7.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.7.tar.gz", + "tar", "-xf", "tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, @@ -1220,12 +1220,12 @@ func TestIOSBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.7.tar.gz", + "tar", "-xf", "tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, @@ -1298,12 +1298,12 @@ func TestIOSBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.7.tar.gz", + "tar", "-xf", "tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, diff --git a/internal/cmd/buildtool/linuxcdeps_test.go b/internal/cmd/buildtool/linuxcdeps_test.go index 40d4b5817e..6ae5aca748 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.1.3.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.3.tar.gz", + "tar", "-xf", "openssl-3.2.0.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.7.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.7.tar.gz", + "tar", "-xf", "tor-0.4.8.10.tar.gz", }, }, { Env: []string{},