summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-12-13 15:55:00 -0800
committerTim Smith <tsmith@chef.io>2017-12-13 15:55:00 -0800
commit25cf147c73e60ac5f7a2b4a8a1967b7637334473 (patch)
tree96cea5d8f8e29f95dad5acf16dbc428985d3cf99
parentb232aed7d43af0cf5168b6c62964fbf02a237f95 (diff)
downloadchef-25cf147c73e60ac5f7a2b4a8a1967b7637334473.tar.gz
Update openssl to 1.0.2.n
Also properly update the omnibus_overrides file. I didn't regen this last time so the libs never updated. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--omnibus_overrides.rb10
-rw-r--r--version_policy.rb4
2 files changed, 7 insertions, 7 deletions
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index b02d2384db..9698b2fe3e 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -3,11 +3,11 @@ override :rubygems, version: "2.6.14"
override :bundler, version: "1.12.5"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.15"
-override "liblzma", version: "5.2.2"
+override "liblzma", version: "5.2.3"
override "libtool", version: "2.4.2"
-override "libxml2", version: "2.9.4"
-override "libxslt", version: "1.1.29"
-override "libyaml", version: "0.1.6"
+override "libxml2", version: "2.9.5"
+override "libxslt", version: "1.1.30"
+override "libyaml", version: "0.1.7"
override "makedepend", version: "1.0.5"
override "ncurses", version: "5.9"
override "pkg-config-lite", version: "0.28-1"
@@ -16,4 +16,4 @@ 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.2j"
+override "openssl", version: "1.0.2n"
diff --git a/version_policy.rb b/version_policy.rb
index 38e956ca32..b37952c23e 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -33,7 +33,7 @@ OMNIBUS_OVERRIDES = {
"makedepend" => "1.0.5",
"ncurses" => "5.9",
"pkg-config-lite" => "0.28-1",
- "ruby" => "2.3.1",
+ "ruby" => "2.3.5",
# Leave dev-kit pinned to 4.5 on 32-bit, because 4.7 is 20MB larger and we don't want
# to unnecessarily make the client any fatter. (Since it's different between
# 32 and 64, we have to do it in the project file still.)
@@ -45,7 +45,7 @@ OMNIBUS_OVERRIDES = {
## These can float as they are frequently updated in a way that works for us
#override "cacerts" =>"???",
- "openssl" => "1.0.2l",
+ "openssl" => "1.0.2n",
}
#