diff options
author | Tim Smith <tsmith@chef.io> | 2020-06-10 10:49:07 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-10 10:49:07 -0700 |
commit | bfa1e6e4eb6ef507f306df3a134a0ee233edc4d3 (patch) | |
tree | 7912de055c9656043aa27a0a7283b17738dd52db | |
parent | 1778e88ceddc647cd7bf517e69ae8c86ef820719 (diff) | |
parent | 3eee34485b9091cdbb19983a3fd8ffba8ac9f4dc (diff) | |
download | chef-bfa1e6e4eb6ef507f306df3a134a0ee233edc4d3.tar.gz |
Merge pull request #9978 from chef/ffi
Allow for the latest net-ssh and ffi 1.13.1
-rw-r--r-- | Gemfile.lock | 40 | ||||
-rw-r--r-- | chef.gemspec | 6 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 16 |
3 files changed, 31 insertions, 31 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fec8aa09c2..7e12beb1e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: 0e9ee45a766c84f9c5cfb867fbeb85c092121f37 + revision: 309b638d8434b8a98f7c54329947ea11c8373ef4 branch: master specs: - chefstyle (1.1.0) - rubocop (= 0.85.0) + chefstyle (1.1.1) + rubocop (= 0.85.1) GIT remote: https://github.com/chef/ohai.git @@ -39,7 +39,7 @@ PATH diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) erubis (~> 2.7) - ffi (>= 1.9.25, < 1.13) + ffi (>= 1.9.25) ffi-libarchive ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) @@ -50,8 +50,8 @@ PATH mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.0.3, < 4.0) - net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 4.2, < 6) + net-sftp (>= 2.1.2, < 4.0) + net-ssh (>= 4.2, < 7) net-ssh-multi (~> 1.2, >= 1.2.1) ohai (~> 16.0) pastel @@ -73,7 +73,7 @@ PATH diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) erubis (~> 2.7) - ffi (>= 1.9.25, < 1.13) + ffi (>= 1.9.25) ffi-libarchive ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) @@ -85,8 +85,8 @@ PATH mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.0.3, < 4.0) - net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 4.2, < 6) + net-sftp (>= 2.1.2, < 4.0) + net-ssh (>= 4.2, < 7) net-ssh-multi (~> 1.2, >= 1.2.1) ohai (~> 16.0) pastel @@ -177,9 +177,9 @@ GEM multipart-post (>= 1.2, < 3) fauxhai-ng (8.2.0) net-ssh - ffi (1.12.2) - ffi (1.12.2-x64-mingw32) - ffi (1.12.2-x86-mingw32) + ffi (1.13.1) + ffi (1.13.1-x64-mingw32) + ffi (1.13.1-x86-mingw32) ffi-libarchive (1.0.0) ffi (~> 1.0) ffi-win32-extensions (1.0.3) @@ -262,9 +262,9 @@ GEM necromancer (0.5.1) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (5.2.0) + net-sftp (3.0.0) + net-ssh (>= 5.0.0, < 7.0.0) + net-ssh (6.1.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) net-ssh-multi (1.2.1) @@ -297,7 +297,7 @@ GEM rainbow (3.0.0) rake (13.0.1) rb-readline (0.5.5) - regexp_parser (1.7.0) + regexp_parser (1.7.1) rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) @@ -318,7 +318,7 @@ GEM rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.85.0) + rubocop (0.85.1) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) @@ -353,13 +353,13 @@ GEM tins (1.25.0) sync tomlrb (1.3.0) - train-core (3.2.37) + train-core (3.3.1) addressable (~> 2.5) - ffi (< 1.13) + ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 4.0) - net-ssh (>= 2.9, < 6.0) + net-ssh (>= 2.9, < 7.0) train-winrm (0.2.6) winrm (~> 2.0) winrm-fs (~> 1.0) diff --git a/chef.gemspec b/chef.gemspec index e99d9e9e83..69644f0fb5 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -28,11 +28,11 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0" s.add_dependency "ohai", "~> 16.0" - s.add_dependency "ffi", ">= 1.9.25", "< 1.13" # https://github.com/ffi/ffi/issues/784 + s.add_dependency "ffi", ">= 1.9.25" s.add_dependency "ffi-yajl", "~> 2.2" - s.add_dependency "net-ssh", ">= 4.2", "< 6" + s.add_dependency "net-ssh", ">= 4.2", "< 7" s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1" - s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2" + s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0" s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support s.add_dependency "bcrypt_pbkdf", "= 1.1.0.rc1" # ed25519 ssh key support s.add_dependency "highline", ">= 1.6.9", "< 3" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index d7a83eeafa..e91e6a4946 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -33,8 +33,8 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.325.0) - aws-sdk-core (3.97.1) + aws-partitions (1.327.0) + aws-sdk-core (3.98.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -172,9 +172,9 @@ GEM erubis (2.7.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) - ffi (1.12.2) - ffi (1.12.2-x64-mingw32) - ffi (1.12.2-x86-mingw32) + ffi (1.12.1) + ffi (1.12.1-x64-mingw32) + ffi (1.12.1-x86-mingw32) ffi-libarchive (1.0.0) ffi (~> 1.0) ffi-win32-extensions (1.0.3) @@ -313,13 +313,13 @@ GEM toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train-core (3.2.37) + train-core (3.3.1) addressable (~> 2.5) - ffi (< 1.13) + ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 4.0) - net-ssh (>= 2.9, < 6.0) + net-ssh (>= 2.9, < 7.0) train-winrm (0.2.6) winrm (~> 2.0) winrm-fs (~> 1.0) |