From b35f20b40387e92f66bf20fe554408898329514e Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 11 Feb 2010 07:29:41 -0800
Subject: [PATCH] Avoid CAPVERSION bump to implement FLOW_FILTER detection

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Config.pm | 8 +++++++-
 Shorewall/lib.base                 | 2 +-
 Shorewall6/lib.base                | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index e80dc6929..2e2bbf278 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -338,7 +338,7 @@ sub initialize( $ ) {
 		    EXPORT => 0,
 		    UNTRACKED => 0,
 		    VERSION => "4.4.7",
-		    CAPVERSION => 40408 ,
+		    CAPVERSION => 40407 ,
 		  );
 
     #
@@ -655,6 +655,7 @@ sub initialize( $ ) {
 	       LOG_TARGET => 1,         # Assume that we have it.
 	       PERSISTENT_SNAT => undef,
 	       OLD_HL_MATCH => undef,
+	       FLOW_FILTER => 'default',
 	       CAPVERSION => undef,
 	       KERNELVERSION => undef,
 	       );
@@ -2600,6 +2601,11 @@ sub read_capabilities() {
     for ( keys %capabilities ) {
 	$capabilities{$_} = '' unless defined $capabilities{$_};
     }
+
+    if ( $capabilities{FLOW_FILTER} eq 'default' ) {
+	$capabilities{FLOW_FILTER} = $capabilities{OLD_HL_MATCH} ? '' : 'Yes';
+    }
+    
 }
 
 #
diff --git a/Shorewall/lib.base b/Shorewall/lib.base
index 3a2f0e6c4..9c97eb307 100644
--- a/Shorewall/lib.base
+++ b/Shorewall/lib.base
@@ -30,7 +30,7 @@
 #
 
 SHOREWALL_LIBVERSION=40407
-SHOREWALL_CAPVERSION=40408
+SHOREWALL_CAPVERSION=40407
 
 [ -n "${VARDIR:=/var/lib/shorewall}" ]
 [ -n "${SHAREDIR:=/usr/share/shorewall}" ]
diff --git a/Shorewall6/lib.base b/Shorewall6/lib.base
index 592755e68..57ca8d825 100644
--- a/Shorewall6/lib.base
+++ b/Shorewall6/lib.base
@@ -33,7 +33,7 @@
 #
 
 SHOREWALL_LIBVERSION=40407
-SHOREWALL_CAPVERSION=40408
+SHOREWALL_CAPVERSION=40407
 
 [ -n "${VARDIR:=/var/lib/shorewall6}" ]
 [ -n "${SHAREDIR:=/usr/share/shorewall6}" ]