community/openvswitch: upgrade to 2.12.0

* http://docs.openvswitch.org/en/latest/

3 files changed, 89 insertions, 38 deletions

diff --git a/community/openvswitch/APKBUILD b/community/openvswitch/APKBUILD
index 06ea6b1f36..3e12d096b2 100644
--- a/community/openvswitch/APKBUILD
+++ b/community/openvswitch/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=openvswitch
-pkgver=2.10.1
-pkgrel=2
+pkgver=2.12.0
+pkgrel=0
 pkgdesc="A production quality, multilayer virtual switch"
 url="http://openvswitch.org/"
 arch="all"
@@ -18,6 +18,7 @@ subpackages="$pkgname-doc $pkgname-dbg $pkgname-dev
 	py2-$pkgname:_py2:noarch
 	py3-$pkgname:_py3:noarch
 	$pkgname-ovn:_ovn
+	$pkgname-openrc
 	"
 source="http://openvswitch.org/releases/$pkgname-$pkgver.tar.gz
 	ovsdb-server.initd
@@ -25,7 +26,6 @@ source="http://openvswitch.org/releases/$pkgname-$pkgver.tar.gz
 	ovs-vswitchd.initd
 	ovs-vswitchd.confd
 	ovs-modules.initd
-	musl-if_packet.patch
 	ifupdown-alpine.patch
 	readme.debian.patch
 	"
@@ -159,12 +159,11 @@ _ovn() {
 		usr/bin/ovn-docker-overlay-driver
 }
 
-sha512sums="3634bd3e978110cb9e11191a88e4232a7af152a6ddf46e8a32e50e07de866be782b7e753d26b81183ec107816e5af4109badf8f2067a61fd9506ccf81e748e44  openvswitch-2.10.1.tar.gz
+sha512sums="e9bf9030a1c5dbcddcf463d332a87c84326c21fb53eac743cd999da9e03f564a394e2362fe5ab2ebec35bb456fc76e10da6910c398886b41fbd28a35465b5aee  openvswitch-2.12.0.tar.gz
 097d4721a78fff749c534910d98543778474406bd61b469b88a0d981a2a380556444437ec44278cead6d8688c45a38b2acbf1551acb9ab38d048f413728e3b88  ovsdb-server.initd
 b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5  ovsdb-server.confd
 4bff37f8bed32d5327b4b0433984ab8ffdce77f618034aa6ffd1ad4a7caa00703ea2bef312876dce5aafa4c17fe06dddd75e5c05c10e13bf8f5c3805a0654a96  ovs-vswitchd.initd
 346aea099f51707d2b4fc9fdc8c1502582723fb4e00c4d5d1624b0378c94dfb76674fa95e2af894f36169df52109dbe441ee6a45aa744584d9e4c74d15a46c1d  ovs-vswitchd.confd
 1e08aa5ac6ce55b97256478b9243c8a4c92a42a97fc70ea0439c832b12a775af28a127224ae6c4ce01642dde65f76c610a44105912338bf443d8ea390c2d9ccf  ovs-modules.initd
-c5f137bce28bf80c1e5a6ca18722dae9a5ecff03d20bf92642270951bbbb499e5fb05a08163442720e866d135fcd7426b88add0b42ed240d5f0c068aa9fcd9da  musl-if_packet.patch
 eca5b19954e6df7dc17c582e22e4b27533710d077039a54a2ba291ae7d3a2706872f5bcad8795ca58e06ca7e45a9b8c4c51e99aedbabd0e87623972ebcdca230  ifupdown-alpine.patch
-f006e7a849132140e1c6312810e7b897421dff0cc6661d4f0590a117c0a85da1fef2feca3339758f94b7732445d6d617b12744a23939fcb8ebe85884d3134d9e  readme.debian.patch"
+177f8c98cfa261b440c398d3a3be4aeba694ee3d43400082427cd3b238de9c84736193a25968a6029f4a09957d00c6fcfb3f87f9317feb71732f31c91933fd29  readme.debian.patch"
diff --git a/community/openvswitch/musl-if_packet.patch b/community/openvswitch/musl-if_packet.patch
deleted file mode 100644
index e57b30778d..0000000000
--- a/community/openvswitch/musl-if_packet.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- openvswitch-2.4.0/lib/netdev-linux.c	2015-08-20 00:33:42.960971996 +0000
-+++ openvswitch-2.4.0/lib/netdev-linux.c.new	2015-08-22 18:16:10.741115156 +0000
-@@ -37,10 +37,9 @@
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <sys/utsname.h>
--#include <netpacket/packet.h>
- #include <net/if.h>
- #include <net/if_arp.h>
--#include <net/if_packet.h>
-+#include <linux/if_packet.h>
- #include <net/route.h>
- #include <netinet/in.h>
- #include <poll.h>
diff --git a/community/openvswitch/readme.debian.patch b/community/openvswitch/readme.debian.patch
index af89a0d355..28ea816610 100644
--- a/community/openvswitch/readme.debian.patch
+++ b/community/openvswitch/readme.debian.patch
@@ -1,5 +1,5 @@
---- a/debian/openvswitch-switch.README.Debian
---- b/debian/openvswitch-switch.README.Debian
+--- openvswitch-2.12.0/debian/openvswitch-switch.README.Debian
++++ openvswitch-2.12.0/debian/openvswitch-switch.README.Debian.new
 @@ -1,48 +1,8 @@
 -README.Debian for openvswitch-switch
 ----------------------------------
