diff options
author | Tim Smith <tsmith@chef.io> | 2021-04-02 16:12:43 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-02 16:12:43 -0700 |
commit | 66f0526c349534427e9a521c18c6fc38b314251c (patch) | |
tree | 663c0ee051524886e083248cfb63c727cbc0416d | |
parent | 864253b5cc5cbb0585883514766b7ea08db713f0 (diff) | |
parent | 90dbd2bad492c27d86d2f6fb4375580cdb0b0482 (diff) | |
download | chef-66f0526c349534427e9a521c18c6fc38b314251c.tar.gz |
Merge pull request #11295 from chef/bump_openssl
Update openSSL on macOS to 1.1.1k
-rw-r--r-- | RELEASE_NOTES.md | 2 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 8 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 17ae7fb321..be66aee542 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -37,7 +37,7 @@ This section serves to track things we should later document here for 17.0 - Alibaba Cloud support with node['alibaba'] showing metadata, `alibaba?` helper and node['cloud'] returning data now - https://github.com/chef/chef/pull/11004 - Removed detection of discontinued antergos and Pidora distros - https://github.com/chef/ohai/pull/1633 / https://github.com/chef/ohai/pull/1634 -## What's New in 16.12.0 +## What's New in 16.12 ### Chef InSpec diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 0d6810fe21..2991abf5fb 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: a0e7438f3eda36164d05d1e76c6ecb0fadc508e5 + revision: 76b31d11c1fbbc43a4ed1a1990a2662d05b28644 branch: master specs: omnibus-software (4.0.0) @@ -32,7 +32,7 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.1.1) - aws-partitions (1.438.0) + aws-partitions (1.441.0) aws-sdk-core (3.113.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -202,7 +202,7 @@ GEM highline (2.0.3) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.28.0) + inspec-core (4.29.3) addressable (~> 2.4) chef-telemetry (~> 1.0) faraday (>= 0.9.0, < 1.4) @@ -286,7 +286,7 @@ GEM octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (16.10.7) + ohai (16.12.3) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 3267966641..d20d702d73 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.1j" : "1.0.2y" +override "openssl", version: mac_os_x? ? "1.1.1k" : "1.0.2y" override "pkg-config-lite", version: "0.28-1" override "ruby", version: "2.7.2" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" |