[packages/chef] update to 11.14.2
glen
glen at pld-linux.org
Fri Dec 5 12:01:02 CET 2014
commit 96f87093a67b121e4f6f86c9b0e5e97bef58f6df
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Dec 5 12:37:56 2014 +0200
update to 11.14.2
FHS.patch | 33 ++++++++++++++-------------------
chef.spec | 9 ++++++---
platform-pld.patch | 38 +++++++++++++++++++-------------------
poldek.patch | 8 ++++----
4 files changed, 43 insertions(+), 45 deletions(-)
---
diff --git a/chef.spec b/chef.spec
index 7b39d08..e769b05 100644
--- a/chef.spec
+++ b/chef.spec
@@ -6,12 +6,12 @@
Summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure
Name: chef
-Version: 11.12.8
-Release: 1
+Version: 11.14.2
+Release: 0.1
License: Apache v2.0
Group: Networking/Admin
Source0: http://rubygems.org/downloads/%{name}-%{version}.gem
-# Source0-md5: e453d166d30ebc8d99b3a12d849612f7
+# Source0-md5: 9eac2363456e27b02b2ad753d5b92085
Source1: %{name}.rb
Source2: %{name}.tmpfiles
Source3: https://raw.github.com/stevendanna/knife-hacks/master/shell/knife_completion.sh
@@ -203,8 +203,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/knife-recipe-list.1*
%{_mandir}/man1/knife-role.1*
%{_mandir}/man1/knife-search.1*
+%{_mandir}/man1/knife-serve.1*
%{_mandir}/man1/knife-show.1*
%{_mandir}/man1/knife-ssh.1*
+%{_mandir}/man1/knife-ssl-check.1*
+%{_mandir}/man1/knife-ssl-fetch.1*
%{_mandir}/man1/knife-status.1*
%{_mandir}/man1/knife-tag.1*
%{_mandir}/man1/knife-upload.1*
diff --git a/FHS.patch b/FHS.patch
index 71f219e..dbb20b6 100644
--- a/FHS.patch
+++ b/FHS.patch
@@ -1,15 +1,6 @@
---- chef-11.8.0/lib/chef/config.rb 2013-12-21 17:24:18.980654855 +0200
-+++ chef-11.8.2/lib/chef/config.rb 2013-12-21 20:00:26.000000000 +0200
-@@ -162,7 +162,7 @@
- end
- end
- else
-- platform_specific_path("/var/chef")
-+ platform_specific_path("/var/lib/chef")
- end
- end
-
-@@ -201,7 +201,7 @@
+--- chef-11.14.2/lib/chef/config.rb 2014-12-04 18:09:43.557089359 +0200
++++ chef-11.14.2/lib/chef/config.rb 2014-12-04 18:40:15.075764026 +0200
+@@ -181,7 +181,7 @@
# Location of cookbooks on disk. String or array of strings.
# Defaults to <chef_repo_path>/cookbooks. If chef_repo_path
@@ -18,15 +9,19 @@
default(:cookbook_path) do
if self.configuration[:chef_repo_path]
derive_path_from_chef_repo_path('cookbooks')
-@@ -260,7 +260,7 @@
- if local_mode
+@@ -241,9 +241,9 @@
"#{config_dir}local-mode-cache"
else
-- platform_specific_path("/var/chef")
-+ platform_specific_path("/var/cache/chef")
- end
- end
-
+ primary_cache_root = platform_specific_path("/var")
+- primary_cache_path = platform_specific_path("/var/chef")
+- # Use /var/chef as the cache path only if that folder exists and we can read and write
+- # into it, or /var exists and we can read and write into it (we'll create /var/chef later).
++ primary_cache_path = platform_specific_path("/var/cache/chef")
++ # Use /var/cache/chef as the cache path only if that folder exists and we can read and write
++ # into it, or /var exists and we can read and write into it (we'll create /var/cache/chef later).
+ # Otherwise, we'll create .chef under the user's home directory and use that as
+ # the cache path.
+ unless path_accessible?(primary_cache_path) || path_accessible?(primary_cache_root)
@@ -268,10 +268,10 @@
default(:checksum_path) { path_join(cache_path, "checksums") }
diff --git a/platform-pld.patch b/platform-pld.patch
index 13fd9bd..932acf8 100644
--- a/platform-pld.patch
+++ b/platform-pld.patch
@@ -1,19 +1,19 @@
---- chef-11.12.2/lib/chef/platform/provider_mapping.rb 2014-05-03 16:17:20.832320849 +0300
-+++ chef-11.12.2/lib/chef/platform/provider_mapping.rb 2014-05-03 16:16:41.990604626 +0300
-@@ -185,6 +185,16 @@
- :group => Chef::Provider::Group::Usermod
- }
- },
-+ :pld => {
-+ :default => {
-+ :service => Chef::Provider::Service::Redhat,
-+ :cron => Chef::Provider::Cron,
-+ :package => Chef::Provider::Package::Poldek,
-+ :mdadm => Chef::Provider::Mdadm,
-+ :ifconfig => Chef::Provider::Ifconfig::Redhat, # TODO: PLD config path needed
-+ :group => Chef::Provider::Group::Usermod,
-+ }
-+ },
- :suse => {
- :default => {
- :service => Chef::Provider::Service::Redhat,
+--- chef-11.14.2/lib/chef/platform/provider_mapping.rb~ 2014-12-04 18:02:46.000000000 +0200
++++ chef-11.14.2/lib/chef/platform/provider_mapping.rb 2014-12-04 18:07:26.765336890 +0200
+@@ -194,6 +194,16 @@
+ :group => Chef::Provider::Group::Suse
+ }
+ },
++ :pld => {
++ :default => {
++ :service => Chef::Provider::Service::Redhat,
++ :cron => Chef::Provider::Cron,
++ :package => Chef::Provider::Package::Poldek,
++ :mdadm => Chef::Provider::Mdadm,
++ :ifconfig => Chef::Provider::Ifconfig::Redhat, # TODO: PLD config path needed
++ :group => Chef::Provider::Group::Usermod,
++ }
++ },
+ :oracle => {
+ :default => {
+ :service => Chef::Provider::Service::Redhat,
diff --git a/poldek.patch b/poldek.patch
index 238a4eb..7f8209b 100644
--- a/poldek.patch
+++ b/poldek.patch
@@ -129,16 +129,16 @@ https://github.com/opscode/chef/pull/1225
+ end
+ end
+end
---- chef-11.12.8/lib/chef/providers.rb 2014-12-04 18:27:52.686448859 +0200
-+++ chef-11.12.8.poldek/lib/chef/providers.rb 2014-12-04 18:27:24.438414927 +0200
-@@ -60,6 +60,7 @@
+--- chef-11.14.2/lib/chef/providers.rb~ 2014-12-04 18:38:06.000000000 +0200
++++ chef-11.14.2/lib/chef/providers.rb 2014-12-04 18:38:39.567794339 +0200
+@@ -62,6 +62,7 @@
require 'chef/provider/package/macports'
require 'chef/provider/package/pacman'
require 'chef/provider/package/portage'
+require 'chef/provider/package/poldek'
+ require 'chef/provider/package/paludis'
require 'chef/provider/package/rpm'
require 'chef/provider/package/rubygems'
- require 'chef/provider/package/yum'
--- chef-11.12.8/lib/chef/resource/poldek_package.rb 1970-01-01 02:00:00.000000000 +0200
+++ chef-11.12.8.poldek/lib/chef/resource/poldek_package.rb 2014-12-04 18:27:24.438414927 +0200
@@ -0,0 +1,34 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chef.git/commitdiff/05d6135ceeb9e63a5d4d74de4381255f5d9f0cfc
More information about the pld-cvs-commit
mailing list