Bug 247409 - net/openvswitch: upgrade to 2.13 / add Python3 support
Summary: net/openvswitch: upgrade to 2.13 / add Python3 support
Status: In Progress
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Rene Ladan
URL: https://www.openvswitch.org/releases/...
Keywords: buildisok
: 247373 (view as bug list)
Depends on:
Blocks: 247373
  Show dependency treegraph
 
Reported: 2020-06-19 09:18 UTC by Sven R
Modified: 2020-07-11 20:07 UTC (History)
4 users (show)

See Also:
koue: maintainer-feedback+


Attachments
net/openvswitch upgrade to 2.13 incl python3 support (7.54 KB, patch)
2020-06-19 09:27 UTC, Sven R
no flags Details | Diff
poudriere testport 12-1 amd64 (61.33 KB, application/gzip)
2020-06-19 10:40 UTC, Sven R
no flags Details
net/openvswitch upgrade to 2.13 incl python3 support UPDATE (18.44 KB, patch)
2020-06-19 10:42 UTC, Sven R
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Sven R 2020-06-19 09:18:45 UTC
This patch 
(1) upgrades openvswitch to 2.13
(2) adds logging for ovsdb-server
(3) adds upgrade message (ovsdb-tool convert)
(4) adds Python 3 support
Comment 1 Sven R 2020-06-19 09:21:31 UTC
This update would obsolete https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247373
Comment 2 Sven R 2020-06-19 09:27:11 UTC
Created attachment 215768 [details]
net/openvswitch upgrade to 2.13 incl python3 support
Comment 3 Lewis Cook freebsd_triage 2020-06-19 09:33:31 UTC
^Triage:

- If there is a changelog or release notes URL available for this version, please add it to the URL field

- Please confirm this change passes QA (portlint, poudriere at least). 

For details and instructions, see: 

https://www.freebsd.org/doc/en/books/porters-handbook/testing.html

Since #247373 is now obsolete, it would be worth closing the report. Would you like me to do that?
Comment 4 Sven R 2020-06-19 09:46:53 UTC
*** Bug 247373 has been marked as a duplicate of this bug. ***
Comment 5 Sven R 2020-06-19 10:40:10 UTC
Created attachment 215769 [details]
poudriere testport  12-1 amd64

Poudriere testport attached.

`portlint net/openvswitch/
looks fine.`
Comment 6 Sven R 2020-06-19 10:40:38 UTC
Comment on attachment 215768 [details]
net/openvswitch upgrade to 2.13 incl python3 support

diff -Naur /tmp/devel/usr/ports/net/openvswitch/Makefile /usr/ports/net/openvswitch/Makefile
--- /tmp/devel/usr/ports/net/openvswitch/Makefile	2020-06-18 10:09:41.000000000 +0200
+++ /usr/ports/net/openvswitch/Makefile	2020-06-19 11:46:57.294316000 +0200
@@ -2,7 +2,7 @@
 # $FreeBSD: head/net/openvswitch/Makefile 515818 2019-10-27 19:26:14Z pkubaj $
 
 PORTNAME=	openvswitch
-DISTVERSION=	2.12.0
+DISTVERSION=	2.13.0
 CATEGORIES=	net
 MASTER_SITES=	http://openvswitch.org/releases/
 
@@ -15,9 +15,9 @@
 
 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 \
+SHEBANG_FILES=	utilities/bugtool/ovs-bugtool-get-port-stats \
 		utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \
 		utilities/ovs-docker \
 		utilities/ovs-appctl-bashcomp.bash \
diff -Naur /tmp/devel/usr/ports/net/openvswitch/distinfo /usr/ports/net/openvswitch/distinfo
--- /tmp/devel/usr/ports/net/openvswitch/distinfo	2019-10-07 17:24:13.000000000 +0200
+++ /usr/ports/net/openvswitch/distinfo	2020-06-19 08:46:12.871208000 +0200
@@ -1,3 +1,3 @@
 TIMESTAMP = 1570040636
