openvswitch: 2.4.0 -> 2.5.0

3 files changed, 53 insertions, 31 deletions

diff --git a/openvswitch/.footprint b/openvswitch/.footprint
index e804979bf..4abfb4391 100644
--- a/openvswitch/.footprint
+++ b/openvswitch/.footprint
@@ -7,6 +7,13 @@ drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/ovsd
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/ovn-controller
+-rwxr-xr-x	root/root	usr/bin/ovn-controller-vtep
+-rwxr-xr-x	root/root	usr/bin/ovn-docker-overlay-driver
+-rwxr-xr-x	root/root	usr/bin/ovn-docker-underlay-driver
+-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/ovs-appctl
 -rwxr-xr-x	root/root	usr/bin/ovs-benchmark
 -rwxr-xr-x	root/root	usr/bin/ovs-docker
@@ -52,6 +59,8 @@ drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libofproto.la
 -rw-r--r--	root/root	usr/lib/libopenvswitch.a
 -rwxr-xr-x	root/root	usr/lib/libopenvswitch.la
+-rw-r--r--	root/root	usr/lib/libovn.a
+-rwxr-xr-x	root/root	usr/lib/libovn.la
 -rw-r--r--	root/root	usr/lib/libovsdb.a
 -rwxr-xr-x	root/root	usr/lib/libovsdb.la
 -rw-r--r--	root/root	usr/lib/libsflow.a
@@ -63,40 +72,50 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libopenvswitch.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libovsdb.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libsflow.pc
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/ovs-benchmark.1.gz
--rw-r--r--	root/root	usr/man/man1/ovs-pcap.1.gz
--rw-r--r--	root/root	usr/man/man1/ovs-tcpundump.1.gz
--rw-r--r--	root/root	usr/man/man1/ovsdb-client.1.gz
--rw-r--r--	root/root	usr/man/man1/ovsdb-server.1.gz
--rw-r--r--	root/root	usr/man/man1/ovsdb-tool.1.gz
-drwxr-xr-x	root/root	usr/man/man5/
--rw-r--r--	root/root	usr/man/man5/ovs-vswitchd.conf.db.5.gz
--rw-r--r--	root/root	usr/man/man5/vtep.5.gz
-drwxr-xr-x	root/root	usr/man/man8/
--rw-r--r--	root/root	usr/man/man8/ovs-appctl.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-bugtool.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-ctl.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-dpctl-top.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-dpctl.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-l3ping.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-ofctl.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-parse-backtrace.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-pki.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-test.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-testcontroller.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-vlan-bug-workaround.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-vlan-test.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-vsctl.8.gz
--rw-r--r--	root/root	usr/man/man8/ovs-vswitchd.8.gz
--rw-r--r--	root/root	usr/man/man8/vtep-ctl.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/ovs-bugtool
 -rwxr-xr-x	root/root	usr/sbin/ovs-vlan-bug-workaround
 -rwxr-xr-x	root/root	usr/sbin/ovs-vswitchd
 -rwxr-xr-x	root/root	usr/sbin/ovsdb-server
 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
+-rw-r--r--	root/root	usr/share/man/man1/ovsdb-server.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/ovsdb-tool.1.gz
+drwxr-xr-x	root/root	usr/share/man/man5/
+-rw-r--r--	root/root	usr/share/man/man5/ovn-nb.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/ovn-sb.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/ovs-vswitchd.conf.db.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/vtep.5.gz
+drwxr-xr-x	root/root	usr/share/man/man7/
+-rw-r--r--	root/root	usr/share/man/man7/ovn-architecture.7.gz
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/ovn-controller-vtep.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ovn-controller.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ovn-ctl.8.gz
+-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/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
+-rw-r--r--	root/root	usr/share/man/man8/ovs-dpctl-top.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ovs-dpctl.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ovs-l3ping.8.gz
+-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-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
+-rw-r--r--	root/root	usr/share/man/man8/ovs-vlan-test.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ovs-vsctl.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ovs-vswitchd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vtep-ctl.8.gz
 drwxr-xr-x	root/root	usr/share/openvswitch/
 drwxr-xr-x	root/root	usr/share/openvswitch/bugtool-plugins/
 drwxr-xr-x	root/root	usr/share/openvswitch/bugtool-plugins/kernel-info/
@@ -108,6 +127,8 @@ 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
 drwxr-xr-x	root/root	usr/share/openvswitch/bugtool-plugins/system-logs/
 -rw-r--r--	root/root	usr/share/openvswitch/bugtool-plugins/system-logs/openvswitch.xml
+-rw-r--r--	root/root	usr/share/openvswitch/ovn-nb.ovsschema
+-rw-r--r--	root/root	usr/share/openvswitch/ovn-sb.ovsschema
 drwxr-xr-x	root/root	usr/share/openvswitch/python/
 drwxr-xr-x	root/root	usr/share/openvswitch/python/ovs/
 -rw-r--r--	root/root	usr/share/openvswitch/python/ovs/__init__.py
@@ -148,9 +169,11 @@ 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-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
 -rwxr-xr-x	root/root	usr/share/openvswitch/scripts/ovs-bugtool-cfm-show
+-rwxr-xr-x	root/root	usr/share/openvswitch/scripts/ovs-bugtool-conntrack-dump
 -rwxr-xr-x	root/root	usr/share/openvswitch/scripts/ovs-bugtool-coverage-show
 -rwxr-xr-x	root/root	usr/share/openvswitch/scripts/ovs-bugtool-daemons-ver
 -rwxr-xr-x	root/root	usr/share/openvswitch/scripts/ovs-bugtool-fdb-show
diff --git a/openvswitch/.md5sum b/openvswitch/.md5sum
index a20b5ced9..ab9adde16 100644
--- a/openvswitch/.md5sum
+++ b/openvswitch/.md5sum
@@ -1,2 +1,2 @@
-4ff52595855c1f9e4dd3e84295599f5f  openvswitch-2.4.0.tar.gz
+d86045933aa8f582f1d74ab77f998e44  openvswitch-2.5.0.tar.gz
 a39713e450024fc67ce14e51dda1e6ea  ovsd
diff --git a/openvswitch/Pkgfile b/openvswitch/Pkgfile
index 63f5a68da..c4b712633 100644
--- a/openvswitch/Pkgfile
+++ b/openvswitch/Pkgfile
@@ -4,14 +4,13 @@
 # Depends on:  python
 
 name=openvswitch
-version=2.4.0
+version=2.5.0
 release=1
 source=(http://openvswitch.org/releases/openvswitch-$version.tar.gz ovsd)
 
 build() {
   cd $name-$version
   ./configure --prefix=/usr \
-              --mandir=/usr/man \
               --sysconfdir=/etc \
               --localstatedir=/var
   make