Merge pull request #10771 from chef/bump_libs

Signed-off-by: Tim Smith <tsmith@chef.io>

2 files changed, 75 insertions, 65 deletions

diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 3d44842662..b056cc6744 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,28 +1,28 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 22ce15145e83cefbe8ae8603bacf8a340e274715
+  revision: d13ae1686e8b54e065ce2a3f27585a2890f1abec
   branch: master
   specs:
-    omnibus (7.0.24)
+    omnibus (8.0.9)
       aws-sdk-s3 (~> 1)
       chef-cleanroom (~> 1.0)
-      chef-sugar (>= 3.3)
+      chef-utils (>= 15.4)
       ffi-yajl (~> 2.2)
       license_scout (~> 1.0)
       mixlib-shellout (>= 2.0, < 4.0)
       mixlib-versioning
-      ohai (>= 13, < 17)
+      ohai (>= 15)
       pedump
       ruby-progressbar (~> 1.7)
       thor (>= 0.18, < 2.0)
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 0d5f81dc0515357d571e9210031b3fa0edab0903
+  revision: 457df26b59259183d2918e802ffb79de9a134e27
   branch: master
   specs:
     omnibus-software (4.0.0)
-      omnibus (>= 5.6.1)
+      omnibus (>= 8.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -32,18 +32,18 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.366.0)
-    aws-sdk-core (3.105.0)
+    aws-partitions (1.410.0)
+    aws-sdk-core (3.110.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.37.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kms (1.40.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.79.1)
-      aws-sdk-core (~> 3, >= 3.104.3)
-      aws-sdk-kms (~> 1)
+    aws-sdk-s3 (1.86.2)
+      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-kms (~> 1.26)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -64,12 +64,12 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (16.4.41)
+    chef (16.7.61)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.4.41)
-      chef-utils (= 16.4.41)
+      chef-config (= 16.7.61)
+      chef-utils (= 16.7.61)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -80,7 +80,7 @@ GEM
       ffi-yajl (~> 2.2)
       highline (>= 1.6.9, < 3)
       iniparse (~> 1.4)
-      license-acceptance (~> 1.0, >= 1.0.5)
+      license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
       mixlib-cli (>= 2.1.1, < 3.0)
@@ -98,13 +98,14 @@ GEM
       train-winrm (>= 0.2.5)
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
+      tty-table (~> 0.11)
       uuidtools (~> 2.1.5)
-    chef (16.4.41-universal-mingw32)
+    chef (16.7.61-universal-mingw32)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.4.41)
-      chef-utils (= 16.4.41)
+      chef-config (= 16.7.61)
+      chef-utils (= 16.7.61)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -116,7 +117,7 @@ GEM
       highline (>= 1.6.9, < 3)
       iniparse (~> 1.4)
       iso8601 (>= 0.12.1, < 0.14)
-      license-acceptance (~> 1.0, >= 1.0.5)
+      license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
       mixlib-cli (>= 2.1.1, < 3.0)
@@ -134,6 +135,7 @@ GEM
       train-winrm (>= 0.2.5)
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
+      tty-table (~> 0.11)
       uuidtools (~> 2.1.5)
       win32-api (~> 1.5.3)
       win32-certstore (~> 0.3)
@@ -141,22 +143,21 @@ GEM
       win32-eventlog (= 0.6.3)
       win32-mmap (~> 0.4.1)
       win32-mutex (~> 0.4.2)
-      win32-process (~> 0.8.2)
+      win32-process (~> 0.9)
       win32-service (>= 2.1.5, < 3.0)
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.2)
-    chef-config (16.4.41)
+    chef-config (16.7.61)
       addressable
-      chef-utils (= 16.4.41)
+      chef-utils (= 16.7.61)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-sugar (5.1.11)
-    chef-utils (16.4.41)
-    chef-vault (4.0.11)
-    chef-zero (15.0.2)
+    chef-utils (16.7.61)
+    chef-vault (4.1.0)
+    chef-zero (15.0.3)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 5.0)
       mixlib-log (>= 2.0, < 4.0)
@@ -167,13 +168,14 @@ GEM
     concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     ed25519 (1.2.4)
-    erubi (1.9.0)
+    erubi (1.10.0)
     erubis (2.7.0)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.13.1)
-    ffi (1.13.1-x64-mingw32)
-    ffi (1.13.1-x86-mingw32)
+      ruby2_keywords
+    ffi (1.14.1)
+    ffi (1.14.1-x64-mingw32)
+    ffi (1.14.1-x86-mingw32)
     ffi-libarchive (1.0.4)
       ffi (~> 1.0)
     ffi-win32-extensions (1.0.4)
@@ -181,7 +183,7 @@ GEM
     ffi-yajl (2.3.4)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
-    gssapi (1.3.0)
+    gssapi (1.3.1)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
@@ -193,16 +195,16 @@ GEM
     ipaddress (0.8.3)
     iso8601 (0.13.0)
     jmespath (1.4.0)
-    json (2.3.1)
-    kitchen-vagrant (1.7.0)
+    json (2.4.1)
+    kitchen-vagrant (1.7.2)
       test-kitchen (>= 1.4, < 3)
     libyajl2 (1.2.0)
-    license-acceptance (1.0.19)
+    license-acceptance (2.1.13)
       pastel (~> 0.7)
