summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-03-06 22:10:14 -0800
committerGitHub <noreply@github.com>2021-03-06 22:10:14 -0800
commitcfe9a9149730437b4a2eb9783ecca687f4515425 (patch)
tree0cb249e5eb5c3f8a590fe4bc9fa19e78718e512a
parenta9322ba1f79ed01e2d1fa362e13c72b54270c733 (diff)
parent1b9bd8b438ed852f43cc923f429a9cb60c8b4f3e (diff)
downloadchef-cfe9a9149730437b4a2eb9783ecca687f4515425.tar.gz
Merge pull request #11151 from chef/ffi
Update FFI to 1.15.0
-rw-r--r--Gemfile.lock16
-rw-r--r--chef.gemspec2
-rw-r--r--omnibus/Gemfile.lock14
3 files changed, 16 insertions, 16 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 1e916e0c29..a3f3100faa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 2397af29ecc3c3e849d817a8519d32866aab89ff
+ revision: 7b33f59cd06ebee58c0cbc73fe2af45840d2ee1e
branch: master
specs:
- ohai (17.0.24)
+ ohai (17.0.25)
chef-config (>= 12.8, < 18)
chef-utils (>= 16.0, < 18)
ffi (~> 1.9)
@@ -38,7 +38,7 @@ PATH
diff-lcs (>= 1.2.4, < 1.4.0)
ed25519 (~> 1.2)
erubis (~> 2.7)
- ffi (>= 1.9.25, < 1.14.0)
+ ffi (>= 1.9.25)
ffi-libarchive (~> 1.0, >= 1.0.3)
ffi-yajl (~> 2.2)
highline (>= 1.6.9, < 3)
@@ -74,7 +74,7 @@ PATH
diff-lcs (>= 1.2.4, < 1.4.0)
ed25519 (~> 1.2)
erubis (~> 2.7)
- ffi (>= 1.9.25, < 1.14.0)
+ ffi (>= 1.9.25)
ffi-libarchive (~> 1.0, >= 1.0.3)
ffi-yajl (~> 2.2)
highline (>= 1.6.9, < 3)
@@ -182,9 +182,9 @@ GEM
faraday (~> 1.0)
fauxhai-ng (8.7.0)
net-ssh
- ffi (1.13.1)
- ffi (1.13.1-x64-mingw32)
- ffi (1.13.1-x86-mingw32)
+ ffi (1.15.0)
+ ffi (1.15.0-x64-mingw32)
+ ffi (1.15.0-x86-mingw32)
ffi-libarchive (1.0.17)
ffi (~> 1.0)
ffi-win32-extensions (1.0.4)
@@ -369,7 +369,7 @@ GEM
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uuidtools (2.2.0)
- webmock (3.12.0)
+ webmock (3.12.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
diff --git a/chef.gemspec b/chef.gemspec
index 3986d6a882..4f05de47a9 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
s.add_dependency "ohai", "~> 17.0"
s.add_dependency "inspec-core", "~> 4.23"
- s.add_dependency "ffi", ">= 1.9.25", "< 1.14.0" # 1.14 breaks i386 windows. It should be fixed in 1.14.3
+ s.add_dependency "ffi", ">= 1.9.25"
s.add_dependency "ffi-yajl", "~> 2.2"
s.add_dependency "net-ssh", ">= 5.1", "< 7"
s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 0f9218540a..3fc66d741a 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -31,9 +31,9 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
artifactory (3.0.15)
awesome_print (1.8.0)
- aws-eventstream (1.1.0)
- aws-partitions (1.430.0)
- aws-sdk-core (3.112.0)
+ aws-eventstream (1.1.1)
+ aws-partitions (1.431.1)
+ aws-sdk-core (3.112.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
@@ -45,7 +45,7 @@ GEM
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
- aws-sigv4 (1.2.2)
+ aws-sigv4 (1.2.3)
aws-eventstream (~> 1, >= 1.0.2)
bcrypt_pbkdf (1.1.0.rc2)
bcrypt_pbkdf (1.1.0.rc2-x64-mingw32)
@@ -184,9 +184,9 @@ GEM
faraday-net_http (1.0.1)
faraday_middleware (1.0.0)
faraday (~> 1.0)
- ffi (1.14.2)
- ffi (1.14.2-x64-mingw32)
- ffi (1.14.2-x86-mingw32)
+ ffi (1.15.0)
+ ffi (1.15.0-x64-mingw32)
+ ffi (1.15.0-x86-mingw32)
ffi-libarchive (1.0.17)
ffi (~> 1.0)
ffi-win32-extensions (1.0.4)