Merge pull request #12399 from chef/netftp

net-ftp isn't bundled in Ruby 3.1 anymore so dep on it

3 files changed, 24 insertions, 10 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 8052291af1..68b01ed8cb 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)
@@ -90,6 +91,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)
@@ -189,6 +191,7 @@ GEM
       ffi (>= 1.15.0)
     crack (0.4.5)
       rexml
+    date (3.2.2)
     debug_inspector (1.1.0)
     diff-lcs (1.5.0)
     ed25519 (1.3.0)
@@ -254,6 +257,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)
@@ -287,6 +291,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)
@@ -358,8 +368,11 @@ 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)
+    train-core (3.8.7)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
diff --git a/chef.gemspec b/chef.gemspec
index 84857f3fb8..668f8ad958 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.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/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f18603fef8..1b165a46a4 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: 791cc46777a782b6ab3391b1e7244492e0a2e944
+  revision: c7a43ec60aa452698fc37fcea12929b5db200d95
   branch: main
   specs:
     omnibus-software (4.0.0)
@@ -33,21 +33,21 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.551.0)
-    aws-sdk-core (3.125.6)
+    aws-partitions (1.553.0)
+    aws-sdk-core (3.126.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.53.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-kms (1.54.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.111.3)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-s3 (1.112.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.56.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-secretsmanager (1.57.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)