-      tomlrb (~> 1.2)
-      tty-box (~> 0.3)
-      tty-prompt (~> 0.18)
-    license_scout (1.1.9)
+      tomlrb (>= 1.2, < 3.0)
+      tty-box (~> 0.6)
+      tty-prompt (~> 0.20)
+    license_scout (1.2.7)
       ffi-yajl (~> 2.2)
       mixlib-shellout (>= 2.2, < 4.0)
       toml-rb (>= 1, < 3)
@@ -219,19 +221,20 @@ GEM
     mixlib-cli (2.1.8)
     mixlib-config (3.0.9)
       tomlrb
-    mixlib-install (3.12.3)
+    mixlib-install (3.12.5)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-log (3.0.9)
-    mixlib-shellout (3.1.6)
+    mixlib-shellout (3.2.2)
       chef-utils
-    mixlib-shellout (3.1.6-universal-mingw32)
+    mixlib-shellout (3.2.2-universal-mingw32)
       chef-utils
-      win32-process (~> 0.8.2)
+      ffi-win32-extensions (~> 1.0.3)
+      win32-process (~> 0.9)
       wmi-lite (~> 1.0)
     mixlib-versioning (1.2.12)
-    molinillo (0.6.6)
+    molinillo (0.7.0)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     net-scp (3.0.0)
@@ -245,10 +248,10 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     nori (2.6.0)
-    octokit (4.18.0)
+    octokit (4.19.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (16.5.0)
+    ohai (16.8.1)
       chef-config (>= 12.8, < 17)
       chef-utils (>= 16.0, < 17)
       ffi (~> 1.9)
@@ -259,6 +262,7 @@ GEM
       mixlib-log (>= 2.0.1, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       plist (~> 3.1)
+      train-core
       wmi-lite (~> 1.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
@@ -275,6 +279,7 @@ GEM
     rainbow (3.0.0)
     retryable (3.0.5)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     rubyntlm (0.6.2)
     rubyzip (2.3.0)
     sawyer (0.8.2)
@@ -291,7 +296,7 @@ GEM
     strings-ansi (0.2.0)
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
-    test-kitchen (2.7.0)
+    test-kitchen (2.8.0)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)
@@ -308,30 +313,35 @@ GEM
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)
-    train-core (3.3.16)
+    train-core (3.4.4)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 4.0)
       net-ssh (>= 2.9, < 7.0)
-    train-winrm (0.2.6)
+    train-winrm (0.2.11)
       winrm (~> 2.0)
+      winrm-elevated (~> 1.2.2)
       winrm-fs (~> 1.0)
-    tty-box (0.6.0)
+    tty-box (0.7.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-cursor (~> 0.7)
-    tty-color (0.5.2)
+    tty-color (0.6.0)
     tty-cursor (0.7.1)
-    tty-prompt (0.22.0)
+    tty-prompt (0.23.0)
       pastel (~> 0.8)
       tty-reader (~> 0.8)
-    tty-reader (0.8.0)
+    tty-reader (0.9.0)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
     tty-screen (0.8.1)
+    tty-table (0.12.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-screen (~> 0.8)
     unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
@@ -349,15 +359,15 @@ GEM
       ffi
     win32-mutex (0.4.3)
       win32-ipc (>= 0.6.0)
-    win32-process (0.8.3)
+    win32-process (0.9.0)
       ffi (>= 1.0.0)
-    win32-service (2.1.6)
+    win32-service (2.2.0)
       ffi
       ffi-win32-extensions
     win32-taskscheduler (2.0.4)
       ffi
       structured_warnings
-    winrm (2.3.4)
+    winrm (2.3.5)
       builder (>= 2.1.2)
       erubi (~> 1.8)
       gssapi (~> 1.2)
@@ -366,11 +376,11 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.2.1)
+    winrm-elevated (1.2.3)
       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.3.4)
+    winrm-fs (1.3.5)
       erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 2.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index c25e2c65c8..b4e7d73904 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -5,9 +5,9 @@
 # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock
 override :rubygems, version: "3.0.3" # rubygems ships its own bundler which may differ from bundler defined below and then we get double bundler which results in performance issues / CLI warnings. Make sure these versions match before bumping either.
 override :bundler, version: "1.17.2" # currently pinned to what ships in Ruby to prevent double bundler
-override "libarchive", version: "3.4.3"
-override "libffi", version: "3.2.1"
-override "libiconv", version: "1.15"
+override "libarchive", version: "3.5.0"
+override "libffi", version: "3.3"
+override "libiconv", version: "1.16"
 override "liblzma", version: "5.2.5"
 override "libtool", version: "2.4.2"
 override "libxml2", version: "2.9.10"
@@ -16,7 +16,7 @@ override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "nokogiri", version: "1.10.10"
-override "openssl", version: "1.0.2w"
+override "openssl", version: "1.0.2x"
 override "pkg-config-lite", version: "0.28-1"
 override "ruby", version: "2.6.6"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
@@ -29,5 +29,5 @@ override "zlib", version: "1.2.11"
 # is in master, which won't match what's in the Gemfile.lock and used by the chef
 # definition. This pin will ensure that ohai and chef-client commands use the
 # same (released) version of ohai.
-gemfile_lock = File.join(File.expand_path(File.dirname(__FILE__)), "Gemfile.lock")
+gemfile_lock = File.join(File.expand_path(__dir__), "Gemfile.lock")
 override "ohai", version: "#{::File.readlines(gemfile_lock).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; "v" + $1}" # rubocop: disable Layout/SpaceInsideStringInterpolation