summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-04-01 19:47:10 -0700
committerTim Smith <tsmith84@gmail.com>2020-04-01 20:48:39 -0700
commit319a71071c5d1ae1d2dacca5fcd817d117c8382f (patch)
tree7c672b04d72fc0433bb77a65ff0ef4ba87b40986
parent446e7ec6dfb2416db684ca91252266af3cc6f35b (diff)
downloadchef-319a71071c5d1ae1d2dacca5fcd817d117c8382f.tar.gz
Update Ruby to 2.7.1 / bundler to 2.1.4
This resolves 2 CVEs in Ruby https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-7-1-released/ Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock24
-rw-r--r--omnibus/Gemfile.lock22
-rw-r--r--omnibus_overrides.rb4
-rwxr-xr-xscripts/bk_tests/bk_linux_exec.sh6
4 files changed, 28 insertions, 28 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d5825ccd94..abe7dc496a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,17 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: ebbcec68f08a048406764ceae8d2ac33a33507af
+ revision: d0e353d4415834d58aa267f8bc6d5c4ce8d95652
branch: master
specs:
- chefstyle (0.15.1)
- rubocop (= 0.80.1)
+ chefstyle (1.0.0)
+ rubocop (= 0.81.0)
GIT
remote: https://github.com/chef/ohai.git
- revision: 10615b80e8abd2a8a3263a3514822a90158c14d1
+ revision: 1f3fc923263abac1cff1f64e22813d1c5e47e53b
branch: master
specs:
- ohai (16.0.12)
+ ohai (16.0.15)
chef-config (>= 12.8, < 17)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -176,7 +176,7 @@ GEM
equatable (0.6.1)
erubi (1.9.0)
erubis (2.7.0)
- faraday (1.0.0)
+ faraday (1.0.1)
multipart-post (>= 1.2, < 3)
fauxhai-ng (8.0.0)
net-ssh
@@ -285,7 +285,7 @@ GEM
net-ssh-gateway (>= 1.2.0)
nori (2.6.0)
parallel (1.19.1)
- parser (2.7.0.4)
+ parser (2.7.0.5)
ast (~> 2.4.0)
parslet (1.8.2)
pastel (0.7.3)
@@ -331,14 +331,14 @@ GEM
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
- rubocop (0.80.1)
+ rubocop (0.81.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
rexml
ruby-progressbar (~> 1.7)
- unicode-display_width (>= 1.4.0, < 1.7)
+ unicode-display_width (>= 1.4.0, < 2.0)
ruby-prof (1.2.0)
ruby-progressbar (1.10.1)
ruby-shadow (2.5.0)
@@ -399,8 +399,10 @@ GEM
tty-screen (~> 0.7)
unf (0.1.4)
unf_ext
- unf_ext (0.0.7.6)
- unicode-display_width (1.6.1)
+ unf_ext (0.0.7.7)
+ unf_ext (0.0.7.7-x64-mingw32)
+ unf_ext (0.0.7.7-x86-mingw32)
+ unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uri_template (0.7.0)
uuidtools (2.1.5)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index fc2a5edad1..6a58cd3999 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: c086d8057ac9a15486fe2010009db0dee1cea682
+ revision: 18564cc92b5f7b6d3ada694a41adf3bf948918fb
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.281.0)
- aws-sdk-core (3.91.0)
+ aws-partitions (1.293.0)
+ aws-sdk-core (3.92.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
@@ -41,7 +41,7 @@ GEM
aws-sdk-kms (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.61.0)
+ aws-sdk-s3 (1.61.1)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@@ -164,7 +164,7 @@ GEM
equatable (0.6.1)
erubi (1.9.0)
erubis (2.7.0)
- faraday (1.0.0)
+ faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.12.2)
ffi (1.12.2-x64-mingw32)
@@ -183,7 +183,6 @@ GEM
hashie (4.1.0)
highline (1.7.10)
httpclient (2.8.3)
- inifile (3.0.0)
iniparse (1.5.0)
iostruct (0.0.4)
ipaddress (0.8.3)
@@ -240,10 +239,10 @@ GEM
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
nori (2.6.0)
- octokit (4.17.0)
+ octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (15.7.4)
+ ohai (15.8.0)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -274,7 +273,7 @@ GEM
retryable (3.0.5)
ruby-progressbar (1.10.1)
rubyntlm (0.6.2)
- rubyzip (2.2.0)
+ rubyzip (2.3.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
@@ -306,10 +305,9 @@ GEM
thor (0.20.3)
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
- tomlrb (1.2.9)
- train-core (3.2.23)
+ tomlrb (1.3.0)
+ train-core (3.2.26)
addressable (~> 2.5)
- inifile (~> 3.0)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 1243714975..e4babcc5ee 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -4,7 +4,7 @@
# NOTE: You MUST update omnibus-software when adding new versions of
# 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 :bundler, version: "2.1.4" # pin to what ships in the ruby version
override "libarchive", version: "3.4.2"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.15"
@@ -18,7 +18,7 @@ override "ncurses", version: "5.9"
override "nokogiri", version: "1.11.0.rc1"
override "openssl", version: "1.0.2u"
override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.7.0"
+override "ruby", version: "2.7.1"
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 e74f598d40..b4bbce59f9 100755
--- a/scripts/bk_tests/bk_linux_exec.sh
+++ b/scripts/bk_tests/bk_linux_exec.sh
@@ -35,9 +35,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.5"
-/opt/asdf/bin/asdf install ruby 2.6.5
-/opt/asdf/bin/asdf global ruby 2.6.5
+echo "--- Installing Ruby 2.6.6"
+/opt/asdf/bin/asdf install ruby 2.6.6
+/opt/asdf/bin/asdf global ruby 2.6.6
# Update Gems
gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)