summaryrefslogtreecommitdiff
path: root/omnibus/config/projects/chef-fips.rb
diff options
context:
space:
mode:
Diffstat (limited to 'omnibus/config/projects/chef-fips.rb')
-rw-r--r--omnibus/config/projects/chef-fips.rb11
1 files changed, 0 insertions, 11 deletions
diff --git a/omnibus/config/projects/chef-fips.rb b/omnibus/config/projects/chef-fips.rb
index c91dbc4b89..dfe1a9e13a 100644
--- a/omnibus/config/projects/chef-fips.rb
+++ b/omnibus/config/projects/chef-fips.rb
@@ -34,16 +34,7 @@ else
install_dir "#{default_root}/#{name}"
end
-# Even if chef marches ahead, make sure that we stay pinned to 1.10.6
-# bundler 1.11 introduces some new features that require zlib. The zlib1.dll
-# base address is generated by gcc to overlap that of libeay.dll. This will
-# force windows into relocating libeay, freaking out the FIPS integrity
-# verifier. Lol security indeed.
-# Delete this once all dlls we generate are appropriately relocated.
-override :bundler, version: "1.10.6"
-
override :ruby, version: "2.1.7"
-override :"rb-readline", version: "v0.5.3"
# Global FIPS override flag.
override :fips, enabled: true
@@ -51,8 +42,6 @@ override :fips, enabled: true
override :chef, version: "local_source"
override :ohai, version: "master"
-dependency "rb-readline"
-
msi_upgrade_code = "819F5DB3-B818-4358-BB2B-54B8171D0A26"
project_location_dir = "chef-fips"