openvswitch: 2.5.1 -> 2.6.1

3 files changed, 37 insertions, 4 deletions

diff --git a/openvswitch/.footprint b/openvswitch/.footprint
index 4abfb4391..b5d4d1851 100644
--- a/openvswitch/.footprint
+++ b/openvswitch/.footprint
@@ -14,8 +14,8 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ovn-nbctl
 -rwxr-xr-x	root/root	usr/bin/ovn-northd
 -rwxr-xr-x	root/root	usr/bin/ovn-sbctl
+-rwxr-xr-x	root/root	usr/bin/ovn-trace
 -rwxr-xr-x	root/root	usr/bin/ovs-appctl
--rwxr-xr-x	root/root	usr/bin/ovs-benchmark
 -rwxr-xr-x	root/root	usr/bin/ovs-docker
 -rwxr-xr-x	root/root	usr/bin/ovs-dpctl
 -rwxr-xr-x	root/root	usr/bin/ovs-dpctl-top
@@ -24,6 +24,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ovs-parse-backtrace
 -rwxr-xr-x	root/root	usr/bin/ovs-pcap
 -rwxr-xr-x	root/root	usr/bin/ovs-pki
+-rwxr-xr-x	root/root	usr/bin/ovs-tcpdump
 -rwxr-xr-x	root/root	usr/bin/ovs-tcpundump
 -rwxr-xr-x	root/root	usr/bin/ovs-test
 -rwxr-xr-x	root/root	usr/bin/ovs-testcontroller
@@ -34,6 +35,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/vtep-ctl
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/openflow/
+-rw-r--r--	root/root	usr/include/openflow/intel-ext.h
 -rw-r--r--	root/root	usr/include/openflow/netronome-ext.h
 -rw-r--r--	root/root	usr/include/openflow/nicira-ext.h
 -rw-r--r--	root/root	usr/include/openflow/openflow-1.0.h
@@ -46,14 +48,39 @@ drwxr-xr-x	root/root	usr/include/openflow/
 -rw-r--r--	root/root	usr/include/openflow/openflow.h
 drwxr-xr-x	root/root	usr/include/openvswitch/
 -rw-r--r--	root/root	usr/include/openvswitch/compiler.h
+-rw-r--r--	root/root	usr/include/openvswitch/dynamic-string.h
+-rw-r--r--	root/root	usr/include/openvswitch/flow.h
+-rw-r--r--	root/root	usr/include/openvswitch/geneve.h
+-rw-r--r--	root/root	usr/include/openvswitch/hmap.h
+-rw-r--r--	root/root	usr/include/openvswitch/json.h
 -rw-r--r--	root/root	usr/include/openvswitch/list.h
+-rw-r--r--	root/root	usr/include/openvswitch/match.h
+-rw-r--r--	root/root	usr/include/openvswitch/meta-flow.h
+-rw-r--r--	root/root	usr/include/openvswitch/netdev.h
+-rw-r--r--	root/root	usr/include/openvswitch/ofp-actions.h
+-rw-r--r--	root/root	usr/include/openvswitch/ofp-errors.h
+-rw-r--r--	root/root	usr/include/openvswitch/ofp-msgs.h
+-rw-r--r--	root/root	usr/include/openvswitch/ofp-parse.h
+-rw-r--r--	root/root	usr/include/openvswitch/ofp-print.h
+-rw-r--r--	root/root	usr/include/openvswitch/ofp-prop.h
+-rw-r--r--	root/root	usr/include/openvswitch/ofp-util.h
+-rw-r--r--	root/root	usr/include/openvswitch/ofpbuf.h
+-rw-r--r--	root/root	usr/include/openvswitch/packets.h
+-rw-r--r--	root/root	usr/include/openvswitch/shash.h
 -rw-r--r--	root/root	usr/include/openvswitch/thread.h
 -rw-r--r--	root/root	usr/include/openvswitch/token-bucket.h
+-rw-r--r--	root/root	usr/include/openvswitch/tun-metadata.h
+-rw-r--r--	root/root	usr/include/openvswitch/type-props.h
 -rw-r--r--	root/root	usr/include/openvswitch/types.h
 -rw-r--r--	root/root	usr/include/openvswitch/util.h
+-rw-r--r--	root/root	usr/include/openvswitch/uuid.h
 -rw-r--r--	root/root	usr/include/openvswitch/vconn.h
 -rw-r--r--	root/root	usr/include/openvswitch/version.h
 -rw-r--r--	root/root	usr/include/openvswitch/vlog.h
