Skip to content

Commit

Permalink
chore: upgrade C dependencies
Browse files Browse the repository at this point in the history 
See ooni/probe#2722
  • Loading branch information
@bassosimone
bassosimone committed May 13, 2024
1 parent f54be77 commit 8cf6544
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 42 deletions.
32 changes: 16 additions & 16 deletions internal/cmd/buildtool/android_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.1.tar.gz",
"tar", "-xf", "openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -757,12 +757,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.1.tar.gz",
"tar", "-xf", "openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -812,12 +812,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.1.tar.gz",
"tar", "-xf", "openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -867,12 +867,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.1.tar.gz",
"tar", "-xf", "openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -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.10.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.10.tar.gz",
"tar", "-xf", "tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1827,12 +1827,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.10.tar.gz",
"tar", "-xf", "tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1916,12 +1916,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.10.tar.gz",
"tar", "-xf", "tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -2005,12 +2005,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.10.tar.gz",
"tar", "-xf", "tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Expand Down
10 changes: 5 additions & 5 deletions internal/cmd/buildtool/cdepsopenssl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1.tar.gz")
cdepsMustFetch("https://www.openssl.org/source/openssl-3.3.0.tar.gz")
deps.VerifySHA256( // must be mockable
"83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39",
"openssl-3.2.1.tar.gz",
"53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02",
"openssl-3.3.0.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "openssl-3.2.1.tar.gz")
_ = deps.MustChdir("openssl-3.2.1") // must be mockable
must.Run(log.Log, "tar", "-xf", "openssl-3.3.0.tar.gz")
_ = deps.MustChdir("openssl-3.3.0") // must be mockable

mydir := filepath.Join(topdir, "CDEPS", "openssl")
for _, patch := range cdepsMustListPatches(mydir) {
Expand Down
10 changes: 5 additions & 5 deletions internal/cmd/buildtool/cdepstor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.tar.gz")
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.11.tar.gz")
deps.VerifySHA256( // must be mockable
"e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86",
"tor-0.4.8.10.tar.gz",
"8f2bdf90e63380781235aa7d604e159570f283ecee674670873d8bb7052c8e07",
"tor-0.4.8.11.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.10.tar.gz")
_ = deps.MustChdir("tor-0.4.8.10") // must be mockable
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.11.tar.gz")
_ = deps.MustChdir("tor-0.4.8.11") // must be mockable

mydir := filepath.Join(topdir, "CDEPS", "tor")
for _, patch := range cdepsMustListPatches(mydir) {
Expand Down
24 changes: 12 additions & 12 deletions internal/cmd/buildtool/ios_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.1.tar.gz",
"tar", "-xf", "openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -399,12 +399,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.1.tar.gz",
"tar", "-xf", "openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -449,12 +449,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.1.tar.gz",
"tar", "-xf", "openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -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.10.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.10.tar.gz",
"tar", "-xf", "tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1232,12 +1232,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.10.tar.gz",
"tar", "-xf", "tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1322,12 +1322,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.10.tar.gz",
"tar", "-xf", "tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Expand Down
8 changes: 4 additions & 4 deletions internal/cmd/buildtool/linuxcdeps_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.1.tar.gz",
"tar", "-xf", "openssl-3.3.0.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -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.10.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.10.tar.gz",
"tar", "-xf", "tor-0.4.8.11.tar.gz",
},
}, {
Env: []string{},
Expand Down

0 comments on commit 8cf6544

Please sign in to comment.