up to 14.13.15

diff --git a/FHS.patch b/FHS.patch
index 97e0690d026bd06dacf0d9d38fe640ba9fa67672..eddca15812423526208905127fa6983e4a65f7ad 100644 (file)
--- a/FHS.patch
+++ b/FHS.patch
@@ -164,8 +164,8 @@
    end
  
    # Don't need to have an after block to reset the config...
---- chef-14.1.21/spec/unit/application/solo_spec.rb~   2018-05-21 18:22:54.000000000 +0200
-+++ chef-14.1.21/spec/unit/application/solo_spec.rb    2018-07-14 22:13:57.265002987 +0200
+--- chef-14.13.15/spec/unit/application/solo_spec.rb~  2019-08-14 19:42:36.000000000 +0300
++++ chef-14.13.15/spec/unit/application/solo_spec.rb   2019-08-20 17:10:40.315154871 +0300
 @@ -206,10 +206,10 @@
      end
  
@@ -173,7 +173,7 @@
 -      expect(Chef::Config).to receive(:find_chef_repo_path).and_return("/var/chef")
 +      expect(Chef::Config).to receive(:find_chef_repo_path).and_return("/var/lib/chef")
        app.reconfigure
-       expect(Chef::Config.has_key?(:chef_repo_path)).to be_truthy
+       expect(Chef::Config.key?(:chef_repo_path)).to be_truthy
 -      expect(Chef::Config[:chef_repo_path]).to eq ("/var/chef")
 +      expect(Chef::Config[:chef_repo_path]).to eq ("/var/lib/chef")
      end
@@ -290,3 +290,25 @@
  
    describe "when first created" do
      it "locates the lockfile in the file cache path by default" do
+--- chef-14.13.15/lib/chef/resource/file.rb~   2019-08-14 19:42:36.000000000 +0300
++++ chef-14.13.15/lib/chef/resource/file.rb    2019-08-20 17:14:28.073369726 +0300
+@@ -58,7 +58,7 @@
+                description: "Perform atomic file updates on a per-resource basis. Set to true for atomic file updates. Set to false for non-atomic file updates. This setting overrides file_atomic_update, which is a global setting found in the client.rb file."
+ 
+       property :backup, [ Integer, FalseClass ], desired_state: false, default: 5,
+-               description: "The number of backups to be kept in /var/chef/backup (for UNIX- and Linux-based platforms) or C:/chef/backup (for the Microsoft Windows platform). Set to false to prevent backups from being kept."
++               description: "The number of backups to be kept in /var/lib/chef/backup (for UNIX- and Linux-based platforms) or C:/chef/backup (for the Microsoft Windows platform). Set to false to prevent backups from being kept."
+ 
+       property :checksum, [ /^[a-zA-Z0-9]{64}$/, nil ],
+                description: "The SHA-256 checksum of the file. Use to ensure that a specific file is used. If the checksum does not match, the file is not used."
+--- chef-14.13.15/lib/chef/resource/launchd.rb~        2019-08-14 19:42:36.000000000 +0300
++++ chef-14.13.15/lib/chef/resource/launchd.rb 2019-08-20 17:14:38.793912812 +0300
+@@ -36,7 +36,7 @@
+ 
+       property :backup, [Integer, FalseClass],
+                desired_state: false,
+-               description: "The number of backups to be kept in /var/chef/backup. Set to false to prevent backups from being kept."
++               description: "The number of backups to be kept in /var/lib/chef/backup. Set to false to prevent backups from being kept."
+ 
+       property :cookbook, String,
+                desired_state: false,

diff --git a/chef.spec b/chef.spec
index f94f61bf74d64be62391bc51eecdad7aaa44c746..0b8688ce0c4a33e64cbfe33ca1cf3f4e06cc27f6 100644 (file)
--- a/chef.spec
+++ b/chef.spec
@@ -7,12 +7,12 @@
 
 Summary:       A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure
 Name:          chef
-Version:       14.1.36
-Release:       2
+Version:       14.13.15
+Release:       1
 License:       Apache v2.0
 Group:         Networking/Admin
 Source0:       https://github.com/chef/chef/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 442169a1a824b3335376a88723e133a0
+# Source0-md5: 95a6ba0d3dd61dd01f3c1511e92e2ba3
 Source2:       %{name}.tmpfiles
 Source3:       https://raw.github.com/stevendanna/knife-hacks/master/shell/knife_completion.sh
 # Source3-md5: a4c1e41370be8088a59ddb3b2e7ea397
@@ -112,9 +112,6 @@ rm bin/chef-service-manager
 rm bin/chef-windows-service
 %endif
 
-# don't package this, a maintainer's rake task
-rm chef-config/lib/chef-config/package_task.rb
-
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 

diff --git a/gemdeps.patch b/gemdeps.patch
index 2c9fa94622b299194c7fcd17cf748fe0d1c4fb96..e420b35831d56c3b35f9fd6e3119b4ad5cf8163e 100644 (file)
--- a/gemdeps.patch
+++ b/gemdeps.patch
@@ -1,5 +1,5 @@
---- chef-14.1.21/chef.gemspec  2018-07-16 14:45:25.219811439 +0300
-+++ chef-14.1.36/chef.gemspec  2018-07-16 16:31:33.837545915 +0300
+--- chef-14.13.15/chef.gemspec~        2019-08-20 17:11:29.000000000 +0300
++++ chef-14.13.15/chef.gemspec 2019-08-20 17:12:20.043551512 +0300
 @@ -26,7 +26,7 @@
  
    s.add_dependency "ffi", "~> 1.9", ">= 1.9.25"
@@ -9,7 +9,7 @@
    s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
    s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2"
    s.add_dependency "highline", "~> 1.6", ">= 1.6.9"
-@@ -34,28 +34,15 @@
+@@ -33,27 +33,14 @@
    s.add_dependency "erubis", "~> 2.7"
    s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
  
@@ -18,7 +18,6 @@
 -  s.add_dependency "plist", "~> 3.2"
    s.add_dependency "iniparse", "~> 1.4"
    s.add_dependency "addressable"
-   s.add_dependency "iso8601", "~> 0.9.1"
  
 -  # Audit mode requires these, so they are non-developmental dependencies now
 -  %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5" }