wipbp-423/git-stunnel

3 files changed, 17 insertions, 15 deletions

diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 735b371c62..5d3f40668f 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "omnibus", github: "chef/omnibus", branch: "rhass/COOL-502_with_gcc_investigate"
-gem "omnibus-software", github: "chef/omnibus-software", branch: "shain/ruby_windows_monster"
+gem "omnibus-software", github: "chef/omnibus-software", branch: "bp-423/git-stunnel"
 gem "license_scout", github: "chef/license_scout"
 
 gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index e64c4659b4..9942746797 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/chef/license_scout.git
-  revision: 95a308e01848e7843c84fa9be6214fa06e30f436
+  revision: 4206a53973133853c38466bff7fcc0ec21eccdb4
   specs:
     license_scout (0.1.2)
       ffi-yajl (~> 2.2)
@@ -8,8 +8,8 @@ GIT
 
 GIT
   remote: git://github.com/chef/omnibus-software.git
-  revision: cd69f8563fa8875c82a4e44652ffbfdac7ef201d
-  branch: shain/ruby_windows_monster
+  revision: 8574922e3332faf5f3e91b7f78090e97b9693cd9
+  branch: bp-423/git-stunnel
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -17,7 +17,7 @@ GIT
 
 GIT
   remote: git://github.com/chef/omnibus.git
-  revision: 0612bf6333b2a7b125e599228ec6c46cbaa3ed3d
+  revision: 4b0341dea51234b7c838d3bb6a1a4092f4171dfb
   branch: rhass/COOL-502_with_gcc_investigate
   specs:
     omnibus (5.5.0)
@@ -38,12 +38,14 @@ GEM
     addressable (2.4.0)
     artifactory (2.5.0)
     awesome_print (1.7.0)
-    aws-sdk (2.6.18)
-      aws-sdk-resources (= 2.6.18)
-    aws-sdk-core (2.6.18)
+    aws-sdk (2.6.38)
+      aws-sdk-resources (= 2.6.38)
+    aws-sdk-core (2.6.38)
+      aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.18)
-      aws-sdk-core (= 2.6.18)
+    aws-sdk-resources (2.6.38)
+      aws-sdk-core (= 2.6.38)
+    aws-sigv4 (1.0.0)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -83,7 +85,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.15.19)
+    chef-config (12.17.44)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -150,7 +152,7 @@ GEM
     nori (2.6.0)
     octokit (4.4.1)
       sawyer (~> 0.7.0, >= 0.5.3)
-    ohai (8.21.0)
+    ohai (8.22.1)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -220,7 +222,7 @@ GEM
       net-ssh-gateway (~> 1.2.0)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
-    thor (0.19.1)
+    thor (0.19.4)
     timers (4.0.4)
       hitimes
     varia_model (0.4.1)
diff --git a/omnibus/config/software/chef-complete.rb b/omnibus/config/software/chef-complete.rb
index 172eae8440..e37363eb91 100644
--- a/omnibus/config/software/chef-complete.rb
+++ b/omnibus/config/software/chef-complete.rb
@@ -2,6 +2,7 @@ name "chef-complete"
 
 license :project_license
 skip_transitive_dependency_licensing true
+fips_enabled = (project.overrides[:fips] && project.overrides[:fips][:enabled]) || true
 
 dependency "chef"
 dependency "chef-appbundle"
@@ -12,8 +13,7 @@ dependency "shebang-cleanup"
 dependency "version-manifest"
 dependency "openssl-customization"
 
-# If fips-enabled openssl is being installed
-if windows? || rhel?
+if fips_enabled
    dependency "stunnel"
 end