summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-09-09 09:27:46 -0700
committerGitHub <noreply@github.com>2020-09-09 09:27:46 -0700
commit98b461696b7ba1a088729c28a4f44a61d09e8409 (patch)
tree259cf53adec187d68355e02fbc4d87a7967ad30e
parent9a0e73022fa69b01c041ba33344e874a13f5ef2f (diff)
parent57f59bdaff27f02bd450e63fc7c348b2f555484c (diff)
downloadchef-98b461696b7ba1a088729c28a4f44a61d09e8409.tar.gz
Merge pull request #10402 from chef/openssl
Update openssl to 1.0.2w
-rw-r--r--omnibus/Gemfile.lock4
-rw-r--r--omnibus_overrides.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 8147a6c0d3..05dc7529cc 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: e55d20a73bf8641c5fd009d90747ee9ad05192f1
+ revision: 0d5f81dc0515357d571e9210031b3fa0edab0903
branch: master
specs:
omnibus-software (4.0.0)
@@ -291,7 +291,7 @@ GEM
strings-ansi (0.2.0)
structured_warnings (0.4.0)
syslog-logger (1.6.8)
- test-kitchen (2.6.0)
+ test-kitchen (2.7.0)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (>= 1.0.11, < 3.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index d173ee3b33..49009c8778 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.2v"
+override "openssl", version: "1.0.2w"
override "pkg-config-lite", version: "0.28-1"
override "ruby", version: "2.7.1"
override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"