From 3cf2e6d6834ed7a49566e4612a3e3e758fab2e4b Mon Sep 17 00:00:00 2001 From: decfox Date: Mon, 25 Nov 2024 03:48:30 +0530 Subject: [PATCH] chore: upgrade cdeps --- internal/cmd/buildtool/cdepsopenssl.go | 10 +++++----- internal/cmd/buildtool/cdepstor.go | 10 +++++----- internal/cmd/buildtool/linuxcdeps_test.go | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/internal/cmd/buildtool/cdepsopenssl.go b/internal/cmd/buildtool/cdepsopenssl.go index 1119dcc61..cf0046a53 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.3.1.tar.gz") + cdepsMustFetch("https://www.openssl.org/source/openssl-3.4.0.tar.gz") deps.VerifySHA256( // must be mockable - "777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e", - "openssl-3.3.1.tar.gz", + "e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf", + "openssl-3.4.0.tar.gz", ) - must.Run(log.Log, "tar", "-xf", "openssl-3.3.1.tar.gz") - _ = deps.MustChdir("openssl-3.3.1") // must be mockable + must.Run(log.Log, "tar", "-xf", "openssl-3.4.0.tar.gz") + _ = deps.MustChdir("openssl-3.4.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 129ec9f4f..77dd39090 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.12.tar.gz") + cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.13.tar.gz") deps.VerifySHA256( // must be mockable - "ca7cc735d98e3747b58f2f3cc14f804dd789fa0fb333a84dcb6bd70adbb8c874", - "tor-0.4.8.12.tar.gz", + "9baf26c387a2820b3942da572146e6eb77c2bc66862af6297cd02a074e6fba28", + "tor-0.4.8.13.tar.gz", ) - must.Run(log.Log, "tar", "-xf", "tor-0.4.8.12.tar.gz") - _ = deps.MustChdir("tor-0.4.8.12") // must be mockable + must.Run(log.Log, "tar", "-xf", "tor-0.4.8.13.tar.gz") + _ = deps.MustChdir("tor-0.4.8.13") // 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 9527f09d0..d8b0c62c8 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.1.tar.gz", + "curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "openssl-3.3.1.tar.gz", + "tar", "-xf", "openssl-3.4.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.12.tar.gz", + "curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.13.tar.gz", }, }, { Env: []string{}, Argv: []string{ - "tar", "-xf", "tor-0.4.8.12.tar.gz", + "tar", "-xf", "tor-0.4.8.13.tar.gz", }, }, { Env: []string{},