[openvswitch/f17] Don't add iptables accept rule for -p GRE as GRE tunneling is unsupported

[Thomas Graf]

commit 5c33f70643d6c3663a24fcf0a43fe48401b5ff6d
Author: Thomas Graf <tgraf at suug.ch>
Date:   Thu Oct 25 14:55:39 2012 +0200

    Don't add iptables accept rule for -p GRE as GRE tunneling is unsupported

 openvswitch.init |    3 ++-
 openvswitch.spec |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/openvswitch.init b/openvswitch.init
index 9f1506c..cf32c79 100644
--- a/openvswitch.init
+++ b/openvswitch.init
@@ -50,7 +50,8 @@ start () {
     fi
     "$@"
 
-    $ovs_ctl --protocol=gre enable-protocol
+# Fedora kernel does not support OVS GRE tunneling yet
+#   $ovs_ctl --protocol=gre enable-protocol
 
     touch /var/lock/subsys/openvswitch
 }
diff --git a/openvswitch.spec b/openvswitch.spec
index 61c2346..ef4839b 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -1,6 +1,6 @@
 Name:           openvswitch
 Version:        1.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Open vSwitch daemon/database/utilities
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
@@ -218,6 +218,9 @@ fi
 
 
 %changelog
+* Tue Oct 25 2012 Thomas Graf <tgraf at redhat.com> - 1.4.2-4
+- Don't add iptables accept rule for -p GRE as GRE tunneling is unsupported
+
 * Wed Oct 10 2012 Thomas Graf <tgraf at redhat.com> - 1.4.2-3
 - make ovs-vsctl timeout if daemon is not running (#858722)