From 210088c2bdbcb77b85a817de893af060d4e45f28 Mon Sep 17 00:00:00 2001 From: decfox Date: Wed, 7 Aug 2024 15:14:11 +0530 Subject: [PATCH 1/3] chore: update c dependencies --- internal/cmd/buildtool/cdepsopenssl.go | 4 ++-- internal/cmd/buildtool/cdepstor.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/cmd/buildtool/cdepsopenssl.go b/internal/cmd/buildtool/cdepsopenssl.go index 1a7ac3a046..f752edc021 100644 --- a/internal/cmd/buildtool/cdepsopenssl.go +++ b/internal/cmd/buildtool/cdepsopenssl.go @@ -27,9 +27,9 @@ 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", + "777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e", "openssl-3.3.0.tar.gz", ) must.Run(log.Log, "tar", "-xf", "openssl-3.3.0.tar.gz") diff --git a/internal/cmd/buildtool/cdepstor.go b/internal/cmd/buildtool/cdepstor.go index 6189eed5ef..c6fa3663dd 100644 --- a/internal/cmd/buildtool/cdepstor.go +++ b/internal/cmd/buildtool/cdepstor.go @@ -27,9 +27,9 @@ 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", + "ca7cc735d98e3747b58f2f3cc14f804dd789fa0fb333a84dcb6bd70adbb8c874", "tor-0.4.8.11.tar.gz", ) must.Run(log.Log, "tar", "-xf", "tor-0.4.8.11.tar.gz") From 01acf567a3a44875721209666574d7baf9d19f60 Mon Sep 17 00:00:00 2001 From: decfox Date: Wed, 7 Aug 2024 15:22:52 +0530 Subject: [PATCH 2/3] chore: update new dependency references --- internal/cmd/buildtool/android_test.go | 32 +++++++++++------------ internal/cmd/buildtool/ios_test.go | 24 ++++++++--------- internal/cmd/buildtool/linuxcdeps_test.go | 8 +++--- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/internal/cmd/buildtool/android_test.go b/internal/cmd/buildtool/android_test.go index 63e666eeec..13b5771486 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/ios_test.go b/internal/cmd/buildtool/ios_test.go index 45fee77b9c..6a0cb67fe5 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 1978fd8400..9527f09d0a 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{}, From dea57a4640ede4b5bfbed59c10deb07b9d400f79 Mon Sep 17 00:00:00 2001 From: decfox Date: Wed, 7 Aug 2024 15:26:14 +0530 Subject: [PATCH 3/3] fix: update missing references --- internal/cmd/buildtool/cdepsopenssl.go | 6 +++--- internal/cmd/buildtool/cdepstor.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/cmd/buildtool/cdepsopenssl.go b/internal/cmd/buildtool/cdepsopenssl.go index f752edc021..1119dcc61e 100644 --- a/internal/cmd/buildtool/cdepsopenssl.go +++ b/internal/cmd/buildtool/cdepsopenssl.go @@ -30,10 +30,10 @@ func cdepsOpenSSLBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencie cdepsMustFetch("https://www.openssl.org/source/openssl-3.3.1.tar.gz") deps.VerifySHA256( // must be mockable "777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e", - "openssl-3.3.0.tar.gz", + "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 c6fa3663dd..129ec9f4f3 100644 --- a/internal/cmd/buildtool/cdepstor.go +++ b/internal/cmd/buildtool/cdepstor.go @@ -30,10 +30,10 @@ func cdepsTorBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies) { cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.12.tar.gz") deps.VerifySHA256( // must be mockable "ca7cc735d98e3747b58f2f3cc14f804dd789fa0fb333a84dcb6bd70adbb8c874", - "tor-0.4.8.11.tar.gz", + "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) {