Attachment #192447 for bug #227458

View | Details | Raw Unified | Return to bug 227458
Collapse All | Expand All

Lines 1-8 Link Here

(-)openvswitch/Makefile (-5 / +9 lines)
1	# Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>	1	# Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
2	# $FreeBSD: head/net/openvswitch/Makefile 461846 2018-02-14 23:17:48Z antoine $	2	# $FreeBSD$
3		3
4	PORTNAME= openvswitch	4	PORTNAME= openvswitch
5	PORTVERSION= 2.8.1	5	PORTVERSION= 2.9.0
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://openvswitch.org/releases/	7	MASTER_SITES= http://openvswitch.org/releases/
8		8
Lines 15-25 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}si Link Here
15		15
16	BROKEN_powerpc64= fails to compile: bfd.c: internal compiler error: in extract_insn, at recog.c	16	BROKEN_powerpc64= fails to compile: bfd.c: internal compiler error: in extract_insn, at recog.c
17		17
18	USES= cpe gmake libtool perl5 pkgconfig python:2.7 shebangfix ssl	18	USES= compiler:c++14-lang cpe gmake libtool perl5 pkgconfig python:2.7 shebangfix ssl
19	SHEBANG_FILES= utilities/ovs-docker \	19	SHEBANG_FILES= ovn/utilities/ovndb-servers.ocf \
		20	utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \
		21	utilities/ovs-docker \
20	utilities/ovs-appctl-bashcomp.bash \	22	utilities/ovs-appctl-bashcomp.bash \
21	ovn/utilities/ovndb-servers.ocf \
22	vtep/ovs-vtep.in	23	vtep/ovs-vtep.in
		24
23	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
24	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
25	CONFIGURE_ARGS= --enable-shared --localstatedir=/var \	27	CONFIGURE_ARGS= --enable-shared --localstatedir=/var \
Lines 30-35 LDFLAGS+= -lpthread Link Here
30	INSTALL_TARGET=install-strip	32	INSTALL_TARGET=install-strip
31		33
32	post-install:	34	post-install:
		35	@${MKDIR} ${STAGEDIR}/var/run/openvswitch
		36	@${MKDIR} ${STAGEDIR}/var/log/openvswitch
33	${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${STAGEDIR}${PREFIX}/share/openvswitch/	37	${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${STAGEDIR}${PREFIX}/share/openvswitch/
34		38
35	.include <bsd.port.mk>	39	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)openvswitch/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1511968087	1	TIMESTAMP = 1522945468
2	SHA256 (openvswitch-2.8.1.tar.gz) = 8d1c439e26d7044f0ec823c7fef1b00b7c6465da0b83a7d0cf3191ed1dc43893	2	SHA256 (openvswitch-2.9.0.tar.gz) = 3699ce579acd346e9aa2fba89514cdcc79b231f6227659eea6714917b398419d
3	SIZE (openvswitch-2.8.1.tar.gz) = 6746474	3	SIZE (openvswitch-2.9.0.tar.gz) = 6933057

Lines 1-6 Link Here

(-)openvswitch/files/ovs-vswitchd.in (-2 / +6 lines)
1	#!/bin/sh	1	#!/bin/sh
2	#	2	#
3	# $FreeBSD: head/net/openvswitch/files/ovs-vswitchd.in 417410 2016-06-24 03:31:33Z kevlo $	3	# $FreeBSD$
4	#	4	#
5		5
6	# PROVIDE: ovs_vswitchd	6	# PROVIDE: ovs_vswitchd
Lines 18-28 start_precmd="ovs_vswitchd_precmd" Link Here
18	load_rc_config $name	18	load_rc_config $name
19		19
20	: ${ovs_vswitchd_enable="NO"}	20	: ${ovs_vswitchd_enable="NO"}
		21	: ${ovs_vswitchd_flags=""}
		22	: ${ovs_vswitchd_logfile="/var/log/openvswitch/${name}.log"}
		23	: ${ovs_vswitchd_pidfile="/var/run/openvswitch/${name}.pid"}
21		24
22	ovs_vswitchd_precmd() {	25	ovs_vswitchd_precmd() {
23	load_kld if_tap \|\| return 1	26	load_kld if_tap \|\| return 1
24	}	27	}
25		28
26	command_args="--detach --pidfile"	29	command_args="--detach --log-file=${ovs_vswitchd_logfile} \
		30	--pidfile=${ovs_vswitchd_pidfile} ${ovs_vswitchd_flags}"
27		31
28	run_rc_command "$1"	32	run_rc_command "$1"




--- 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=




--- 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"




--- 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
         }
     }
 




