diff options
| author | Stuart Cardall <developer@it-offshore.co.uk> | 2014-06-18 18:56:21 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-19 07:22:21 +0000 |
| commit | 820a35f5020db4cdb112b67415b7479486f440c7 (patch) | |
| tree | ff72133e96c22261d61b44419f537442ac74996b | |
| parent | 0449861a8f541e2091c0e4b049682f8deee67333 (diff) | |
| download | aports-820a35f5020db4cdb112b67415b7479486f440c7.tar.bz2 aports-820a35f5020db4cdb112b67415b7479486f440c7.tar.xz | |
main/lxc: update to 1.0.4
quite a few bug fixes in 1.0.4:
https://linuxcontainers.org/news/
| -rw-r--r-- | main/lxc/0001-allow-all-iX86-strings-for-lxc.arch.patch | 40 | ||||
| -rw-r--r-- | main/lxc/APKBUILD | 14 |
2 files changed, 5 insertions, 49 deletions
diff --git a/main/lxc/0001-allow-all-iX86-strings-for-lxc.arch.patch b/main/lxc/0001-allow-all-iX86-strings-for-lxc.arch.patch deleted file mode 100644 index 4c6f3b3400..0000000000 --- a/main/lxc/0001-allow-all-iX86-strings-for-lxc.arch.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bb8d8207c36402ba1282081963b3dcd3356452ec Mon Sep 17 00:00:00 2001 -From: Dwight Engen <dwight.engen@oracle.com> -Date: Mon, 28 Apr 2014 16:50:51 -0400 -Subject: [PATCH] allow all iX86 strings for lxc.arch - -This change accepts all the same strings for lxc.arch that setarch(8) does. - -Note that we continue to parse plain x86 as PER_LINUX32 so as not to break -existing lxc configuration files. - -Signed-off-by: Dwight Engen <dwight.engen@oracle.com> -Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> ---- - src/lxc/confile.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/lxc/confile.c b/src/lxc/confile.c -index 90fb344..4e7dead 100644 ---- a/src/lxc/confile.c -+++ b/src/lxc/confile.c -@@ -1723,9 +1723,15 @@ signed long lxc_config_parse_arch(const char *arch) - struct per_name { - char *name; - unsigned long per; -- } pername[4] = { -+ } pername[] = { - { "x86", PER_LINUX32 }, -+ { "linux32", PER_LINUX32 }, -+ { "i386", PER_LINUX32 }, -+ { "i486", PER_LINUX32 }, -+ { "i586", PER_LINUX32 }, - { "i686", PER_LINUX32 }, -+ { "athlon", PER_LINUX32 }, -+ { "linux64", PER_LINUX }, - { "x86_64", PER_LINUX }, - { "amd64", PER_LINUX }, - }; --- -1.9.3 - diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 36b2696b37..cad3578dd3 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.4 _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="73ca55d5987549b7a85cb3f7f64e4973 lxc-1.0.4.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="bcb04752fddc581030727be179a9f65715e11b0a04bf9bb119adb1b2d117bd9a lxc-1.0.4.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="ec30e01e2dab393a74b50279981a9bb0e93da2ed2c82b33e218cd1146df20b5443a75ace623c30b6c9718f8a23e4a447484bf316c9155324fe931741d2ed9f06 lxc-1.0.4.tar.gz e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def version.patch -5c4758bec433a1da5c65bc7aa53452f3b9452ad7f3dece76321af38824a177a2b334dc638596987633143074ba785ed2bae98551b31c5259eae436f981394eee 0001-allow-all-iX86-strings-for-lxc.arch.patch 6618ceb59f1927bb82ad1a0fe0a7d4c452ced7855d8f0953556fce9154f30a4c5afbd7a2ab07fb26e6e793b07d4c8f906f8dc27c1defe0580dcf1545c80d1d60 lxc.initd" |