diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-02-07 10:28:54 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2019-02-07 10:28:54 -0800 |
commit | b790768e43164701d7e6375a3d40049e2cd1a5ce (patch) | |
tree | 4ec2596cffb11adb5b46693c0427f827968cb33d | |
parent | 26b747fcd00ade7e4b7af9dfbe24a13b73d3cb55 (diff) | |
download | chef-lcg/ed25519-again-chef14.tar.gz |
Chef-14: add ed25519 gemset and update omnibus-softwarelcg/ed25519-again-chef14
backport of #8221
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r-- | Gemfile.lock | 10 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d1ec761d43..05a240a176 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,6 +94,9 @@ GEM mixlib-shellout (~> 2.0) ast (2.4.0) backports (3.11.4) + bcrypt_pbkdf (1.0.0) + bcrypt_pbkdf (1.0.0-x64-mingw32) + bcrypt_pbkdf (1.0.0-x86-mingw32) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.3) @@ -246,6 +249,10 @@ GEM rainbow (3.0.0) rake (12.3.0) rb-readline (0.5.5) + rbnacl (6.0.1) + ffi + rbnacl-libsodium (1.0.16) + rbnacl (>= 3.0.1) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -388,6 +395,7 @@ PLATFORMS DEPENDENCIES appbundler + bcrypt_pbkdf chef! chef-config! chef-vault @@ -402,6 +410,8 @@ DEPENDENCIES pry-stack_explorer rake (<= 12.3.0) rb-readline + rbnacl + rbnacl-libsodium ruby-prof ruby-shadow simplecov diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 50b1bb25e3..23a5ba1581 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: f341152c973e02da707a5a408cfb19cccaf54e45 + revision: ebe3e0ab360080534f954b8630970f641ed795e6 branch: master specs: omnibus-software (4.0.0) @@ -199,7 +199,7 @@ GEM mixlib-cli (1.7.0) mixlib-config (2.2.18) tomlrb - mixlib-install (3.11.5) + mixlib-install (3.11.11) mixlib-shellout mixlib-versioning thor |