From d6451dbdea879994c60cd97e853c3163a2421c79 Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith@chef.io>
Date: Wed, 2 Jan 2019 10:55:14 -0800
Subject: Update openssl to 1.0.2q and bring in latest omnibus-software

This updates our ca-cert file to the latest as well.

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 Gemfile.lock         | 48 +++++++++++++++++++++++++-----------------------
 omnibus/Gemfile.lock |  6 +++---
 omnibus_overrides.rb |  2 +-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7aece02dd4..8796044cc4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,7 +86,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     appbundler (0.11.6)
       mixlib-cli (~> 1.4)
       mixlib-shellout (~> 2.0)
@@ -121,7 +122,7 @@ GEM
     ethon (0.11.0)
       ffi (>= 1.3.0)
     excon (0.62.0)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
@@ -144,7 +145,7 @@ GEM
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashdiff (0.3.7)
+    hashdiff (0.3.8)
     hashie (3.6.0)
     highline (1.7.10)
     htmlentities (4.3.4)
@@ -179,18 +180,18 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    method_source (0.9.0)
-    mixlib-archive (0.4.18)
+    method_source (0.9.2)
+    mixlib-archive (0.4.19)
       mixlib-log
-    mixlib-archive (0.4.18-universal-mingw32)
+    mixlib-archive (0.4.19-universal-mingw32)
       mixlib-log
     mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
-    mixlib-config (2.2.13)
+    mixlib-config (2.2.18)
       tomlrb
     mixlib-log (1.7.1)
-    mixlib-shellout (2.4.0)
-    mixlib-shellout (2.4.0-universal-mingw32)
+    mixlib-shellout (2.4.4)
+    mixlib-shellout (2.4.4-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
     multi_json (1.13.1)
@@ -228,10 +229,10 @@ GEM
     parser (2.5.3.0)
       ast (~> 2.4.0)
     parslet (1.8.2)
-    plist (3.4.0)
+    plist (3.5.0)
     powerpack (0.1.2)
     proxifier (1.0.3)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.6.0)
@@ -240,13 +241,14 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.9.2)
+    pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
+    public_suffix (3.0.3)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    rack (2.0.5)
+    rack (2.0.6)
     rainbow (2.2.2)
       rake
     rake (12.0.0)
@@ -286,7 +288,7 @@ GEM
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    semverse (2.0.0)
+    semverse (3.0.0)
     serverspec (2.41.3)
       multi_json
       rspec (~> 3.0)
@@ -299,7 +301,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     slop (3.6.0)
-    specinfra (2.76.3)
+    specinfra (2.76.6)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
@@ -307,8 +309,8 @@ GEM
     sslshake (1.2.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    thor (0.20.0)
-    tomlrb (1.2.7)
+    thor (0.20.3)
+    tomlrb (1.2.8)
     train (0.32.0)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
@@ -328,9 +330,9 @@ GEM
       typhoeus (~> 0.6, >= 0.6.8)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.4.1)
     uuidtools (2.1.5)
-    webmock (3.4.2)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -355,7 +357,7 @@ GEM
       ffi-win32-extensions
     windows-api (0.4.4)
       win32-api (>= 1.4.5)
-    winrm (2.3.0)
+    winrm (2.3.1)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -364,12 +366,12 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-fs (1.3.1)
+    winrm-fs (1.3.2)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
       winrm (~> 2.0)
-    wmi-lite (1.0.0)
+    wmi-lite (1.0.1)
     yard (0.9.16)
 
 PLATFORMS
@@ -403,4 +405,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.17.1
+   1.17.3
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 5f6d87594c..ad7fb0a6ae 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 6cfec3a04de67aea335c23b5a3bd334a3a68fafe
+  revision: 5ac799cdcc5a7865b452daa96f92812144dccb3d
   branch: master
   specs:
-    omnibus (6.0.4)
+    omnibus (6.0.10)
       aws-sdk-s3 (~> 1)
       chef-sugar (>= 3.3)
       cleanroom (~> 1.0)
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 3b6ef4c42d8c2f9f9e1c6e285b2ea48e0d0f0fdd
+  revision: f876bb6a1d60e0b9e2b52a4ce16318d05327bdfd
   branch: master
   specs:
     omnibus-software (4.0.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 283b04cfdd..8358d304ea 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.2p"
+override "openssl", version: "1.0.2q"
 override "ohai", version: "13-stable"
-- 
cgit v1.2.1