diff options
| author | Tim Smith <tsmith@chef.io> | 2021-08-27 10:31:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-27 10:31:53 -0700 |
| commit | aa46bac4ef1382c4b58a059184e2cd818a8dd06b (patch) | |
| tree | 3b3a5a6853b5317b99f4196ef391a99945751f7e | |
| parent | b9bd774ff1291ab954b20aa869ffc77ed7e9b797 (diff) | |
| parent | 2f0705a009b5f6314f612d52a0c3b2422a1e7a30 (diff) | |
| download | chef-aa46bac4ef1382c4b58a059184e2cd818a8dd06b.tar.gz | |
Merge pull request #11973 from chef/bump_openssl
Update openssl on macOS to 1.1.1l
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 4 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b7df6bae81..2be480c69e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -447,4 +447,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.2.26 + 2.2.22 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index f5f3fae4d8..b631cf1d96 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: 2ffd4e497e36c22abb661480b2373dfd77e55da8 + revision: e87ce07718ff421edf72ce869c4c289f71209686 branch: main specs: omnibus-software (4.0.0) @@ -240,7 +240,7 @@ GEM iso8601 (0.13.0) jmespath (1.4.0) json (2.5.1) - kitchen-vagrant (1.9.0) + kitchen-vagrant (1.10.0) test-kitchen (>= 1.4, < 4) libyajl2 (2.1.0) license-acceptance (2.1.13) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 4a307ed72e..225a66422d 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -14,7 +14,7 @@ override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" override "nokogiri", version: "1.11.0" -override "openssl", version: mac_os_x? ? "1.1.1k" : "1.0.2y" +override "openssl", version: mac_os_x? ? "1.1.1l" : "1.0.2y" override "pkg-config-lite", version: "0.28-1" override "bundler", version: "2.2.22" override "ruby", version: "3.0.2" |