main/lxc: upgrade to 1.0.6

3 files changed, 5 insertions, 67 deletions

diff --git a/main/lxc/0001-lua-Do-not-link-Lua-module-to-the-Lua-core-library.patch b/main/lxc/0001-lua-Do-not-link-Lua-module-to-the-Lua-core-library.patch
deleted file mode 100644
index 02a5b02f69..0000000000
--- a/main/lxc/0001-lua-Do-not-link-Lua-module-to-the-Lua-core-library.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From aa0337f7856feefab804c8a7bba4eaca205d3bab Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 20 Feb 2014 09:48:37 +0000
-Subject: [PATCH 1/2] lua: Do not link Lua module to the Lua core library
-
-Modules should not link to the Lua core library.
-
-See http://lua-users.org/wiki/BuildingModules under
-"Do Not Link Modules to the Lua Core Libraries"
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- src/lua-lxc/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lua-lxc/Makefile.am b/src/lua-lxc/Makefile.am
-index 7bbaf61..540238f 100644
---- a/src/lua-lxc/Makefile.am
-+++ b/src/lua-lxc/Makefile.am
-@@ -18,7 +18,7 @@ core_so_LDFLAGS = \
- 	-L$(top_srcdir)/src/lxc \
- 	-Wl,-soname,core.so.$(firstword $(subst ., ,$(VERSION)))
- 
--core_so_LDADD = -llxc $(LUA_LIBS)
-+core_so_LDADD = -llxc
- 
- lxc.lua:
- 
--- 
-1.8.5.4
-
diff --git a/main/lxc/0002-lxc-alpine-add-support-for-architecture-arm.patch b/main/lxc/0002-lxc-alpine-add-support-for-architecture-arm.patch
deleted file mode 100644
index f4bfad2fce..0000000000
--- a/main/lxc/0002-lxc-alpine-add-support-for-architecture-arm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 882bdfc07672202fbade0d8e38d26cf0a5309b5d Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 20 Feb 2014 10:30:22 +0000
-Subject: [PATCH 2/2] lxc-alpine: add support for architecture arm
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- templates/lxc-alpine.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
-index afda971..d8c6674 100644
---- a/templates/lxc-alpine.in
-+++ b/templates/lxc-alpine.in
-@@ -368,6 +368,9 @@ case "$arch" in
-         ;;
-     x86_64|"")
-         ;;
-+    arm*)
-+        apk_arch=armhf
-+        ;;
-     *)
-         die "unsupported architecture: $arch"
-         ;;
--- 
-1.8.5.4
-
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index 36b2696b37..e3d77d509f 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lxc
-pkgver=1.0.3
+pkgver=1.0.6
 _mypkgver=${pkgver/_rc/.rc}
-pkgrel=1
+pkgrel=0
 pkgdesc="linux containers - tools"
 url="http://lxc.sourceforge.net/"
 arch="all"
@@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lvm lua5.2-lxc:_lua52
 	$pkgname-templates $pkgname-libs"
 source="https://github.com/lxc/lxc/archive/lxc-$_mypkgver.tar.gz
 	version.patch
-	0001-allow-all-iX86-strings-for-lxc.arch.patch
 	lxc.initd
 	"
 
@@ -85,15 +84,12 @@ dev() {
 		"$pkgdir"/usr/bin/ || return 1
 }
 
-md5sums="4ebce63536f157125ed953e5836767d6  lxc-1.0.3.tar.gz
+md5sums="3949cd916a120f40c2355c9a5b65cd51  lxc-1.0.6.tar.gz
 79e90616b5049a472ccdcb5b1dcdd8b1  version.patch
-81aff50820a3f06e3a6abdb7136f8216  0001-allow-all-iX86-strings-for-lxc.arch.patch
 1268d4b3e6ed004a47216b8714d09bfd  lxc.initd"
-sha256sums="9fc4ac60a842058e4ad0fe6a281dc0079ee9830afa1852a10fa044219f2c6412  lxc-1.0.3.tar.gz
+sha256sums="2aea199a89e2cd946f93406af6c3f62844f36954b79a6991b36d2c33022cb11c  lxc-1.0.6.tar.gz
 b6d85fb23940d2511b3951de56b2532843c0e03ec1613548366361cc0c1a46b9  version.patch
-e8da394a0610e1c2d6400c34fe7b015faba02ff1b94a995faceeb534c089542b  0001-allow-all-iX86-strings-for-lxc.arch.patch
 bc108a722dc359a24c48837ef7012c776b1d20a533ae0e2231f75081dad4e2f5  lxc.initd"
-sha512sums="95d7080cdb34776b601959bbc95572b1d6defeaec6820a38d9b09eb05bb43eaa4a2c4d9fae26f4d1a7ee13ad6cd104c36dd5cbe6ee5e44f274135e42370cc983  lxc-1.0.3.tar.gz
+sha512sums="fe85ccb57865d86704df6b4b79d60f31892785b07dc9dd2580cc6c384c89c29c23516e906b7a16bc03c6582c1fb2432bb8ff11bd17c09efa8f6a035fb41f46b1  lxc-1.0.6.tar.gz
 e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def  version.patch
-5c4758bec433a1da5c65bc7aa53452f3b9452ad7f3dece76321af38824a177a2b334dc638596987633143074ba785ed2bae98551b31c5259eae436f981394eee  0001-allow-all-iX86-strings-for-lxc.arch.patch
 6618ceb59f1927bb82ad1a0fe0a7d4c452ced7855d8f0953556fce9154f30a4c5afbd7a2ab07fb26e6e793b07d4c8f906f8dc27c1defe0580dcf1545c80d1d60  lxc.initd"