diff options
author | Tim Smith <tsmith84@gmail.com> | 2021-03-17 13:06:30 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2021-03-17 13:06:30 -0700 |
commit | edcf7c9f1d1550d6446cb442ea1c668195f26365 (patch) | |
tree | fd201eacda90068bd9b147c9693d1f13c3da068d | |
parent | b9a9f25e893041920ba3bd7ff9dc7194be0bc848 (diff) | |
download | chef-edcf7c9f1d1550d6446cb442ea1c668195f26365.tar.gz |
Update FFI to 1.15 for M1 Macs + libarchive to 3.5.1
Minor fixes in libarchive for the archive_file resource, but we need to
bump FFI for the new Macs
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | Gemfile | 4 | ||||
-rw-r--r-- | Gemfile.lock | 8 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 8 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 |
4 files changed, 11 insertions, 11 deletions
@@ -1,7 +1,7 @@ source "https://rubygems.org" -# pin until issues with Windows builds in 1.14.2 are resolved -gem "ffi", "=1.13.1" +# 1.15+ is required for M1 mac builds +gem "ffi", ">=1.15" # Note we do not use the gemspec DSL which restricts to the # gemspec for the current platform and filters out other platforms diff --git a/Gemfile.lock b/Gemfile.lock index 82244538ca..9dcf407e5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,9 +178,9 @@ GEM faraday (~> 1.0) fauxhai-ng (8.7.0) net-ssh - ffi (1.13.1) - ffi (1.13.1-x64-mingw32) - ffi (1.13.1-x86-mingw32) + ffi (1.15.0) + ffi (1.15.0-x64-mingw32) + ffi (1.15.0-x86-mingw32) ffi-libarchive (1.0.17) ffi (~> 1.0) ffi-win32-extensions (1.0.4) @@ -429,7 +429,7 @@ DEPENDENCIES cheffish (>= 14) chefstyle (= 1.5.9) fauxhai-ng - ffi (= 1.13.1) + ffi (>= 1.15) inspec-core-bin (~> 4.24) ohai! pry diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index e282ca13b3..474ecc380b 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -32,7 +32,7 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.1.1) - aws-partitions (1.433.0) + aws-partitions (1.434.0) aws-sdk-core (3.113.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -202,7 +202,7 @@ GEM highline (2.0.3) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.26.13) + inspec-core (4.28.0) addressable (~> 2.4) chef-telemetry (~> 1.0) faraday (>= 0.9.0, < 1.4) @@ -238,7 +238,7 @@ GEM tomlrb (>= 1.2, < 3.0) tty-box (~> 0.6) tty-prompt (~> 0.20) - license_scout (1.2.9) + license_scout (1.2.10) ffi-yajl (~> 2.2) mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) @@ -256,7 +256,7 @@ GEM mixlib-cli (2.1.8) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.7) + mixlib-install (3.12.11) mixlib-shellout mixlib-versioning thor diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 11c0446546..559bfaef1c 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -3,7 +3,7 @@ # # NOTE: You MUST update omnibus-software when adding new versions of # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock -override "libarchive", version: "3.5.0" +override "libarchive", version: "3.5.1" override "libffi", version: "3.3" override "libiconv", version: "1.16" override "liblzma", version: "5.2.5" |