diff options
author | Christopher A. Snapp <csnapp@chef.io> | 2019-10-02 18:08:07 -0600 |
---|---|---|
committer | Christopher A. Snapp <csnapp@chef.io> | 2019-10-02 18:14:39 -0600 |
commit | 4893b4e4e205c3a17c562dc5ec18c30c5f3116a1 (patch) | |
tree | e255bf544f5c911aba450875603a14a91ec0f216 | |
parent | 8a153f06cd1e0e3a52232d957ef6868c6efc7b0b (diff) | |
download | chef-4893b4e4e205c3a17c562dc5ec18c30c5f3116a1.tar.gz |
Bump Ruby to 2.6.5 to address CVEs #8951
Signed-off-by: Christopher A. Snapp <csnapp@chef.io>
-rw-r--r-- | Gemfile.lock | 10 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 4 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 | ||||
-rwxr-xr-x | scripts/bk_tests/bk_linux_exec.sh | 6 | ||||
-rw-r--r-- | scripts/bk_tests/bk_win_functional.ps1 | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0cd35e966b..beca6739bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -249,7 +249,7 @@ GEM net-ssh-gateway (>= 1.2.0) nori (2.6.0) parallel (1.17.0) - parser (2.6.4.1) + parser (2.6.5.0) ast (~> 2.4.0) parslet (1.8.2) pastel (0.7.3) @@ -280,16 +280,16 @@ GEM rspec-mocks (~> 3.8.0) rspec-core (3.8.2) rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) + rspec-expectations (3.8.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.8.1) + rspec-mocks (3.8.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-support (3.8.2) + rspec-support (3.8.3) rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) @@ -440,4 +440,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.17.3 + 1.17.3
\ No newline at end of file diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index f7b25da4c2..5a5153cc60 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 63602e1cbb63abdb02f714fc4cc3d0c2176c9504 + revision: 3e901694559a2f3a64105b204ed79f0ffb3410d5 branch: master specs: omnibus-software (4.0.0) @@ -34,7 +34,7 @@ GEM awesome_print (1.8.0) aws-eventstream (1.0.3) aws-partitions (1.220.0) - aws-sdk-core (3.68.0) + aws-sdk-core (3.68.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) aws-sigv4 (~> 1.1) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 9399504d59..0a29952fe9 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -18,7 +18,7 @@ override "ncurses", version: "5.9" override "nokogiri", version: "1.10.4" override "openssl", version: "1.0.2s" override "pkg-config-lite", version: "0.28-1" -override "ruby", version: "2.6.4" +override "ruby", version: "2.6.5" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" override "util-macros", version: "1.19.0" override "xproto", version: "7.0.28" diff --git a/scripts/bk_tests/bk_linux_exec.sh b/scripts/bk_tests/bk_linux_exec.sh index 12c7594a8d..d08bcf38c6 100755 --- a/scripts/bk_tests/bk_linux_exec.sh +++ b/scripts/bk_tests/bk_linux_exec.sh @@ -32,9 +32,9 @@ sudo git clone https://github.com/asdf-vm/asdf.git /opt/asdf echo "--- Installing Ruby ASDF plugin" /opt/asdf/bin/asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git -echo "--- Installing Ruby 2.6.4" -/opt/asdf/bin/asdf install ruby 2.6.4 -/opt/asdf/bin/asdf global ruby 2.6.4 +echo "--- Installing Ruby 2.6.5" +/opt/asdf/bin/asdf install ruby 2.6.5 +/opt/asdf/bin/asdf global ruby 2.6.5 # Update Gems gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) diff --git a/scripts/bk_tests/bk_win_functional.ps1 b/scripts/bk_tests/bk_win_functional.ps1 index 085f22e40c..3cca7a7fff 100644 --- a/scripts/bk_tests/bk_win_functional.ps1 +++ b/scripts/bk_tests/bk_win_functional.ps1 @@ -14,13 +14,13 @@ $ErrorActionPreference = 'Stop' echo "Downloading Ruby + DevKit" [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -(New-Object System.Net.WebClient).DownloadFile('https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.4-1/rubyinstaller-devkit-2.6.4-1-x64.exe', 'c:\\rubyinstaller-devkit-2.6.4-1-x64.exe') +(New-Object System.Net.WebClient).DownloadFile('https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.5-1/rubyinstaller-devkit-2.6.5-1-x64.exe', 'c:\\rubyinstaller-devkit-2.6.5-1-x64.exe') echo "Installing Ruby + DevKit" -Start-Process c:\rubyinstaller-devkit-2.6.4-1-x64.exe -ArgumentList '/verysilent /dir=C:\\ruby26' -Wait +Start-Process c:\rubyinstaller-devkit-2.6.5-1-x64.exe -ArgumentList '/verysilent /dir=C:\\ruby26' -Wait echo "Cleaning up installation" -Remove-Item c:\rubyinstaller-devkit-2.6.4-1-x64.exe -Force +Remove-Item c:\rubyinstaller-devkit-2.6.5-1-x64.exe -Force echo "Closing out the layer (this can take awhile)" # Set-Item -Path Env:Path -Value to include ruby26 |