diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-09-02 09:20:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-02 09:20:22 -0700 |
| commit | 863f57089f4a5395a39cf1b555865cab4e16c5e2 (patch) | |
| tree | 81f2702000860245d88234bae1b806933a21a360 | |
| parent | fc13612a6fa603577a7ade868cc43a99719dd14b (diff) | |
| parent | f3e2240471d6a90735aacb2c21fd21b64a0cea60 (diff) | |
| download | chef-863f57089f4a5395a39cf1b555865cab4e16c5e2.tar.gz | |
Merge pull request #5260 from chef/lcg/openssl-1.0.2
bump openssl to 1.0.2h
| -rw-r--r-- | omnibus/Gemfile | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 16 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 1 | ||||
| -rw-r--r-- | version_policy.rb | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 12b6171271..2f2df4126f 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "omnibus", github: "chef/omnibus", branch: "sersut/ff-ksubrama/gcc_investigate" -gem "omnibus-software", github: "chef/omnibus-software", branch: "sersut/ff-ksubrama/ruby23" +gem "omnibus-software", github: "chef/omnibus-software", branch: "lcg/ruby23" gem "license_scout", github: "chef/license_scout" # pedump pessimistically pins multipart-post to a version from 2013 which makes diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 0912895e80..15f10baf24 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -8,8 +8,8 @@ GIT GIT remote: git://github.com/chef/omnibus-software.git - revision: 676b89e48a213f34567f847c1c2aa20f08d5a2b7 - branch: sersut/ff-ksubrama/ruby23 + revision: c1daa55c0a17b2f3192f22edcc0909b685aa4591 + branch: lcg/ruby23 specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -50,12 +50,12 @@ GEM addressable (2.4.0) artifactory (2.3.3) awesome_print (1.7.0) - aws-sdk (2.5.5) - aws-sdk-resources (= 2.5.5) - aws-sdk-core (2.5.5) + aws-sdk (2.5.7) + aws-sdk-resources (= 2.5.7) + aws-sdk-core (2.5.7) jmespath (~> 1.0) - aws-sdk-resources (2.5.5) - aws-sdk-core (= 2.5.5) + aws-sdk-resources (2.5.7) + aws-sdk-core (= 2.5.7) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (~> 2.0, >= 2.0.2) @@ -137,7 +137,7 @@ GEM mixlib-authentication (1.4.1) mixlib-log mixlib-cli (1.7.0) - mixlib-config (2.2.2) + mixlib-config (2.2.3) mixlib-install (1.1.0) artifactory mixlib-shellout diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index e75ed3de92..289d6df1f4 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -10,6 +10,7 @@ override "libxslt", version: "1.1.29" override "libyaml", version: "0.1.6" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" +override "openssl", version: "1.0.2h" override "pkg-config-lite", version: "0.28-1" override "ruby", version: "2.3.1" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" diff --git a/version_policy.rb b/version_policy.rb index 578f913ef7..cd909d8ffb 100644 --- a/version_policy.rb +++ b/version_policy.rb @@ -44,7 +44,7 @@ OMNIBUS_OVERRIDES = { ## These can float as they are frequently updated in a way that works for us #override "cacerts" =>"???", - #override "openssl" =>"???", + "openssl" => "1.0.2h", } # |