summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorey Hemminger <hemminger@hotmail.com>2022-10-21 10:45:36 -0500
committerCorey Hemminger <hemminger@hotmail.com>2022-10-21 10:45:36 -0500
commitdff0e4150aab4ea6d97788fc80436d92f8669293 (patch)
treee30ecc99238af06b85b074fac9ce2ae3190635a1
parentbb0071c0420b45f0b9297286b488dde2d80c5ff4 (diff)
downloadchef-dff0e4150aab4ea6d97788fc80436d92f8669293.tar.gz
Bump deps for net-ssh 7.x for RHEL 9 and Ubuntu 22.04 ssh new algorithms support
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
-rw-r--r--Gemfile.lock20
-rw-r--r--chef.gemspec2
-rw-r--r--knife/knife.gemspec2
-rw-r--r--omnibus/Gemfile.lock18
4 files changed, 21 insertions, 21 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b1242d1190..2b6849a49a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,7 +74,7 @@ PATH
mixlib-log (>= 2.0.3, < 4.0)
mixlib-shellout (>= 3.1.1, < 4.0)
net-ftp
- net-sftp (>= 2.1.2, < 4.0)
+ net-sftp (>= 2.1.2, < 5.0)
ohai (~> 18.0)
plist (~> 3.2)
proxifier (~> 1.0)
@@ -110,7 +110,7 @@ PATH
mixlib-log (>= 2.0.3, < 4.0)
mixlib-shellout (>= 3.1.1, < 4.0)
net-ftp
- net-sftp (>= 2.1.2, < 4.0)
+ net-sftp (>= 2.1.2, < 5.0)
ohai (~> 18.0)
plist (~> 3.2)
proxifier (~> 1.0)
@@ -323,11 +323,11 @@ GEM
time
net-protocol (0.1.3)
timeout
- net-scp (3.0.0)
- net-ssh (>= 2.6.5, < 7.0.0)
- net-sftp (3.0.0)
- net-ssh (>= 5.0.0, < 7.0.0)
- net-ssh (6.1.0)
+ net-scp (4.0.0)
+ net-ssh (>= 2.6.5, < 8.0.0)
+ net-sftp (4.0.0.rc1)
+ net-ssh (>= 5.0.0, < 8.0.0)
+ net-ssh (7.0.1)
netrc (0.11.0)
nori (2.6.0)
parallel (1.22.1)
@@ -398,13 +398,13 @@ GEM
date
timeout (0.3.0)
tomlrb (1.3.0)
- train-core (3.10.1)
+ train-core (3.10.7)
addressable (~> 2.5)
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, < 7.0)
+ net-scp (>= 1.2, < 5.0)
+ net-ssh (>= 2.9, < 8.0)
train-rest (0.5.0)
aws-sigv4 (~> 1.5)
rest-client (~> 2.1)
diff --git a/chef.gemspec b/chef.gemspec
index a9ea748b65..7d689b2bb1 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
s.add_dependency "ffi", ">= 1.15.5"
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 "net-ftp" # 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
diff --git a/knife/knife.gemspec b/knife/knife.gemspec
index aac58d4bf7..34b764b71d 100644
--- a/knife/knife.gemspec
+++ b/knife/knife.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
s.add_dependency "ohai", "~> 18.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
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f3b842efc6..b3aee05639 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: fc901c6446e6354058133b89a29a6ef8e2995b3d
+ revision: 7d0e0fe472759f800a75fe65a1fe179da950c5c9
branch: main
specs:
omnibus-software (4.0.0)
@@ -285,11 +285,11 @@ GEM
molinillo (0.8.0)
multi_json (1.15.0)
multipart-post (2.2.3)
- net-scp (3.0.0)
- net-ssh (>= 2.6.5, < 7.0.0)
- net-sftp (3.0.0)
- net-ssh (>= 5.0.0, < 7.0.0)
- net-ssh (6.1.0)
+ net-scp (4.0.0)
+ net-ssh (>= 2.6.5, < 8.0.0)
+ net-sftp (4.0.0.rc1)
+ net-ssh (>= 5.0.0, < 8.0.0)
+ net-ssh (7.0.1)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
nori (2.6.0)
@@ -364,15 +364,15 @@ GEM
strings-ansi (0.2.0)
structured_warnings (0.4.0)
syslog-logger (1.6.8)
- test-kitchen (3.3.1)
+ test-kitchen (3.4.0)
bcrypt_pbkdf (~> 1.0)
chef-utils (>= 16.4.35)
ed25519 (~> 1.2)
license-acceptance (>= 1.0.11, < 3.0)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 4.0)
- net-scp (>= 1.1, < 4.0)
- net-ssh (>= 2.9, < 7.0)
+ net-scp (>= 1.1, < 5.0)
+ net-ssh (>= 2.9, < 8.0)
net-ssh-gateway (>= 1.2, < 3.0)
thor (>= 0.19, < 2.0)
winrm (~> 2.0)