Skip to content

Commit

Permalink
chore: upgrade C dependencies
Browse files Browse the repository at this point in the history 
Part of ooni/probe#2524. Prompted by observing
a failing Linux build test for zlib.

Upgrading to OpenSSL v3 is tracked by ooni/probe#2498
and implemented by #1191.

While there, fix ./pkg/oonimkall integration tests as well.
  • Loading branch information
@bassosimone
bassosimone committed Aug 23, 2023
1 parent 23059b6 commit eb282bb
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 51 deletions.
48 changes: 24 additions & 24 deletions internal/cmd/buildtool/android_test.go
View file
Expand Up @@ -440,12 +440,12 @@ func TestAndroidBuildCdepsZlib(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://zlib.net/zlib-1.2.13.tar.gz",
"curl", "-fsSLO", "https://zlib.net/zlib-1.3.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "zlib-1.2.13.tar.gz",
"tar", "-xf", "zlib-1.3.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -493,12 +493,12 @@ func TestAndroidBuildCdepsZlib(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://zlib.net/zlib-1.2.13.tar.gz",
"curl", "-fsSLO", "https://zlib.net/zlib-1.3.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "zlib-1.2.13.tar.gz",
"tar", "-xf", "zlib-1.3.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -546,12 +546,12 @@ func TestAndroidBuildCdepsZlib(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://zlib.net/zlib-1.2.13.tar.gz",
"curl", "-fsSLO", "https://zlib.net/zlib-1.3.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "zlib-1.2.13.tar.gz",
"tar", "-xf", "zlib-1.3.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -599,12 +599,12 @@ func TestAndroidBuildCdepsZlib(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://zlib.net/zlib-1.2.13.tar.gz",
"curl", "-fsSLO", "https://zlib.net/zlib-1.3.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "zlib-1.2.13.tar.gz",
"tar", "-xf", "zlib-1.3.tar.gz",
},
}, {
Env: []string{},
Expand Down 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-1.1.1u.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1v.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-1.1.1u.tar.gz",
"tar", "-xf", "openssl-1.1.1v.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-1.1.1u.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1v.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-1.1.1u.tar.gz",
"tar", "-xf", "openssl-1.1.1v.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-1.1.1u.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1v.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-1.1.1u.tar.gz",
"tar", "-xf", "openssl-1.1.1v.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-1.1.1u.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1v.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-1.1.1u.tar.gz",
"tar", "-xf", "openssl-1.1.1v.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.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.7.13.tar.gz",
"tar", "-xf", "tor-0.4.7.14.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.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.7.13.tar.gz",
"tar", "-xf", "tor-0.4.7.14.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.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.7.13.tar.gz",
"tar", "-xf", "tor-0.4.7.14.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.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.7.13.tar.gz",
"tar", "-xf", "tor-0.4.7.14.tar.gz",
},
}, {
Env: []string{},
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/buildtool/cdepslibevent.go
View file
Expand Up @@ -26,7 +26,7 @@ func cdepsLibeventBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependenci
restore := cdepsMustChdir(work)
defer restore()

// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/libevent.rb
// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/lib/libevent.rb
cdepsMustFetch("https://github.com/libevent/libevent/archive/release-2.1.12-stable.tar.gz")
deps.VerifySHA256( // must be mockable
"7180a979aaa7000e1264da484f712d403fcf7679b1e9212c4e3d09f5c93efc24",
Expand Down
16 changes: 8 additions & 8 deletions internal/cmd/buildtool/cdepsopenssl.go
View file
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@1.1.rb
cdepsMustFetch("https://www.openssl.org/source/openssl-1.1.1u.tar.gz")
// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/o/openssl@1.1.rb
cdepsMustFetch("https://www.openssl.org/source/openssl-1.1.1v.tar.gz")
deps.VerifySHA256( // must be mockable
"e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6",
"openssl-1.1.1u.tar.gz",
"d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0",
"openssl-1.1.1v.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "openssl-1.1.1u.tar.gz")
_ = deps.MustChdir("openssl-1.1.1u") // must be mockable
must.Run(log.Log, "tar", "-xf", "openssl-1.1.1v.tar.gz")
_ = deps.MustChdir("openssl-1.1.1v") // must be mockable

mydir := filepath.Join(topdir, "CDEPS", "openssl")
for _, patch := range cdepsMustListPatches(mydir) {
Expand All @@ -47,12 +47,12 @@ func cdepsOpenSSLBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencie
mergedEnv := cBuildMerge(globalEnv, localEnv)
envp := cBuildExportOpenSSL(mergedEnv)

// QUIRK: OpenSSL-1.1.1u wants ANDROID_NDK_HOME
// QUIRK: OpenSSL-1.1.1v wants ANDROID_NDK_HOME
if mergedEnv.ANDROID_NDK_ROOT != "" {
envp.Append("ANDROID_NDK_HOME", mergedEnv.ANDROID_NDK_ROOT)
}

// QUIRK: OpenSSL-1.1.1u wants the PATH to contain the
// QUIRK: OpenSSL-1.1.1v wants the PATH to contain the
// directory where the Android compiler lives.
if mergedEnv.BINPATH != "" {
envp.Append("PATH", cdepsPrependToPath(mergedEnv.BINPATH))
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/buildtool/cdepstor.go
View file
Expand Up @@ -26,14 +26,14 @@ func cdepsTorBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies) {
restore := cdepsMustChdir(work)
defer restore()

// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/tor.rb
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.7.13.tar.gz")
// 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")
deps.VerifySHA256( // must be mockable
"2079172cce034556f110048e26083ce9bea751f3154b0ad2809751815b11ea9d",
"tor-0.4.7.13.tar.gz",
"a5ac67f6466380fc05e8043d01c581e4e8a2b22fe09430013473e71065e65df8",
"tor-0.4.7.14.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "tor-0.4.7.13.tar.gz")
_ = deps.MustChdir("tor-0.4.7.13") // must be mockable
must.Run(log.Log, "tar", "-xf", "tor-0.4.7.14.tar.gz")
_ = deps.MustChdir("tor-0.4.7.14") // must be mockable

mydir := filepath.Join(topdir, "CDEPS", "tor")
for _, patch := range cdepsMustListPatches(mydir) {
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/buildtool/cdepszlib.go
View file
Expand Up @@ -24,14 +24,14 @@ func cdepsZlibBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies)
restore := cdepsMustChdir(work)
defer restore()

// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/zlib.rb
cdepsMustFetch("https://zlib.net/zlib-1.2.13.tar.gz")
// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/z/zlib.rb
cdepsMustFetch("https://zlib.net/zlib-1.3.tar.gz")
deps.VerifySHA256( // must be mockable
"b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30",
"zlib-1.2.13.tar.gz",
"ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e",
"zlib-1.3.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "zlib-1.2.13.tar.gz")
_ = deps.MustChdir("zlib-1.2.13") // must be mockable
must.Run(log.Log, "tar", "-xf", "zlib-1.3.tar.gz")
_ = deps.MustChdir("zlib-1.3") // must be mockable

mydir := filepath.Join(topdir, "CDEPS", "zlib")
for _, patch := range cdepsMustListPatches(mydir) {
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/buildtool/linuxcdeps_test.go
View file
Expand Up @@ -40,12 +40,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://zlib.net/zlib-1.2.13.tar.gz",
"curl", "-fsSLO", "https://zlib.net/zlib-1.3.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "zlib-1.2.13.tar.gz",
"tar", "-xf", "zlib-1.3.tar.gz",
},
}, {
Env: []string{},
Expand Down 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-1.1.1u.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1v.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-1.1.1u.tar.gz",
"tar", "-xf", "openssl-1.1.1v.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.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.7.13.tar.gz",
"tar", "-xf", "tor-0.4.7.14.tar.gz",
},
}, {
Env: []string{},
Expand Down
2 changes: 2 additions & 0 deletions pkg/oonimkall/xoonirun_test.go
View file
Expand Up @@ -27,6 +27,7 @@ func TestOONIRunFetch(t *testing.T) {
}

expect := map[string]any{
"archived": false,
"descriptor_creation_time": "2023-07-18T15:38:21Z",
"descriptor": map[string]any{
"author": "simone@openobservatory.org",
Expand All @@ -48,6 +49,7 @@ func TestOONIRunFetch(t *testing.T) {
"short_description": "Integration testing descriptor for ooni/probe-cli/v3/pkg/oonimkall.",
"short_description_intl": map[string]any{},
},
"mine": false,
"translation_creation_time": "2023-07-18T15:38:21Z",
"v": 1.0,
}
Expand Down

0 comments on commit eb282bb

Please sign in to comment.