--- 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;




include/openvswitch/ofp-util.h
include/openvswitch/ofpbuf.h
include/openvswitch/packets.h
include/openvswitch/poll-loop.h
include/openvswitch/rconn.h
include/openvswitch/shash.h
include/openvswitch/thread.h
include/openvswitch/token-bucket.h

include/ovn/actions.h
include/ovn/expr.h
include/ovn/lex.h
lib/libofproto-2.9.so.0
lib/libofproto-2.9.so.0.0.0
lib/libofproto.a
lib/libofproto.so
lib/libopenvswitch-2.9.so.0
lib/libopenvswitch-2.9.so.0.0.0
lib/libopenvswitch.a
lib/libopenvswitch.so
lib/libovn-2.9.so.0
lib/libovn-2.9.so.0.0.0
lib/libovn.a
lib/libovn.so
lib/libovsdb-2.9.so.0
lib/libovsdb-2.9.so.0.0.0
lib/libovsdb.a
lib/libovsdb.so
lib/libsflow-2.9.so.0
lib/libsflow-2.9.so.0.0.0
lib/libsflow.a
lib/libsflow.so
lib/libvtep-2.9.so.0
lib/libvtep-2.9.so.0.0.0
lib/libvtep.a
lib/libvtep.so
libdata/pkgconfig/libofproto.pc

%%DATADIR%%/python/ovstest/udp.py
%%DATADIR%%/python/ovstest/util.py
%%DATADIR%%/python/ovstest/vswitch.py
%%DATADIR%%/scripts/ovs-bugtool-daemons-ver
%%DATADIR%%/scripts/ovs-bugtool-fdb-show
%%DATADIR%%/scripts/ovs-bugtool-get-dpdk-nic-numa
%%DATADIR%%/scripts/ovs-bugtool-qos-configs
%%DATADIR%%/scripts/ovn-bugtool-nbctl-show
%%DATADIR%%/scripts/ovs-bugtool-ovs-appctl-dpif
%%DATADIR%%/scripts/ovs-bugtool-ovs-bridge-datapath-type
%%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-loop-over-bridges
%%DATADIR%%/scripts/ovs-bugtool-ovs-vswitchd-threads-affinity
%%DATADIR%%/scripts/ovn-bugtool-sbctl-lflow-list
%%DATADIR%%/scripts/ovn-bugtool-sbctl-show
%%DATADIR%%/scripts/ovs-bugtool-tc-class-show
%%DATADIR%%/scripts/ovn-ctl
%%DATADIR%%/scripts/ovndb-servers.ocf
%%DATADIR%%/scripts/ovs-bugtool-bfd-show
%%DATADIR%%/scripts/ovs-bugtool-bond-show
%%DATADIR%%/scripts/ovs-bugtool-cfm-show
%%DATADIR%%/scripts/ovs-bugtool-conntrack-dump
%%DATADIR%%/scripts/ovs-bugtool-coverage-show
%%DATADIR%%/scripts/ovs-bugtool-daemons-ver
%%DATADIR%%/scripts/ovs-bugtool-fdb-show
%%DATADIR%%/scripts/ovs-bugtool-lacp-show
%%DATADIR%%/scripts/ovs-bugtool-list-dbs
%%DATADIR%%/scripts/ovs-bugtool-memory-show
%%DATADIR%%/scripts/ovs-bugtool-ovs-appctl-dpif
%%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-dump-flows
%%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-show
%%DATADIR%%/scripts/ovs-bugtool-ovsdb-dump
%%DATADIR%%/scripts/ovs-bugtool-tc-class-show
%%DATADIR%%/scripts/ovs-bugtool-vsctl-show
%%DATADIR%%/scripts/ovs-check-dead-ifs
%%DATADIR%%/scripts/ovs-ctl
%%DATADIR%%/scripts/ovs-lib

