summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-10-01 20:49:01 -0700
committerGitHub <noreply@github.com>2019-10-01 20:49:01 -0700
commitbcb872dc39d65ca9f3cfdadb40e1e3b75ca54435 (patch)
tree45e6acdfe3a9a3c946497da96a3776e7f1d9c5b1
parent7aa09027b604a5230cf28f059638782523d198ef (diff)
parent145feabc64247b2f7638d8878f509e6f0a2f79cd (diff)
downloadchef-bcb872dc39d65ca9f3cfdadb40e1e3b75ca54435.tar.gz
Merge pull request #8943 from chef/updates
Update nokogiri to 1.10.4 and openssl to 1.0.2t
-rw-r--r--omnibus_overrides.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 91fcaa59b7..c307f049c8 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -6,7 +6,7 @@
# software here: bundle exec rake dependencies:update_omnibus_gemfile_lock
override :rubygems, version: "2.7.9"
override :bundler, version: "1.16.6"
-override "nokogiri", version: "1.10.2"
+override "nokogiri", version: "1.10.4"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.15"
override "liblzma", version: "5.2.4"
@@ -22,7 +22,7 @@ override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
override "util-macros", version: "1.19.0"
override "xproto", version: "7.0.28"
override "zlib", version: "1.2.11"
-override "openssl", version: "1.0.2s"
+override "openssl", version: "1.0.2t"
# we build both a chef and ohai omnibus-software defintion which create the
# chef-client and ohai binstubs. Out of the box the ohai definition uses whatever