Skip to content

Commit bd2dd29

Browse files
DecFoxDecFox
authored
chore: sync with v3.26.0 (#1220)
1 parent 0c33424 commit bd2dd29

37 files changed

+666
-574
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ jobs:
1111
- uses: actions/checkout@v3
1212
- uses: actions/setup-go@v3
1313
with:
14-
go-version: "1.23.4"
14+
go-version: "1.23.7"
1515
- run: go build ./...

‎UPSTREAM‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v3.25.0
1+
v3.26.0

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ module github.com/ooni/probe-engine
22

33
go 1.23.0
44

5-
toolchain go1.23.4
5+
toolchain go1.23.7
66

77
require (
88
filippo.io/age v1.2.1
9-
github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250319154633-ceb78316d06e
9+
github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250604135210-85a7bd92a4ba
1010
github.com/apex/log v1.9.0
1111
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
1212
github.com/cloudflare/circl v1.5.0
@@ -24,7 +24,7 @@ require (
2424
github.com/montanaflynn/stats v0.7.1
2525
github.com/ooni/minivpn v0.0.7
2626
github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8
27-
github.com/ooni/probe-assets v0.26.0
27+
github.com/ooni/probe-assets v0.27.0
2828
github.com/oschwald/maxminddb-golang v1.13.1
2929
github.com/pborman/getopt/v2 v2.1.0
3030
github.com/pion/stun v0.6.1
@@ -56,7 +56,7 @@ require (
5656
github.com/Psiphon-Labs/consistent v0.0.0-20240322131436-20aaa4e05737 // indirect
5757
github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464 // indirect
5858
github.com/Psiphon-Labs/psiphon-tls v0.0.0-20250318183125-2a2fae2db378 // indirect
59-
github.com/Psiphon-Labs/quic-go v0.0.0-20250318213212-301924cbe026 // indirect
59+
github.com/Psiphon-Labs/quic-go v0.0.0-20250527153145-79fe45fb83b1 // indirect
6060
github.com/Psiphon-Labs/utls v1.1.1-0.20241107183331-b18909f8ccaa // indirect
6161
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
6262
github.com/andybalholm/brotli v1.1.1 // indirect
@@ -170,7 +170,7 @@ require (
170170
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
171171
github.com/vishvananda/netns v0.0.4 // indirect
172172
github.com/wader/filtertransport v0.0.0-20200316221534-bdd9e61eee78 // indirect
173-
github.com/wlynxg/anet v0.0.3 // indirect
173+
github.com/wlynxg/anet v0.0.5 // indirect
174174
github.com/x448/float16 v0.8.4 // indirect
175175
github.com/xtaci/kcp-go/v5 v5.6.8 // indirect
176176
github.com/xtaci/smux v1.5.31 // indirect

‎go.sum‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464 h1:VmnMMMheFX
3535
github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464/go.mod h1:Pe5BqN2DdIdChorAXl6bDaQd/wghpCleJfid2NoSli0=
3636
github.com/Psiphon-Labs/psiphon-tls v0.0.0-20250318183125-2a2fae2db378 h1:LqI8cxnYxgUKLLvv+XZKpxZAQcov6xhEKgC82FdvG/k=
3737
github.com/Psiphon-Labs/psiphon-tls v0.0.0-20250318183125-2a2fae2db378/go.mod h1:7ZUnPnWT5z8J8hxfsVjKHYK77Zme/Y0If1b/zeziiJs=
38-
github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250319154633-ceb78316d06e h1:J47d+9jsigy2T+763M1vdRuq5aqMUZ56IRXU8MdpW/M=
39-
github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250319154633-ceb78316d06e/go.mod h1:HvJvOtzWZ9ESc5T9OK0Db49BX8vfdgOzxHVqirHfOLY=
40-
github.com/Psiphon-Labs/quic-go v0.0.0-20250318213212-301924cbe026 h1:HT5a/8JUfI1H2eA9g5LPyOZis1wa+gzFdXMgWYWB88I=
41-
github.com/Psiphon-Labs/quic-go v0.0.0-20250318213212-301924cbe026/go.mod h1:rONdWgPMbFjyyBai7gB1IBF4pT9r4l0GyiDst5XR1SY=
38+
github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250604135210-85a7bd92a4ba h1:WPAeM6Dn0GmLNaRLlEdKRSeFZ7tV8kM3s5+lTQJ4JQ8=
39+
github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250604135210-85a7bd92a4ba/go.mod h1:1BflUn6FnGX/FlC9GFp5fFFV7ePyVUtnj3lTxZDCXwA=
40+
github.com/Psiphon-Labs/quic-go v0.0.0-20250527153145-79fe45fb83b1 h1:zD7JvZCV8gjvtI0AZmE81Ffc/v7A+qwU1/YfUmN/Flk=
41+
github.com/Psiphon-Labs/quic-go v0.0.0-20250527153145-79fe45fb83b1/go.mod h1:rONdWgPMbFjyyBai7gB1IBF4pT9r4l0GyiDst5XR1SY=
4242
github.com/Psiphon-Labs/utls v1.1.1-0.20241107183331-b18909f8ccaa h1:5FszHIhxb7yO267qt47tTfJOtD31k7R80L88EwNm4tc=
4343
github.com/Psiphon-Labs/utls v1.1.1-0.20241107183331-b18909f8ccaa/go.mod h1:dxmztdV9lf59cq44YY8r21m3b+xSjhg98cgZW8WK1p0=
4444
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
@@ -387,8 +387,8 @@ github.com/ooni/minivpn v0.0.7 h1:fRL6lOivKM+Q23HcN/FFiBftbKTAtz7U8r6cOypBAeM=
387387
github.com/ooni/minivpn v0.0.7/go.mod h1:0KNwmK2Wg9lDbk936XjtxvCq4tPNbK4C3IJvyLwIMrE=
388388
github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8 h1:kJ2wn19lIP/y9ng85BbFRdWKHK6Er116Bbt5uhqHVD4=
389389
github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8/go.mod h1:b/wAvTR5n92Vk2b0SBmuMU0xO4ZGVrsXtU7zjTby7vw=
390-
github.com/ooni/probe-assets v0.26.0 h1:pzhUcKOK7S0VNEeSeK2H6o5+KhuihNTQRtfXC7R7Spk=
391-
github.com/ooni/probe-assets v0.26.0/go.mod h1:m0k2FFzcLfFm7dhgyYkLCUR3R0CoRPr0jcjctDS2+gU=
390+
github.com/ooni/probe-assets v0.27.0 h1:aTQTlsUle7u7uKafYDKEBTR/W90oq7jjmjl+dOoqmDo=
391+
github.com/ooni/probe-assets v0.27.0/go.mod h1:m0k2FFzcLfFm7dhgyYkLCUR3R0CoRPr0jcjctDS2+gU=
392392
github.com/oschwald/geoip2-golang v1.9.0 h1:uvD3O6fXAXs+usU+UGExshpdP13GAqp4GBrzN7IgKZc=
393393
github.com/oschwald/geoip2-golang v1.9.0/go.mod h1:BHK6TvDyATVQhKNbQBdrj9eAvuwOMi2zSFXizL3K81Y=
394394
github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5MbwsmL4MRQE=
@@ -595,8 +595,9 @@ github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1Y
595595
github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
596596
github.com/wader/filtertransport v0.0.0-20200316221534-bdd9e61eee78 h1:9sreu9e9KOihf2Y0NbpyfWhd1XFDcL4GTkPYL4IvMrg=
597597
github.com/wader/filtertransport v0.0.0-20200316221534-bdd9e61eee78/go.mod h1:HazXTRLhXFyq80TQp7PUXi6BKE6mS+ydEdzEqNBKopQ=
598-
github.com/wlynxg/anet v0.0.3 h1:PvR53psxFXstc12jelG6f1Lv4MWqE0tI76/hHGjh9rg=
599598
github.com/wlynxg/anet v0.0.3/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
599+
github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
600+
github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
600601
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
601602
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
602603
github.com/xtaci/kcp-go/v5 v5.6.8 h1:jlI/0jAyjoOjT/SaGB58s4bQMJiNS41A2RKzR6TMWeI=

‎pkg/cmd/buildtool/android_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -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-3.4.0.tar.gz",
705+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
706706
},
707707
}, {
708708
Env: []string{},
709709
Argv: []string{
710-
"tar", "-xf", "openssl-3.4.0.tar.gz",
710+
"tar", "-xf", "openssl-3.5.0.tar.gz",
711711
},
712712
}, {
713713
Env: []string{},
@@ -757,12 +757,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
757757
}, {
758758
Env: []string{},
759759
Argv: []string{
760-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
760+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
761761
},
762762
}, {
763763
Env: []string{},
764764
Argv: []string{
765-
"tar", "-xf", "openssl-3.4.0.tar.gz",
765+
"tar", "-xf", "openssl-3.5.0.tar.gz",
766766
},
767767
}, {
768768
Env: []string{},
@@ -812,12 +812,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
812812
}, {
813813
Env: []string{},
814814
Argv: []string{
815-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
815+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
816816
},
817817
}, {
818818
Env: []string{},
819819
Argv: []string{
820-
"tar", "-xf", "openssl-3.4.0.tar.gz",
820+
"tar", "-xf", "openssl-3.5.0.tar.gz",
821821
},
822822
}, {
823823
Env: []string{},
@@ -867,12 +867,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
867867
}, {
868868
Env: []string{},
869869
Argv: []string{
870-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
870+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
871871
},
872872
}, {
873873
Env: []string{},
874874
Argv: []string{
875-
"tar", "-xf", "openssl-3.4.0.tar.gz",
875+
"tar", "-xf", "openssl-3.5.0.tar.gz",
876876
},
877877
}, {
878878
Env: []string{},
@@ -1738,12 +1738,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
17381738
expect: []buildtooltest.ExecExpectations{{
17391739
Env: []string{},
17401740
Argv: []string{
1741-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
1741+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
17421742
},
17431743
}, {
17441744
Env: []string{},
17451745
Argv: []string{
1746-
"tar", "-xf", "tor-0.4.8.14.tar.gz",
1746+
"tar", "-xf", "tor-0.4.8.16.tar.gz",
17471747
},
17481748
}, {
17491749
Env: []string{},
@@ -1827,12 +1827,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
18271827
}, {
18281828
Env: []string{},
18291829
Argv: []string{
1830-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
1830+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
18311831
},
18321832
}, {
18331833
Env: []string{},
18341834
Argv: []string{
1835-
"tar", "-xf", "tor-0.4.8.14.tar.gz",
1835+
"tar", "-xf", "tor-0.4.8.16.tar.gz",
18361836
},
18371837
}, {
18381838
Env: []string{},
@@ -1916,12 +1916,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
19161916
}, {
19171917
Env: []string{},
19181918
Argv: []string{
1919-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
1919+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
19201920
},
19211921
}, {
19221922
Env: []string{},
19231923
Argv: []string{
1924-
"tar", "-xf", "tor-0.4.8.14.tar.gz",
1924+
"tar", "-xf", "tor-0.4.8.16.tar.gz",
19251925
},
19261926
}, {
19271927
Env: []string{},
@@ -2005,12 +2005,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
20052005
}, {
20062006
Env: []string{},
20072007
Argv: []string{
2008-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
2008+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
20092009
},
20102010
}, {
20112011
Env: []string{},
20122012
Argv: []string{
2013-
"tar", "-xf", "tor-0.4.8.14.tar.gz",
2013+
"tar", "-xf", "tor-0.4.8.16.tar.gz",
20142014
},
20152015
}, {
20162016
Env: []string{},

‎pkg/cmd/buildtool/cdepsopenssl.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ func cdepsOpenSSLBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencie
2727
defer restore()
2828

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

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

‎pkg/cmd/buildtool/cdepstor.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ func cdepsTorBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies) {
2727
defer restore()
2828

2929
// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/t/tor.rb
30-
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.14.tar.gz")
30+
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.16.tar.gz")
3131
deps.VerifySHA256( // must be mockable
32-
"5047e1ded12d9aac4eb858f7634a627714dd58ce99053d517691a4b304a66d10",
33-
"tor-0.4.8.14.tar.gz",
32+
"6540dd377a120fb8e7d27530aa3b7ff72a0fa5b4f670fe1d64c987c1cfd390cb",
33+
"tor-0.4.8.16.tar.gz",
3434
)
35-
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.14.tar.gz")
36-
_ = deps.MustChdir("tor-0.4.8.14") // must be mockable
35+
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.16.tar.gz")
36+
_ = deps.MustChdir("tor-0.4.8.16") // must be mockable
3737

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

‎pkg/cmd/buildtool/gomobile.go‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,30 @@ func gomobileBuild(config *gomobileConfig) {
6464

6565
runtimex.Try0(shellx.RunEx(defaultShellxConfig(), argv, config.envp))
6666
}
67+
68+
// oomobileBuild runs a build based on oomobile
69+
func oomobileBuild(config *gomobileConfig) {
70+
// Undoes the effects of go-getting golang.org/x/mobile/cmd/gomobile
71+
defer must.Run(log.Log, "go", "mod", "tidy")
72+
73+
must.Run(log.Log, "go", "install", "github.com/ooni/oomobile/cmd/gomobile@latest")
74+
must.Run(log.Log, "go", "install", "github.com/ooni/oomobile/cmd/gobind@latest")
75+
76+
gopath := config.deps.GOPATH()
77+
gomobile := filepath.Join(gopath, "bin", "gomobile")
78+
must.Run(log.Log, gomobile, "init")
79+
80+
// Adding gomobile to go.mod as documented by golang.org/wiki/Mobile
81+
must.Run(log.Log, "go", "get", "-d", "github.com/ooni/oomobile/cmd/gomobile")
82+
83+
argv := runtimex.Try1(shellx.NewArgv(gomobile, "bind"))
84+
argv.Append("-target", config.target)
85+
argv.Append("-o", config.output)
86+
for _, entry := range config.extraFlags {
87+
argv.Append(entry)
88+
}
89+
90+
argv.Append("./pkg/oonimkall")
91+
92+
runtimex.Try0(shellx.RunEx(defaultShellxConfig(), argv, config.envp))
93+
}

‎pkg/cmd/buildtool/ios_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -349,12 +349,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
349349
expect: []buildtooltest.ExecExpectations{{
350350
Env: []string{},
351351
Argv: []string{
352-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
352+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
353353
},
354354
}, {
355355
Env: []string{},
356356
Argv: []string{
357-
"tar", "-xf", "openssl-3.4.0.tar.gz",
357+
"tar", "-xf", "openssl-3.5.0.tar.gz",
358358
},
359359
}, {
360360
Env: []string{},
@@ -399,12 +399,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
399399
}, {
400400
Env: []string{},
401401
Argv: []string{
402-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
402+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
403403
},
404404
}, {
405405
Env: []string{},
406406
Argv: []string{
407-
"tar", "-xf", "openssl-3.4.0.tar.gz",
407+
"tar", "-xf", "openssl-3.5.0.tar.gz",
408408
},
409409
}, {
410410
Env: []string{},
@@ -449,12 +449,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
449449
}, {
450450
Env: []string{},
451451
Argv: []string{
452-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
452+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
453453
},
454454
}, {
455455
Env: []string{},
456456
Argv: []string{
457-
"tar", "-xf", "openssl-3.4.0.tar.gz",
457+
"tar", "-xf", "openssl-3.5.0.tar.gz",
458458
},
459459
}, {
460460
Env: []string{},
@@ -1142,12 +1142,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
11421142
expect: []buildtooltest.ExecExpectations{{
11431143
Env: []string{},
11441144
Argv: []string{
1145-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
1145+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
11461146
},
11471147
}, {
11481148
Env: []string{},
11491149
Argv: []string{
1150-
"tar", "-xf", "tor-0.4.8.14.tar.gz",
1150+
"tar", "-xf", "tor-0.4.8.16.tar.gz",
11511151
},
11521152
}, {
11531153
Env: []string{},
@@ -1232,12 +1232,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
12321232
}, {
12331233
Env: []string{},
12341234
Argv: []string{
1235-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
1235+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
12361236
},
12371237
}, {
12381238
Env: []string{},
12391239
Argv: []string{
1240-
"tar", "-xf", "tor-0.4.8.14.tar.gz",
1240+
"tar", "-xf", "tor-0.4.8.16.tar.gz",
12411241
},
12421242
}, {
12431243
Env: []string{},
@@ -1322,12 +1322,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
13221322
}, {
13231323
Env: []string{},
13241324
Argv: []string{
1325-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
1325+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
13261326
},
13271327
}, {
13281328
Env: []string{},
13291329
Argv: []string{
1330-
"tar", "-xf", "tor-0.4.8.14.tar.gz",
1330+
"tar", "-xf", "tor-0.4.8.16.tar.gz",
13311331
},
13321332
}, {
13331333
Env: []string{},

‎pkg/cmd/buildtool/linuxcdeps_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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-3.4.0.tar.gz",
95+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
9696
},
9797
}, {
9898
Env: []string{},
9999
Argv: []string{
100-
"tar", "-xf", "openssl-3.4.0.tar.gz",
100+
"tar", "-xf", "openssl-3.5.0.tar.gz",
101101
},
102102
}, {
103103
Env: []string{},
@@ -322,12 +322,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
322322
expect: []buildtooltest.ExecExpectations{{
323323
Env: []string{},
324324
Argv: []string{
325-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
325+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
326326
},
327327
}, {
328328
Env: []string{},
329329
Argv: []string{
330-
"tar", "-xf", "tor-0.4.8.14.tar.gz",
330+
"tar", "-xf", "tor-0.4.8.16.tar.gz",
331331
},
332332
}, {
333333
Env: []string{},

0 commit comments

Comments
 (0)