Merge pull request #7547 from chef/chef_13_openssl_bump

Update to openssl 1.0.2p

3 files changed, 32 insertions, 32 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 78631ae657..be6df27a7b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,7 +153,7 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashdiff (0.3.7)
-    hashie (3.5.7)
+    hashie (3.6.0)
     highline (1.7.10)
     htmlentities (4.3.4)
     httpclient (2.8.3)
@@ -216,7 +216,7 @@ GEM
     net-telnet (0.2.0)
     netrc (0.11.0)
     nori (2.6.0)
-    octokit (4.9.0)
+    octokit (4.10.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     ohai (13.10.0)
       chef-config (>= 12.5.0.alpha.1, < 14)
@@ -376,7 +376,7 @@ GEM
       rubyzip (~> 1.1)
       winrm (~> 2.0)
     wmi-lite (1.0.0)
-    yard (0.9.15)
+    yard (0.9.16)
 
 PLATFORMS
   ruby
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 2c772500d3..e1d847a9f5 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,23 +1,23 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 7e9c9a6a71c1ada2d7f42484f13074e1ec6b7cd3
+  revision: 386cd17f6a6365bd4585761a2738b4561fbaea97
   specs:
-    omnibus (5.6.12)
+    omnibus (6.0.1)
       aws-sdk (~> 2)
-      chef-sugar (~> 3.3)
+      chef-sugar (>= 3.3)
       cleanroom (~> 1.0)
       ffi-yajl (~> 2.2)
       license_scout (~> 1.0)
       mixlib-shellout (~> 2.0)
       mixlib-versioning
-      ohai (>= 8.6.0.alpha.1, < 15)
+      ohai (>= 13, < 15)
       pedump
       ruby-progressbar (~> 1.7)
       thor (~> 0.18)
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 836bd650d49e6350dfa40b43a1398c5847a6fd42
+  revision: 8369ed7b074102971c9e25e732001d8a3566423b
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -29,13 +29,13 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
-    aws-sdk (2.11.86)
-      aws-sdk-resources (= 2.11.86)
-    aws-sdk-core (2.11.86)
+    aws-sdk (2.11.107)
+      aws-sdk-resources (= 2.11.107)
+    aws-sdk-core (2.11.107)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.86)
-      aws-sdk-core (= 2.11.86)
+    aws-sdk-resources (2.11.107)
+      aws-sdk-core (= 2.11.107)
     aws-sigv4 (1.0.3)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
@@ -76,13 +76,13 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (14.2.0)
+    chef-config (14.3.37)
       addressable
       fuzzyurl
-      mixlib-config (~> 2.0)
+      mixlib-config (>= 2.2.12, < 3.0)
       mixlib-shellout (~> 2.0)
       tomlrb (~> 1.2)
-    chef-sugar (3.6.0)
+    chef-sugar (4.0.1)
     citrus (3.0.2)
     cleanroom (1.0.0)
     coderay (1.1.2)
@@ -100,7 +100,7 @@ GEM
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.7)
+    hashie (3.6.0)
     hitimes (1.3.0)
     hitimes (1.3.0-x64-mingw32)
     hitimes (1.3.0-x86-mingw32)
@@ -112,7 +112,7 @@ GEM
     kitchen-vagrant (0.19.0)
       test-kitchen (~> 1.4)
     libyajl2 (1.2.0)
-    license_scout (1.0.10)
+    license_scout (1.0.15)
       ffi-yajl (~> 2.2)
       mixlib-shellout (~> 2.2)
       toml-rb (~> 1.0)
@@ -122,19 +122,19 @@ GEM
       multi_json (~> 1.10)
     method_source (0.9.0)
     minitar (0.6.1)
-    mixlib-archive (0.4.8)
+    mixlib-archive (0.4.13)
       mixlib-log
     mixlib-authentication (2.1.1)
     mixlib-cli (1.7.0)
-    mixlib-config (2.2.12)
+    mixlib-config (2.2.13)
       tomlrb
-    mixlib-install (3.11.2)
+    mixlib-install (3.11.5)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-log (2.0.4)
-    mixlib-shellout (2.3.2)
-    mixlib-shellout (2.3.2-universal-mingw32)
+    mixlib-shellout (2.4.0)
+    mixlib-shellout (2.4.0-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
     mixlib-versioning (1.2.2)
@@ -148,14 +148,14 @@ GEM
       net-ssh (>= 2.6.5)
     nio4r (2.3.1)
     nori (2.6.0)
-    octokit (4.9.0)
+    octokit (4.10.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (14.3.0)
+    ohai (14.4.0)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
-      mixlib-cli
+      mixlib-cli (>= 1.7.0)
       mixlib-config (~> 2.0)
       mixlib-log (~> 2.0, >= 2.0.1)
       mixlib-shellout (~> 2.0)
@@ -169,7 +169,7 @@ GEM
       progressbar
       zhexdump (>= 0.0.2)
     plist (3.4.0)
-    progressbar (1.9.0)
+    progressbar (1.10.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -199,7 +199,7 @@ GEM
       retryable (~> 2.0)
       semverse (~> 1.1)
       varia_model (~> 0.4.0)
-    ruby-progressbar (1.9.0)
+    ruby-progressbar (1.10.0)
     rubyntlm (0.6.2)
     rubyzip (1.2.1)
     sawyer (0.8.1)
@@ -210,7 +210,7 @@ GEM
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
     systemu (2.6.5)
-    test-kitchen (1.22.0)
+    test-kitchen (1.23.2)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -243,7 +243,7 @@ GEM
     winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.2.0)
+    winrm-fs (1.2.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -269,4 +269,4 @@ DEPENDENCIES
   winrm-fs (~> 1.0)
 
 BUNDLED WITH
-   1.16.2
+   1.16.3
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index e034f215df..7dec230a6b 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -19,5 +19,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"
 override "zlib", version: "1.2.11"
-override "openssl", version: "1.0.2o"
+override "openssl", version: "1.0.2p"
 override "ohai", version: "13-stable"