@dir /var/lib/openvswitch/pki
@dir /var/lib/openvswitch
@dir /var/lib
@dir /var/log/openvswitch
@dir /var/run/openvswitch
@dir %%ETCDIR%%

Return to bug 227458

Line 0 Link Here

(-)openvswitch/files/patch-configure (+13 lines)
	1	--- configure.orig 2018-04-11 14:28:38 UTC
	2	+++ configure
	3	@@ -18310,8 +18310,8 @@ fi
	4	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ovs_cv_sphinx" >&5
	5	$as_echo "$ovs_cv_sphinx" >&6; }
	6	if test "$ovs_cv_sphinx" = yes; then
	7	- HAVE_SPHINX_TRUE=
	8	- HAVE_SPHINX_FALSE='#'
	9	+ HAVE_SPHINX_TRUE='#'
	10	+ HAVE_SPHINX_FALSE=
	11	else
	12	HAVE_SPHINX_TRUE='#'
	13	HAVE_SPHINX_FALSE=

Lines 1-14 Link Here

(-)openvswitch/files/patch-lib_conntrack.c (-14 lines)
1	--- lib/conntrack.c.orig 2017-11-29 15:45:30 UTC
2	+++ lib/conntrack.c
3	@@ -17,10 +17,10 @@
4	#include <config.h>
5	#include <ctype.h>
6	#include <errno.h>
7	+#include <sys/types.h>
8	#include <netinet/in.h>
9	#include <netinet/icmp6.h>
10	#include <string.h>
11	-#include <sys/types.h>
12
13	#include "bitmap.h"
14	#include "conntrack.h"

Lines 1-23 Link Here

