net/openvswitch: update to 2.9.0

PR:		227458
Submitted by:	Nikola Kolev <koue@chaosophia.net> (maintainer)

5 files changed, 18 insertions, 61 deletions

diff --git a/net/openvswitch/files/ovs-vswitchd.in b/net/openvswitch/files/ovs-vswitchd.in
index 7da4705852d1..dd6e3dbf955e 100644
--- a/net/openvswitch/files/ovs-vswitchd.in
+++ b/net/openvswitch/files/ovs-vswitchd.in
@@ -18,11 +18,15 @@ start_precmd="ovs_vswitchd_precmd"
 load_rc_config $name
 
 : ${ovs_vswitchd_enable="NO"}
+: ${ovs_vswitchd_flags=""}
+: ${ovs_vswitchd_logfile="/var/log/openvswitch/${name}.log"}
+: ${ovs_vswitchd_pidfile="/var/run/openvswitch/${name}.pid"}
 
 ovs_vswitchd_precmd() {
 	load_kld if_tap || return 1
 }
 
-command_args="--detach --pidfile"
+command_args="--detach --log-file=${ovs_vswitchd_logfile} \
+			--pidfile=${ovs_vswitchd_pidfile} ${ovs_vswitchd_flags}"
 
 run_rc_command "$1"
diff --git a/net/openvswitch/files/patch-configure b/net/openvswitch/files/patch-configure
new file mode 100644
index 000000000000..645dd6df6dda
--- /dev/null
+++ b/net/openvswitch/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	2018-04-11 14:28:38 UTC
++++ configure
+@@ -18310,8 +18310,8 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ovs_cv_sphinx" >&5
+ $as_echo "$ovs_cv_sphinx" >&6; }
+     if test "$ovs_cv_sphinx" = yes; then
+-  HAVE_SPHINX_TRUE=
+-  HAVE_SPHINX_FALSE='#'
++  HAVE_SPHINX_TRUE='#'
++  HAVE_SPHINX_FALSE=
+ else
+   HAVE_SPHINX_TRUE='#'
+   HAVE_SPHINX_FALSE=
diff --git a/net/openvswitch/files/patch-lib_conntrack.c b/net/openvswitch/files/patch-lib_conntrack.c
deleted file mode 100644
index 3ee4befcfedb..000000000000
--- a/net/openvswitch/files/patch-lib_conntrack.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/conntrack.c.orig	2017-11-29 15:45:30 UTC
-+++ lib/conntrack.c
-@@ -17,10 +17,10 @@
- #include <config.h>
- #include <ctype.h>
- #include <errno.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <netinet/icmp6.h>
- #include <string.h>
--#include <sys/types.h>
- 
- #include "bitmap.h"
- #include "conntrack.h"
diff --git a/net/openvswitch/files/patch-lib_dpif-netdev.c b/net/openvswitch/files/patch-lib_dpif-netdev.c
deleted file mode 100644
index 13b7f881fd30..000000000000
--- a/net/openvswitch/files/patch-lib_dpif-netdev.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/dpif-netdev.c.orig	2017-11-29 15:46:19 UTC
-+++ lib/dpif-netdev.c
-@@ -78,6 +78,8 @@
- #include "unixctl.h"
- #include "util.h"
- 
-+#define	ERRNO_NO_LOCAL_MAPPING	-600
-+
- VLOG_DEFINE_THIS_MODULE(dpif_netdev);
- 
- #define FLOW_DUMP_MAX_BATCH 50
-@@ -4086,7 +4088,11 @@ dpif_netdev_meter_set(struct dpif *dpif,
-     /* Validate rates */
-     for (i = 0; i < config->n_bands; i++) {
-         if (config->bands[i].rate == 0) {
-+#ifdef EBADRQC
-             return EBADRQC; /* rate must be non-zero */
-+#else
-+            return ERRNO_NO_LOCAL_MAPPING;
-+#endif
-         }
-     }
- 
diff --git a/net/openvswitch/files/patch-ofproto_ofproto-dpif.c b/net/openvswitch/files/patch-ofproto_ofproto-dpif.c
deleted file mode 100644
index 16d42482c67a..000000000000
--- a/net/openvswitch/files/patch-ofproto_ofproto-dpif.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- ofproto/ofproto-dpif.c.orig	2017-11-29 15:48:58 UTC
-+++ ofproto/ofproto-dpif.c
-@@ -73,6 +73,8 @@
- #include "util.h"
- #include "vlan-bitmap.h"
- 
-+#define	ERRNO_NO_LOCAL_MAPPING	-600
-+
- VLOG_DEFINE_THIS_MODULE(ofproto_dpif);
- 
- COVERAGE_DEFINE(ofproto_dpif_expired);
-@@ -5695,7 +5697,11 @@ meter_set(struct ofproto *ofproto_, ofpr
-         return OFPERR_OFPMMFC_OUT_OF_BANDS;
-     case ENODEV: /* Unsupported band type */
-         return OFPERR_OFPMMFC_BAD_BAND;
-+#ifdef EBADRQC
-     case EBADRQC: /* Rate must be non-zero */
-+#else
-+    case ERRNO_NO_LOCAL_MAPPING:
-+#endif
-         return OFPERR_OFPMMFC_BAD_RATE;
-     default:
-         return OFPERR_OFPMMFC_UNKNOWN;