+drwxr-xr-x	root/root	usr/include/ovn/
+-rw-r--r--	root/root	usr/include/ovn/actions.h
+-rw-r--r--	root/root	usr/include/ovn/expr.h
+-rw-r--r--	root/root	usr/include/ovn/lex.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libofproto.a
 -rwxr-xr-x	root/root	usr/lib/libofproto.la
@@ -80,7 +107,6 @@ drwxr-xr-x	root/root	usr/sbin/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/ovs-benchmark.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ovs-pcap.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ovs-tcpundump.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ovsdb-client.1.gz
@@ -100,6 +126,7 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/ovn-nbctl.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ovn-northd.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ovn-sbctl.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ovn-trace.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ovs-appctl.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ovs-bugtool.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ovs-ctl.8.gz
@@ -109,6 +136,7 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/ovs-ofctl.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ovs-parse-backtrace.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ovs-pki.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ovs-tcpdump.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ovs-test.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ovs-testcontroller.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ovs-vlan-bug-workaround.8.gz
@@ -122,6 +150,7 @@ drwxr-xr-x	root/root	usr/share/openvswitch/bugtool-plugins/kernel-info/
 -rw-r--r--	root/root	usr/share/openvswitch/bugtool-plugins/kernel-info/openvswitch.xml
 drwxr-xr-x	root/root	usr/share/openvswitch/bugtool-plugins/network-status/
 -rw-r--r--	root/root	usr/share/openvswitch/bugtool-plugins/network-status/openvswitch.xml
+-rw-r--r--	root/root	usr/share/openvswitch/bugtool-plugins/network-status/ovn.xml
 -rw-r--r--	root/root	usr/share/openvswitch/bugtool-plugins/system-configuration.xml
 drwxr-xr-x	root/root	usr/share/openvswitch/bugtool-plugins/system-configuration/
 -rw-r--r--	root/root	usr/share/openvswitch/bugtool-plugins/system-configuration/openvswitch.xml
@@ -143,6 +172,7 @@ drwxr-xr-x	root/root	usr/share/openvswitch/python/ovs/db/
 -rw-r--r--	root/root	usr/share/openvswitch/python/ovs/db/types.py
 -rw-r--r--	root/root	usr/share/openvswitch/python/ovs/dirs.py
 -rw-r--r--	root/root	usr/share/openvswitch/python/ovs/fatal_signal.py
+-rw-r--r--	root/root	usr/share/openvswitch/python/ovs/fcntl_win.py
 -rw-r--r--	root/root	usr/share/openvswitch/python/ovs/json.py
 -rw-r--r--	root/root	usr/share/openvswitch/python/ovs/jsonrpc.py
 -rw-r--r--	root/root	usr/share/openvswitch/python/ovs/ovsuuid.py
@@ -169,6 +199,9 @@ drwxr-xr-x	root/root	usr/share/openvswitch/python/ovstest/
 -rw-r--r--	root/root	usr/share/openvswitch/python/ovstest/util.py
 -rw-r--r--	root/root	usr/share/openvswitch/python/ovstest/vswitch.py
 drwxr-xr-x	root/root	usr/share/openvswitch/scripts/
+-rwxr-xr-x	root/root	usr/share/openvswitch/scripts/ovn-bugtool-nbctl-show
+-rwxr-xr-x	root/root	usr/share/openvswitch/scripts/ovn-bugtool-sbctl-lflow-list
+-rwxr-xr-x	root/root	usr/share/openvswitch/scripts/ovn-bugtool-sbctl-show
 -rwxr-xr-x	root/root	usr/share/openvswitch/scripts/ovn-ctl
 -rwxr-xr-x	root/root	usr/share/openvswitch/scripts/ovs-bugtool-bfd-show
 -rwxr-xr-x	root/root	usr/share/openvswitch/scripts/ovs-bugtool-bond-show
diff --git a/openvswitch/.md5sum b/openvswitch/.md5sum
index 310a4b178..1d4d96f29 100644
--- a/openvswitch/.md5sum
+++ b/openvswitch/.md5sum
@@ -1,2 +1,2 @@
-124e72258cc634e988d641d608f50e99  openvswitch-2.5.1.tar.gz
+59216437f24ce9bf2d643b760f1f692a  openvswitch-2.6.1.tar.gz
 a39713e450024fc67ce14e51dda1e6ea  ovsd
diff --git a/openvswitch/Pkgfile b/openvswitch/Pkgfile
index b8b6e6e28..4a11b270c 100644
--- a/openvswitch/Pkgfile
+++ b/openvswitch/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  python
 
 name=openvswitch
-version=2.5.1
+version=2.6.1
 release=1
 source=(http://openvswitch.org/releases/openvswitch-$version.tar.gz ovsd)