diff options
author | Corey Hemminger <hemminger@hotmail.com> | 2023-02-28 14:59:20 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-28 15:59:20 -0500 |
commit | d72df71ee8dfaf51cda170bc01870c11f442348e (patch) | |
tree | 0ce2f466acd2af3c976c253cdb0cf1c3df042aec | |
parent | 129f44068c1392fa4cf9371ec8fc365b920c6542 (diff) | |
download | chef-d72df71ee8dfaf51cda170bc01870c11f442348e.tar.gz |
[chef-17] backport Bump deps for net-ssh 7.x for RHEL 9 and Ubuntu 22.04 ssh (#13332)
* update dep for net-ssh 7 support
* update gem deps for net-ssh 7.x
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 28 | ||||
-rw-r--r-- | chef.gemspec | 6 | ||||
-rw-r--r-- | knife/knife.gemspec | 4 |
4 files changed, 20 insertions, 20 deletions
@@ -20,7 +20,7 @@ gem "cheffish", "~> 17.0" group(:omnibus_package) do gem "appbundler" gem "rb-readline" - gem "inspec-core-bin", "~> 4.24" # need to provide the binaries for inspec + gem "inspec-core-bin", ">= 4.24" # need to provide the binaries for inspec gem "chef-vault" end diff --git a/Gemfile.lock b/Gemfile.lock index a42e2d2160..904d341bb3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,19 +50,19 @@ PATH ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) iniparse (~> 1.4) - inspec-core (~> 4.23) + inspec-core (>= 4.23) license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (>= 2.1, < 4) mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.1.1, < 4.0) - net-sftp (>= 2.1.2, < 4.0) + net-sftp (>= 2.1.2, < 5.0) ohai (~> 17.0) plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) - train-core (~> 3.2, >= 3.2.28) + train-core (~> 3.10) train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) @@ -82,7 +82,7 @@ PATH ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) iniparse (~> 1.4) - inspec-core (~> 4.23) + inspec-core (>= 4.23) iso8601 (>= 0.12.1, < 0.14) license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) @@ -90,12 +90,12 @@ PATH mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.1.1, < 4.0) - net-sftp (>= 2.1.2, < 4.0) + net-sftp (>= 2.1.2, < 5.0) ohai (~> 17.0) plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) - train-core (~> 3.2, >= 3.2.28) + train-core (~> 3.10) train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) @@ -230,7 +230,7 @@ GEM hashie (4.1.0) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.56.20) + inspec-core (5.18.14) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -250,11 +250,11 @@ GEM sslshake (~> 1.2) thor (>= 0.20, < 2.0) tomlrb (>= 1.2, < 2.1) - train-core (~> 3.0) + train-core (~> 3.10) tty-prompt (~> 0.17) tty-table (~> 0.10) - inspec-core-bin (4.56.20) - inspec-core (= 4.56.20) + inspec-core-bin (5.18.14) + inspec-core (= 5.18.14) ipaddress (0.8.3) iso8601 (0.13.0) jmespath (1.6.2) @@ -290,8 +290,8 @@ GEM multipart-post (2.3.0) net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) + net-sftp (4.0.0) + net-ssh (>= 5, <8.0.0) net-ssh (7.0.1) nori (2.6.0) parallel (1.22.1) @@ -459,7 +459,7 @@ DEPENDENCIES chefstyle! ed25519 (~> 1.2) fauxhai-ng - inspec-core-bin (~> 4.24) + inspec-core-bin (>= 4.24) ohai! pry (= 0.13.0) pry-byebug @@ -471,4 +471,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.18 + 2.3.24 diff --git a/chef.gemspec b/chef.gemspec index 07b5fd9d74..76cee183e4 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_dependency "chef-config", "= #{Chef::VERSION}" s.add_dependency "chef-utils", "= #{Chef::VERSION}" - s.add_dependency "train-core", "~> 3.2", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635 + s.add_dependency "train-core", "~> 3.10" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635 s.add_dependency "train-winrm", ">= 0.2.5" s.add_dependency "license-acceptance", ">= 1.0.5", "< 3" @@ -36,11 +36,11 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-shellout", ">= 3.1.1", "< 4.0" s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0" s.add_dependency "ohai", "~> 17.0" - s.add_dependency "inspec-core", "~> 4.23" + s.add_dependency "inspec-core", ">= 4.23" s.add_dependency "ffi", ">= 1.5.0" s.add_dependency "ffi-yajl", "~> 2.2" - s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0" # remote_file resource + s.add_dependency "net-sftp", ">= 2.1.2", "< 5.0" # remote_file resource s.add_dependency "erubis", "~> 2.7" # template resource / cookbook syntax check s.add_dependency "diff-lcs", ">= 1.2.4", "!= 1.4.0", "< 1.6.0" # 1.4 breaks output. Used in lib/chef/util/diff s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3" # archive_file resource diff --git a/knife/knife.gemspec b/knife/knife.gemspec index d121343211..ad7cfaf230 100644 --- a/knife/knife.gemspec +++ b/knife/knife.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.add_dependency "chef-config", ">= #{Chef::Knife::VERSION.split(".").first}" s.add_dependency "chef-utils", ">= #{Chef::Knife::VERSION.split(".").first}" s.add_dependency "chef", ">= #{Chef::Knife::VERSION.split(".").first}" - s.add_dependency "train-core", "~> 3.2", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635 + s.add_dependency "train-core", "~> 3.10" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635 s.add_dependency "train-winrm", ">= 0.2.5" s.add_dependency "license-acceptance", ">= 1.0.5", "< 3" s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0" @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_dependency "ohai", "~> 17.0" s.add_dependency "ffi", ">= 1.15" # 1.14 versions are broken on i386 windows s.add_dependency "ffi-yajl", "~> 2.2" - s.add_dependency "net-ssh", ">= 5.1", "< 7" + s.add_dependency "net-ssh", ">= 5.1", "< 8" s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1" s.add_dependency "bcrypt_pbkdf", "~> 1.1" # ed25519 ssh key support # disabling this until we get get it to compile on RHEL 7 |