From e28d87e2a31b61fac5ff390e9cf6ce7e3ee2cb75 Mon Sep 17 00:00:00 2001 From: Kurt Jaeger Date: Tue, 18 Aug 2020 18:15:20 +0000 Subject: [PATCH] net/openvswitch: update 2.12.0 -> 2.14.0 - New OpenFlow feature support - OVS validated with DPDK 19.11.2, due to the inclusion of fixes for CVE-2020-10722, CVE-2020-10723, CVE-2020-10724, CVE-2020-10725 and CVE-2020-10726, this DPDK version is strongly recommended to be used Relnotes: https://mail.openvswitch.org/pipermail/ovs-announce/2020-August/000264.html https://www.openvswitch.org/releases/NEWS-2.14.0 --- net/openvswitch/Makefile | 12 ++++---- net/openvswitch/distinfo | 6 ++-- net/openvswitch/files/patch-configure | 13 -------- net/openvswitch/pkg-plist | 44 +-------------------------- 4 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 net/openvswitch/files/patch-configure diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index b99817e3d7be..992e253bf3dd 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openvswitch -DISTVERSION= 2.12.0 +DISTVERSION= 2.14.0 CATEGORIES= net MASTER_SITES= http://openvswitch.org/releases/ @@ -15,10 +15,10 @@ BROKEN_mips64= fails to compile: ofp-actions.h:486: flexible array member in ot BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} -USES= compiler:c11 cpe gmake libtool perl5 pkgconfig python:2.7 \ +USES= compiler:c11 cpe gmake libtool perl5 pkgconfig python \ shebangfix ssl -SHEBANG_FILES= ovn/utilities/ovndb-servers.ocf \ - utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \ +SHEBANG_FILES= utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \ + utilities/bugtool/ovs-bugtool-get-port-stats \ utilities/ovs-docker \ utilities/ovs-appctl-bashcomp.bash \ vtep/ovs-vtep.in @@ -36,8 +36,8 @@ SHLIB_VER= ${DISTVERSION:C/\.[0-9]*$//} PLIST_SUB= SHLIB_VER=${SHLIB_VER} post-install: - @${MKDIR} ${STAGEDIR}/var/run/openvswitch - @${MKDIR} ${STAGEDIR}/var/log/openvswitch + ${MKDIR} ${STAGEDIR}/var/run/openvswitch + ${MKDIR} ${STAGEDIR}/var/log/openvswitch ${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${STAGEDIR}${PREFIX}/share/openvswitch/ .include diff --git a/net/openvswitch/distinfo b/net/openvswitch/distinfo index cbb3b77b04f1..235ab2fcab51 100644 --- a/net/openvswitch/distinfo +++ b/net/openvswitch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1570040636 -SHA256 (openvswitch-2.12.0.tar.gz) = 13fd42703180b4b1146c7e97926d09225485868cc2fbbd58dc0c421b4b8fe8f8 -SIZE (openvswitch-2.12.0.tar.gz) = 8162771 +TIMESTAMP = 1597737237 +SHA256 (openvswitch-2.14.0.tar.gz) = 4171e52a8c0ffe160c1daa6687219d902a2a6969b296d223d8dac980ab99a260 +SIZE (openvswitch-2.14.0.tar.gz) = 7359886 diff --git a/net/openvswitch/files/patch-configure b/net/openvswitch/files/patch-configure deleted file mode 100644 index 645dd6df6dda..000000000000 --- a/net/openvswitch/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/pkg-plist b/net/openvswitch/pkg-plist index 41ef34b3c603..608e3b8b29c9 100644 --- a/net/openvswitch/pkg-plist +++ b/net/openvswitch/pkg-plist @@ -1,12 +1,3 @@ -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 @@ -87,19 +78,12 @@ 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 -include/ovn/logical-fields.h lib/libofproto-%%SHLIB_VER%%.so.0 lib/libofproto-%%SHLIB_VER%%.so.0.0.0 lib/libofproto.so lib/libopenvswitch-%%SHLIB_VER%%.so.0 lib/libopenvswitch-%%SHLIB_VER%%.so.0.0.0 lib/libopenvswitch.so -lib/libovn-%%SHLIB_VER%%.so.0 -lib/libovn-%%SHLIB_VER%%.so.0.0.0 -lib/libovn.so lib/libovsdb-%%SHLIB_VER%%.so.0 lib/libovsdb-%%SHLIB_VER%%.so.0.0.0 lib/libovsdb.so @@ -113,40 +97,21 @@ 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/ovsdb-server.5.gz man/man5/vtep.5.gz man/man7/ovs-actions.7.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-kmod-ctl.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 @@ -155,12 +120,9 @@ 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/compat/__init__.py %%DATADIR%%/python/ovs/compat/sortedcontainers/__init__.py @@ -206,17 +168,13 @@ sbin/ovsdb-server %%DATADIR%%/scripts/ovs-bugtool-daemons-ver %%DATADIR%%/scripts/ovs-bugtool-fdb-show %%DATADIR%%/scripts/ovs-bugtool-get-dpdk-nic-numa +%%DATADIR%%/scripts/ovs-bugtool-get-port-stats %%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-check-dead-ifs %%DATADIR%%/scripts/ovs-ctl %%DATADIR%%/scripts/ovs-kmod-ctl