-SHA256 (openvswitch-2.12.0.tar.gz) = 13fd42703180b4b1146c7e97926d09225485868cc2fbbd58dc0c421b4b8fe8f8
-SIZE (openvswitch-2.12.0.tar.gz) = 8162771
+SHA256 (openvswitch-2.13.0.tar.gz) = dd5f727427e36cab22bdeae61529d8c8fccacc53d968cfa7658f7f935ddda531
+SIZE (openvswitch-2.13.0.tar.gz) = 7233892 
diff -Naur /tmp/devel/usr/ports/net/openvswitch/files/patch-configure /usr/ports/net/openvswitch/files/patch-configure
--- /tmp/devel/usr/ports/net/openvswitch/files/patch-configure	2018-04-13 11:25:42.000000000 +0200
+++ /usr/ports/net/openvswitch/files/patch-configure	2020-06-19 11:49:58.020645000 +0200
@@ -1,9 +1,162 @@
---- configure.orig	2018-04-11 14:28:38 UTC
+--- configure.orig	2020-02-24 19:41:21 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
+@@ -10858,7 +10858,7 @@ $as_echo_n "checking whether the $compiler linker ($LD
+   hardcode_minus_L=no
+   hardcode_shlibpath_var=unsupported
+   inherit_rpath=no
+-  link_all_deplibs=unknown
++  link_all_deplibs=no
+   module_cmds=
+   module_expsym_cmds=
+   old_archive_from_new_cmds=
+@@ -11160,7 +11160,7 @@ _LT_EOF
+ 	wlarc=
+       else
+ 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+       fi
+       ;;
+ 
+@@ -11179,7 +11179,7 @@ _LT_EOF
+ _LT_EOF
+       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+       else
+ 	ld_shlibs=no
+       fi
+@@ -11208,7 +11208,7 @@ _LT_EOF
+ 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ 	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++	    archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ 	  else
+ 	    ld_shlibs=no
+ 	  fi
+@@ -11226,7 +11226,7 @@ _LT_EOF
+     *)
+       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+       else
+ 	ld_shlibs=no
+       fi
+@@ -11875,7 +11875,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
+ 	hardcode_direct_absolute=yes
+ 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
++	  archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver'
+ 	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ 	  export_dynamic_flag_spec='$wl-E'
+ 	else
+@@ -12724,7 +12724,7 @@ freebsd* | dragonfly*)
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
+       soname_spec='$libname$release$shared_ext$major'
+       need_version=no
+       need_lib_prefix=no
+@@ -13868,7 +13868,7 @@ striplib=
+ old_striplib=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+ $as_echo_n "checking whether stripping libraries is possible... " >&6; }
+-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
+   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -14120,7 +14120,7 @@ hardcode_automatic_CXX=no
+ inherit_rpath_CXX=no
+ module_cmds_CXX=
+ module_expsym_cmds_CXX=
+-link_all_deplibs_CXX=unknown
++link_all_deplibs_CXX=no
+ old_archive_cmds_CXX=$old_archive_cmds
+ reload_flag_CXX=$reload_flag
+ reload_cmds_CXX=$reload_cmds
+@@ -14331,7 +14331,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+       # archiving commands below assume that GNU ld is being used.
+       if test yes = "$with_gnu_ld"; then
+         archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+-        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++        archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ 
+         hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+         export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+@@ -15023,7 +15023,7 @@ fi
+ 	    case `$CC -V 2>&1` in
+ 	      *"Version 7."*)
+ 	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+-		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++		archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ 		;;
+ 	      *)  # Version 8.0 or newer
+ 	        tmp_idyn=
+@@ -15031,7 +15031,7 @@ fi
+ 		  ia64*) tmp_idyn=' -i_dynamic';;
+ 		esac
+ 	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+-		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++		archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ 		;;
+ 	    esac
+ 	    archive_cmds_need_lc_CXX=no
+@@ -15063,7 +15063,7 @@ fi
+ 	      ;;
+ 	    *) # Version 6 and above use weak symbols
+ 	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+-	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
++	      archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
+ 	      ;;
+ 	    esac
+ 
+@@ -15074,7 +15074,7 @@ fi
+ 	  cxx*)
+ 	    # Compaq C++
+ 	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+-	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
++	    archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-version-script $wl$lib-ver'
+ 
+ 	    runpath_var=LD_RUN_PATH
+ 	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+@@ -15108,7 +15108,7 @@ fi
+ 	      # Sun C++ 5.9
+ 	      no_undefined_flag_CXX=' -zdefs'
+ 	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
++	      archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script $wl$lib-ver'
+ 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
+ 	      whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+ 	      compiler_needs_object_CXX=yes
+@@ -15176,7 +15176,7 @@ fi
+ 	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ 	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ 	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+-	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
++	    archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script,$lib-ver -o $lib'
+ 	    export_dynamic_flag_spec_CXX='$wl-E'
+ 	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+ 	  fi
+@@ -16701,7 +16701,7 @@ freebsd* | dragonfly*)
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
+       soname_spec='$libname$release$shared_ext$major'
+       need_version=no
+       need_lib_prefix=no
+@@ -18458,8 +18458,8 @@ test -n "$SPHINXBUILD" || SPHINXBUILD="none"
+ 
+ 
+     if test "$SPHINXBUILD" != none; then
 -  HAVE_SPHINX_TRUE=
 -  HAVE_SPHINX_FALSE='#'
 +  HAVE_SPHINX_TRUE='#'
