diff options
| -rw-r--r-- | main/lxc/APKBUILD | 24 | ||||
| -rw-r--r-- | main/lxc/alpine-template-keep-setfcap.patch | 24 | ||||
| -rw-r--r-- | main/lxc/alpine-template-mount-shm.patch | 24 |
3 files changed, 8 insertions, 64 deletions
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index bc3328f99d..c5e897921f 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.5 +pkgver=2.0.6 _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,8 +23,6 @@ source="https://github.com/lxc/lxc/archive/lxc-$_pkgver.tar.gz lxc.conf download-template-tmpfs.patch - alpine-template-mount-shm.patch - alpine-template-keep-setfcap.patch " builddir="$srcdir/lxc-lxc-$_pkgver" @@ -110,24 +108,18 @@ dev() { mv "$subpkgdir"/usr/bin/lxc-config "$pkgdir"/usr/bin/ } -md5sums="065cc7d4cc440156576ecd737c13568f lxc-2.0.5.tar.gz +md5sums="a3deb334fa203b0d5627128f2d3deb07 lxc-2.0.6.tar.gz 79e90616b5049a472ccdcb5b1dcdd8b1 version.patch 7c9d3bb2e5015dd40080de6e18100f2f lxc.initd 032d70c80d3380353223776a5bfe4014 lxc.conf -e8fd932f3ec6d52d7b4c183fc58c0b24 download-template-tmpfs.patch -214082ef88454f810ace045a04f8a041 alpine-template-mount-shm.patch -d3dd0f8bb55985f546b7e19095340643 alpine-template-keep-setfcap.patch" -sha256sums="1f1c491b2ad5e74a85b8eb791ccac8128e6eaf5ddcc1323e9360997c030f7072 lxc-2.0.5.tar.gz +e8fd932f3ec6d52d7b4c183fc58c0b24 download-template-tmpfs.patch" +sha256sums="8723ef5973a47e7b2c439002c28590d74689e871d36f03089965503c0c0d50b2 lxc-2.0.6.tar.gz b6d85fb23940d2511b3951de56b2532843c0e03ec1613548366361cc0c1a46b9 version.patch 0738606c80cb2185a4eb13ba794d42a80a18fc60f383e7f9cab77de829d3aba6 lxc.initd 06c02a9d21c5160a00c0a92fac222850b97c04f830307692007f264d9344c474 lxc.conf -8cb638f927d51f05884439e6db15092e902a9c59ef830cbdcb07d88f5cff11e1 download-template-tmpfs.patch -3376e2facb877615908745c960626249888c10826c8086fc04ac3ee168772309 alpine-template-mount-shm.patch -8cd342e9cde7cf88a24a9f6edec4ddf1c396fbe93a9bb19a3a59f69c32a1086f alpine-template-keep-setfcap.patch" -sha512sums="8e14036597fa3407c87fb92d13b40bbca9a646d27d817e0a9d20fe626625d6cf04a1df65b1a723391d41a311b9f4f3432b3213004892d64355fe0edc7858cb9f lxc-2.0.5.tar.gz +8cb638f927d51f05884439e6db15092e902a9c59ef830cbdcb07d88f5cff11e1 download-template-tmpfs.patch" +sha512sums="f44c0498876462d78e57d19816eab666e90470badc2bbd38fed9f504e8b21c3e68e4d0f63a8676fa8716be60481befb3db44098228fd71b480972af2b5dcf1e3 lxc-2.0.6.tar.gz e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def version.patch 1037e0b773553aa04b619cec7cfc8fa504af830e58c8211eda367da7e36aeb88f45fca1f955a08fc4fa3f9da660017d5fe7145a326a2064cf15e24d1772d9e27 lxc.initd 5b83b0323e58bf00bd1e124c265729499cee97559b6fe18482962e3bed50d121b4c7a09f25cbce7b1e18d4234627bc4b4581ba2060e33cd022f105b4429cef01 lxc.conf -b3b8c47a8594cefff58cef74efe9e6bf0dd8422a40289c4398ea34e61d04dd3d95c567e880a4b123df42ffac3fae179b63b130b357eb6659f73f922f2908d971 download-template-tmpfs.patch -9f81565c5812419f4b42e7cd9fe9f7c6082647df0b1ad3ae862049ea42afdcc9bac210ea5a5f192095b0b6951499669387dc6bf4a22809d75e976a4bf28c38f9 alpine-template-mount-shm.patch -965b21cb2e47e704ffe7ff9c3566a4710cdc5e6613bd3533a0a93d5b46ea42327f07eeb6420779cc14c632c7e2c8a487a1d0c000b2797c8c64553ef5a56fbb92 alpine-template-keep-setfcap.patch" +b3b8c47a8594cefff58cef74efe9e6bf0dd8422a40289c4398ea34e61d04dd3d95c567e880a4b123df42ffac3fae179b63b130b357eb6659f73f922f2908d971 download-template-tmpfs.patch" diff --git a/main/lxc/alpine-template-keep-setfcap.patch b/main/lxc/alpine-template-keep-setfcap.patch deleted file mode 100644 index fa3c873b6a..0000000000 --- a/main/lxc/alpine-template-keep-setfcap.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 64365bc2e95b8a62223d65c160215a465b1b8c03 Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Tue, 18 Oct 2016 18:09:42 +0200 -Subject: [PATCH] lxc-alpine: do not drop setfcap - -https://github.com/lxc/lxc/pull/1241 - -Signed-off-by: Jakub Jirutka <jakub@jirutka.cz> ---- - config/templates/alpine.common.conf.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/config/templates/alpine.common.conf.in b/config/templates/alpine.common.conf.in -index 1be61f7..b344426 100644 ---- a/config/templates/alpine.common.conf.in -+++ b/config/templates/alpine.common.conf.in -@@ -8,7 +8,6 @@ lxc.devttydir = - lxc.cap.drop = audit_write - lxc.cap.drop = ipc_owner - lxc.cap.drop = mknod --lxc.cap.drop = setfcap - lxc.cap.drop = setpcap - lxc.cap.drop = sys_nice - lxc.cap.drop = sys_pacct diff --git a/main/lxc/alpine-template-mount-shm.patch b/main/lxc/alpine-template-mount-shm.patch deleted file mode 100644 index 69eb8b3a22..0000000000 --- a/main/lxc/alpine-template-mount-shm.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 48938fe71da106587f94654246ea13d284c50291 Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Wed, 12 Oct 2016 13:32:18 +0200 -Subject: [PATCH] lxc-alpine: mount /dev/shm as tmpfs - -Signed-off-by: Jakub Jirutka <jakub@jirutka.cz> ---- - config/templates/alpine.common.conf.in | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/config/templates/alpine.common.conf.in b/config/templates/alpine.common.conf.in -index 55ea3d2..1be61f7 100644 ---- a/config/templates/alpine.common.conf.in -+++ b/config/templates/alpine.common.conf.in -@@ -19,5 +19,8 @@ lxc.cap.drop = sys_tty_config - lxc.cap.drop = syslog - lxc.cap.drop = wake_alarm - --# Mount tmpfs under /run. -+# Mount /run as tmpfs. - lxc.mount.entry=run run tmpfs rw,nodev,relatime,mode=755 0 0 -+ -+# Mount /dev/shm as tmpfs; needed for building python and possibly other packages. -+lxc.mount.entry=shm dev/shm tmpfs rw,nodev,noexec,nosuid,relatime,mode=1777,create=dir 0 0 |