Skip to content

Commit

Permalink
chore: upgrade C dependencies (ooni#1339)
Browse files Browse the repository at this point in the history 
This diff updates C dependencies to the latest version.

Part of ooni/probe#2524.
  • Loading branch information
@bassosimone @Murphy-OrangeMud
bassosimone authored and Murphy-OrangeMud committed Feb 13, 2024
1 parent 937f7e2 commit 99b6d88
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 31 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.2.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.3.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.2.tar.gz",
"tar", "-xf", "openssl-3.1.3.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -763,12 +763,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.2.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.3.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.2.tar.gz",
"tar", "-xf", "openssl-3.1.3.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -824,12 +824,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.2.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.3.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.2.tar.gz",
"tar", "-xf", "openssl-3.1.3.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -885,12 +885,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.2.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.3.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.2.tar.gz",
"tar", "-xf", "openssl-3.1.3.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1646,12 +1646,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.7.14.tar.gz",
"tar", "-xf", "tor-0.4.8.7.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1722,12 +1722,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.7.14.tar.gz",
"tar", "-xf", "tor-0.4.8.7.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1798,12 +1798,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.7.14.tar.gz",
"tar", "-xf", "tor-0.4.8.7.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1874,12 +1874,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.7.14.tar.gz",
"tar", "-xf", "tor-0.4.8.7.tar.gz",
},
}, {
Env: []string{},
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/buildtool/cdepsopenssl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ func cdepsOpenSSLBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencie
restore := cdepsMustChdir(work)
defer restore()

// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/openssl@3.rb
cdepsMustFetch("https://www.openssl.org/source/openssl-3.1.2.tar.gz")
// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/o/openssl@3.rb
cdepsMustFetch("https://www.openssl.org/source/openssl-3.1.3.tar.gz")
deps.VerifySHA256( // must be mockable
"a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539",
"openssl-3.1.2.tar.gz",
"f0316a2ebd89e7f2352976445458689f80302093788c466692fb2a188b2eacf6",
"openssl-3.1.3.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "openssl-3.1.2.tar.gz")
_ = deps.MustChdir("openssl-3.1.2") // must be mockable
must.Run(log.Log, "tar", "-xf", "openssl-3.1.3.tar.gz")
_ = deps.MustChdir("openssl-3.1.3") // 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.7.14.tar.gz")
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.7.tar.gz")
deps.VerifySHA256( // must be mockable
"a5ac67f6466380fc05e8043d01c581e4e8a2b22fe09430013473e71065e65df8",
"tor-0.4.7.14.tar.gz",
"b20d2b9c74db28a00c07f090ee5b0241b2b684f3afdecccc6b8008931c557491",
"tor-0.4.8.7.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "tor-0.4.7.14.tar.gz")
_ = deps.MustChdir("tor-0.4.7.14") // must be mockable
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.7.tar.gz")
_ = deps.MustChdir("tor-0.4.8.7") // must be mockable

mydir := filepath.Join(topdir, "CDEPS", "tor")
for _, patch := range cdepsMustListPatches(mydir) {
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.2.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.1.3.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.1.2.tar.gz",
"tar", "-xf", "openssl-3.1.3.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -299,12 +299,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.7.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.7.14.tar.gz",
"tar", "-xf", "tor-0.4.8.7.tar.gz",
},
}, {
Env: []string{},
Expand Down

0 comments on commit 99b6d88

Please sign in to comment.