diff options
| author | Tim Smith <tsmith@chef.io> | 2021-08-25 16:06:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-25 16:06:57 -0700 |
| commit | f8872b5657f647497cf140b7c8ebc3f5bfdd0eb0 (patch) | |
| tree | 6c9211e29ecfaf81737f473f2cfa9241c3be8b06 | |
| parent | 0e532bb3b582ea37c720f46127006f1295d5045d (diff) | |
| parent | 551fac5e9dda22215b275432f7a6b9bf05962dc4 (diff) | |
| download | chef-f8872b5657f647497cf140b7c8ebc3f5bfdd0eb0.tar.gz | |
Merge pull request #11958 from chef/libarchive352
Update libarchive to 3.5.2
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | omnibus/Gemfile | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 12 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index be7411ab71..f78a4b20b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: de7b4f4349c767120f223b0569687187082ad73c + revision: 5545eca02969338cff7a138ee92c5c0e8b8ae564 branch: main specs: - ohai (17.3.2) + ohai (17.5.0) chef-config (>= 14.12, < 18) chef-utils (>= 16.0, < 18) ffi (~> 1.9) @@ -136,7 +136,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.1.1) - aws-partitions (1.490.0) + aws-partitions (1.491.0) aws-sdk-core (3.119.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 14d2f3e698..4cee6794f4 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "master") -gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "master") +gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main") +gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main") gem "artifactory" gem "pedump" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index e269e8f647..f5f3fae4d8 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,15 +1,15 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: 01f52a2524a303a26eeac9f115a8b526fa7cf494 - branch: master + revision: 2ffd4e497e36c22abb661480b2373dfd77e55da8 + branch: main specs: omnibus-software (4.0.0) omnibus (>= 8.0.0) GIT remote: https://github.com/chef/omnibus.git - revision: e3573e77f3de5944a2fcd998ba50c773c2212ab7 - branch: master + revision: 7ce6173d7a7e9ee501ee2aed20f82d873926b299 + branch: main specs: omnibus (8.2.1) aws-sdk-s3 (~> 1) @@ -33,7 +33,7 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.1.1) - aws-partitions (1.490.0) + aws-partitions (1.491.0) aws-sdk-core (3.119.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -309,7 +309,7 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - parallel (1.20.2) + parallel (1.20.1) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 127c6bf24e..4a307ed72e 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.1" +override "libarchive", version: "3.5.2" override "libffi", version: "3.3" override "libiconv", version: "1.16" override "liblzma", version: "5.2.5" |