[packages/chef] up to 11.6.0
glen
glen at pld-linux.org
Sat Sep 14 15:16:50 CEST 2013
commit f0820095c38b042995257d9156806adbfc1c0b4a
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Sep 14 16:14:13 2013 +0300
up to 11.6.0
FHS.patch | 86 ++++++++++++++++++++++++++++--------------------------
chef.spec | 13 ++++++---
platform-pld.patch | 11 +++----
3 files changed, 60 insertions(+), 50 deletions(-)
---
diff --git a/chef.spec b/chef.spec
index 50b8219..3dd7b70 100644
--- a/chef.spec
+++ b/chef.spec
@@ -4,12 +4,12 @@
Summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure
Name: chef
-Version: 11.4.4
-Release: 5
+Version: 11.6.0
+Release: 1
License: Apache v2.0
Group: Development/Languages
Source0: http://rubygems.org/downloads/%{name}-%{version}.gem
-# Source0-md5: dc50aa6a4a7d4785a4c82fcaab3f9436
+# Source0-md5: 3e8f67a5d11144573cf2c8d520ca39a6
Source1: %{name}.rb
Patch0: platform-pld.patch
Patch1: FHS.patch
@@ -23,8 +23,12 @@ BuildRequires: rpmbuild(macros) >= 1.656
BuildRequires: sed >= 4.0
%if %{with tests}
BuildRequires: ruby-abstract
+BuildRequires: ruby-chef-zero < 2
+BuildRequires: ruby-chef-zero >= 1.4
BuildRequires: ruby-mixlib-authentication >= 1.3.0
BuildRequires: ruby-net-ssh-multi >= 1.1.0
+BuildRequires: ruby-puma < 2
+BuildRequires: ruby-puma >= 1.6
BuildRequires: ruby-rack
BuildRequires: ruby-rake
#BuildRequires: ruby-rdoc
@@ -37,6 +41,7 @@ BuildRequires: ruby-rspec-mocks >= 2.12.0
%endif
Requires: lsb-release
Requires: poldek >= 0.30
+Requires: ruby >= 1:1.9.3.429-4
Requires: ruby-erubis
Requires: ruby-highline >= 1.6.9
Requires: ruby-json >= 1.4.4
@@ -51,7 +56,6 @@ Requires: ruby-ohai >= 0.6.0
Requires: ruby-rest-client >= 1.0.4
Requires: ruby-rubygems
Requires: ruby-yajl >= 1.1
-Requires: ruby >= 1:1.9.3.429-4
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -93,6 +97,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/chef.rb
%attr(755,root,root) %{_bindir}/chef-apply
%attr(755,root,root) %{_bindir}/chef-client
+%attr(755,root,root) %{_bindir}/chef-service-manager
%attr(755,root,root) %{_bindir}/chef-shell
%attr(755,root,root) %{_bindir}/chef-solo
%attr(755,root,root) %{_bindir}/knife
diff --git a/FHS.patch b/FHS.patch
index 9ae155b..d99cc18 100644
--- a/FHS.patch
+++ b/FHS.patch
@@ -1,6 +1,17 @@
---- chef-11.4.4.gem/lib/chef/config.rb 2013-04-30 01:35:11.703271336 +0300
-+++ chef-11.4.4/lib/chef/config.rb 2013-04-30 01:38:24.665295683 +0300
-@@ -141,20 +141,20 @@
+--- chef-11.4.4.gem/lib/chef/handler/json_file.rb 2013-04-30 01:35:11.709938303 +0300
++++ chef-11.4.4/lib/chef/handler/json_file.rb 2013-04-30 01:38:24.665295683 +0300
+@@ -27,7 +27,7 @@
+
+ def initialize(config={})
+ @config = config
+- @config[:path] ||= "/var/chef/reports"
++ @config[:path] ||= "/var/lib/chef/reports"
+ @config
+ end
+
+--- chef-11.6.0/lib/chef/config.rb~ 2013-08-18 18:27:57.000000000 +0300
++++ chef-11.6.0/lib/chef/config.rb 2013-08-18 18:28:08.057227738 +0300
+@@ -123,17 +123,17 @@
# Where the cookbooks are located. Meaning is somewhat context dependent between
# knife, chef-client, and chef-solo.
@@ -12,10 +23,6 @@
# An array of paths to search for knife exec scripts if they aren't in the current directory
script_path []
- # Where files are stored temporarily during uploads
-- sandbox_path "/var/chef/sandboxes"
-+ sandbox_path "/var/lib/chef/sandboxes"
-
# Where cookbook files are stored on the server (by content checksum)
- checksum_path "/var/chef/checksums"
+ checksum_path "/var/lib/chef/checksums"
@@ -26,7 +33,7 @@
# By default, chef-client (or solo) creates a lockfile in
# `file_cache_path`/chef-client-running.pid
-@@ -166,7 +166,7 @@
+@@ -145,7 +145,7 @@
lockfile nil
# Where backups of chef-managed files should go
@@ -35,17 +42,8 @@
## Daemonization Settings ##
# What user should Chef run as?
-@@ -202,7 +202,7 @@
- # toggle info level log items that can create a lot of output
- verbose_logging true
- node_name nil
-- node_path "/var/chef/node"
-+ node_path "/var/lib/chef/node"
- diff_disable false
- diff_filesize_threshold 10000000
- diff_output_threshold 1000000
-@@ -239,9 +239,9 @@
-
+@@ -207,11 +207,11 @@
+ ssl_ca_file nil
# Where should chef-solo look for role files?
- role_path platform_specific_path("/var/chef/roles")
@@ -54,20 +52,12 @@
- data_bag_path platform_specific_path("/var/chef/data_bags")
+ data_bag_path platform_specific_path("/var/lib/chef/data_bags")
+- environment_path platform_specific_path("/var/chef/environments")
++ environment_path platform_specific_path("/var/lib/chef/environments")
+
# Where should chef-solo download recipes from?
recipe_url nil
-@@ -286,8 +286,8 @@
- # Server Signing CA
- #
- # In truth, these don't even have to change
-- signing_ca_cert "/var/chef/ca/cert.pem"
-- signing_ca_key "/var/chef/ca/key.pem"
-+ signing_ca_cert "/var/lib/chef/ca/cert.pem"
-+ signing_ca_key "/var/lib/chef/ca/key.pem"
- signing_ca_user nil
- signing_ca_group nil
- signing_ca_country "US"
-@@ -318,7 +318,7 @@
+@@ -302,7 +302,7 @@
syntax_check_cache_path nil
# Deprecated:
@@ -76,14 +66,28 @@
# Set to false to silence Chef 11 deprecation warnings:
chef11_deprecation_warnings true
---- chef-11.4.4.gem/lib/chef/handler/json_file.rb 2013-04-30 01:35:11.709938303 +0300
-+++ chef-11.4.4/lib/chef/handler/json_file.rb 2013-04-30 01:38:24.665295683 +0300
-@@ -27,7 +27,7 @@
-
- def initialize(config={})
- @config = config
-- @config[:path] ||= "/var/chef/reports"
-+ @config[:path] ||= "/var/lib/chef/reports"
- @config
- end
+--- chef-11.6.0/lib/chef/chef_fs/config.rb~ 2013-08-18 18:28:38.000000000 +0300
++++ chef-11.6.0/lib/chef/chef_fs/config.rb 2013-08-18 18:29:11.806714479 +0300
+@@ -158,17 +158,17 @@
+
+ def configure_repo_paths
+ # Smooth out some (for now) inappropriate defaults set by Chef
+- if @chef_config[:cookbook_path] == [ @chef_config.platform_specific_path("/var/chef/cookbooks"),
+- @chef_config.platform_specific_path("/var/chef/site-cookbooks") ]
++ if @chef_config[:cookbook_path] == [ @chef_config.platform_specific_path("/var/lib/chef/cookbooks"),
++ @chef_config.platform_specific_path("/var/lib/chef/site-cookbooks") ]
+ @chef_config[:cookbook_path] = nil
+ end
+- if @chef_config[:data_bag_path] == @chef_config.platform_specific_path('/var/chef/data_bags')
++ if @chef_config[:data_bag_path] == @chef_config.platform_specific_path('/var/lib/chef/data_bags')
+ @chef_config[:data_bag_path] = nil
+ end
+- if @chef_config[:node_path] == '/var/chef/node'
++ if @chef_config[:node_path] == '/var/lib/chef/node'
+ @chef_config[:node_path] = nil
+ end
+- if @chef_config[:role_path] == @chef_config.platform_specific_path('/var/chef/roles')
++ if @chef_config[:role_path] == @chef_config.platform_specific_path('/var/lib/chef/roles')
+ @chef_config[:role_path] = nil
+ end
diff --git a/platform-pld.patch b/platform-pld.patch
index ccf7348..5bf207e 100644
--- a/platform-pld.patch
+++ b/platform-pld.patch
@@ -1,7 +1,7 @@
---- chef-11.4.0/lib/chef/platform.rb~ 2013-04-14 16:43:01.000000000 +0300
-+++ chef-11.4.0/lib/chef/platform.rb 2013-04-14 21:34:43.907576130 +0300
-@@ -147,6 +147,14 @@
- :mdadm => Chef::Provider::Mdadm
+--- chef-11.6.0/lib/chef/platform/provider_mapping.rb~ 2013-08-18 18:21:27.000000000 +0300
++++ chef-11.6.0/lib/chef/platform/provider_mapping.rb 2013-08-18 18:25:27.133441297 +0300
+@@ -173,6 +173,15 @@
+ :ifconfig => Chef::Provider::Ifconfig::Redhat
}
},
+ :pld => {
@@ -9,7 +9,8 @@
+ :service => Chef::Provider::Service::Redhat,
+ :cron => Chef::Provider::Cron,
+ :package => Chef::Provider::Package::Poldek,
-+ :mdadm => Chef::Provider::Mdadm
++ :mdadm => Chef::Provider::Mdadm,
++ :ifconfig => Chef::Provider::Ifconfig::Redhat # TODO: PLD config path needed
+ }
+ },
:suse => {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chef.git/commitdiff/a58665addb6358c9392e5ac0147e98284166250a
More information about the pld-cvs-commit
mailing list