main/lxc: upgrade to 2.0.5

2 files changed, 6 insertions, 78 deletions

diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index aadf33f93a..e6c62f3fb9 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -3,9 +3,9 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lxc
-pkgver=2.0.4
+pkgver=2.0.5
 _pkgver=${pkgver/_rc/.rc}
-pkgrel=2
+pkgrel=0
 pkgdesc="Userspace interface for the Linux kernel containment features"
 url="https://linuxcontainers.org/lxc/"
 arch="all"
@@ -23,7 +23,6 @@ source="https://github.com/lxc/lxc/archive/lxc-$_pkgver.tar.gz
 	lxc.conf
 
 	download-template-tmpfs.patch
-	add_more_archs.patch
 	alpine-template-mount-shm.patch
 	"
 builddir="$srcdir/lxc-lxc-$_pkgver"
@@ -48,6 +47,7 @@ build() {
 		--enable-lua \
 		--with-lua-pc=lua5.2 \
 		--with-distro=alpine \
+		--disable-werror \
 		|| return 1
 	make VERSION=$pkgver || return 1
 }
@@ -112,24 +112,21 @@ dev() {
 	mv "$subpkgdir"/usr/bin/lxc-config "$pkgdir"/usr/bin/
 }
 
-md5sums="d6140f9a02420bd944f548899550bdfa  lxc-2.0.4.tar.gz
+md5sums="065cc7d4cc440156576ecd737c13568f  lxc-2.0.5.tar.gz
 79e90616b5049a472ccdcb5b1dcdd8b1  version.patch
 8ffde5bd9bfec77d14a8013c780074ca  lxc.initd
 032d70c80d3380353223776a5bfe4014  lxc.conf
 e8fd932f3ec6d52d7b4c183fc58c0b24  download-template-tmpfs.patch
-64baa87f8fad40667e634b81412f3830  add_more_archs.patch
 214082ef88454f810ace045a04f8a041  alpine-template-mount-shm.patch"
-sha256sums="57d40234aeecf5b60fb29d563e5a09d6a04c89e1267eb22a6704388ac8573e7b  lxc-2.0.4.tar.gz
+sha256sums="1f1c491b2ad5e74a85b8eb791ccac8128e6eaf5ddcc1323e9360997c030f7072  lxc-2.0.5.tar.gz
 b6d85fb23940d2511b3951de56b2532843c0e03ec1613548366361cc0c1a46b9  version.patch
 dc39d869a2a690f7dcc9186c2707ed6c7ae2cd5248a9c062f3cb0ce4de73295b  lxc.initd
 06c02a9d21c5160a00c0a92fac222850b97c04f830307692007f264d9344c474  lxc.conf
 8cb638f927d51f05884439e6db15092e902a9c59ef830cbdcb07d88f5cff11e1  download-template-tmpfs.patch
-872e93155834e1ccf8861458aefc9765142da95bb09b05172dd3ebc4a755e038  add_more_archs.patch
 3376e2facb877615908745c960626249888c10826c8086fc04ac3ee168772309  alpine-template-mount-shm.patch"
-sha512sums="3f985bba5aaa8a70f0329316ea4f42ab135d58c47611154c62e103718212a4b2c5e4f25fd45c372424db1fbf40afdc8269ae98655fb3bc8e31085a5d948f702b  lxc-2.0.4.tar.gz
+sha512sums="8e14036597fa3407c87fb92d13b40bbca9a646d27d817e0a9d20fe626625d6cf04a1df65b1a723391d41a311b9f4f3432b3213004892d64355fe0edc7858cb9f  lxc-2.0.5.tar.gz
 e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def  version.patch
 82c8cdae3cf39a00205bb38a87561ba5b603c046c2438bfd897fc5ee4a2d1d5fde0431cb471f51b2e92cb76f795832ea9cb2f7494e4d67e7131aae2a6d6c29b2  lxc.initd
 5b83b0323e58bf00bd1e124c265729499cee97559b6fe18482962e3bed50d121b4c7a09f25cbce7b1e18d4234627bc4b4581ba2060e33cd022f105b4429cef01  lxc.conf
 b3b8c47a8594cefff58cef74efe9e6bf0dd8422a40289c4398ea34e61d04dd3d95c567e880a4b123df42ffac3fae179b63b130b357eb6659f73f922f2908d971  download-template-tmpfs.patch
