diff --git a/community/openvswitch/APKBUILD b/community/openvswitch/APKBUILD index 7169cfe3793..2c7dc9c7931 100644 --- a/community/openvswitch/APKBUILD +++ b/community/openvswitch/APKBUILD @@ -2,9 +2,7 @@ # Maintainer: Lindsay Zhou maintainer="Lindsay Zhou " pkgname=openvswitch -# Note: Update only to LTS versions -# Check https://docs.openvswitch.org/en/latest/internals/release-process/ -pkgver=3.3.7 +pkgver=3.6.1 pkgrel=0 pkgdesc="production quality, multilayer virtual switch" url="https://www.openvswitch.org/" @@ -134,12 +132,12 @@ _py3() { } sha512sums=" -7dc529a9f2281e8680953d07c4b0d3f3816d7d0546dbdce26103ef037a0e914f0fc43f6b8cdb95a0844a4e0363cc359cdc71174cb35de9bf6dfa84b90450bf45 openvswitch-3.3.7.tar.gz +6672c8f97862b24a06eb70bdaa1e4ea02fb5bd4d11b8cb090b10464d268842b9e9e5159f700e628285938894da9c220f92ddfe944347028ef55d0682b257af71 openvswitch-3.6.1.tar.gz 097d4721a78fff749c534910d98543778474406bd61b469b88a0d981a2a380556444437ec44278cead6d8688c45a38b2acbf1551acb9ab38d048f413728e3b88 ovsdb-server.initd b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5 ovsdb-server.confd 4bff37f8bed32d5327b4b0433984ab8ffdce77f618034aa6ffd1ad4a7caa00703ea2bef312876dce5aafa4c17fe06dddd75e5c05c10e13bf8f5c3805a0654a96 ovs-vswitchd.initd 346aea099f51707d2b4fc9fdc8c1502582723fb4e00c4d5d1624b0378c94dfb76674fa95e2af894f36169df52109dbe441ee6a45aa744584d9e4c74d15a46c1d ovs-vswitchd.confd 1e08aa5ac6ce55b97256478b9243c8a4c92a42a97fc70ea0439c832b12a775af28a127224ae6c4ce01642dde65f76c610a44105912338bf443d8ea390c2d9ccf ovs-modules.initd 3ed7baad4274887657896accbf72a4f6e8540dfeaa800f7ec1bcf3528e71cc7e682ae4f8ca505dde2b90a08280915e71cc433735f3286f4dc33c810ce4f28ec6 ifupdown-alpine.patch -993588f22dcf4fc5855734d331b8770ec09da4762e34359a645f3c29c67ad3134356950475d98881ea892eec5c3f68fffb8e81a605d6cc4b36cb65995e733208 readme.debian.patch +ae2cfffadc4809f5081d43acdb0dd512f331ea7a59c8b7f957adcceca2b7be16f35c569672babda61da3cd8aca920984d1525e96e3970291c4dd0ac999b99b09 readme.debian.patch " diff --git a/community/openvswitch/readme.debian.patch b/community/openvswitch/readme.debian.patch index 352526d1bb6..f8e5de4bc05 100644 --- a/community/openvswitch/readme.debian.patch +++ b/community/openvswitch/readme.debian.patch @@ -1,30 +1,18 @@ diff --git a/debian/openvswitch-switch.README.Debian b/debian/openvswitch-switch.README.Debian -index cb6567ec8..05ee1b6b1 100644 +index cdfc57c26..04432eeb3 100644 --- a/debian/openvswitch-switch.README.Debian +++ b/debian/openvswitch-switch.README.Debian -@@ -1,18 +1,9 @@ +@@ -1,7 +1,7 @@ -README.Debian for openvswitch-switch +README.Alpine for openvswitch-switch --------------------------------- --The Linux kernel 3.3 or later has an integrated Open vSwitch kernel --module. Theis Linux kernel module lacks a few features that are in --the third-party module. For details, please see the FAQ, "What --features are not available in the Open vSwitch kernel datapath that --ships as part of the upstream Linux kernel?". If you need the --additional features, you will need to build and install a Linux kernel --module by hand from the openvswitch source package. -- -- -Debian network scripts (ifupdown) integration +network scripts integration ------------------------------------------------ --This package lets a user to optionally configure Open vSwitch bridges -+This package enables a user to optionally configure Open vSwitch bridges + This package lets 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. - -@@ -172,115 +163,30 @@ iface gre1 inet manual +@@ -163,115 +163,28 @@ iface gre1 inet manual ex 8: Create and destroy bridges. @@ -76,12 +64,10 @@ index cb6567ec8..05ee1b6b1 100644 -[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: - @@ -157,3 +143,5 @@ index cb6567ec8..05ee1b6b1 100644 -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