(-)openvswitch/files/patch-lib_dpif-netdev.c (-23 lines)
1	--- lib/dpif-netdev.c.orig 2017-11-29 15:46:19 UTC
2	+++ lib/dpif-netdev.c
3	@@ -78,6 +78,8 @@
4	#include "unixctl.h"
5	#include "util.h"
6
7	+#define ERRNO_NO_LOCAL_MAPPING -600
8	+
9	VLOG_DEFINE_THIS_MODULE(dpif_netdev);
10
11	#define FLOW_DUMP_MAX_BATCH 50
12	@@ -4086,7 +4088,11 @@ dpif_netdev_meter_set(struct dpif *dpif,
13	/* Validate rates */
14	for (i = 0; i < config->n_bands; i++) {
15	if (config->bands[i].rate == 0) {
16	+#ifdef EBADRQC
17	return EBADRQC; /* rate must be non-zero */
18	+#else
19	+ return ERRNO_NO_LOCAL_MAPPING;
20	+#endif
21	}
22	}
23

Lines 1-23 Link Here

(-)openvswitch/files/patch-ofproto_ofproto-dpif.c (-23 lines)
1	--- ofproto/ofproto-dpif.c.orig 2017-11-29 15:48:58 UTC
2	+++ ofproto/ofproto-dpif.c
3	@@ -73,6 +73,8 @@
4	#include "util.h"
5	#include "vlan-bitmap.h"
6
7	+#define ERRNO_NO_LOCAL_MAPPING -600
8	+
9	VLOG_DEFINE_THIS_MODULE(ofproto_dpif);
10
11	COVERAGE_DEFINE(ofproto_dpif_expired);
12	@@ -5695,7 +5697,11 @@ meter_set(struct ofproto *ofproto_, ofpr
13	return OFPERR_OFPMMFC_OUT_OF_BANDS;
14	case ENODEV: /* Unsupported band type */
15	return OFPERR_OFPMMFC_BAD_BAND;
16	+#ifdef EBADRQC
17	case EBADRQC: /* Rate must be non-zero */
18	+#else
19	+ case ERRNO_NO_LOCAL_MAPPING:
20	+#endif
21	return OFPERR_OFPMMFC_BAD_RATE;
22	default:
23	return OFPERR_OFPMMFC_UNKNOWN;

Lines 60-65 include/openvswitch/ofp-prop.h Link Here

(-)openvswitch/pkg-plist (-28 / +25 lines)
60	include/openvswitch/ofp-util.h	60	include/openvswitch/ofp-util.h
61	include/openvswitch/ofpbuf.h	61	include/openvswitch/ofpbuf.h
62	include/openvswitch/packets.h	62	include/openvswitch/packets.h
		63	include/openvswitch/poll-loop.h
		64	include/openvswitch/rconn.h
63	include/openvswitch/shash.h	65	include/openvswitch/shash.h
64	include/openvswitch/thread.h	66	include/openvswitch/thread.h
65	include/openvswitch/token-bucket.h	67	include/openvswitch/token-bucket.h
Lines 74-101 include/openvswitch/vlog.h Link Here
74	include/ovn/actions.h	76	include/ovn/actions.h
75	include/ovn/expr.h	77	include/ovn/expr.h
76	include/ovn/lex.h	78	include/ovn/lex.h
77	lib/libofproto-2.8.so.0	79	lib/libofproto-2.9.so.0
78	lib/libofproto-2.8.so.0.0.1	80	lib/libofproto-2.9.so.0.0.0
79	lib/libofproto.a	81	lib/libofproto.a
80	lib/libofproto.so	82	lib/libofproto.so
81	lib/libopenvswitch-2.8.so.0	83	lib/libopenvswitch-2.9.so.0
82	lib/libopenvswitch-2.8.so.0.0.1	84	lib/libopenvswitch-2.9.so.0.0.0
83	lib/libopenvswitch.a	85	lib/libopenvswitch.a
84	lib/libopenvswitch.so	86	lib/libopenvswitch.so
85	lib/libovn-2.8.so.0	87	lib/libovn-2.9.so.0
86	lib/libovn-2.8.so.0.0.1	88	lib/libovn-2.9.so.0.0.0
87	lib/libovn.a	89	lib/libovn.a
88	lib/libovn.so	90	lib/libovn.so
89	lib/libovsdb-2.8.so.0	91	lib/libovsdb-2.9.so.0
90	lib/libovsdb-2.8.so.0.0.1	92	lib/libovsdb-2.9.so.0.0.0
91	lib/libovsdb.a	93	lib/libovsdb.a
92	lib/libovsdb.so	94	lib/libovsdb.so
93	lib/libsflow-2.8.so.0	95	lib/libsflow-2.9.so.0
94	lib/libsflow-2.8.so.0.0.1	96	lib/libsflow-2.9.so.0.0.0
95	lib/libsflow.a	97	lib/libsflow.a
96	lib/libsflow.so	98	lib/libsflow.so
97	lib/libvtep-2.8.so.0	99	lib/libvtep-2.9.so.0
98	lib/libvtep-2.8.so.0.0.1	100	lib/libvtep-2.9.so.0.0.0
99	lib/libvtep.a	101	lib/libvtep.a
100	lib/libvtep.so	102	lib/libvtep.so
101	libdata/pkgconfig/libofproto.pc	103	libdata/pkgconfig/libofproto.pc
Lines 183-209 sbin/ovsdb-server Link Here
183	%%DATADIR%%/python/ovstest/udp.py	185	%%DATADIR%%/python/ovstest/udp.py
184	%%DATADIR%%/python/ovstest/util.py	186	%%DATADIR%%/python/ovstest/util.py
185	%%DATADIR%%/python/ovstest/vswitch.py	187	%%DATADIR%%/python/ovstest/vswitch.py
		188	%%DATADIR%%/scripts/ovs-bugtool-daemons-ver
		189	%%DATADIR%%/scripts/ovs-bugtool-fdb-show
		190	%%DATADIR%%/scripts/ovs-bugtool-get-dpdk-nic-numa
		191	%%DATADIR%%/scripts/ovs-bugtool-qos-configs
186	%%DATADIR%%/scripts/ovn-bugtool-nbctl-show	192	%%DATADIR%%/scripts/ovn-bugtool-nbctl-show
		193	%%DATADIR%%/scripts/ovs-bugtool-ovs-appctl-dpif
		194	%%DATADIR%%/scripts/ovs-bugtool-ovs-bridge-datapath-type
		195	%%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-loop-over-bridges
		196	%%DATADIR%%/scripts/ovs-bugtool-ovs-vswitchd-threads-affinity
187	%%DATADIR%%/scripts/ovn-bugtool-sbctl-lflow-list	197	%%DATADIR%%/scripts/ovn-bugtool-sbctl-lflow-list
188	%%DATADIR%%/scripts/ovn-bugtool-sbctl-show	198	%%DATADIR%%/scripts/ovn-bugtool-sbctl-show
		199	%%DATADIR%%/scripts/ovs-bugtool-tc-class-show
189	%%DATADIR%%/scripts/ovn-ctl	200	%%DATADIR%%/scripts/ovn-ctl
190	%%DATADIR%%/scripts/ovndb-servers.ocf	201	%%DATADIR%%/scripts/ovndb-servers.ocf
191	%%DATADIR%%/scripts/ovs-bugtool-bfd-show
192	%%DATADIR%%/scripts/ovs-bugtool-bond-show
193	%%DATADIR%%/scripts/ovs-bugtool-cfm-show
194	%%DATADIR%%/scripts/ovs-bugtool-conntrack-dump
195	%%DATADIR%%/scripts/ovs-bugtool-coverage-show
196	%%DATADIR%%/scripts/ovs-bugtool-daemons-ver
197	%%DATADIR%%/scripts/ovs-bugtool-fdb-show
198	%%DATADIR%%/scripts/ovs-bugtool-lacp-show
199	%%DATADIR%%/scripts/ovs-bugtool-list-dbs
200	%%DATADIR%%/scripts/ovs-bugtool-memory-show
201	%%DATADIR%%/scripts/ovs-bugtool-ovs-appctl-dpif
202	%%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-dump-flows
203	%%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-show
204	%%DATADIR%%/scripts/ovs-bugtool-ovsdb-dump
205	%%DATADIR%%/scripts/ovs-bugtool-tc-class-show
206	%%DATADIR%%/scripts/ovs-bugtool-vsctl-show
207	%%DATADIR%%/scripts/ovs-check-dead-ifs	202	%%DATADIR%%/scripts/ovs-check-dead-ifs
208	%%DATADIR%%/scripts/ovs-ctl	203	%%DATADIR%%/scripts/ovs-ctl
209	%%DATADIR%%/scripts/ovs-lib	204	%%DATADIR%%/scripts/ovs-lib
Lines 214-217 sbin/ovsdb-server Link Here
214	@dir /var/lib/openvswitch/pki	209	@dir /var/lib/openvswitch/pki
215	@dir /var/lib/openvswitch	210	@dir /var/lib/openvswitch
216	@dir /var/lib	211	@dir /var/lib
		212	@dir /var/log/openvswitch
		213	@dir /var/run/openvswitch
217	@dir %%ETCDIR%%	214	@dir %%ETCDIR%%