Index: head/net/openvswitch/Makefile =================================================================== --- head/net/openvswitch/Makefile (revision 467221) +++ head/net/openvswitch/Makefile (revision 467222) @@ -1,35 +1,39 @@ # Created by: Edward Tomasz Napierala # $FreeBSD$ PORTNAME= openvswitch -PORTVERSION= 2.8.1 +PORTVERSION= 2.9.0 CATEGORIES= net MASTER_SITES= http://openvswitch.org/releases/ MAINTAINER= koue@chaosophia.net COMMENT= Production quality, multilayer virtual switch LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} - BROKEN_powerpc64= fails to compile: bfd.c: internal compiler error: in extract_insn, at recog.c -USES= cpe gmake libtool perl5 pkgconfig python:2.7 shebangfix ssl -SHEBANG_FILES= utilities/ovs-docker \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} + +USES= compiler:c++14-lang cpe gmake libtool perl5 pkgconfig python:2.7 shebangfix ssl +SHEBANG_FILES= ovn/utilities/ovndb-servers.ocf \ + utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \ + utilities/ovs-docker \ utilities/ovs-appctl-bashcomp.bash \ - ovn/utilities/ovndb-servers.ocf \ vtep/ovs-vtep.in + USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --localstatedir=/var \ --with-dbdir=/var/db/${PORTNAME} \ --with-openssl=${OPENSSLBASE} USE_RC_SUBR= ovs-vswitchd ovsdb-server LDFLAGS+= -lpthread INSTALL_TARGET=install-strip post-install: + @${MKDIR} ${STAGEDIR}/var/run/openvswitch + @${MKDIR} ${STAGEDIR}/var/log/openvswitch ${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${STAGEDIR}${PREFIX}/share/openvswitch/ .include Index: head/net/openvswitch/distinfo =================================================================== --- head/net/openvswitch/distinfo (revision 467221) +++ head/net/openvswitch/distinfo (revision 467222) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511968087 -SHA256 (openvswitch-2.8.1.tar.gz) = 8d1c439e26d7044f0ec823c7fef1b00b7c6465da0b83a7d0cf3191ed1dc43893 -SIZE (openvswitch-2.8.1.tar.gz) = 6746474 +TIMESTAMP = 1522945468 +SHA256 (openvswitch-2.9.0.tar.gz) = 3699ce579acd346e9aa2fba89514cdcc79b231f6227659eea6714917b398419d +SIZE (openvswitch-2.9.0.tar.gz) = 6933057 Index: head/net/openvswitch/files/patch-lib_dpif-netdev.c =================================================================== --- head/net/openvswitch/files/patch-lib_dpif-netdev.c (revision 467221) +++ head/net/openvswitch/files/patch-lib_dpif-netdev.c (nonexistent) @@ -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 - } - } - Property changes on: head/net/openvswitch/files/patch-lib_dpif-netdev.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/openvswitch/files/patch-lib_conntrack.c =================================================================== --- head/net/openvswitch/files/patch-lib_conntrack.c (revision 467221) +++ head/net/openvswitch/files/patch-lib_conntrack.c (nonexistent) @@ -1,14 +0,0 @@ ---- lib/conntrack.c.orig 2017-11-29 15:45:30 UTC -+++ lib/conntrack.c -@@ -17,10 +17,10 @@ - #include - #include - #include -+#include - #include - #include - #include --#include - - #include "bitmap.h" - #include "conntrack.h" Property changes on: head/net/openvswitch/files/patch-lib_conntrack.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/openvswitch/files/patch-ofproto_ofproto-dpif.c =================================================================== --- head/net/openvswitch/files/patch-ofproto_ofproto-dpif.c (revision 467221) +++ head/net/openvswitch/files/patch-ofproto_ofproto-dpif.c (nonexistent) @@ -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; Property changes on: head/net/openvswitch/files/patch-ofproto_ofproto-dpif.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/openvswitch/files/ovs-vswitchd.in =================================================================== --- head/net/openvswitch/files/ovs-vswitchd.in (revision 467221) +++ head/net/openvswitch/files/ovs-vswitchd.in (revision 467222) @@ -1,28 +1,32 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: ovs_vswitchd # REQUIRE: LOGIN ovsdb_server # KEYWORD: shutdown . /etc/rc.subr name="ovs_vswitchd" rcvar=ovs_vswitchd_enable command="/usr/local/sbin/ovs-vswitchd" 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" Index: head/net/openvswitch/files/patch-configure =================================================================== --- head/net/openvswitch/files/patch-configure (nonexistent) +++ head/net/openvswitch/files/patch-configure (revision 467222) @@ -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= Property changes on: head/net/openvswitch/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/openvswitch/pkg-plist =================================================================== --- head/net/openvswitch/pkg-plist (revision 467221) +++ head/net/openvswitch/pkg-plist (revision 467222) @@ -1,217 +1,214 @@ bin/ovn-controller bin/ovn-controller-vtep bin/ovn-detrace bin/ovn-docker-overlay-driver bin/ovn-docker-underlay-driver bin/ovn-nbctl bin/ovn-northd bin/ovn-sbctl bin/ovn-trace bin/ovs-appctl bin/ovs-docker bin/ovs-dpctl bin/ovs-dpctl-top bin/ovs-l3ping bin/ovs-ofctl bin/ovs-parse-backtrace bin/ovs-pcap bin/ovs-pki bin/ovs-tcpdump bin/ovs-tcpundump bin/ovs-testcontroller bin/ovs-test bin/ovs-vlan-test bin/ovs-vsctl bin/ovsdb-client bin/ovsdb-tool bin/vtep-ctl etc/bash_completion.d/ovs-appctl-bashcomp.bash etc/bash_completion.d/ovs-vsctl-bashcomp.bash include/openflow/intel-ext.h include/openflow/netronome-ext.h include/openflow/nicira-ext.h include/openflow/openflow-1.0.h include/openflow/openflow-1.1.h include/openflow/openflow-1.2.h include/openflow/openflow-1.3.h include/openflow/openflow-1.4.h include/openflow/openflow-1.5.h include/openflow/openflow-1.6.h include/openflow/openflow-common.h include/openflow/openflow.h include/openvswitch/compiler.h include/openvswitch/dynamic-string.h include/openvswitch/flow.h include/openvswitch/geneve.h include/openvswitch/hmap.h include/openvswitch/json.h include/openvswitch/list.h include/openvswitch/match.h include/openvswitch/meta-flow.h include/openvswitch/netdev.h include/openvswitch/nsh.h include/openvswitch/ofp-actions.h include/openvswitch/ofp-ed-props.h include/openvswitch/ofp-errors.h include/openvswitch/ofp-msgs.h include/openvswitch/ofp-parse.h include/openvswitch/ofp-print.h include/openvswitch/ofp-prop.h 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/openvswitch/tun-metadata.h include/openvswitch/type-props.h include/openvswitch/types.h include/openvswitch/util.h include/openvswitch/uuid.h include/openvswitch/vconn.h include/openvswitch/version.h include/openvswitch/vlog.h include/ovn/actions.h include/ovn/expr.h include/ovn/lex.h -lib/libofproto-2.8.so.0 -lib/libofproto-2.8.so.0.0.1 +lib/libofproto-2.9.so.0 +lib/libofproto-2.9.so.0.0.0 lib/libofproto.a lib/libofproto.so -lib/libopenvswitch-2.8.so.0 -lib/libopenvswitch-2.8.so.0.0.1 +lib/libopenvswitch-2.9.so.0 +lib/libopenvswitch-2.9.so.0.0.0 lib/libopenvswitch.a lib/libopenvswitch.so -lib/libovn-2.8.so.0 -lib/libovn-2.8.so.0.0.1 +lib/libovn-2.9.so.0 +lib/libovn-2.9.so.0.0.0 lib/libovn.a lib/libovn.so -lib/libovsdb-2.8.so.0 -lib/libovsdb-2.8.so.0.0.1 +lib/libovsdb-2.9.so.0 +lib/libovsdb-2.9.so.0.0.0 lib/libovsdb.a lib/libovsdb.so -lib/libsflow-2.8.so.0 -lib/libsflow-2.8.so.0.0.1 +lib/libsflow-2.9.so.0 +lib/libsflow-2.9.so.0.0.0 lib/libsflow.a lib/libsflow.so -lib/libvtep-2.8.so.0 -lib/libvtep-2.8.so.0.0.1 +lib/libvtep-2.9.so.0 +lib/libvtep-2.9.so.0.0.0 lib/libvtep.a lib/libvtep.so libdata/pkgconfig/libofproto.pc libdata/pkgconfig/libopenvswitch.pc libdata/pkgconfig/libovsdb.pc libdata/pkgconfig/libsflow.pc man/man1/ovn-detrace.1.gz man/man1/ovs-pcap.1.gz man/man1/ovs-tcpundump.1.gz man/man1/ovsdb-client.1.gz man/man1/ovsdb-server.1.gz man/man1/ovsdb-tool.1.gz man/man5/ovn-nb.5.gz man/man5/ovn-sb.5.gz man/man5/ovs-vswitchd.conf.db.5.gz man/man5/vtep.5.gz man/man7/ovn-architecture.7.gz man/man7/ovs-fields.7.gz man/man8/ovs-appctl.8.gz man/man8/ovs-bugtool.8.gz man/man8/ovn-controller-vtep.8.gz man/man8/ovn-controller.8.gz man/man8/ovn-ctl.8.gz man/man8/ovn-nbctl.8.gz man/man8/ovn-northd.8.gz man/man8/ovn-sbctl.8.gz man/man8/ovn-trace.8.gz man/man8/ovs-ctl.8.gz man/man8/ovs-dpctl-top.8.gz man/man8/ovs-dpctl.8.gz man/man8/ovs-l3ping.8.gz man/man8/ovs-ofctl.8.gz man/man8/ovs-parse-backtrace.8.gz man/man8/ovs-pki.8.gz man/man8/ovs-tcpdump.8.gz man/man8/ovs-testcontroller.8.gz man/man8/ovs-vlan-bug-workaround.8.gz man/man8/ovs-vsctl.8.gz man/man8/ovs-vswitchd.8.gz man/man8/vtep-ctl.8.gz sbin/ovs-bugtool sbin/ovs-vswitchd sbin/ovsdb-server %%DATADIR%%/bugtool-plugins/kernel-info/openvswitch.xml %%DATADIR%%/bugtool-plugins/network-status/openvswitch.xml %%DATADIR%%/bugtool-plugins/network-status/ovn.xml %%DATADIR%%/bugtool-plugins/system-configuration.xml %%DATADIR%%/bugtool-plugins/system-configuration/openvswitch.xml %%DATADIR%%/bugtool-plugins/system-logs/openvswitch.xml %%DATADIR%%/ovn-nb.ovsschema %%DATADIR%%/ovn-sb.ovsschema %%DATADIR%%/python/ovs/__init__.py %%DATADIR%%/python/ovs/daemon.py %%DATADIR%%/python/ovs/db/__init__.py %%DATADIR%%/python/ovs/db/data.py %%DATADIR%%/python/ovs/db/error.py %%DATADIR%%/python/ovs/db/idl.py %%DATADIR%%/python/ovs/db/parser.py %%DATADIR%%/python/ovs/db/schema.py %%DATADIR%%/python/ovs/db/types.py %%DATADIR%%/python/ovs/dirs.py %%DATADIR%%/python/ovs/fatal_signal.py %%DATADIR%%/python/ovs/fcntl_win.py %%DATADIR%%/python/ovs/json.py %%DATADIR%%/python/ovs/jsonrpc.py %%DATADIR%%/python/ovs/ovsuuid.py %%DATADIR%%/python/ovs/poller.py %%DATADIR%%/python/ovs/process.py %%DATADIR%%/python/ovs/reconnect.py %%DATADIR%%/python/ovs/socket_util.py %%DATADIR%%/python/ovs/stream.py %%DATADIR%%/python/ovs/timeval.py %%DATADIR%%/python/ovs/unixctl/__init__.py %%DATADIR%%/python/ovs/unixctl/client.py %%DATADIR%%/python/ovs/unixctl/server.py %%DATADIR%%/python/ovs/util.py %%DATADIR%%/python/ovs/version.py %%DATADIR%%/python/ovs/vlog.py %%DATADIR%%/python/ovs/winutils.py %%DATADIR%%/python/ovstest/__init__.py %%DATADIR%%/python/ovstest/args.py %%DATADIR%%/python/ovstest/rpcserver.py %%DATADIR%%/python/ovstest/tcp.py %%DATADIR%%/python/ovstest/tests.py %%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 %%DATADIR%%/scripts/ovs-save %%DATADIR%%/scripts/ovs-vtep %%DATADIR%%/vswitch.ovsschema %%DATADIR%%/vtep.ovsschema @dir /var/lib/openvswitch/pki @dir /var/lib/openvswitch @dir /var/lib +@dir /var/log/openvswitch +@dir /var/run/openvswitch @dir %%ETCDIR%%