diff --git a/internal/cmd/buildtool/android_test.go b/internal/cmd/buildtool/android_test.go index bc554295a5..416a857d2d 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.2.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.3.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.2.tar.gz", + "tar", "-xf", "openssl-3.1.3.tar.gz", }, }, { Env: []string{}, @@ -763,12 +763,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.2.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.3.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.2.tar.gz", + "tar", "-xf", "openssl-3.1.3.tar.gz", }, }, { Env: []string{}, @@ -824,12 +824,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.2.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.3.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.2.tar.gz", + "tar", "-xf", "openssl-3.1.3.tar.gz", }, }, { Env: []string{}, @@ -885,12 +885,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.2.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.3.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.2.tar.gz", + "tar", "-xf", "openssl-3.1.3.tar.gz", }, }, { Env: []string{}, @@ -1646,12 +1646,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.7.14.tar.gz", + "tar", "-xf", "tor-0.4.8.7.tar.gz", }, }, { Env: []string{}, @@ -1722,12 +1722,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.7.14.tar.gz", + "tar", "-xf", "tor-0.4.8.7.tar.gz", }, }, { Env: []string{}, @@ -1798,12 +1798,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.7.14.tar.gz", + "tar", "-xf", "tor-0.4.8.7.tar.gz", }, }, { Env: []string{}, @@ -1874,12 +1874,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) { }, { Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.7.14.tar.gz", + "tar", "-xf", "tor-0.4.8.7.tar.gz", }, }, { Env: []string{}, diff --git a/internal/cmd/buildtool/cdepsopenssl.go b/internal/cmd/buildtool/cdepsopenssl.go index 241676a053..dbecb9f624 100644 --- a/internal/cmd/buildtool/cdepsopenssl.go +++ b/internal/cmd/buildtool/cdepsopenssl.go @@ -26,14 +26,14 @@ func cdepsOpenSSLBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencie restore := cdepsMustChdir(work) defer restore() - // See https://github.com/Homebrew/homebrew-core/blob/master/Formula/openssl@3.rb - cdepsMustFetch("https://www.openssl.org/source/openssl-3.1.2.tar.gz") + // 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") deps.VerifySHA256( // must be mockable - "a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539", - "openssl-3.1.2.tar.gz", + "f0316a2ebd89e7f2352976445458689f80302093788c466692fb2a188b2eacf6", + "openssl-3.1.3.tar.gz", ) - must.Run(log.Log, "tar", "-xf", "openssl-3.1.2.tar.gz") - _ = deps.MustChdir("openssl-3.1.2") // must be mockable + must.Run(log.Log, "tar", "-xf", "openssl-3.1.3.tar.gz") + _ = deps.MustChdir("openssl-3.1.3") // 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 cf6711030a..0098b0ff03 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.7.14.tar.gz") + cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.7.tar.gz") deps.VerifySHA256( // must be mockable - "a5ac67f6466380fc05e8043d01c581e4e8a2b22fe09430013473e71065e65df8", - "tor-0.4.7.14.tar.gz", + "b20d2b9c74db28a00c07f090ee5b0241b2b684f3afdecccc6b8008931c557491", + "tor-0.4.8.7.tar.gz", ) - must.Run(log.Log, "tar", "-xf", "tor-0.4.7.14.tar.gz") - _ = deps.MustChdir("tor-0.4.7.14") // must be mockable + must.Run(log.Log, "tar", "-xf", "tor-0.4.8.7.tar.gz") + _ = deps.MustChdir("tor-0.4.8.7") // must be mockable mydir := filepath.Join(topdir, "CDEPS", "tor") for _, patch := range cdepsMustListPatches(mydir) { diff --git a/internal/cmd/buildtool/linuxcdeps_test.go b/internal/cmd/buildtool/linuxcdeps_test.go index 67b14f13d2..87a5f6cbeb 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.2.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.3.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.1.2.tar.gz", + "tar", "-xf", "openssl-3.1.3.tar.gz", }, }, { Env: []string{}, @@ -299,12 +299,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) { expect: []buildtooltest.ExecExpectations{{ Env: []string{}, Argv: []string{ - "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.7.14.tar.gz", + "tar", "-xf", "tor-0.4.8.7.tar.gz", }, }, { Env: []string{},