diff -Naur /tmp/devel/usr/ports/net/openvswitch/pkg-message /usr/ports/net/openvswitch/pkg-message
--- /tmp/devel/usr/ports/net/openvswitch/pkg-message	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net/openvswitch/pkg-message	2020-06-19 10:35:07.077319000 +0200
@@ -0,0 +1 @@
+Don't forget to run "ovsdb-tool convert /var/db/openvswitch/conf.db" when upgrading an existing installation.
diff -Naur /tmp/devel/usr/ports/net/openvswitch/pkg-plist /usr/ports/net/openvswitch/pkg-plist
--- /tmp/devel/usr/ports/net/openvswitch/pkg-plist	2019-10-07 17:24:13.000000000 +0200
+++ /usr/ports/net/openvswitch/pkg-plist	2020-06-19 12:09:52.676000000 +0200
@@ -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
@@ -18,8 +9,8 @@
 bin/ovs-pki
 bin/ovs-tcpdump
 bin/ovs-tcpundump
-bin/ovs-testcontroller
 bin/ovs-test
+bin/ovs-testcontroller
 bin/ovs-vlan-test
 bin/ovs-vsctl
 bin/ovsdb-client
@@ -66,8 +57,8 @@
 include/openvswitch/ofp-parse.h
 include/openvswitch/ofp-port.h
 include/openvswitch/ofp-print.h
-include/openvswitch/ofp-protocol.h
 include/openvswitch/ofp-prop.h
+include/openvswitch/ofp-protocol.h
 include/openvswitch/ofp-queue.h
 include/openvswitch/ofp-switch.h
 include/openvswitch/ofp-table.h
@@ -87,19 +78,12 @@
 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/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/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 @@
 %%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-get-port-stats
 %%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-qos-configs
 %%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
@@ -226,9 +184,9 @@
 %%DATADIR%%/scripts/ovs-vtep
 %%DATADIR%%/vswitch.ovsschema
 %%DATADIR%%/vtep.ovsschema
+@dir %%ETCDIR%%
 @dir /var/lib/openvswitch/pki
 @dir /var/lib/openvswitch
 @dir /var/lib
 @dir /var/log/openvswitch
 @dir /var/run/openvswitch
-@dir %%ETCDIR%%
Comment 7 Sven R 2020-06-19 10:42:09 UTC
Created attachment 215770 [details]
net/openvswitch upgrade to 2.13 incl python3 support UPDATE

Testport showed to small issue. fix attached
Comment 8 Sven R 2020-06-19 10:44:34 UTC
Sorry, accidentally pasted the attachment as a comment. Thanks for your help!
Comment 9 Lewis Cook freebsd_triage 2020-06-19 10:52:10 UTC
(In reply to Sven R from comment #8)
No worries. QA, such as Poudriere and portlint aren't entirely mandatory for trivial/small updates but certainly speed up the process of committing. General rule of thumb is to ensure a change passes QA and therefore saves time of a committer doing it themselves. Cheers!

^Lewis
Comment 10 Rene Ladan freebsd_committer 2020-07-11 20:07:29 UTC
This is not ready for Python 3 yet:

> % ovs-test
>  File "/usr/local/bin/ovs-test", line 45
>    print "Node %s:%u " % (node[0], node[1])
>                      ^
> SyntaxError: invalid syntax