[DRE-commits] [chef] 03/07: Refresh patches

Antonio Terceiro terceiro at moszumanska.debian.org
Sun Jun 5 15:26:38 UTC 2016


This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository chef.

commit fdfe27b0555ead1656900b95ba3bbb74a341c690
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jun 5 10:15:58 2016 -0300

    Refresh patches
---
 debian/changelog                                   | 11 ++++++
 debian/patches/0001-Update-gemspec-file.patch      | 16 +++-----
 .../0002-remove-deprecated-Thread.exclusive.patch  | 23 -----------
 ...ainst-source-checkout-and-installed-pack.patch} | 44 ++++++++++++++++++----
 .../0003-spec-remove-absolute-require-path.patch   | 37 ------------------
 debian/patches/series                              |  4 +-
 6 files changed, 54 insertions(+), 81 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58e387c..6cd248f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+chef (12.10.24-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Refresh patches
+    - Drop 0002-remove-deprecated-Thread.exclusive.patch, applied upstream
+    - Turn 0002-spec-remove-absolute-require-path.patch and
+      0003-Make-specs-work-against-installed-package.patch into a single patch
+      (0002-spec-work-against-source-checkout-and-installed-pack.patch)
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sun, 05 Jun 2016 10:49:39 -0300
+
 chef (12.7.2-1) unstable; urgency=medium
 
   [ Lucas Kanashiro ]
diff --git a/debian/patches/0001-Update-gemspec-file.patch b/debian/patches/0001-Update-gemspec-file.patch
index 08df046..dc22e77 100644
--- a/debian/patches/0001-Update-gemspec-file.patch
+++ b/debian/patches/0001-Update-gemspec-file.patch
@@ -2,22 +2,16 @@ From: Lucas Kanashiro <kanashiro.duarte at gmail.com>
 Date: Sat, 4 Jun 2016 13:17:06 -0300
 Subject: Update gemspec file
 
-Remove rspec-junit-formatter dependency and flex plist version
-requirement
+- remove rspec-junit-formatter dependency
 ---
- chef.gemspec | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ chef.gemspec | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/chef.gemspec b/chef.gemspec
-index c55b242..42c018b 100644
+index 59367b0..6bd3d35 100644
 --- a/chef.gemspec
 +++ b/chef.gemspec
-@@ -32,11 +32,10 @@ Gem::Specification.new do |s|
- 
-   s.add_dependency "chef-zero", "~> 4.5"
- 
--  s.add_dependency "plist", "~> 3.1.0"
-+  s.add_dependency "plist", ">= 3.1.0"
+@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
  
    # 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.4" }
diff --git a/debian/patches/0002-remove-deprecated-Thread.exclusive.patch b/debian/patches/0002-remove-deprecated-Thread.exclusive.patch
deleted file mode 100644
index e507b2b..0000000
--- a/debian/patches/0002-remove-deprecated-Thread.exclusive.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Nathan Williams <nathan at teamtreehouse.com>
-Date: Thu, 10 Mar 2016 18:22:05 -0800
-Subject: remove deprecated Thread.exclusive
-
----
- lib/chef/dsl/declare_resource.rb | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/lib/chef/dsl/declare_resource.rb b/lib/chef/dsl/declare_resource.rb
-index 2e7dc93..7efc985 100644
---- a/lib/chef/dsl/declare_resource.rb
-+++ b/lib/chef/dsl/declare_resource.rb
-@@ -88,9 +88,7 @@ class Chef
-       #
-       def build_resource(type, name, created_at = nil, run_context: self.run_context, &resource_attrs_block)
-         created_at ||= caller[0]
--        Thread.exclusive do
--          require "chef/resource_builder" unless defined?(Chef::ResourceBuilder)
--        end
-+        require "chef/resource_builder" unless defined?(Chef::ResourceBuilder)
- 
-         Chef::ResourceBuilder.new(
-           type:                type,
diff --git a/debian/patches/0004-Make-specs-work-against-installed-package.patch b/debian/patches/0002-spec-work-against-source-checkout-and-installed-pack.patch
similarity index 64%
rename from debian/patches/0004-Make-specs-work-against-installed-package.patch
rename to debian/patches/0002-spec-work-against-source-checkout-and-installed-pack.patch
index 3165e7e..4e53e3c 100644
--- a/debian/patches/0004-Make-specs-work-against-installed-package.patch
+++ b/debian/patches/0002-spec-work-against-source-checkout-and-installed-pack.patch
@@ -1,15 +1,19 @@
 From: Antonio Terceiro <terceiro at debian.org>
-Date: Sat, 4 Jun 2016 23:42:22 -0300
-Subject: Make specs work against installed package
+Date: Sat, 4 Jun 2016 13:47:47 -0300
+Subject: spec: work against source checkout and installed package
 
+All of those are not really necessary; we should just trust the testing
+framework to setup the $LOAD_PATH.
 ---
- spec/spec_helper.rb                   | 13 +++----------
- spec/unit/file_access_control_spec.rb |  2 +-
- spec/unit/mixin/securable_spec.rb     |  4 ++--
- 3 files changed, 6 insertions(+), 13 deletions(-)
+ spec/spec_helper.rb                                  | 13 +++----------
+ spec/unit/chef_fs/config_spec.rb                     |  2 +-
+ spec/unit/chef_fs/data_handler/group_handler_spec.rb |  2 +-
+ spec/unit/file_access_control_spec.rb                |  2 +-
+ spec/unit/mixin/securable_spec.rb                    |  4 ++--
+ 5 files changed, 8 insertions(+), 15 deletions(-)
 
 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 47432f5..985ef99 100644
+index 2f6747c..5eb22c0 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -24,16 +24,9 @@ module Shell
@@ -43,6 +47,32 @@ index 47432f5..985ef99 100644
  
  require "chef/resource_resolver"
  require "chef/provider_resolver"
+diff --git a/spec/unit/chef_fs/config_spec.rb b/spec/unit/chef_fs/config_spec.rb
+index 5fc5ad5..57a25ec 100644
+--- a/spec/unit/chef_fs/config_spec.rb
++++ b/spec/unit/chef_fs/config_spec.rb
+@@ -18,7 +18,7 @@
+ 
+ require "spec_helper"
+ require "chef/exceptions"
+-require "lib/chef/chef_fs/config.rb"
++require "chef/chef_fs/config.rb"
+ 
+ describe Chef::ChefFS::Config do
+   describe "initialize" do
+diff --git a/spec/unit/chef_fs/data_handler/group_handler_spec.rb b/spec/unit/chef_fs/data_handler/group_handler_spec.rb
+index 849bc84..2fd4a02 100644
+--- a/spec/unit/chef_fs/data_handler/group_handler_spec.rb
++++ b/spec/unit/chef_fs/data_handler/group_handler_spec.rb
+@@ -17,7 +17,7 @@
+ #
+ 
+ require "spec_helper"
+-require "lib/chef/chef_fs/data_handler/group_data_handler"
++require "chef/chef_fs/data_handler/group_data_handler"
+ 
+ class TestEntry < Mash
+   attr_accessor :name, :org
 diff --git a/spec/unit/file_access_control_spec.rb b/spec/unit/file_access_control_spec.rb
 index 4357a91..1b4017d 100644
 --- a/spec/unit/file_access_control_spec.rb
diff --git a/debian/patches/0003-spec-remove-absolute-require-path.patch b/debian/patches/0003-spec-remove-absolute-require-path.patch
deleted file mode 100644
index 73f57b7..0000000
--- a/debian/patches/0003-spec-remove-absolute-require-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Sat, 4 Jun 2016 13:47:47 -0300
-Subject: spec: remove absolute require path
-
-This is not necessary; we should just trust the testing framework to
-setup the $LOAD_PATH
----
- spec/unit/chef_fs/config_spec.rb                     | 2 +-
- spec/unit/chef_fs/data_handler/group_handler_spec.rb | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/spec/unit/chef_fs/config_spec.rb b/spec/unit/chef_fs/config_spec.rb
-index 2f65b6d..4b5bbbf 100644
---- a/spec/unit/chef_fs/config_spec.rb
-+++ b/spec/unit/chef_fs/config_spec.rb
-@@ -18,7 +18,7 @@
- 
- require "spec_helper"
- require "chef/exceptions"
--require "lib/chef/chef_fs/config.rb"
-+require "chef/chef_fs/config.rb"
- 
- describe Chef::ChefFS::Config do
-   describe "initialize" do
-diff --git a/spec/unit/chef_fs/data_handler/group_handler_spec.rb b/spec/unit/chef_fs/data_handler/group_handler_spec.rb
-index 849bc84..2fd4a02 100644
---- a/spec/unit/chef_fs/data_handler/group_handler_spec.rb
-+++ b/spec/unit/chef_fs/data_handler/group_handler_spec.rb
-@@ -17,7 +17,7 @@
- #
- 
- require "spec_helper"
--require "lib/chef/chef_fs/data_handler/group_data_handler"
-+require "chef/chef_fs/data_handler/group_data_handler"
- 
- class TestEntry < Mash
-   attr_accessor :name, :org
diff --git a/debian/patches/series b/debian/patches/series
index 3fdbcb6..d75d2e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 0001-Update-gemspec-file.patch
-0002-remove-deprecated-Thread.exclusive.patch
-0003-spec-remove-absolute-require-path.patch
-0004-Make-specs-work-against-installed-package.patch
+0002-spec-work-against-source-checkout-and-installed-pack.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/chef.git



More information about the Pkg-ruby-extras-commits mailing list