summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-12-11 07:17:48 -0800
committerGitHub <noreply@github.com>2020-12-11 07:17:48 -0800
commit2f7c35abb2b60fbcd21d3c9bcac4ac79490b97d7 (patch)
tree1496beb2daa376f08056ebfe863220d620eb4844
parentd5de0b20dd712becb2ec9b57724e0bd749128057 (diff)
parentee5e173055f621c67f3e2fea584e36e69f742c45 (diff)
downloadchef-2f7c35abb2b60fbcd21d3c9bcac4ac79490b97d7.tar.gz
Merge pull request #10732 from chef/openssl_bump
Update openSSL to 1.0.2x
-rw-r--r--omnibus/Gemfile.lock2
-rw-r--r--omnibus_overrides.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 7bfc2111ef..db2c83fc55 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 3f948d5a56ef3a5af1e617af30443fabf63c6f0a
+ revision: aa93b0f3c21f75508b28c1c1e016b1aa11ecf3a9
branch: master
specs:
omnibus-software (4.0.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index c09bd8653a..a70dbe12ad 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -16,7 +16,7 @@ override "libyaml", version: "0.1.7"
override "makedepend", version: "1.0.5"
override "ncurses", version: "5.9"
override "nokogiri", version: "1.10.10"
-override "openssl", version: "1.0.2w"
+override "openssl", version: "1.0.2x"
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"