diff options
| author | Tim Smith <tsmith@chef.io> | 2020-07-28 18:28:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 18:28:13 -0700 |
| commit | 58d620fed9851f3f067c0b70c3cdf096b3155168 (patch) | |
| tree | f454a9b512ec603eac39bd6f21a30e2c19ed67d9 | |
| parent | acffd83f97f8e9551c19bf6a60ad300876e15543 (diff) | |
| parent | c8772fadfe75c98f877b25dbce0fd1a5c4ad960a (diff) | |
| download | chef-58d620fed9851f3f067c0b70c3cdf096b3155168.tar.gz | |
Merge pull request #10221 from chef/bump_omnibus
Update libarchive, liblzma, and nokogiri to the latest
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 8 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 439cb5a842..c43d6f89ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: 5a1bce1ca8bf3310f14632c28ed0f0e9b04ec2f9 + revision: 955a4a5685026f28d417d8977784a6ca89ff0279 branch: master specs: - ohai (16.3.1) + ohai (16.3.2) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index b1a3724a35..7e969fd3a3 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 70b006114a9ed20899ef32fedb863ee517a37322 + revision: d0427be1405e0a6230109fd51cd29e7967ffbdb5 branch: master specs: omnibus-software (4.0.0) @@ -32,7 +32,7 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.345.0) + aws-partitions (1.346.0) aws-sdk-core (3.104.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -251,7 +251,7 @@ GEM octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (16.3.0) + ohai (16.3.2) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) @@ -267,7 +267,7 @@ GEM pastel (0.7.4) equatable (~> 0.6) tty-color (~> 0.5) - pedump (0.6.0) + pedump (0.6.1) awesome_print iostruct (>= 0.0.4) multipart-post (>= 2.0.0) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 179d9a6a08..f21f3e30f0 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -5,10 +5,10 @@ # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock override :rubygems, version: "3.1.2" # pin to what ships in the ruby version override :bundler, version: "2.1.4" # pin to what ships in the ruby version -override "libarchive", version: "3.4.2" +override "libarchive", version: "3.4.3" override "libffi", version: "3.2.1" override "libiconv", version: "1.15" -override "liblzma", version: "5.2.4" +override "liblzma", version: "5.2.5" override "libtool", version: "2.4.2" override "libxml2", version: "2.9.10" override "libxslt", version: "1.1.34" |