summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-04-13 11:42:12 -0700
committerTim Smith <tsmith84@gmail.com>2020-04-13 11:42:12 -0700
commit6f6bf4854f88496722509b9df1dd3e65532dbf34 (patch)
tree752573467477d413774fadde9ee16ac3d30e15fb
parent58c4cc25116f30f9901d0fab296a066a0ce843ca (diff)
downloadchef-6f6bf4854f88496722509b9df1dd3e65532dbf34.tar.gz
Require at least train-core 3.2.28 to resolve sudo issues
Make sure that even a gem install of chef will work correctly here. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock4
-rw-r--r--chef.gemspec2
-rw-r--r--omnibus/Gemfile.lock34
3 files changed, 20 insertions, 20 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e512748a2..3ca86063ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,7 +57,7 @@ PATH
plist (~> 3.2)
proxifier (~> 1.0)
syslog-logger (~> 1.6)
- train-core (~> 3.1)
+ train-core (~> 3.2, >= 3.2.28)
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
@@ -92,7 +92,7 @@ PATH
plist (~> 3.2)
proxifier (~> 1.0)
syslog-logger (~> 1.6)
- train-core (~> 3.1)
+ train-core (~> 3.2, >= 3.2.28)
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
diff --git a/chef.gemspec b/chef.gemspec
index 0bdd455ab5..ee7ba80460 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
s.add_dependency "chef-config", "= #{Chef::VERSION}"
s.add_dependency "chef-utils", "= #{Chef::VERSION}"
- s.add_dependency "train-core", "~> 3.1"
+ s.add_dependency "train-core", "~> 3.2", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635
s.add_dependency "train-winrm", ">= 0.2.5"
s.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.5"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 6a58cd3999..a4162bef1f 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -31,17 +31,17 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
artifactory (3.0.12)
awesome_print (1.8.0)
- aws-eventstream (1.0.3)
- aws-partitions (1.293.0)
- aws-sdk-core (3.92.0)
- aws-eventstream (~> 1.0, >= 1.0.2)
+ aws-eventstream (1.1.0)
+ aws-partitions (1.296.0)
+ aws-sdk-core (3.94.0)
+ aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.61.1)
+ aws-sdk-s3 (1.61.2)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@@ -64,12 +64,12 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.4)
- chef (15.8.23)
+ chef (15.9.17)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.8.23)
- chef-utils (= 15.8.23)
+ chef-config (= 15.9.17)
+ chef-utils (= 15.9.17)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -96,12 +96,12 @@ GEM
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.8.23-universal-mingw32)
+ chef (15.9.17-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.8.23)
- chef-utils (= 15.8.23)
+ chef-config (= 15.9.17)
+ chef-utils (= 15.9.17)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -141,15 +141,15 @@ GEM
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
chef-cleanroom (1.0.2)
- chef-config (15.8.23)
+ chef-config (15.9.17)
addressable
- chef-utils (= 15.8.23)
+ chef-utils (= 15.9.17)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-sugar (5.1.9)
- chef-utils (15.8.23)
+ chef-utils (15.9.17)
chef-zero (15.0.0)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 5.0)
@@ -211,7 +211,7 @@ GEM
mixlib-archive (1.0.5-universal-mingw32)
mixlib-log
mixlib-authentication (3.0.6)
- mixlib-cli (2.1.5)
+ mixlib-cli (2.1.6)
mixlib-config (3.0.6)
tomlrb
mixlib-install (3.12.1)
@@ -267,7 +267,7 @@ GEM
plist (3.5.0)
progressbar (1.10.1)
proxifier (1.0.3)
- public_suffix (4.0.3)
+ public_suffix (4.0.4)
rack (2.2.2)
rainbow (3.0.0)
retryable (3.0.5)
@@ -306,7 +306,7 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
- train-core (3.2.26)
+ train-core (3.2.28)
addressable (~> 2.5)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)