@@ -43,8 +43,8 @@
 -       * Build and install the kernel module by hand.
 -
 -
--Debian network scripts integration
------------------------------------
+-Debian network scripts (ifupdown) integration
+-------------------------------------------------
 -This package lets a user to optionally configure Open vSwitch bridges
 +README.Alpine for Openvswitch
 +-----------------------------
@@ -54,7 +54,7 @@
  and ports from /etc/network/interfaces. Please refer to the interfaces(5)
  manpage for more details regarding /etc/network/interfaces.
  
-@@ -202,43 +162,29 @@
+@@ -202,115 +162,30 @@
  
  ex 8: Create and destroy bridges.
  
@@ -62,32 +62,100 @@
 -ifdown --allow=ovs $list_of_bridges
 +ifup $list_of_bridges
 +ifdown $list_of_bridges
-+
+ 
+-Open vSwitch integration with systemd-networkd
+------------------------------------------------
 +Notes on LXC integration:
 +-------------------------
-+
+ 
+-There is no native integration of OVS with systemd-networkd. That is,
+-you cannot create OVS bridges, ports and bonds by simply writing configuration
+-files in /etc/systemd/network.  But, you can create OVS devices using ovs-vsctl
+-and then write configuration files to provide them IP addresses.
 +To prevent containers failing to start after hard reboots create:
 +-----------------------------------------------------------------
-+
+ 
+-As soon as a OVS device is visible, systemd-networkd will provide that device
+-an IP address.  Since OVS database is persistent across reboots, the OVS
+-devices will get re-created after a reboot as soon as OVS startup script is
+-invoked. And systemd-networkd will immediately assign the configuration defined
+-in /etc/systemd/network.
 +/etc/lxc/ovsup:
-+
+ 
+-Example:
 +#!/bin/sh
 +ovs-vsctl --if-exists del-port $5
 +-----------------------------------------------------------------
-+
+ 
+-If you have a physical ethernet device "ens160" which has been configured with
+-DHCP, your systemd-networkd's .network config file will look something like
+-this:
 +/etc/lxc/ovsdown:
-+
-+#!/bin/sh
  
--Notes on dependencies:
-----------------------
+-```
+-[Match]
+-Name=ens160
++#!/bin/sh
 +ovs-vsctl --if-exists del-port veth.$LXC_NAME
 +-----------------------------------------------------------------
  
--openvswitch-switch depends on $network, $named $remote_fs and $syslog to start.
--This creates some startup dependency issues.
+-[Network]
+-DHCP=ipv4
 +& add to the container config file:
  
+-[DHCP]
+-ClientIdentifier=mac
+-```
++lxc.hook.pre-start = /etc/lxc/ovsup
++lxc.hook.post-stop = /etc/lxc/ovsdown
+ 
+-Please note how the DHCP ClientIdentifier above has been configured with the
+-mac address.
+ 
+-To create a OVS bridge "br-ens160" and add "ens160" as a port of that
+-bridge, you can change the .network configuration for "ens160" to look like:
+-
+-```
+-[Match]
+-Name=ens160
+-```
+-
+-Now create a new .network configuration file for "br-ens160". Something like:
+-
+-```
+-[Match]
+-Name=br-ens160
+-
+-[Network]
+-DHCP=ipv4
+-
+-[DHCP]
+-ClientIdentifier=mac
+-```
+-
+-Now, use ovs-vsctl to create br-ens160 and add ens160 as a port of it.  You
+-will also have to flush the IP address of ens160 and restart systemd-networkd
+-in the same line. It is important to let br-ens160 have the same mac address as
+-ens160 to get the same IP address to br-ens160 from the DHCP server.  In the
+-below command, "$mac_of_ens160" holds the mac address of ens160. For e.g:
+-
+-```
+-mac_of_ens160='"00:0c:29:77:27:7a"'
+-ovs-vsctl --may-exist add-br br-ens160 -- \
+-    --may-exist add-port br-ens160 ens160 -- \
+-    set interface br-ens160 mac="$mac_of_ens160"; ip addr flush dev ens160; \
+-    systemctl restart systemd-networkd
+-```
+-
+-br-ens160 should now have the same DHCP IP. It should also have the correct
+-DNS resolution servers configured.
+-
+-Notes on dependencies:
+----------------------
+-
+-openvswitch-switch depends on $network, $named $remote_fs and $syslog to start.
+-This creates some startup dependency issues.
+-
 -* Since openvswitch utilities are placed in /usr and /usr can be mounted
 -through NFS, openvswitch has to start after it.  But if a user uses openvswitch
 -for all his networking needs and hence to mount NFS, there will be a deadlock.
@@ -119,5 +187,3 @@
 -bridges using tools like "ovs-vsctl" or "ovs-dpctl".  This is also a problem
 -when you upgrade your openvswitch kernel module using commands like
 -'force-reload-kmod'.
-+lxc.hook.pre-start = /etc/lxc/ovsup
-+lxc.hook.post-stop = /etc/lxc/ovsdown