summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2022-01-18 17:51:29 -0800
committerTim Smith <tsmith84@gmail.com>2022-01-18 17:51:29 -0800
commit899830d9f4556cf2c3942612563ea9a6adca67dd (patch)
tree9652e79c6c8c7c170dc7739feed601c51c4fa846
parent2b96cb7e23d3e4a66b2a3bad60ea99be6d9bda23 (diff)
downloadchef-899830d9f4556cf2c3942612563ea9a6adca67dd.tar.gz
net-ftp isn't bundled in Ruby 3.1 anymore so dep on itnetftp
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock15
-rw-r--r--chef.gemspec1
2 files changed, 15 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 238ba43a9b..2d5cbedef7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,6 +57,7 @@ PATH
mixlib-cli (>= 2.1.1, < 3.0)
mixlib-log (>= 2.0.3, < 4.0)
mixlib-shellout (>= 3.1.1, < 4.0)
+ net-ftp
net-sftp (>= 2.1.2, < 4.0)
ohai (~> 18.0)
plist (~> 3.2)
@@ -89,6 +90,7 @@ PATH
mixlib-cli (>= 2.1.1, < 3.0)
mixlib-log (>= 2.0.3, < 4.0)
mixlib-shellout (>= 3.1.1, < 4.0)
+ net-ftp
net-sftp (>= 2.1.2, < 4.0)
ohai (~> 18.0)
plist (~> 3.2)
@@ -185,6 +187,7 @@ GEM
ffi (>= 1.15.0)
crack (0.4.5)
rexml
+ date (3.2.2)
debug_inspector (1.1.0)
diff-lcs (1.3)
ed25519 (1.3.0)
@@ -250,6 +253,7 @@ GEM
tty-table (~> 0.10)
inspec-core-bin (4.52.9)
inspec-core (= 4.52.9)
+ io-wait (0.2.1)
ipaddress (0.8.3)
iso8601 (0.13.0)
jmespath (1.5.0)
@@ -283,6 +287,12 @@ GEM
wmi-lite (~> 1.0)
multi_json (1.15.0)
multipart-post (2.1.1)
+ net-ftp (0.1.3)
+ net-protocol
+ time
+ net-protocol (0.1.2)
+ io-wait
+ timeout
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-sftp (3.0.0)
@@ -354,6 +364,9 @@ GEM
structured_warnings (0.4.0)
syslog-logger (1.6.8)
thor (1.2.1)
+ time (0.2.0)
+ date
+ timeout (0.2.0)
tomlrb (1.3.0)
train-core (3.8.6)
addressable (~> 2.5)
@@ -438,7 +451,7 @@ GEM
wmi-lite (1.0.5)
PLATFORMS
- arm64-darwin-20
+ arm64-darwin-21
ruby
x64-mingw32
x86-mingw32
diff --git a/chef.gemspec b/chef.gemspec
index 8b36cef57a..b12a906467 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
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-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.4 breaks output. Used in lib/chef/util/diff
s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3" # archive_file resource