chore: upgrade C dependencies (#1524)

See ooni/probe#2690
ooni · Mar 21, 2024 · 0ad0198 · 0ad0198
1 parent cd86c8b
commit 0ad0198
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/NDKVERSION b/NDKVERSION
@@ -1 +1 @@
-26.1.10909125
+26.2.11394342
diff --git 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.2.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.2.0.tar.gz",
+				"tar", "-xf", "openssl-3.2.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.2.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.2.0.tar.gz",
+				"tar", "-xf", "openssl-3.2.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.2.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.2.0.tar.gz",
+				"tar", "-xf", "openssl-3.2.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.2.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.2.0.tar.gz",
+				"tar", "-xf", "openssl-3.2.1.tar.gz",
 			},
 		}, {
 			Env: []string{},

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/openssl@3.rb
-	cdepsMustFetch("https://www.openssl.org/source/openssl-3.2.0.tar.gz")
+	cdepsMustFetch("https://www.openssl.org/source/openssl-3.2.1.tar.gz")
 	deps.VerifySHA256( // must be mockable
-		"14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e",
-		"openssl-3.2.0.tar.gz",
+		"83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39",
+		"openssl-3.2.1.tar.gz",
 	)
-	must.Run(log.Log, "tar", "-xf", "openssl-3.2.0.tar.gz")
-	_ = deps.MustChdir("openssl-3.2.0") // must be mockable
+	must.Run(log.Log, "tar", "-xf", "openssl-3.2.1.tar.gz")
+	_ = deps.MustChdir("openssl-3.2.1") // 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
@@ -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.2.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.2.0.tar.gz",
+				"tar", "-xf", "openssl-3.2.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.2.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.2.0.tar.gz",
+				"tar", "-xf", "openssl-3.2.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.2.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.2.0.tar.gz",
+				"tar", "-xf", "openssl-3.2.1.tar.gz",
 			},
 		}, {
 			Env: []string{},

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.2.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.2.0.tar.gz",
+				"tar", "-xf", "openssl-3.2.1.tar.gz",
 			},
 		}, {
 			Env: []string{},