Commit b0398ba8 authored by Stuart Cardall's avatar Stuart Cardall Committed by Jakub Jirutka

main/openvswitch: upgrade to 2.9.0

https://github.com/openvswitch/ovs/blob/master/NEWS
parent ae72fb1b
POSIX uses -1 and does not define WAIT_ANY so we need to define it if
needed.
See:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/waitpid.html
http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
--- openvswitch-2.6.0/tests/test-ovn.c
+++ openvswitch-2.6.0/tests/test-ovn.c.new
@@ -18,6 +18,11 @@
#include <errno.h>
#include <getopt.h>
#include <sys/wait.h>
+
+#ifndef WAIT_ANY
+#define WAIT_ANY (-1)
+#endif
+
#include "command-line.h"
#include "fatal-signal.h"
#include "flow.h"
# Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk> # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=openvswitch pkgname=openvswitch
pkgver=2.8.1 pkgver=2.9.0
pkgrel=2 pkgrel=0
pkgdesc="A production quality, multilayer virtual switch" pkgdesc="A production quality, multilayer virtual switch"
url="http://openvswitch.org/" url="http://openvswitch.org/"
arch="all" arch="all"
...@@ -19,11 +19,10 @@ source="http://openvswitch.org/releases/$pkgname-$pkgver.tar.gz ...@@ -19,11 +19,10 @@ source="http://openvswitch.org/releases/$pkgname-$pkgver.tar.gz
ovs-vswitchd.confd ovs-vswitchd.confd
ovs-modules.initd ovs-modules.initd
musl-if_packet.patch musl-if_packet.patch
0002-fix-wait-any.patch
ifupdown-alpine.patch ifupdown-alpine.patch
readme.debian.patch readme.debian.patch
libressl-compat.patch
" "
builddir="$srcdir/$pkgname-$pkgver" builddir="$srcdir/$pkgname-$pkgver"
build() { build() {
...@@ -91,14 +90,12 @@ bashcomp() { ...@@ -91,14 +90,12 @@ bashcomp() {
"$subpkgdir"/usr/share/bash-completion/completions/$pkgname/ "$subpkgdir"/usr/share/bash-completion/completions/$pkgname/
} }
sha512sums="b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7 openvswitch-2.8.1.tar.gz sha512sums="c9feb45c650b73093ad1f25f2fc6dbd135dfab691b3322bf87c6efe34bcbfc0a099d1db85c14fe08eb05f4154eae56dd81de54c0a6be97b42a4aa4b6ae53e37b openvswitch-2.9.0.tar.gz
097d4721a78fff749c534910d98543778474406bd61b469b88a0d981a2a380556444437ec44278cead6d8688c45a38b2acbf1551acb9ab38d048f413728e3b88 ovsdb-server.initd 097d4721a78fff749c534910d98543778474406bd61b469b88a0d981a2a380556444437ec44278cead6d8688c45a38b2acbf1551acb9ab38d048f413728e3b88 ovsdb-server.initd
b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5 ovsdb-server.confd b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5 ovsdb-server.confd
4bff37f8bed32d5327b4b0433984ab8ffdce77f618034aa6ffd1ad4a7caa00703ea2bef312876dce5aafa4c17fe06dddd75e5c05c10e13bf8f5c3805a0654a96 ovs-vswitchd.initd 4bff37f8bed32d5327b4b0433984ab8ffdce77f618034aa6ffd1ad4a7caa00703ea2bef312876dce5aafa4c17fe06dddd75e5c05c10e13bf8f5c3805a0654a96 ovs-vswitchd.initd
346aea099f51707d2b4fc9fdc8c1502582723fb4e00c4d5d1624b0378c94dfb76674fa95e2af894f36169df52109dbe441ee6a45aa744584d9e4c74d15a46c1d ovs-vswitchd.confd 346aea099f51707d2b4fc9fdc8c1502582723fb4e00c4d5d1624b0378c94dfb76674fa95e2af894f36169df52109dbe441ee6a45aa744584d9e4c74d15a46c1d ovs-vswitchd.confd
1e08aa5ac6ce55b97256478b9243c8a4c92a42a97fc70ea0439c832b12a775af28a127224ae6c4ce01642dde65f76c610a44105912338bf443d8ea390c2d9ccf ovs-modules.initd 1e08aa5ac6ce55b97256478b9243c8a4c92a42a97fc70ea0439c832b12a775af28a127224ae6c4ce01642dde65f76c610a44105912338bf443d8ea390c2d9ccf ovs-modules.initd
c5f137bce28bf80c1e5a6ca18722dae9a5ecff03d20bf92642270951bbbb499e5fb05a08163442720e866d135fcd7426b88add0b42ed240d5f0c068aa9fcd9da musl-if_packet.patch c5f137bce28bf80c1e5a6ca18722dae9a5ecff03d20bf92642270951bbbb499e5fb05a08163442720e866d135fcd7426b88add0b42ed240d5f0c068aa9fcd9da musl-if_packet.patch
973e1e188c23981114c5120d04cf39bec4597349d4c60056cc3834aa8148cd7bafea6216b0649db3dbd0ea540f8876bfaac90262e9a493abf2faf660c4dda01e 0002-fix-wait-any.patch
eca5b19954e6df7dc17c582e22e4b27533710d077039a54a2ba291ae7d3a2706872f5bcad8795ca58e06ca7e45a9b8c4c51e99aedbabd0e87623972ebcdca230 ifupdown-alpine.patch eca5b19954e6df7dc17c582e22e4b27533710d077039a54a2ba291ae7d3a2706872f5bcad8795ca58e06ca7e45a9b8c4c51e99aedbabd0e87623972ebcdca230 ifupdown-alpine.patch
346f11a81f1538513151ea328fcbf2cdfc3c864aa34ea522055bc70266b9b2b2e05bdc0691593a9a1e4ef360d89d465507623edbcd9f764e3707d852736c895c readme.debian.patch 2874bc7b4552c21d21e06f73c63ac5cf72d7db5252b51a0ac17b58e8cd536453c15e494c59b432aacba03be5cc309a4074ccdac11420a1613c22aa3fe07def7f readme.debian.patch"
b980ffa94fd0087e213dc666382ce47fd8429e395687379c8b396840323cd2ca7cf79595c35fdfa4a0e48ca602d6512c6ccf3b644f78eafbacd7e0e63b632609 libressl-compat.patch"
--- openvswitch-2.8.0/lib/stream-ssl.c
+++ openvswitch-2.8.0/lib/stream-ssl.c.new
@@ -448,7 +448,7 @@
}
const char *cn;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
/* ASN1_STRING_data() is deprecated as of OpenSSL version 1.1 */
cn = (const char *)ASN1_STRING_data(cn_data);
#else
--- openvswitch-2.4.0/debian/openvswitch-switch.README.Debian 2015-08-22 18:26:22.381124884 +0000 --- a/debian/openvswitch-switch.README.Debian
+++ openvswitch-2.4.0/debian/openvswitch-switch.README.Debian.new 2015-08-22 18:44:37.717142304 +0000 --- b/debian/openvswitch-switch.README.Debian
@@ -1,44 +1,5 @@ @@ -1,48 +1,8 @@
-README.Debian for openvswitch-switch -README.Debian for openvswitch-switch
---------------------------------- ----------------------------------
- -
...@@ -42,12 +42,19 @@ ...@@ -42,12 +42,19 @@
- -
- * Build and install the kernel module by hand. - * Build and install the kernel module by hand.
- -
-
-Debian network scripts integration
-----------------------------------
-This package lets a user to optionally configure Open vSwitch bridges
+README.Alpine for Openvswitch +README.Alpine for Openvswitch
+----------------------------- +-----------------------------
+network scripts integration
+-----------------------------
+This package enables a user to optionally configure Open vSwitch bridges
and ports from /etc/network/interfaces. Please refer to the interfaces(5)
manpage for more details regarding /etc/network/interfaces.
Debian network scripts integration @@ -202,43 +162,29 @@
----------------------------------
@@ -202,8 +163,8 @@ iface gre1 inet manual
ex 8: Create and destroy bridges. ex 8: Create and destroy bridges.
...@@ -56,19 +63,57 @@ ...@@ -56,19 +63,57 @@
+ifup $list_of_bridges +ifup $list_of_bridges
+ifdown $list_of_bridges +ifdown $list_of_bridges
Notes on dependencies: -Notes on dependencies:
--------------------- ----------------------
@@ -231,3 +192,12 @@ in the 'auto' section, openvswitch-switc +Notes on LXC integration:
ifupdown kicks in. In a case like this, the admin needs to make sure that /usr +-------------------------
has already been mounted and that a remote $syslog (if used) is ready to
receive openvswitch logs. -openvswitch-switch depends on $network, $named $remote_fs and $syslog to start.
+ -This creates some startup dependency issues.
+Notes on LXC / ifupdown integration: +To prevent containers failing to start after hard reboots create:
+------------------------------------ +-----------------------------------------------------------------
-* 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.
-So, if /usr is mounted through NFS and openvswitch is used for all networking,
-the administrator should figure out a way to mount NFS before starting OVS.
-One way to do this is in initramfs.
+/etc/lxc/ovsup:
-* Since openvswitch starts after $network, $remote_fs and $syslog, any startup
-script that depends on openvswitch but starts before it, needs to be changed
-to depend on openvswitch-switch too.
+#!/bin/sh
+ovs-vsctl --if-exists del-port $5
+-----------------------------------------------------------------
-* Ideally, an admin should not add openvswitch bridges in the 'auto'
-section of the 'interfaces' file (i.e., if "br0" is a OVS bridge, you should
-not have a line "auto br0"). This is because, when ifupdown starts
-working on bridges listed in 'auto', openvswitch has not yet started.
+/etc/lxc/ovsdown:
-But, if the admin wants to go down this route and adds openvswitch bridges
-in the 'auto' section, openvswitch-switch will forcefully be started when
-ifupdown kicks in. In a case like this, the admin needs to make sure that /usr
-has already been mounted and that a remote $syslog (if used) is ready to
-receive openvswitch logs.
+#!/bin/sh
-* With systemd, adding openvswitch bridges in the 'auto' section of the
-'interfaces' file can cause race conditions (i.e., if "br0" is a OVS bridge,
-you should not have a line "auto br0"). Debian systems have added a
-systemd ifup@.service file. This file will call ifdown and ifup on interfaces
-in "auto" section automatically when the interfaces disappear and appear
-respectively. This will cause race conditions if you delete and add the same
-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'.
+ovs-vsctl --if-exists del-port veth.$LXC_NAME
+-----------------------------------------------------------------
+ +
+LXC has partial support for ovs (ports are added but not fully removed) +& add to the container config file:
+https://github.com/lxc/lxc/issues/590
+ +
+See 'ovsup' & 'ovsdown' https://github.com/itoffshore/lxc-scripts +lxc.hook.pre-start = /etc/lxc/ovsup
+these scripts allow networking to be restarted & containers do not lose +lxc.hook.post-stop = /etc/lxc/ovsdown
+connectivity.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment