diff options
author | Tim Smith <tsmith@chef.io> | 2020-06-25 21:36:09 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-25 21:36:09 -0700 |
commit | 79f0a604576f5c384515e72d815c30be33d0ce7a (patch) | |
tree | 05d7f58966f5ed822f68f577b8afe28303e2120c | |
parent | 3fc86487916b7130fa6cd563c0cc263160c31ec2 (diff) | |
parent | 454fddf19a86c1ce4aa7b6ca119a5d77d1d13a0e (diff) | |
download | chef-79f0a604576f5c384515e72d815c30be33d0ce7a.tar.gz |
Merge pull request #10072 from chef/libarchive
Update ffi-libarchive for windows fixes / pin the dep
-rw-r--r-- | Gemfile.lock | 14 | ||||
-rw-r--r-- | chef.gemspec | 2 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 66 |
3 files changed, 41 insertions, 41 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bc1519edda..50949df73e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: 309b638d8434b8a98f7c54329947ea11c8373ef4 + revision: d8d6cc3aa61b8ba9611be452f43618f5a6138ade branch: master specs: - chefstyle (1.1.1) - rubocop (= 0.85.1) + chefstyle (1.1.2) + rubocop (= 0.86.0) GIT remote: https://github.com/chef/ohai.git @@ -40,7 +40,7 @@ PATH ed25519 (~> 1.2) erubis (~> 2.7) ffi (>= 1.9.25) - ffi-libarchive + ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) iniparse (~> 1.4) @@ -74,7 +74,7 @@ PATH ed25519 (~> 1.2) erubis (~> 2.7) ffi (>= 1.9.25) - ffi-libarchive + ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) iniparse (~> 1.4) @@ -318,13 +318,13 @@ GEM rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.85.1) + rubocop (0.86.0) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.0.3) + rubocop-ast (>= 0.0.3, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (0.0.3) diff --git a/chef.gemspec b/chef.gemspec index 69644f0fb5..b2fc6cf5e3 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -40,7 +40,7 @@ Gem::Specification.new do |s| s.add_dependency "pastel" # knife ui.color s.add_dependency "erubis", "~> 2.7" s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4" - s.add_dependency "ffi-libarchive" + s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3" s.add_dependency "chef-zero", ">= 14.0.11" s.add_dependency "chef-vault" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 87bf6688c3..c37f90dc97 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 86a1c7ebb859161385676e3bfe537e13ba680f59 + revision: 2cf96c6c07de7d05ded6b45a0531feb10ae7cd9e branch: master specs: omnibus-software (4.0.0) @@ -32,26 +32,26 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.329.0) - aws-sdk-core (3.100.0) + aws-partitions (1.335.0) + aws-sdk-core (3.102.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.34.1) + aws-sdk-kms (1.35.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.68.1) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-s3 (1.71.1) + aws-sdk-core (~> 3, >= 3.102.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.4) - aws-eventstream (~> 1.0, >= 1.0.2) + aws-sigv4 (1.2.1) + aws-eventstream (~> 1, >= 1.0.2) bcrypt_pbkdf (1.1.0.rc1) bcrypt_pbkdf (1.1.0.rc1-x64-mingw32) bcrypt_pbkdf (1.1.0.rc1-x86-mingw32) - berkshelf (7.0.10) - chef (>= 13.6.52) + berkshelf (7.1.0) + chef (>= 15.7.32) chef-config cleanroom (~> 1.0) concurrent-ruby (~> 1.0) @@ -64,18 +64,18 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (16.1.16) + chef (16.2.50) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.1.16) - chef-utils (= 16.1.16) + chef-config (= 16.2.50) + chef-utils (= 16.2.50) chef-vault chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) erubis (~> 2.7) - ffi (~> 1.9, >= 1.9.25) + ffi (>= 1.9.25) ffi-libarchive ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) @@ -86,8 +86,8 @@ GEM 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 @@ -98,18 +98,18 @@ GEM train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (16.1.16-universal-mingw32) + chef (16.2.50-universal-mingw32) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.1.16) - chef-utils (= 16.1.16) + chef-config (= 16.2.50) + chef-utils (= 16.2.50) chef-vault chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) erubis (~> 2.7) - ffi (~> 1.9, >= 1.9.25) + ffi (>= 1.9.25) ffi-libarchive ffi-yajl (~> 2.2) highline (>= 1.6.9, < 3) @@ -121,8 +121,8 @@ GEM 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 @@ -145,15 +145,15 @@ GEM win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) chef-cleanroom (1.0.2) - chef-config (16.1.16) + chef-config (16.2.50) addressable - chef-utils (= 16.1.16) + chef-utils (= 16.2.50) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) chef-sugar (5.1.9) - chef-utils (16.1.16) + chef-utils (16.2.50) chef-vault (4.0.1) chef-zero (15.0.0) ffi-yajl (~> 2.2) @@ -164,7 +164,7 @@ GEM citrus (3.0.2) cleanroom (1.0.0) concurrent-ruby (1.1.6) - diff-lcs (1.3) + diff-lcs (1.4.2) ed25519 (1.2.4) equatable (0.6.1) erubi (1.9.0) @@ -174,7 +174,7 @@ GEM ffi (1.13.1) ffi (1.13.1-x64-mingw32) ffi (1.13.1-x86-mingw32) - ffi-libarchive (1.0.0) + ffi-libarchive (1.0.3) ffi (~> 1.0) ffi-win32-extensions (1.0.3) ffi @@ -191,7 +191,7 @@ GEM iniparse (1.5.0) iostruct (0.0.4) ipaddress (0.8.3) - iso8601 (0.12.1) + iso8601 (0.12.2) jmespath (1.4.0) json (2.3.0) kitchen-vagrant (1.6.1) @@ -235,9 +235,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) @@ -247,7 +247,7 @@ GEM octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (16.1.1) + ohai (16.2.1) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) @@ -312,7 +312,7 @@ GEM toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train-core (3.3.1) + train-core (3.3.4) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) |