diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-02-19 10:45:17 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-02-19 13:13:29 -0800 |
| commit | f100449ecc5c498a507055d2dd0f754967e0898f (patch) | |
| tree | 2b741805b3fd7912beba1053bff06c1e903deaef | |
| parent | c9414338729decf217c8bfc37b1d405619c44331 (diff) | |
| download | chef-f100449ecc5c498a507055d2dd0f754967e0898f.tar.gz | |
Update libarchive to 3.4.2 and nokogiri to 1.10.8
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | omnibus/Gemfile.lock | 14 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 704c7ece58..da5377af50 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus - revision: 5baaf7a1d4ee66a9273e127c7e09ce0bb3b33d90 + revision: 6b0f3401c34e8b346476fb2aad202705b30a1db4 branch: master specs: - omnibus (7.0.2) + omnibus (7.0.3) aws-sdk-s3 (~> 1) chef-cleanroom (~> 1.0) chef-sugar (>= 3.3) @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: da1a26033d7a50e2032ccba412247b8ea7c750a1 + revision: e8312ad1f93bb3b88a232d0921ded4a0e82936b3 branch: master specs: omnibus-software (4.0.0) @@ -32,8 +32,8 @@ GEM artifactory (3.0.12) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.272.0) - aws-sdk-core (3.90.0) + aws-partitions (1.275.0) + aws-sdk-core (3.90.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -198,7 +198,7 @@ GEM tomlrb (~> 1.2) tty-box (~> 0.3) tty-prompt (~> 0.18) - license_scout (1.1.3) + license_scout (1.1.4) ffi-yajl (~> 2.2) mixlib-shellout (>= 2.2, < 4.0) toml-rb (>= 1, < 3) @@ -307,7 +307,7 @@ GEM toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.2.9) - train-core (3.2.20) + train-core (3.2.22) addressable (~> 2.5) inifile (~> 3.0) json (>= 1.8, < 3.0) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 61bca779b4..016c8bc111 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -5,7 +5,7 @@ # 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.2" # pin to what ships in the ruby version -override "libarchive", version: "3.4.0" +override "libarchive", version: "3.4.2" override "libffi", version: "3.2.1" override "libiconv", version: "1.15" override "liblzma", version: "5.2.4" @@ -15,7 +15,7 @@ override "libxslt", version: "1.1.34" override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" -override "nokogiri", version: "1.10.5" +override "nokogiri", version: "1.10.8" override "openssl", version: "1.0.2u" override "pkg-config-lite", version: "0.28-1" override "ruby", version: "2.6.5" |