main/lxc: upgrade to 2.0.9 (bugfixes)

3 files changed, 4 insertions, 85 deletions

diff --git a/main/lxc/0001-lxc-alpine-Add-support-for-ppc64le.patch b/main/lxc/0001-lxc-alpine-Add-support-for-ppc64le.patch
deleted file mode 100644
index 4f9210e1f0..0000000000
--- a/main/lxc/0001-lxc-alpine-Add-support-for-ppc64le.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2933a5ce1c06724a5efceaee8b44ab197eb3b714 Mon Sep 17 00:00:00 2001
-From: Breno Leitao <breno.leitao@gmail.com>
-Date: Mon, 12 Jun 2017 13:45:52 -0500
-Subject: [PATCH] lxc-alpine: Add support for ppc64le
-
-Starting at version 3.6, Alpine Linux has support for ppc64le
-architecture. Adding the new keys also.
-
-Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
----
- templates/lxc-alpine.in | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
-index 1547c2c1..9a9200f7 100644
---- a/templates/lxc-alpine.in
-+++ b/templates/lxc-alpine.in
-@@ -43,7 +43,10 @@ readonly APK_KEYS_SHA256="\
- 2adcf7ce224f476330b5360ca5edb92fd0bf91c92d83292ed028d7c4e26333ab  alpine-devel@lists.alpinelinux.org-4d07755e.rsa.pub
- ebf31683b56410ecc4c00acd9f6e2839e237a3b62b5ae7ef686705c7ba0396a9  alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
- 1bb2a846c0ea4ca9d0e7862f970863857fc33c32f5506098c636a62a726a847b  alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
--12f899e55a7691225603d6fb3324940fc51cd7f133e7ead788663c2b7eecb00c  alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub"
-+12f899e55a7691225603d6fb3324940fc51cd7f133e7ead788663c2b7eecb00c  alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
-+73867d92083f2f8ab899a26ccda7ef63dfaa0032a938620eda605558958a8041  alpine-devel@lists.alpinelinux.org-58199dcc.rsa.pub
-+9a4cd858d9710963848e6d5f555325dc199d1c952b01cf6e64da2c15deedbd97  alpine-devel@lists.alpinelinux.org-58cbb476.rsa.pub
-+780b3ed41786772cbc7b68136546fa3f897f28a23b30c72dde6225319c44cfff  alpine-devel@lists.alpinelinux.org-58e4f17d.rsa.pub"
- 
- readonly APK_KEYS_URI='http://alpinelinux.org/keys'
- readonly DEFAULT_MIRROR_URL='http://dl-cdn.alpinelinux.org/alpine'
-@@ -126,6 +129,7 @@ parse_arch() {
- 		aarch64 | arm64) echo 'aarch64';;
- 		armv7) echo 'armv7';;
- 		arm*) echo 'armhf';;
-+		ppc64le) echo 'ppc64le';;
- 		*) return 1;;
- 	esac
- }
--- 
-2.13.2
-
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index e6fe028c43..280cecdd1d 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.8
+pkgver=2.0.9
 _pkgver=${pkgver/_rc/.rc}
-pkgrel=1
+pkgrel=0
 pkgdesc="Userspace interface for the Linux kernel containment features"
 url="https://linuxcontainers.org/lxc/"
 arch="all"
@@ -24,8 +24,6 @@ source="https://github.com/lxc/lxc/archive/lxc-$_pkgver.tar.gz
 	lxc.conf
 
 	download-template-tmpfs.patch
-	alpine-default-repos.patch
-	0001-lxc-alpine-Add-support-for-ppc64le.patch
 	"
 builddir="$srcdir/lxc-lxc-$_pkgver"
 
@@ -147,10 +145,8 @@ EOF
 }
 
 
-sha512sums="a71a6408e23b0a03f59e6e68b9b87147fb6d0843932942f9e46da59ca58ed357203d0bca1d0e65d53ca441c4a6c36945fc51a0d4a835a866f23cf7405a6a6cd9  lxc-2.0.8.tar.gz
+sha512sums="c2eb65565efb54e31ba2de61e6768a03142d940bcfda3a85c7fd7cd51bfed206aa4ea1a73134fad735774b2b801cbcb3eb4e32b2b09c2fb66d5896f81ac5cd7b  lxc-2.0.9.tar.gz
 e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def  version.patch
 1037e0b773553aa04b619cec7cfc8fa504af830e58c8211eda367da7e36aeb88f45fca1f955a08fc4fa3f9da660017d5fe7145a326a2064cf15e24d1772d9e27  lxc.initd
 5b83b0323e58bf00bd1e124c265729499cee97559b6fe18482962e3bed50d121b4c7a09f25cbce7b1e18d4234627bc4b4581ba2060e33cd022f105b4429cef01  lxc.conf
-b3b8c47a8594cefff58cef74efe9e6bf0dd8422a40289c4398ea34e61d04dd3d95c567e880a4b123df42ffac3fae179b63b130b357eb6659f73f922f2908d971  download-template-tmpfs.patch
-a8ce110414578ba58cee8c15762f59d5185d7e543e8fdd46e1e7148895600b3603499e2c2b9222ee36d867b07e8c9776d8dee994a1647bac4d1fb478129faaf9  alpine-default-repos.patch
-16e6fb35827f05b0aae48264f9f32dc8e7295348a5f44719f72a70e8b18ca5070b52fa9a407b7aab9dba73e48ba5d0a6afbbc0dc4b175bf4ada699ad9946dc6f  0001-lxc-alpine-Add-support-for-ppc64le.patch"
+d055df5f7cc1001829f6eaef4c31c50088eeb7965d57b756e17b05dddeb86cf5648470c6711471fd0092418b95214ad5dc15c33d8db284f242773dd432ea51e0  download-template-tmpfs.patch"
diff --git a/main/lxc/alpine-default-repos.patch b/main/lxc/alpine-default-repos.patch
deleted file mode 100644
index a1f03ab3a8..0000000000
--- a/main/lxc/alpine-default-repos.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 288142218ae6cc24bf084fdd5768ad2c83086fb1 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Tue, 14 Mar 2017 17:28:47 +0100
-Subject: [PATCH 1/2] lxc-alpine: add community repository to default
- repositories
-
-Signed-off-by: Jakub Jirutka <jakub@jirutka.cz>
-Upstream-Issue: https://github.com/lxc/lxc/pull/1461
----
- templates/lxc-alpine.in | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
-index 06616b3..fd281f8 100644
---- a/templates/lxc-alpine.in
-+++ b/templates/lxc-alpine.in
-@@ -236,7 +236,6 @@ install() {
- 	local branch="$3"
- 	local extra_packages="$4"
- 	local apk_cache="$LXC_CACHE_DIR/apk/$arch"
--	local repo_url="$MIRROR_URL/$branch/main"
- 
- 	if [ "$FLUSH_CACHE" = 'yes' ] && [ -d "$apk_cache" ]; then
- 		einfo "Cleaning cached APK packages for $arch"
-@@ -249,7 +248,10 @@ install() {
- 
- 	mkdir -p etc/apk
- 	ln -s "$apk_cache" etc/apk/cache
--	echo "$repo_url" > etc/apk/repositories
-+
-+	local repo; for repo in main community; do
-+		echo "$MIRROR_URL/$branch/$repo" >> etc/apk/repositories
-+	done
- 
- 	install_packages "$arch" "alpine-base $extra_packages"
- 	make_dev_nodes
-