Merge pull request #6405 from chef/tm/2_3_5

update ruby version for multiple CVEs

2 files changed, 29 insertions, 26 deletions

diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 3b59d8d72a..229ed6b4ef 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,14 +1,15 @@
 GIT
   remote: https://github.com/chef/license_scout
-  revision: 1bf2f1c9127516b933e9dc9c02db00c9b28a9cd3
+  revision: 0e89df12ad6bc451924610dd6a570fc264fde15e
   specs:
     license_scout (0.1.3)
       ffi-yajl (~> 2.2)
       mixlib-shellout (~> 2.2)
+      toml-rb (~> 1.0)
 
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 2215d10c1d13c30f058f126806bff09807706c41
+  revision: 52393d7cab443b61790f94c62775d9032d283497
   specs:
     omnibus (5.6.1)
       aws-sdk (~> 2)
@@ -25,7 +26,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 52857abe96da236a6d1017b7d2ae2bd4f2c2dd8a
+  revision: aa4162c2f7a4e8e5cf9d961e060d5a48a15a5e63
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -34,18 +35,18 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     artifactory (2.8.2)
     awesome_print (1.8.0)
-    aws-sdk (2.10.19)
-      aws-sdk-resources (= 2.10.19)
-    aws-sdk-core (2.10.19)
+    aws-sdk (2.10.45)
+      aws-sdk-resources (= 2.10.45)
+    aws-sdk-core (2.10.45)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.19)
-      aws-sdk-core (= 2.10.19)
-    aws-sigv4 (1.0.1)
+    aws-sdk-resources (2.10.45)
+      aws-sdk-core (= 2.10.45)
+    aws-sigv4 (1.0.2)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -79,20 +80,21 @@ GEM
     buff-shell_out (0.2.0)
       buff-ruby_engine (~> 0.1.0)
     builder (3.2.3)
-    byebug (9.0.6)
+    byebug (9.1.0)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (13.2.20)
+    chef-config (13.4.19)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     chef-sugar (3.5.0)
+    citrus (3.0.2)
     cleanroom (1.0.0)
-    coderay (1.1.1)
+    coderay (1.1.2)
     debug_inspector (0.0.3)
     erubis (2.7.0)
     faraday (0.9.2)
@@ -107,8 +109,8 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashie (3.5.6)
-    hitimes (1.2.5)
-    hitimes (1.2.5-x86-mingw32)
+    hitimes (1.2.6)
+    hitimes (1.2.6-x86-mingw32)
     httpclient (2.7.2)
     iostruct (0.0.4)
     ipaddress (0.8.3)
@@ -125,8 +127,7 @@ GEM
     minitar (0.6.1)
     mixlib-archive (0.4.1)
       mixlib-log
-    mixlib-authentication (1.4.1)
-      mixlib-log
+    mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
     mixlib-install (2.1.12)
@@ -141,11 +142,11 @@ GEM
       wmi-lite (~> 1.0)
     mixlib-versioning (1.2.2)
     molinillo (0.4.5)
-    multi_json (1.12.1)
+    multi_json (1.12.2)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
+    net-ssh (4.2.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
     nio4r (2.1.0)
@@ -176,13 +177,13 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+    pry-byebug (3.5.0)
+      byebug (~> 9.1)
       pry (~> 0.10)
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
+    public_suffix (3.0.0)
     retryable (2.0.4)
     ridley (4.6.1)
       addressable
@@ -202,7 +203,7 @@ GEM
       retryable (~> 2.0)
       semverse (~> 1.1)
       varia_model (~> 0.4.0)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.8.3)
     rubyntlm (0.6.2)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
@@ -215,7 +216,7 @@ GEM
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
     systemu (2.6.5)
-    test-kitchen (1.16.0)
+    test-kitchen (1.17.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -226,6 +227,8 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
+    toml-rb (1.0.0)
+      citrus (~> 3.0, > 3.0)
     varia_model (0.4.1)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 4.0.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 5c83597eea..73d5c24f17 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -11,7 +11,7 @@ override "libyaml", version: "0.1.6"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.3.4"
+override "ruby", version: "2.3.5"
 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"