diff --git a/internal/cmd/buildtool/android_test.go b/internal/cmd/buildtool/android_test.go index 9107dc32a..6ea4f7c65 100644 --- a/internal/cmd/buildtool/android_test.go +++ b/internal/cmd/buildtool/android_test.go @@ -716,12 +716,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.6.1.tar.gz", + "tar", "-xf", "openssl-3.6.0.tar.gz", }, }, { Env: []string{}, @@ -771,12 +771,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.6.1.tar.gz", + "tar", "-xf", "openssl-3.6.0.tar.gz", }, }, { Env: []string{}, @@ -826,12 +826,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.6.1.tar.gz", + "tar", "-xf", "openssl-3.6.0.tar.gz", }, }, { Env: []string{}, @@ -881,12 +881,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.6.1.tar.gz", + "tar", "-xf", "openssl-3.6.0.tar.gz", }, }, { Env: []string{}, diff --git a/internal/cmd/buildtool/cdepsopenssl.go b/internal/cmd/buildtool/cdepsopenssl.go index 623caee2f..290734b8d 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.6.1.tar.gz") + cdepsMustFetch("https://www.openssl.org/source/openssl-3.6.0.tar.gz") deps.VerifySHA256( // must be mockable - "b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e", - "openssl-3.6.1.tar.gz", + "b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9", + "openssl-3.6.0.tar.gz", ) - must.Run(log.Log, "tar", "-xf", "openssl-3.6.1.tar.gz") - _ = deps.MustChdir("openssl-3.6.1") // must be mockable + must.Run(log.Log, "tar", "-xf", "openssl-3.6.0.tar.gz") + _ = deps.MustChdir("openssl-3.6.0") // 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 070bc25d6..65d9d5f64 100644 --- a/internal/cmd/buildtool/ios_test.go +++ b/internal/cmd/buildtool/ios_test.go @@ -361,12 +361,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.6.1.tar.gz", + "tar", "-xf", "openssl-3.6.0.tar.gz", }, }, { Env: []string{}, @@ -411,12 +411,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.6.1.tar.gz", + "tar", "-xf", "openssl-3.6.0.tar.gz", }, }, { Env: []string{}, @@ -461,12 +461,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.6.1.tar.gz", + "tar", "-xf", "openssl-3.6.0.tar.gz", }, }, { Env: []string{}, diff --git a/internal/cmd/buildtool/linuxcdeps_test.go b/internal/cmd/buildtool/linuxcdeps_test.go index ed7e4574c..f2e5edcd1 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.6.1.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.6.1.tar.gz", + "tar", "-xf", "openssl-3.6.0.tar.gz", }, }, { Env: []string{},