chore: upgrade cdeps

ooni · Nov 24, 2024 · 3cf2e6d · 3cf2e6d
1 parent 9870e22
commit 3cf2e6d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git 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/[email protected]
-	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
@@ -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
@@ -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{},