summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2018-03-07 17:58:23 +0000
committerThom May <thom@chef.io>2018-03-07 17:58:23 +0000
commit10665be4d26c865fe36779dfaac157be818d5af7 (patch)
tree9ae0647b9f01c381a7caea1e40d2efe040408869
parentf45667c0be4e5d505a46d818a5d2f296b87b44cf (diff)
downloadchef-tm/lock_ffi.tar.gz
lock ffi at 1.9.21tm/lock_ffi
Signed-off-by: Thom May <thom@chef.io>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock9
2 files changed, 7 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 5a6204b414..2195381c01 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,8 @@ gem "ohai", "~> 13"
gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
gem "cheffish", "~> 13" # required for rspec tests
+# FFI crashes on EL6/7 on 1.9.22 and newer
+gem "ffi", "= 1.9.21"
group(:omnibus_package) do
gem "appbundler"
gem "rb-readline"
diff --git a/Gemfile.lock b/Gemfile.lock
index 86d6753749..cd338d69ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -133,9 +133,9 @@ GEM
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
- ffi (1.9.23)
- ffi (1.9.23-x64-mingw32)
- ffi (1.9.23-x86-mingw32)
+ ffi (1.9.21)
+ ffi (1.9.21-x64-mingw32)
+ ffi (1.9.21-x86-mingw32)
ffi-win32-extensions (1.0.3)
ffi
ffi-yajl (2.3.1)
@@ -230,7 +230,7 @@ GEM
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
parallel (1.12.1)
- parser (2.5.0.2)
+ parser (2.5.0.3)
ast (~> 2.4.0)
parslet (1.8.2)
plist (3.4.0)
@@ -390,6 +390,7 @@ DEPENDENCIES
chef-vault
cheffish (~> 13)
chefstyle (= 0.6.0)
+ ffi (= 1.9.21)
inspec (~> 1)
netrc
octokit