-6c9cbb7dc39a95e2eaa1000e11f445425b0a2b70d3bcb646a6781c7c7ec089d06e3a81259f9edf0a781cb9cb92059a9c883164c1e1c748949a122267cab2d811  add_more_archs.patch
 9f81565c5812419f4b42e7cd9fe9f7c6082647df0b1ad3ae862049ea42afdcc9bac210ea5a5f192095b0b6951499669387dc6bf4a22809d75e976a4bf28c38f9  alpine-template-mount-shm.patch"
diff --git a/main/lxc/add_more_archs.patch b/main/lxc/add_more_archs.patch
deleted file mode 100644
index 078dd05a43..0000000000
--- a/main/lxc/add_more_archs.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e319eb3478799207d3185bfc780b94d0959ea627 Mon Sep 17 00:00:00 2001
-From: James Cowgill <james410@cowgill.org.uk>
-Date: Thu, 18 Aug 2016 14:27:35 +0100
-Subject: [PATCH] seccomp: Add mips and mips64 entries to lxc_config_parse_arch
-
-Fixes "unsupported personality" warnings when starting containers.
-
-Signed-off-by: James Cowgill <james410@cowgill.org.uk>
----
- src/lxc/confile.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/lxc/confile.c b/src/lxc/confile.c
-index 5ce2dc4..f5e639d 100644
---- a/src/lxc/confile.c
-+++ b/src/lxc/confile.c
-@@ -2079,9 +2079,13 @@ signed long lxc_config_parse_arch(const char *arch)
- 		{ "i586", PER_LINUX32 },
- 		{ "i686", PER_LINUX32 },
- 		{ "athlon", PER_LINUX32 },
-+		{ "mips", PER_LINUX32 },
-+		{ "mipsel", PER_LINUX32 },
- 		{ "linux64", PER_LINUX },
- 		{ "x86_64", PER_LINUX },
- 		{ "amd64", PER_LINUX },
-+		{ "mips64", PER_LINUX },
-+		{ "mips64el", PER_LINUX },
- 	};
- 	size_t len = sizeof(pername) / sizeof(pername[0]);
- 
-From 08245e8c1b77eb068c3e3b41c787e5b170554aad Mon Sep 17 00:00:00 2001
-From: Christian Brauner <cbrauner@suse.de>
-Date: Fri, 19 Aug 2016 11:15:30 +0200
-Subject: [PATCH] confile: add more archs to lxc_config_parse_arch()
-
-Signed-off-by: Christian Brauner <cbrauner@suse.de>
----
- src/lxc/confile.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/src/lxc/confile.c b/src/lxc/confile.c
-index f5e639d..fac919d 100644
---- a/src/lxc/confile.c
-+++ b/src/lxc/confile.c
-@@ -2081,11 +2081,24 @@ signed long lxc_config_parse_arch(const char *arch)
- 		{ "athlon", PER_LINUX32 },
- 		{ "mips", PER_LINUX32 },
- 		{ "mipsel", PER_LINUX32 },
-+		{ "ppc", PER_LINUX32 },
-+		{ "arm", PER_LINUX32 },
-+		{ "armv7l", PER_LINUX32 },
-+		{ "armhf", PER_LINUX32 },
-+		{ "armel", PER_LINUX32 },
-+		{ "powerpc", PER_LINUX32 },
- 		{ "linux64", PER_LINUX },
- 		{ "x86_64", PER_LINUX },
- 		{ "amd64", PER_LINUX },
- 		{ "mips64", PER_LINUX },
- 		{ "mips64el", PER_LINUX },
-+		{ "ppc64", PER_LINUX },
-+		{ "ppc64le", PER_LINUX },
-+		{ "ppc64el", PER_LINUX },
-+		{ "powerpc64", PER_LINUX },
-+		{ "s390x", PER_LINUX },
-+		{ "aarch64", PER_LINUX },
-+		{ "arm64", PER_LINUX },
- 	};
- 	size_t len = sizeof(pername) / sizeof(pername[0]);
-