Skip to content

Commit b1ad0cf

Browse files
authored
chore: revert openssl to previous version for patch to apply (#1771)
## Checklist - [x] I have read the [contribution guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md) - [x] reference issue for this pull request: #1763 - [ ] if you changed anything related to how experiments work and you need to reflect these changes in the ooni/spec repository, please link to the related ooni/spec pull request: <!-- add URL here --> - [ ] if you changed code inside an experiment, make sure you bump its version number <!-- Reminder: Location of the issue tracker: https://github.com/ooni/probe --> ## Description This reverts openssl to the previous version to allow zlib patches to work
1 parent 23982f1 commit b1ad0cf

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

internal/cmd/buildtool/android_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -716,12 +716,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
716716
expect: []buildtooltest.ExecExpectations{{
717717
Env: []string{},
718718
Argv: []string{
719-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz",
719+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz",
720720
},
721721
}, {
722722
Env: []string{},
723723
Argv: []string{
724-
"tar", "-xf", "openssl-3.6.1.tar.gz",
724+
"tar", "-xf", "openssl-3.6.0.tar.gz",
725725
},
726726
}, {
727727
Env: []string{},
@@ -771,12 +771,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
771771
}, {
772772
Env: []string{},
773773
Argv: []string{
774-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz",
774+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz",
775775
},
776776
}, {
777777
Env: []string{},
778778
Argv: []string{
779-
"tar", "-xf", "openssl-3.6.1.tar.gz",
779+
"tar", "-xf", "openssl-3.6.0.tar.gz",
780780
},
781781
}, {
782782
Env: []string{},
@@ -826,12 +826,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
826826
}, {
827827
Env: []string{},
828828
Argv: []string{
829-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz",
829+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz",
830830
},
831831
}, {
832832
Env: []string{},
833833
Argv: []string{
834-
"tar", "-xf", "openssl-3.6.1.tar.gz",
834+
"tar", "-xf", "openssl-3.6.0.tar.gz",
835835
},
836836
}, {
837837
Env: []string{},
@@ -881,12 +881,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
881881
}, {
882882
Env: []string{},
883883
Argv: []string{
884-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz",
884+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz",
885885
},
886886
}, {
887887
Env: []string{},
888888
Argv: []string{
889-
"tar", "-xf", "openssl-3.6.1.tar.gz",
889+
"tar", "-xf", "openssl-3.6.0.tar.gz",
890890
},
891891
}, {
892892
Env: []string{},

internal/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/openssl@3.rb
30-
cdepsMustFetch("https://www.openssl.org/source/openssl-3.6.1.tar.gz")
30+
cdepsMustFetch("https://www.openssl.org/source/openssl-3.6.0.tar.gz")
3131
deps.VerifySHA256( // must be mockable
32-
"b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e",
33-
"openssl-3.6.1.tar.gz",
32+
"b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9",
33+
"openssl-3.6.0.tar.gz",
3434
)
35-
must.Run(log.Log, "tar", "-xf", "openssl-3.6.1.tar.gz")
36-
_ = deps.MustChdir("openssl-3.6.1") // must be mockable
35+
must.Run(log.Log, "tar", "-xf", "openssl-3.6.0.tar.gz")
36+
_ = deps.MustChdir("openssl-3.6.0") // must be mockable
3737

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

internal/cmd/buildtool/ios_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -361,12 +361,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
361361
expect: []buildtooltest.ExecExpectations{{
362362
Env: []string{},
363363
Argv: []string{
364-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz",
364+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz",
365365
},
366366
}, {
367367
Env: []string{},
368368
Argv: []string{
369-
"tar", "-xf", "openssl-3.6.1.tar.gz",
369+
"tar", "-xf", "openssl-3.6.0.tar.gz",
370370
},
371371
}, {
372372
Env: []string{},
@@ -411,12 +411,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
411411
}, {
412412
Env: []string{},
413413
Argv: []string{
414-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz",
414+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz",
415415
},
416416
}, {
417417
Env: []string{},
418418
Argv: []string{
419-
"tar", "-xf", "openssl-3.6.1.tar.gz",
419+
"tar", "-xf", "openssl-3.6.0.tar.gz",
420420
},
421421
}, {
422422
Env: []string{},
@@ -461,12 +461,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
461461
}, {
462462
Env: []string{},
463463
Argv: []string{
464-
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.1.tar.gz",
464+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz",
465465
},
466466
}, {
467467
Env: []string{},
468468
Argv: []string{
469-
"tar", "-xf", "openssl-3.6.1.tar.gz",
469+
"tar", "-xf", "openssl-3.6.0.tar.gz",
470470
},
471471
}, {
472472
Env: []string{},

internal/cmd/buildtool/linuxcdeps_test.go

Lines changed: 2 additions & 2 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.6.1.tar.gz",
95+
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.6.0.tar.gz",
9696
},
9797
}, {
9898
Env: []string{},
9999
Argv: []string{
100-
"tar", "-xf", "openssl-3.6.1.tar.gz",
100+
"tar", "-xf", "openssl-3.6.0.tar.gz",
101101
},
102102
}, {
103103
Env: []string{},

0 commit comments

Comments
 (0)