From 086aa328a05319f9f005d620d73a7f44830d5ebb Mon Sep 17 00:00:00 2001 From: Dima Panov Date: Thu, 27 Apr 2023 22:47:35 +0300 Subject: [PATCH 3/3] net/openvswitch: update to 3.1.1 release (+) Release Notes: https://www.openvswitch.org/releases/NEWS-3.1.1.txt --- net/openvswitch/Makefile | 13 ++++++++++--- net/openvswitch/distinfo | 6 +++--- net/openvswitch/files/patch-configure | 11 ----------- net/openvswitch/pkg-plist | 25 ++++++++++++++++++++----- 4 files changed, 33 insertions(+), 22 deletions(-) delete mode 100644 net/openvswitch/files/patch-configure diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 903bb7ec1484..8c83301c6454 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -1,5 +1,5 @@ PORTNAME= openvswitch -DISTVERSION= 2.17.3 +DISTVERSION= 3.1.1 CATEGORIES= net MASTER_SITES= http://openvswitch.org/releases/ @@ -13,7 +13,7 @@ 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:3.7-3.9 \ +USES= compiler:c11 cpe gmake libtool perl5 pkgconfig python \ shebangfix ssl SHEBANG_FILES= ipsec/ovs-monitor-ipsec.in \ utilities/bugtool/ovs-bugtool-get-port-stats \ @@ -30,6 +30,9 @@ SHEBANG_FILES= ipsec/ovs-monitor-ipsec.in \ utilities/ovs-tcpundump.in \ utilities/ovs-test.in \ utilities/ovs-vlan-test.in \ + utilities/usdt-scripts/dpif_nl_exec_monitor.py \ + utilities/usdt-scripts/upcall_cost.py \ + utilities/usdt-scripts/upcall_monitor.py \ vtep/ovs-vtep.in USE_LDCONFIG= yes @@ -37,12 +40,16 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --disable-static --localstatedir=/var \ --with-dbdir=/var/db/${PORTNAME} \ --with-openssl=${OPENSSLBASE} +CONFIGURE_ENV+= PYTHON3=${PYTHON_CMD} USE_RC_SUBR= ovs-vswitchd ovsdb-server LDFLAGS+= -lpthread INSTALL_TARGET=install-strip +CONFLICTS_INSTALL= openswitch-lts + SHLIB_VER= ${DISTVERSION:C/\.[0-9]*$//} -PLIST_SUB= SHLIB_VER=${SHLIB_VER} +SO_VER= 0.0.${DISTVERSION:E} +PLIST_SUB= SHLIB_VER=${SHLIB_VER} SO_VER=${SO_VER} post-patch: @${REINPLACE_CMD} -e 's|uuid_from_string(|uuid_from_string_ovs(|g' \ diff --git a/net/openvswitch/distinfo b/net/openvswitch/distinfo index 92208ae83a78..29cdb0ebdd3a 100644 --- a/net/openvswitch/distinfo +++ b/net/openvswitch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665347341 -SHA256 (openvswitch-2.17.3.tar.gz) = 446811fc91ae245cc31904a69371fb0bf0446f7b24eb239a037db400353011c0 -SIZE (openvswitch-2.17.3.tar.gz) = 7977353 +TIMESTAMP = 1682623929 +SHA256 (openvswitch-3.1.1.tar.gz) = 60489183a44d3b95a55224072217c5f6d37aa11be12a75762510cedb93a4e204 +SIZE (openvswitch-3.1.1.tar.gz) = 7927180 diff --git a/net/openvswitch/files/patch-configure b/net/openvswitch/files/patch-configure deleted file mode 100644 index afac13f26bf6..000000000000 --- a/net/openvswitch/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2021-02-15 18:24:25 UTC -+++ configure -@@ -18326,7 +18326,7 @@ else - ovs_cv_python3=$PYTHON3 - else - ovs_cv_python3=no -- for binary in python3 python3.4 python3.5 python3.6 python3.7; do -+ for binary in python3 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9; do - ovs_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for dir in $PATH; do - IFS=$ovs_save_IFS diff --git a/net/openvswitch/pkg-plist b/net/openvswitch/pkg-plist index d0f324342202..12a07334c6d0 100644 --- a/net/openvswitch/pkg-plist +++ b/net/openvswitch/pkg-plist @@ -44,6 +44,7 @@ include/openvswitch/nsh.h include/openvswitch/ofp-actions.h include/openvswitch/ofp-bundle.h include/openvswitch/ofp-connection.h +include/openvswitch/ofp-ct.h include/openvswitch/ofp-ed-props.h include/openvswitch/ofp-errors.h include/openvswitch/ofp-flow.h @@ -80,19 +81,19 @@ include/openvswitch/vconn.h include/openvswitch/version.h include/openvswitch/vlog.h lib/libofproto-%%SHLIB_VER%%.so.0 -lib/libofproto-%%SHLIB_VER%%.so.0.0.3 +lib/libofproto-%%SHLIB_VER%%.so.%%SO_VER%% lib/libofproto.so lib/libopenvswitch-%%SHLIB_VER%%.so.0 -lib/libopenvswitch-%%SHLIB_VER%%.so.0.0.3 +lib/libopenvswitch-%%SHLIB_VER%%.so.%%SO_VER%% lib/libopenvswitch.so lib/libovsdb-%%SHLIB_VER%%.so.0 -lib/libovsdb-%%SHLIB_VER%%.so.0.0.3 +lib/libovsdb-%%SHLIB_VER%%.so.%%SO_VER%% lib/libovsdb.so lib/libsflow-%%SHLIB_VER%%.so.0 -lib/libsflow-%%SHLIB_VER%%.so.0.0.3 +lib/libsflow-%%SHLIB_VER%%.so.%%SO_VER%% lib/libsflow.so lib/libvtep-%%SHLIB_VER%%.so.0 -lib/libvtep-%%SHLIB_VER%%.so.0.0.3 +lib/libvtep-%%SHLIB_VER%%.so.%%SO_VER%% lib/libvtep.so libdata/pkgconfig/libofproto.pc libdata/pkgconfig/libopenvswitch.pc @@ -143,6 +144,16 @@ sbin/ovsdb-server %%DATADIR%%/python/ovs/dirs.py %%DATADIR%%/python/ovs/fatal_signal.py %%DATADIR%%/python/ovs/fcntl_win.py +%%DATADIR%%/python/ovs/flow/__init__.py +%%DATADIR%%/python/ovs/flow/decoders.py +%%DATADIR%%/python/ovs/flow/filter.py +%%DATADIR%%/python/ovs/flow/flow.py +%%DATADIR%%/python/ovs/flow/kv.py +%%DATADIR%%/python/ovs/flow/list.py +%%DATADIR%%/python/ovs/flow/odp.py +%%DATADIR%%/python/ovs/flow/ofp.py +%%DATADIR%%/python/ovs/flow/ofp_act.py +%%DATADIR%%/python/ovs/flow/ofp_fields.py %%DATADIR%%/python/ovs/json.py %%DATADIR%%/python/ovs/jsonrpc.py %%DATADIR%%/python/ovs/ovsuuid.py @@ -184,6 +195,10 @@ sbin/ovsdb-server %%DATADIR%%/scripts/ovs-monitor-ipsec %%DATADIR%%/scripts/ovs-save %%DATADIR%%/scripts/ovs-vtep +%%DATADIR%%/scripts/usdt/bridge_loop.bt +%%DATADIR%%/scripts/usdt/dpif_nl_exec_monitor.py +%%DATADIR%%/scripts/usdt/upcall_cost.py +%%DATADIR%%/scripts/usdt/upcall_monitor.py %%DATADIR%%/vswitch.ovsschema %%DATADIR%%/vtep.ovsschema @dir %%ETCDIR%% -- 2.40.0