Date: Mon, 11 Dec 2017 05:06:48 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455923 - in head/net/openvswitch: . files Message-ID: <201712110506.vBB56mNT034329@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon Dec 11 05:06:47 2017 New Revision: 455923 URL: https://svnweb.freebsd.org/changeset/ports/455923 Log: net/openvswitch: update to 2.8.1 While here, give maintainership to submitter PR: 223970 Submitted by: Nikola Kolev <koue@chaosophia.net> Added: head/net/openvswitch/files/patch-lib_conntrack.c (contents, props changed) head/net/openvswitch/files/patch-lib_dpif-netdev.c (contents, props changed) head/net/openvswitch/files/patch-ofproto_ofproto-dpif.c (contents, props changed) Modified: head/net/openvswitch/Makefile head/net/openvswitch/distinfo head/net/openvswitch/pkg-plist Modified: head/net/openvswitch/Makefile ============================================================================== --- head/net/openvswitch/Makefile Mon Dec 11 04:01:46 2017 (r455922) +++ head/net/openvswitch/Makefile Mon Dec 11 05:06:47 2017 (r455923) @@ -2,26 +2,32 @@ # $FreeBSD$ PORTNAME= openvswitch -PORTVERSION= 2.3.3 +PORTVERSION= 2.8.1 CATEGORIES= net MASTER_SITES= http://openvswitch.org/releases/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= koue@chaosophia.net COMMENT= Production quality, multilayer virtual switch LICENSE= APACHE20 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + BROKEN_powerpc64= fails to compile: bfd.c: internal compiler error: in extract_insn, at recog.c USES= cpe gmake libtool perl5 pkgconfig python shebangfix ssl -SHEBANG_FILES= vtep/ovs-vtep -USE_LDCONFIG= yes +SHEBANG_FILES= 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: ${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${STAGEDIR}${PREFIX}/share/openvswitch/ Modified: head/net/openvswitch/distinfo ============================================================================== --- head/net/openvswitch/distinfo Mon Dec 11 04:01:46 2017 (r455922) +++ head/net/openvswitch/distinfo Mon Dec 11 05:06:47 2017 (r455923) @@ -1,3 +1,3 @@ -TIMESTAMP = 1466737495 -SHA256 (openvswitch-2.3.3.tar.gz) = a61afc4feedeea66198da6ca3389e2c6cb7de1160d01be5cdd8b2a49b8cc8471 -SIZE (openvswitch-2.3.3.tar.gz) = 3291051 +TIMESTAMP = 1511968087 +SHA256 (openvswitch-2.8.1.tar.gz) = 8d1c439e26d7044f0ec823c7fef1b00b7c6465da0b83a7d0cf3191ed1dc43893 +SIZE (openvswitch-2.8.1.tar.gz) = 6746474 Added: head/net/openvswitch/files/patch-lib_conntrack.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/openvswitch/files/patch-lib_conntrack.c Mon Dec 11 05:06:47 2017 (r455923) @@ -0,0 +1,14 @@ +--- 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" Added: head/net/openvswitch/files/patch-lib_dpif-netdev.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/openvswitch/files/patch-lib_dpif-netdev.c Mon Dec 11 05:06:47 2017 (r455923) @@ -0,0 +1,23 @@ +--- 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 + } + } + Added: head/net/openvswitch/files/patch-ofproto_ofproto-dpif.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/openvswitch/files/patch-ofproto_ofproto-dpif.c Mon Dec 11 05:06:47 2017 (r455923) @@ -0,0 +1,23 @@ +--- 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; Modified: head/net/openvswitch/pkg-plist ============================================================================== --- head/net/openvswitch/pkg-plist Mon Dec 11 04:01:46 2017 (r455922) +++ head/net/openvswitch/pkg-plist Mon Dec 11 05:06:47 2017 (r455923) @@ -1,5 +1,14 @@ +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-benchmark +bin/ovs-docker bin/ovs-dpctl bin/ovs-dpctl-top bin/ovs-l3ping @@ -7,35 +16,113 @@ 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 -lib/libofproto-2.3.3.so +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/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.a lib/libofproto.so -lib/libopenvswitch-2.3.3.so +lib/libopenvswitch-2.8.so.0 +lib/libopenvswitch-2.8.so.0.0.1 lib/libopenvswitch.a lib/libopenvswitch.so -lib/libovsdb-2.3.3.so +lib/libovn-2.8.so.0 +lib/libovn-2.8.so.0.0.1 +lib/libovn.a +lib/libovn.so +lib/libovsdb-2.8.so.0 +lib/libovsdb-2.8.so.0.0.1 lib/libovsdb.a lib/libovsdb.so -lib/libsflow-2.3.3.so +lib/libsflow-2.8.so.0 +lib/libsflow-2.8.so.0.0.1 lib/libsflow.a lib/libsflow.so -man/man1/ovs-benchmark.1.gz +lib/libvtep-2.8.so.0 +lib/libvtep-2.8.so.0.0.1 +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 @@ -43,9 +130,9 @@ 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-test.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-vlan-test.8.gz man/man8/ovs-vsctl.8.gz man/man8/ovs-vswitchd.8.gz man/man8/vtep-ctl.8.gz @@ -54,9 +141,12 @@ 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 @@ -68,6 +158,7 @@ sbin/ovsdb-server %%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 @@ -83,6 +174,7 @@ sbin/ovsdb-server %%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 @@ -91,11 +183,18 @@ sbin/ovsdb-server %%DATADIR%%/python/ovstest/udp.py %%DATADIR%%/python/ovstest/util.py %%DATADIR%%/python/ovstest/vswitch.py +%%DATADIR%%/scripts/ovn-bugtool-nbctl-show +%%DATADIR%%/scripts/ovn-bugtool-sbctl-lflow-list +%%DATADIR%%/scripts/ovn-bugtool-sbctl-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 @@ -112,9 +211,7 @@ sbin/ovsdb-server %%DATADIR%%/scripts/ovs-vtep %%DATADIR%%/vswitch.ovsschema %%DATADIR%%/vtep.ovsschema -@dir /var/db/openvswitch @dir /var/lib/openvswitch/pki @dir /var/lib/openvswitch @dir /var/lib -@dir /var/log/openvswitch -@dir /var/run/openvswitch +@dir %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712110506.vBB56mNT034329>