From c02b8c963d16c3f56b571a273623feab629cf752 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 28 May 2016 10:45:46 +0200
Subject: the section requires a ? since EL6

---
 manifests/rule_section.pp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'manifests/rule_section.pp')

diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp
index 82984ca..d853f70 100644
--- a/manifests/rule_section.pp
+++ b/manifests/rule_section.pp
@@ -1,7 +1,13 @@
+# a rule section marker
 define shorewall::rule_section(
-    $order
+  $order
 ){
-    shorewall::entry{"rules-${order}-${name}":
-        line => "SECTION ${name}",
-    }       
+  if $::operatingsystem == 'CentOS' and versioncmp($::operatingsystemmajrelease,'6') > 0 {
+    $prefix = '?SECTION'
+  } else {
+    $prefix = 'SECTION'
+  }
+  shorewall::entry{"rules-${order}-${name}":
+    line => "${prefix} ${name}",
+  }
 }
-- 
cgit v1.2.3


From 10576074788edae1c77b0b9c51949bee5a25f1d6 Mon Sep 17 00:00:00 2001
From: Lebedev Vadim <abraham1901@gmail.com>
Date: Wed, 29 Jun 2016 18:52:16 +0300
Subject: * fix rule section

---
 manifests/rule_section.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'manifests/rule_section.pp')

diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp
index 82984ca..3f2ecc5 100644
--- a/manifests/rule_section.pp
+++ b/manifests/rule_section.pp
@@ -1,7 +1,11 @@
 define shorewall::rule_section(
     $order
 ){
+  $rule_section_prefix = $shorewall_major_version ? {
+    '5' => '?'
+  }
+
     shorewall::entry{"rules-${order}-${name}":
-        line => "SECTION ${name}",
+        line => "${rule_section_prefix}SECTION ${name}",
     }       
 }
-- 
cgit v1.2.3


From b8514959659822868ec1a6b3922854497256338a Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 13 Jan 2017 16:42:22 +0100
Subject: also support the older versions

---
 manifests/rule_section.pp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'manifests/rule_section.pp')

diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp
index 08e5708..9315046 100644
--- a/manifests/rule_section.pp
+++ b/manifests/rule_section.pp
@@ -1,9 +1,11 @@
 # a rule section marker
 define shorewall::rule_section(
-  $order
+  $order,
 ){
-  $rule_section_prefix = $shorewall_major_version ? {
-    '5' => '?'
+  if versioncmp($shorewall_major_version,'5') < 0 {
+    $rule_section_prefix = '?'
+  } else {
+    $rule_section_prefix = ''
   }
 
   shorewall::entry{"rules-${order}-${name}":
-- 
cgit v1.2.3


From 9e82e791f01a85c5ab25c5311ba962d2ca2c7b24 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 13 Jan 2017 16:54:23 +0100
Subject: correct decision

---
 manifests/rule_section.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/rule_section.pp')

diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp
index 9315046..0a8b4bb 100644
--- a/manifests/rule_section.pp
+++ b/manifests/rule_section.pp
@@ -2,7 +2,7 @@
 define shorewall::rule_section(
   $order,
 ){
-  if versioncmp($shorewall_major_version,'5') < 0 {
+  if versioncmp($shorewall_major_version,'4') > 0 {
     $rule_section_prefix = '?'
   } else {
     $rule_section_prefix = ''
-- 
cgit v1.2.3


From 28a72736071330261ba8fa9dd5ca4e1202c1247f Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 9 Apr 2017 18:57:53 +0200
Subject: make it possible to manage rules for ipv4 & ipv6 + add some more
 modern headers for certain versions

---
 manifests/rule_section.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'manifests/rule_section.pp')

diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp
index 0a8b4bb..24b3dfb 100644
--- a/manifests/rule_section.pp
+++ b/manifests/rule_section.pp
@@ -9,6 +9,8 @@ define shorewall::rule_section(
   }
 
   shorewall::entry{"rules-${order}-${name}":
-    line => "${rule_section_prefix}SECTION ${name}",
+    line       => "${rule_section_prefix}SECTION ${name}",
+    shorewall  => true,
+    shorewall6 => true,
   }
 }
-- 
cgit v1.2.3


From 37bb199434a193dbcd2ad8e42bc5cb024718b884 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Sat, 24 Mar 2018 16:39:33 +0100
Subject: This fixes the ?SECTION change.

The change requiring ? before SECTION happened in 4.6.0. Our check was only
looking at the major version to see if it was 4, and if so, it would not add the
?. This was too imprecise and would not add the ? in versions of shorewall 4.6
and greater. So this commit will change that check to be more specific.
---
 manifests/rule_section.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/rule_section.pp')

diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp
index 24b3dfb..620af89 100644
--- a/manifests/rule_section.pp
+++ b/manifests/rule_section.pp
@@ -2,7 +2,7 @@
 define shorewall::rule_section(
   $order,
 ){
-  if versioncmp($shorewall_major_version,'4') > 0 {
+  if versioncmp($shorewall_version,'4.6.0') > 0 {
     $rule_section_prefix = '?'
   } else {
     $rule_section_prefix = ''
-- 
cgit v1.2.3