summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md9
-rw-r--r--Gemfile.lock30
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/run_status.rb8
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock4
-rw-r--r--omnibus/config/software/more-ruby-cleanup.rb23
10 files changed, 46 insertions, 38 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59e76930ae..c800d5eda1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,18 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.4.9 -->
-## [v16.4.9](https://github.com/chef/chef/tree/v16.4.9) (2020-08-05)
+<!-- latest_release 16.4.12 -->
+## [v16.4.12](https://github.com/chef/chef/tree/v16.4.12) (2020-08-06)
#### Merged Pull Requests
-- Speed up our bundle installs by always running 3 jobs [#10264](https://github.com/chef/chef/pull/10264) ([tas50](https://github.com/tas50))
+- Combine attr_reader / attr_writer into attr_accessor [#10268](https://github.com/chef/chef/pull/10268) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.3.45 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Combine attr_reader / attr_writer into attr_accessor [#10268](https://github.com/chef/chef/pull/10268) ([tas50](https://github.com/tas50)) <!-- 16.4.12 -->
+- Cleanup extra binaries from libxml2 and libxslt [#10265](https://github.com/chef/chef/pull/10265) ([tas50](https://github.com/tas50)) <!-- 16.4.11 -->
+- Bump InSpec/Train/omnibus-software [#10267](https://github.com/chef/chef/pull/10267) ([tas50](https://github.com/tas50)) <!-- 16.4.10 -->
- Speed up our bundle installs by always running 3 jobs [#10264](https://github.com/chef/chef/pull/10264) ([tas50](https://github.com/tas50)) <!-- 16.4.9 -->
- Remove lzma and bzip binaries from our builds [#10263](https://github.com/chef/chef/pull/10263) ([tas50](https://github.com/tas50)) <!-- 16.4.8 -->
- Convert windows custom resources to unified_mode [#10260](https://github.com/chef/chef/pull/10260) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 16.4.7 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 862add4f4f..06b9c40a42 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (16.4.9)
+ chef (16.4.12)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.4.9)
- chef-utils (= 16.4.9)
+ chef-config (= 16.4.12)
+ chef-utils (= 16.4.12)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -63,12 +63,12 @@ PATH
tty-prompt (~> 0.21)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.4.9-universal-mingw32)
+ chef (16.4.12-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.4.9)
- chef-utils (= 16.4.9)
+ chef-config (= 16.4.12)
+ chef-utils (= 16.4.12)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -114,15 +114,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.4.9)
- chef (= 16.4.9)
+ chef-bin (16.4.12)
+ chef (= 16.4.12)
PATH
remote: chef-config
specs:
- chef-config (16.4.9)
+ chef-config (16.4.12)
addressable
- chef-utils (= 16.4.9)
+ chef-utils (= 16.4.12)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -131,7 +131,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.4.9)
+ chef-utils (16.4.12)
GEM
remote: https://rubygems.org/
@@ -200,7 +200,7 @@ GEM
htmlentities (4.3.4)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.22.1)
+ inspec-core (4.22.8)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0)
@@ -225,8 +225,8 @@ GEM
train-core (~> 3.0)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
- inspec-core-bin (4.22.1)
- inspec-core (= 4.22.1)
+ inspec-core-bin (4.22.8)
+ inspec-core (= 4.22.8)
ipaddress (0.8.3)
iso8601 (0.13.0)
json (2.3.1)
@@ -357,7 +357,7 @@ GEM
tins (1.25.0)
sync
tomlrb (1.2.9)
- train-core (3.3.6)
+ train-core (3.3.13)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
diff --git a/VERSION b/VERSION
index b82f9108e9..ff1d85bd5c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.4.9 \ No newline at end of file
+16.4.12 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 0fc681eefc..b93b2bd834 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.4.9".freeze
+ VERSION = "16.4.12".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 283fb0fe1f..1d927eae04 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.4.9".freeze
+ VERSION = "16.4.12".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 38c096b6ef..841772aaa3 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("..", __dir__)
- VERSION = "16.4.9".freeze
+ VERSION = "16.4.12".freeze
end
diff --git a/lib/chef/run_status.rb b/lib/chef/run_status.rb
index f5bc1837d7..6e7c83ff48 100644
--- a/lib/chef/run_status.rb
+++ b/lib/chef/run_status.rb
@@ -25,17 +25,13 @@ class Chef::RunStatus
attr_reader :events
- attr_reader :run_context
-
- attr_writer :run_context
+ attr_accessor :run_context
attr_reader :start_time
attr_reader :end_time
- attr_reader :exception
-
- attr_writer :exception
+ attr_accessor :exception
attr_accessor :run_id
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 63a795645b..9a55af0bc8 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("..", __dir__)
- VERSION = Chef::VersionString.new("16.4.9")
+ VERSION = Chef::VersionString.new("16.4.12")
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bcd5f6d699..4c79bd0cb1 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: e1c3d2839fe49e732aaf9edc8ebf708f12846ff3
+ revision: ddae3723ac532c779f6db65be237dc9f73e968c4
branch: master
specs:
omnibus-software (4.0.0)
@@ -314,7 +314,7 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
- train-core (3.3.6)
+ train-core (3.3.13)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
diff --git a/omnibus/config/software/more-ruby-cleanup.rb b/omnibus/config/software/more-ruby-cleanup.rb
index 95412abd5a..2f1db9caea 100644
--- a/omnibus/config/software/more-ruby-cleanup.rb
+++ b/omnibus/config/software/more-ruby-cleanup.rb
@@ -106,13 +106,22 @@ build do
end
end
- block "Remove empty gem dirs from Ruby's built-in gems" do
- Dir.glob("#{install_dir}/embedded/lib/ruby/gems/*/gems/*".tr('\\', "/")).each do |d|
- # skip unless the dir is empty
- next unless Dir.children(d).empty?
-
- puts "Deleting empty gem dir: #{d}"
- FileUtils.rm_rf(d)
+ block "Remove extra unused binaries that are built with libraries we ship" do
+ %w{
+ xml2-config
+ xmlcatalog
+ xmllint
+ xslt-config
+ xsltproc
+ }.each do |f|
+ file_path = "#{install_dir}/embedded/bin/#{f}"
+
+ if ::File.exist?(file_path)
+ puts "Deleting binary at #{file_path}"
+ FileUtils.rm_f(file_path)
+ else
+ puts "Binary #{file_path} not found. Skipping."
+ end
end
end
end
View Lorry Controller Status