Update firewall cookbook

Berksfile

@@ -28,7 +28,7 @@ cookbook 'poise-service',          '~> 1.5.2'
 cookbook 'users',                  '~> 5.3.1'
 cookbook 'sudo',                   '~> 5.3.3'
 cookbook 'hostname',               '= 0.4.2'
-cookbook 'firewall',               '= 2.6.2'
+cookbook 'firewall',               '~> 2.6.3'
 cookbook 'chef_nginx',             '= 6.1.1'
 cookbook 'build-essential',        '= 8.0.3'
 cookbook 'mysql',                  '= 6.1.3'

Berksfile.lock

@@ -13,7 +13,7 @@ DEPENDENCIES
   compat_resource (= 12.19.0)
   database (= 6.1.1)
   dmg (= 4.0.0)
-  firewall (= 2.6.2)
+  firewall (~> 2.6.3)
   git (= 6.0.0)
   homebrew (= 3.0.0)
   hostname (= 0.4.2)
@@ -99,7 +99,7 @@ GRAPH
   database (6.1.1)
     postgresql (>= 1.0.0)
   dmg (4.0.0)
-  firewall (2.6.2)
+  firewall (2.6.3)
     chef-sugar (>= 0.0.0)
   git (6.0.0)
     build-essential (>= 0.0.0)

cookbooks/firewall/CHANGELOG.md

@@ -2,6 +2,10 @@ firewall Cookbook CHANGELOG
 =======================
 This file is used to list changes made in each version of the firewall cookbook.
 
+v2.6.3 (2018-02-01)
+-------------------
+* Fix issue with deep merging of hashes and arrays in recent chef release (#185)
+
 v2.6.2 (2017-06-01)
 -------------------
 * Incorrect file checking on Ubuntu, double file write (#173)

cookbooks/firewall/libraries/helpers_iptables.rb

@@ -94,7 +94,7 @@ module FirewallCookbook
       end
 
       def default_ruleset(current_node)
-        current_node['firewall']['iptables']['defaults'][:ruleset]
+        current_node['firewall']['iptables']['defaults'][:ruleset].to_h
       end
 
       def ensure_default_rules_exist(current_node, new_resource)
@@ -104,7 +104,7 @@ module FirewallCookbook
         # hash regardless of ipv6 status
         %w(iptables ip6tables).each do |name|
           input[name] = {} unless input[name]
-          input[name].merge!(default_ruleset(current_node))
+          input[name].merge!(default_ruleset(current_node).to_h)
         end
       end
     end