diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-11-13 18:51:45 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2019-11-13 18:51:45 -0800 |
| commit | f346be470d6a2f81257c60686c4e0401848479c0 (patch) | |
| tree | ddf0858bb0b307c54fcdc97224d20593accceeec | |
| parent | 546d6da1beb94417a4e86ab3dca974fe8bff5cf5 (diff) | |
| download | chef-f346be470d6a2f81257c60686c4e0401848479c0.tar.gz | |
enable some gcc hardening by default
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | omnibus/Gemfile | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index e5ed31cd73..86aa6cedd1 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master" -gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "lcg/windows-ruby-O3" +gem "omnibus", git: "https://github.com/chef/omnibus", branch: "lcg/enable-hardening" +gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master" gem "artifactory" gem "pedump" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index bcd4c25dc4..04d8d71299 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/chef/omnibus - revision: f0e30edfaaaf47f403c441ddf6665b21a26f4546 - branch: master + revision: fc2837201ff02a0637352574f6b51c661cc2ee89 + branch: lcg/enable-hardening specs: omnibus (6.1.13) aws-sdk-s3 (~> 1) @@ -18,8 +18,8 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: b68d60eb2ea0a1498e501a00fbb4bc621df3e0e6 - branch: lcg/windows-ruby-O3 + revision: 1f1cec89d749593420a429baf182becf8741fe12 + branch: master specs: omnibus-software (4.0.0) omnibus (>= 5.6.1) |