From b6698ab18b4522a621d534a6e214219247ce3afc Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 13 Jan 2017 16:42:22 +0100
Subject: cherry pick fixes for 5.x

Conflicts:
	manifests/rule_section.pp
---
 manifests/rule_section.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp
index 3f2ecc5..35e46b2 100644
--- a/manifests/rule_section.pp
+++ b/manifests/rule_section.pp
@@ -1,8 +1,10 @@
 define shorewall::rule_section(
     $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