Revert "Bump omnibus-software to remove libtool+pkg-config"

This reverts commit 6bce91fbf63bd2aa5fe48afdf13ca416d44c348f.

1 files changed, 34 insertions, 41 deletions

diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index c1b9ebbbc1..13c8086a8e 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 9fbb95fd6636a034874e9a7e3a1a02e4c8b74c2f
+  revision: 97490bb29fc5203d32d9475b044807ecad3ef7ef
   branch: master
   specs:
-    omnibus (6.1.18)
+    omnibus (6.1.14)
       aws-sdk-s3 (~> 1)
       chef-cleanroom (~> 1.0)
       chef-sugar (>= 3.3)
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: c1557585f37c9e91466c9144dec370e983348876
+  revision: 53ab4169b691367dc16a317fca4426fb6563a65a
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,16 +32,16 @@ GEM
     artifactory (3.0.5)
     awesome_print (1.8.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.250.0)
-    aws-sdk-core (3.84.0)
+    aws-partitions (1.240.0)
+    aws-sdk-core (3.77.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.26.0)
+    aws-sdk-kms (1.25.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.58.0)
+    aws-sdk-s3 (1.54.0)
       aws-sdk-core (~> 3, >= 3.77.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -64,12 +64,11 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.3)
-    chef (15.5.17)
+    chef (15.2.20)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.5.17)
-      chef-utils (= 15.5.17)
+      chef-config (= 15.2.20)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -81,10 +80,10 @@ GEM
       iniparse (~> 1.4)
       license-acceptance (~> 1.0, >= 1.0.5)
       mixlib-archive (>= 0.4, < 2.0)
-      mixlib-authentication (>= 2.1, < 4)
+      mixlib-authentication (~> 2.1)
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
-      mixlib-shellout (>= 3.0.3, < 4.0)
+      mixlib-shellout (>= 2.4, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
       net-ssh (>= 4.2, < 6)
       net-ssh-multi (~> 1.2, >= 1.2.1)
@@ -92,16 +91,14 @@ GEM
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
-      train-core (~> 3.1)
-      train-winrm (>= 0.2.5)
+      train-core (~> 2.0, >= 2.0.12)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (15.5.17-universal-mingw32)
+    chef (15.2.20-universal-mingw32)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.5.17)
-      chef-utils (= 15.5.17)
+      chef-config (= 15.2.20)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -114,10 +111,10 @@ GEM
       iso8601 (~> 0.12.1)
       license-acceptance (~> 1.0, >= 1.0.5)
       mixlib-archive (>= 0.4, < 2.0)
-      mixlib-authentication (>= 2.1, < 4)
+      mixlib-authentication (~> 2.1)
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
-      mixlib-shellout (>= 3.0.3, < 4.0)
+      mixlib-shellout (>= 2.4, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
       net-ssh (>= 4.2, < 6)
       net-ssh-multi (~> 1.2, >= 1.2.1)
@@ -125,8 +122,7 @@ GEM
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
-      train-core (~> 3.1)
-      train-winrm (>= 0.2.5)
+      train-core (~> 2.0, >= 2.0.12)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
       win32-api (~> 1.5.3)
@@ -141,15 +137,13 @@ GEM
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.2)
-    chef-config (15.5.17)
+    chef-config (15.2.20)
       addressable
-      chef-utils (= 15.5.17)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
     chef-sugar (5.1.9)
-    chef-utils (15.5.17)
     chef-zero (14.0.13)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
@@ -164,11 +158,11 @@ GEM
     equatable (0.6.1)
     erubi (1.9.0)
     erubis (2.7.0)
-    faraday (0.17.1)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.3)
-    ffi (1.11.3-x64-mingw32)
-    ffi (1.11.3-x86-mingw32)
+    ffi (1.11.2)
+    ffi (1.11.2-x64-mingw32)
+    ffi (1.11.2-x86-mingw32)
     ffi-libarchive (0.4.10)
       ffi (~> 1.0)
     ffi-win32-extensions (1.0.3)
@@ -197,9 +191,9 @@ GEM
       tomlrb (~> 1.2)
       tty-box (~> 0.3)
       tty-prompt (~> 0.18)
-    license_scout (1.0.29)
+    license_scout (1.0.28)
       ffi-yajl (~> 2.2)
-      mixlib-shellout (>= 2.2, < 4.0)
+      mixlib-shellout (~> 2.2)
       toml-rb (~> 1.0)
     little-plugger (1.1.4)
     logging (2.2.2)
@@ -210,7 +204,7 @@ GEM
       mixlib-log
     mixlib-archive (1.0.1-universal-mingw32)
       mixlib-log
-    mixlib-authentication (3.0.4)
+    mixlib-authentication (2.1.1)
     mixlib-cli (2.1.1)
     mixlib-config (3.0.5)
       tomlrb
@@ -219,15 +213,15 @@ GEM
       mixlib-versioning
       thor
     mixlib-log (3.0.1)
-    mixlib-shellout (3.0.7)
-    mixlib-shellout (3.0.7-universal-mingw32)
+    mixlib-shellout (2.4.4)
+    mixlib-shellout (2.4.4-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
     mixlib-versioning (1.2.7)
     molinillo (0.6.6)
     multi_json (1.14.1)
     multipart-post (2.0.0)
-    necromancer (0.5.1)
+    necromancer (0.5.0)
     net-scp (2.0.0)
       net-ssh (>= 2.6.5, < 6.0.0)
     net-sftp (2.1.2)
@@ -278,7 +272,7 @@ GEM
     solve (4.0.2)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    strings (0.1.8)
+    strings (0.1.6)
       strings-ansi (~> 0.1)
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
@@ -302,13 +296,12 @@ GEM
     thor (0.20.3)
     toml-rb (1.1.2)
       citrus (~> 3.0, > 3.0)
-    tomlrb (1.2.9)
-    train-core (3.2.0)
+    tomlrb (1.2.8)
+    train-core (2.1.19)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 3.0)
       net-ssh (>= 2.9, < 6.0)
-    train-winrm (0.2.5)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
     tty-box (0.5.0)
@@ -317,11 +310,11 @@ GEM
       tty-cursor (~> 0.7)
     tty-color (0.5.0)
     tty-cursor (0.7.0)
-    tty-prompt (0.20.0)
+    tty-prompt (0.19.0)
       necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
-      tty-reader (~> 0.7.0)
-    tty-reader (0.7.0)
+      tty-reader (~> 0.6.0)
+    tty-reader (0.6.0)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)