Skip to content

Commit

Permalink
chore: update C deps
Browse files Browse the repository at this point in the history 
Part of ooni/probe#2556
  • Loading branch information
@bassosimone
bassosimone committed Dec 13, 2023
1 parent f8c6189 commit 6556581
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.1.3.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.3.tar.gz",
"tar", "-xf", "openssl-3.2.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.1.3.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.3.tar.gz",
"tar", "-xf", "openssl-3.2.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.1.3.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.3.tar.gz",
"tar", "-xf", "openssl-3.2.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.1.3.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.3.tar.gz",
"tar", "-xf", "openssl-3.2.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.7.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.7.tar.gz",
"tar", "-xf", "tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1815,12 +1815,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.7.tar.gz",
"tar", "-xf", "tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1892,12 +1892,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.7.tar.gz",
"tar", "-xf", "tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1969,12 +1969,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.7.tar.gz",
"tar", "-xf", "tor-0.4.8.10.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.1.3.tar.gz")
cdepsMustFetch("https://www.openssl.org/source/openssl-3.2.0.tar.gz")
deps.VerifySHA256( // must be mockable
"f0316a2ebd89e7f2352976445458689f80302093788c466692fb2a188b2eacf6",
"openssl-3.1.3.tar.gz",
"14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e",
"openssl-3.2.0.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "openssl-3.1.3.tar.gz")
_ = deps.MustChdir("openssl-3.1.3") // must be mockable
must.Run(log.Log, "tar", "-xf", "openssl-3.2.0.tar.gz")
_ = deps.MustChdir("openssl-3.2.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.7.tar.gz")
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.10.tar.gz")
deps.VerifySHA256( // must be mockable
"b20d2b9c74db28a00c07f090ee5b0241b2b684f3afdecccc6b8008931c557491",
"tor-0.4.8.7.tar.gz",
"e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86",
"tor-0.4.8.10.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.7.tar.gz")
_ = deps.MustChdir("tor-0.4.8.7") // must be mockable
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.10.tar.gz")
_ = deps.MustChdir("tor-0.4.8.10") // 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.1.3.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.3.tar.gz",
"tar", "-xf", "openssl-3.2.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.1.3.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.3.tar.gz",
"tar", "-xf", "openssl-3.2.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.1.3.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.3.tar.gz",
"tar", "-xf", "openssl-3.2.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.7.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.7.tar.gz",
"tar", "-xf", "tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1220,12 +1220,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.7.tar.gz",
"tar", "-xf", "tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1298,12 +1298,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.7.tar.gz",
"tar", "-xf", "tor-0.4.8.10.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.1.3.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.3.tar.gz",
"tar", "-xf", "openssl-3.2.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.7.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.7.tar.gz",
"tar", "-xf", "tor-0.4.8.10.tar.gz",
},
}, {
Env: []string{},
Expand Down

0 comments on commit 6556581

Please sign in to comment.