summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md8
-rw-r--r--Gemfile.lock18
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/resource/windows_certificate.rb3
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock10
7 files changed, 24 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0efe13cc66..35f7ea9b92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,17 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.7.22 -->
-## [v14.7.22](https://github.com/chef/chef/tree/v14.7.22) (2018-11-13)
+<!-- latest_release 14.7.24 -->
+## [v14.7.24](https://github.com/chef/chef/tree/v14.7.24) (2018-11-14)
#### Merged Pull Requests
-- Backport: windows_feature: Move provider logic into the default of the install_method property [#7920](https://github.com/chef/chef/pull/7920) ([tas50](https://github.com/tas50))
+- Replace usage of win_friendly_path helper in windows_certificate [#7932](https://github.com/chef/chef/pull/7932) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.7.17 -->
### Changes since 14.7.17 release
#### Merged Pull Requests
+- Replace usage of win_friendly_path helper in windows_certificate [#7932](https://github.com/chef/chef/pull/7932) ([tas50](https://github.com/tas50)) <!-- 14.7.24 -->
+- Bump InSpec to 3.0.46 [#7931](https://github.com/chef/chef/pull/7931) ([tas50](https://github.com/tas50)) <!-- 14.7.23 -->
- Backport: windows_feature: Move provider logic into the default of the install_method property [#7920](https://github.com/chef/chef/pull/7920) ([tas50](https://github.com/tas50)) <!-- 14.7.22 -->
- Update inspec and ca-certs to the latest [#7898](https://github.com/chef/chef/pull/7898) ([tas50](https://github.com/tas50)) <!-- 14.7.21 -->
- Chef 14 Backport: Make sure we define windows_task resource on *nix systems [#7907](https://github.com/chef/chef/pull/7907) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.7.20 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 3015c09879..e5ec05d148 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.7.22)
+ chef (14.7.24)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.22)
+ chef-config (= 14.7.24)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.7.22-universal-mingw32)
+ chef (14.7.24-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.7.22)
+ chef-config (= 14.7.24)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.7.22)
+ chef-config (14.7.24)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -149,7 +149,7 @@ GEM
highline (1.7.10)
htmlentities (4.3.4)
iniparse (1.4.4)
- inspec-core (3.0.25)
+ inspec-core (3.0.46)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -175,7 +175,7 @@ GEM
launchy (2.4.3)
addressable (~> 2.3)
libyajl2 (1.2.0)
- method_source (0.9.1)
+ method_source (0.9.2)
mixlib-archive (0.4.18)
mixlib-log
mixlib-archive (0.4.18-universal-mingw32)
@@ -226,7 +226,7 @@ GEM
plist (3.4.0)
powerpack (0.1.2)
proxifier (1.0.3)
- pry (0.12.0)
+ pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.6.0)
@@ -301,7 +301,7 @@ GEM
structured_warnings (0.3.0)
syslog-logger (1.6.8)
systemu (2.6.5)
- thor (0.20.0)
+ thor (0.20.3)
tomlrb (1.2.7)
train-core (1.5.6)
json (>= 1.8, < 3.0)
diff --git a/VERSION b/VERSION
index 672fb22c36..52d56c0d77 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.7.22 \ No newline at end of file
+14.7.24 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 62d97cd666..6c95db0709 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "14.7.22".freeze
+ VERSION = "14.7.24".freeze
end
#
diff --git a/lib/chef/resource/windows_certificate.rb b/lib/chef/resource/windows_certificate.rb
index a5058f07a8..b482a09cc4 100644
--- a/lib/chef/resource/windows_certificate.rb
+++ b/lib/chef/resource/windows_certificate.rb
@@ -17,6 +17,7 @@
# limitations under the License.
#
+require "chef/util/path_helper"
require "chef/resource"
require "win32-certstore" if Chef::Platform.windows?
require "openssl"
@@ -180,7 +181,7 @@ class Chef
def cert_script(persist)
cert_script = "$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2"
- file = win_friendly_path(new_resource.source)
+ file = Chef::Util::PathHelper.cleanpath(new_resource.source)
cert_script << " \"#{file}\""
if ::File.extname(file.downcase) == ".pfx"
cert_script << ", \"#{new_resource.pfx_password}\""
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6345edd8d1..bbe6ffb925 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("14.7.22")
+ VERSION = Chef::VersionString.new("14.7.24")
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 64265fd696..a44cfac791 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -32,8 +32,8 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-eventstream (1.0.1)
- aws-partitions (1.109.0)
- aws-sdk-core (3.36.0)
+ aws-partitions (1.112.0)
+ aws-sdk-core (3.38.0)
aws-eventstream (~> 1.0)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
@@ -189,7 +189,7 @@ GEM
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
- method_source (0.9.1)
+ method_source (0.9.2)
minitar (0.7)
mixlib-archive (0.4.18)
mixlib-log
@@ -247,7 +247,7 @@ GEM
plist (3.4.0)
progressbar (1.10.0)
proxifier (1.0.3)
- pry (0.12.0)
+ pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.6.0)
@@ -312,7 +312,7 @@ GEM
winrm (~> 2.0)
winrm-elevated (~> 1.0)
winrm-fs (~> 1.1)
- thor (0.20.0)
+ thor (0.20.3)
toml-rb (1.1.2)
citrus (~> 3.0, > 3.0)
tomlrb (1.2.7)
View Lorry Controller Status