Skip to content

Commit 2d8cde9

Browse files
bassosimonebassosimone
authored
chore: upgrade C dependencies (#1194)
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.
1 parent 23059b6 commit 2d8cde9

File tree

7 files changed

+53
-51
lines changed

7 files changed

+53
-51
lines changed

‎internal/cmd/buildtool/android_test.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -440,12 +440,12 @@ func TestAndroidBuildCdepsZlib(t *testing.T) {
440440
expect: []buildtooltest.ExecExpectations{{
441441
Env: []string{},
442442
Argv: []string{
443-
"curl", "-fsSLO", "https://zlib.net/zlib-1.2.13.tar.gz",
443+
"curl", "-fsSLO", "https://zlib.net/zlib-1.3.tar.gz",
444444
},
445445
}, {
446446
Env: []string{},
447447
Argv: []string{
448-
"tar", "-xf", "zlib-1.2.13.tar.gz",
448+
"tar", "-xf", "zlib-1.3.tar.gz",
449449
},
450450
}, {
451451
Env: []string{},
@@ -493,12 +493,12 @@ func TestAndroidBuildCdepsZlib(t *testing.T) {
493493
}, {
494494
Env: []string{},
495495
Argv: []string{
496-
"curl", "-fsSLO", "https://zlib.net/zlib-1.2.13.tar.gz",
496+
"curl", "-fsSLO", "https://zlib.net/zlib-1.3.tar.gz",
497497
},
498498
}, {
499499
Env: []string{},
500500
Argv: []string{
501-
"tar", "-xf", "zlib-1.2.13.tar.gz",
501+
"tar", "-xf", "zlib-1.3.tar.gz",
502502
},
503503
}, {
504504
Env: []string{},
@@ -546,12 +546,12 @@ func TestAndroidBuildCdepsZlib(t *testing.T) {
546546
}, {
547547
Env: []string{},
548548
Argv: []string{
549-
"curl", "-fsSLO", "https://zlib.net/zlib-1.2.13.tar.gz",
549+
"curl", "-fsSLO", "https://zlib.net/zlib-1.3.tar.gz",
550550
},
551551
}, {
552552
Env: []string{},
553553
Argv: []string{
554-
"tar", "-xf", "zlib-1.2.13.tar.gz",
554+
"tar", "-xf", "zlib-1.3.tar.gz",
555555
},
556556
}, {
557557
Env: []string{},
@@ -599,12 +599,12 @@ func TestAndroidBuildCdepsZlib(t *testing.T) {
599599
}, {
600600
Env: []string{},
601601
Argv: []string{
602-
"curl", "-fsSLO", "https://zlib.net/zlib-1.2.13.tar.gz",
602+
"curl", "-fsSLO", "https://zlib.net/zlib-1.3.tar.gz",
603603
},
604604
}, {
605605
Env: []string{},
606606
Argv: []string{
607-
"tar", "-xf", "zlib-1.2.13.tar.gz",
607+
"tar", "-xf", "zlib-1.3.tar.gz",
608608
},
609609
}, {
610610
Env: []string{},
@@ -702,12 +702,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
702702
expect: []buildtooltest.ExecExpectations{{
703703
Env: []string{},
704704
Argv: []string{
705-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1u.tar.gz",
705+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1v.tar.gz",
706706
},
707707
}, {
708708
Env: []string{},
709709
Argv: []string{
710-
"tar", "-xf", "openssl-1.1.1u.tar.gz",
710+
"tar", "-xf", "openssl-1.1.1v.tar.gz",
711711
},
712712
}, {
713713
Env: []string{},
@@ -763,12 +763,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
763763
}, {
764764
Env: []string{},
765765
Argv: []string{
766-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1u.tar.gz",
766+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1v.tar.gz",
767767
},
768768
}, {
769769
Env: []string{},
770770
Argv: []string{
771-
"tar", "-xf", "openssl-1.1.1u.tar.gz",
771+
"tar", "-xf", "openssl-1.1.1v.tar.gz",
772772
},
773773
}, {
774774
Env: []string{},
@@ -824,12 +824,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
824824
}, {
825825
Env: []string{},
826826
Argv: []string{
827-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1u.tar.gz",
827+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1v.tar.gz",
828828
},
829829
}, {
830830
Env: []string{},
831831
Argv: []string{
832-
"tar", "-xf", "openssl-1.1.1u.tar.gz",
832+
"tar", "-xf", "openssl-1.1.1v.tar.gz",
833833
},
834834
}, {
835835
Env: []string{},
@@ -885,12 +885,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
885885
}, {
886886
Env: []string{},
887887
Argv: []string{
888-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1u.tar.gz",
888+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1v.tar.gz",
889889
},
890890
}, {
891891
Env: []string{},
892892
Argv: []string{
893-
"tar", "-xf", "openssl-1.1.1u.tar.gz",
893+
"tar", "-xf", "openssl-1.1.1v.tar.gz",
894894
},
895895
}, {
896896
Env: []string{},
@@ -1646,12 +1646,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
16461646
expect: []buildtooltest.ExecExpectations{{
16471647
Env: []string{},
16481648
Argv: []string{
1649-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.13.tar.gz",
1649+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
16501650
},
16511651
}, {
16521652
Env: []string{},
16531653
Argv: []string{
1654-
"tar", "-xf", "tor-0.4.7.13.tar.gz",
1654+
"tar", "-xf", "tor-0.4.7.14.tar.gz",
16551655
},
16561656
}, {
16571657
Env: []string{},
@@ -1722,12 +1722,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
17221722
}, {
17231723
Env: []string{},
17241724
Argv: []string{
1725-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.13.tar.gz",
1725+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
17261726
},
17271727
}, {
17281728
Env: []string{},
17291729
Argv: []string{
1730-
"tar", "-xf", "tor-0.4.7.13.tar.gz",
1730+
"tar", "-xf", "tor-0.4.7.14.tar.gz",
17311731
},
17321732
}, {
17331733
Env: []string{},
@@ -1798,12 +1798,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
17981798
}, {
17991799
Env: []string{},
18001800
Argv: []string{
1801-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.13.tar.gz",
1801+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
18021802
},
18031803
}, {
18041804
Env: []string{},
18051805
Argv: []string{
1806-
"tar", "-xf", "tor-0.4.7.13.tar.gz",
1806+
"tar", "-xf", "tor-0.4.7.14.tar.gz",
18071807
},
18081808
}, {
18091809
Env: []string{},
@@ -1874,12 +1874,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
18741874
}, {
18751875
Env: []string{},
18761876
Argv: []string{
1877-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.13.tar.gz",
1877+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
18781878
},
18791879
}, {
18801880
Env: []string{},
18811881
Argv: []string{
1882-
"tar", "-xf", "tor-0.4.7.13.tar.gz",
1882+
"tar", "-xf", "tor-0.4.7.14.tar.gz",
18831883
},
18841884
}, {
18851885
Env: []string{},

‎internal/cmd/buildtool/cdepslibevent.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func cdepsLibeventBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependenci
2626
restore := cdepsMustChdir(work)
2727
defer restore()
2828

29-
// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/libevent.rb
29+
// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/lib/libevent.rb
3030
cdepsMustFetch("https://github.com/libevent/libevent/archive/release-2.1.12-stable.tar.gz")
3131
deps.VerifySHA256( // must be mockable
3232
"7180a979aaa7000e1264da484f712d403fcf7679b1e9212c4e3d09f5c93efc24",

‎internal/cmd/buildtool/cdepsopenssl.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ func cdepsOpenSSLBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencie
2626
restore := cdepsMustChdir(work)
2727
defer restore()
2828

29-
// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/[email protected]
30-
cdepsMustFetch("https://www.openssl.org/source/openssl-1.1.1u.tar.gz")
29+
// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/o/[email protected]
30+
cdepsMustFetch("https://www.openssl.org/source/openssl-1.1.1v.tar.gz")
3131
deps.VerifySHA256( // must be mockable
32-
"e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6",
33-
"openssl-1.1.1u.tar.gz",
32+
"d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0",
33+
"openssl-1.1.1v.tar.gz",
3434
)
35-
must.Run(log.Log, "tar", "-xf", "openssl-1.1.1u.tar.gz")
36-
_ = deps.MustChdir("openssl-1.1.1u") // must be mockable
35+
must.Run(log.Log, "tar", "-xf", "openssl-1.1.1v.tar.gz")
36+
_ = deps.MustChdir("openssl-1.1.1v") // must be mockable
3737

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

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

55-
// QUIRK: OpenSSL-1.1.1u wants the PATH to contain the
55+
// QUIRK: OpenSSL-1.1.1v wants the PATH to contain the
5656
// directory where the Android compiler lives.
5757
if mergedEnv.BINPATH != "" {
5858
envp.Append("PATH", cdepsPrependToPath(mergedEnv.BINPATH))

‎internal/cmd/buildtool/cdepstor.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ func cdepsTorBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies) {
2626
restore := cdepsMustChdir(work)
2727
defer restore()
2828

29-
// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/tor.rb
30-
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.7.13.tar.gz")
29+
// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/t/tor.rb
30+
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.7.14.tar.gz")
3131
deps.VerifySHA256( // must be mockable
32-
"2079172cce034556f110048e26083ce9bea751f3154b0ad2809751815b11ea9d",
33-
"tor-0.4.7.13.tar.gz",
32+
"a5ac67f6466380fc05e8043d01c581e4e8a2b22fe09430013473e71065e65df8",
33+
"tor-0.4.7.14.tar.gz",
3434
)
35-
must.Run(log.Log, "tar", "-xf", "tor-0.4.7.13.tar.gz")
36-
_ = deps.MustChdir("tor-0.4.7.13") // must be mockable
35+
must.Run(log.Log, "tar", "-xf", "tor-0.4.7.14.tar.gz")
36+
_ = deps.MustChdir("tor-0.4.7.14") // must be mockable
3737

3838
mydir := filepath.Join(topdir, "CDEPS", "tor")
3939
for _, patch := range cdepsMustListPatches(mydir) {

‎internal/cmd/buildtool/cdepszlib.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ func cdepsZlibBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies)
2424
restore := cdepsMustChdir(work)
2525
defer restore()
2626

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

3636
mydir := filepath.Join(topdir, "CDEPS", "zlib")
3737
for _, patch := range cdepsMustListPatches(mydir) {

‎internal/cmd/buildtool/linuxcdeps_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
4040
expect: []buildtooltest.ExecExpectations{{
4141
Env: []string{},
4242
Argv: []string{
43-
"curl", "-fsSLO", "https://zlib.net/zlib-1.2.13.tar.gz",
43+
"curl", "-fsSLO", "https://zlib.net/zlib-1.3.tar.gz",
4444
},
4545
}, {
4646
Env: []string{},
4747
Argv: []string{
48-
"tar", "-xf", "zlib-1.2.13.tar.gz",
48+
"tar", "-xf", "zlib-1.3.tar.gz",
4949
},
5050
}, {
5151
Env: []string{},
@@ -92,12 +92,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
9292
expect: []buildtooltest.ExecExpectations{{
9393
Env: []string{},
9494
Argv: []string{
95-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1u.tar.gz",
95+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-1.1.1v.tar.gz",
9696
},
9797
}, {
9898
Env: []string{},
9999
Argv: []string{
100-
"tar", "-xf", "openssl-1.1.1u.tar.gz",
100+
"tar", "-xf", "openssl-1.1.1v.tar.gz",
101101
},
102102
}, {
103103
Env: []string{},
@@ -299,12 +299,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
299299
expect: []buildtooltest.ExecExpectations{{
300300
Env: []string{},
301301
Argv: []string{
302-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.13.tar.gz",
302+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.7.14.tar.gz",
303303
},
304304
}, {
305305
Env: []string{},
306306
Argv: []string{
307-
"tar", "-xf", "tor-0.4.7.13.tar.gz",
307+
"tar", "-xf", "tor-0.4.7.14.tar.gz",
308308
},
309309
}, {
310310
Env: []string{},

‎pkg/oonimkall/xoonirun_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ func TestOONIRunFetch(t *testing.T) {
2727
}
2828

2929
expect := map[string]any{
30+
"archived": false,
3031
"descriptor_creation_time": "2023-07-18T15:38:21Z",
3132
"descriptor": map[string]any{
3233
"author": "[email protected]",
@@ -48,6 +49,7 @@ func TestOONIRunFetch(t *testing.T) {
4849
"short_description": "Integration testing descriptor for ooni/probe-cli/v3/pkg/oonimkall.",
4950
"short_description_intl": map[string]any{},
5051
},
52+
"mine": false,
5153
"translation_creation_time": "2023-07-18T15:38:21Z",
5254
"v": 1.0,
5355
}

0 commit comments

Comments
 (0)