From 1bc70c15e4cb6ff25aebec53b95e9015f50f3fdd Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Tue, 18 Oct 2016 18:35:14 +0200
Subject: [PATCH] main/lxc: do not drop setfcap in alpine template
---
main/lxc/APKBUILD | 12 +++++++----
main/lxc/alpine-template-keep-setfcap.patch | 24 +++++++++++++++++++++
2 files changed, 32 insertions(+), 4 deletions(-)
create mode 100644 main/lxc/alpine-template-keep-setfcap.patch
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index e6c62f3fb94f..4ed40c302f91 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -5,7 +5,7 @@
pkgname=lxc
pkgver=2.0.5
_pkgver=${pkgver/_rc/.rc}
-pkgrel=0
+pkgrel=1
pkgdesc="Userspace interface for the Linux kernel containment features"
url="https://linuxcontainers.org/lxc/"
arch="all"
@@ -24,6 +24,7 @@ source="https://github.com/lxc/lxc/archive/lxc-$_pkgver.tar.gz
download-template-tmpfs.patch
alpine-template-mount-shm.patch
+ alpine-template-keep-setfcap.patch
"
builddir="$srcdir/lxc-lxc-$_pkgver"
@@ -117,16 +118,19 @@ md5sums="065cc7d4cc440156576ecd737c13568f lxc-2.0.5.tar.gz
8ffde5bd9bfec77d14a8013c780074ca lxc.initd
032d70c80d3380353223776a5bfe4014 lxc.conf
e8fd932f3ec6d52d7b4c183fc58c0b24 download-template-tmpfs.patch
-214082ef88454f810ace045a04f8a041 alpine-template-mount-shm.patch"
+214082ef88454f810ace045a04f8a041 alpine-template-mount-shm.patch
+d3dd0f8bb55985f546b7e19095340643 alpine-template-keep-setfcap.patch"
sha256sums="1f1c491b2ad5e74a85b8eb791ccac8128e6eaf5ddcc1323e9360997c030f7072 lxc-2.0.5.tar.gz
b6d85fb23940d2511b3951de56b2532843c0e03ec1613548366361cc0c1a46b9 version.patch
dc39d869a2a690f7dcc9186c2707ed6c7ae2cd5248a9c062f3cb0ce4de73295b lxc.initd
06c02a9d21c5160a00c0a92fac222850b97c04f830307692007f264d9344c474 lxc.conf
8cb638f927d51f05884439e6db15092e902a9c59ef830cbdcb07d88f5cff11e1 download-template-tmpfs.patch
-3376e2facb877615908745c960626249888c10826c8086fc04ac3ee168772309 alpine-template-mount-shm.patch"
+3376e2facb877615908745c960626249888c10826c8086fc04ac3ee168772309 alpine-template-mount-shm.patch
+8cd342e9cde7cf88a24a9f6edec4ddf1c396fbe93a9bb19a3a59f69c32a1086f alpine-template-keep-setfcap.patch"
sha512sums="8e14036597fa3407c87fb92d13b40bbca9a646d27d817e0a9d20fe626625d6cf04a1df65b1a723391d41a311b9f4f3432b3213004892d64355fe0edc7858cb9f lxc-2.0.5.tar.gz
e2ffcbf55447291a8434a4f37255c3a6a119bc4116c75d205006aa2b070bf6be28535cf6107bead14bbf64bf9fa415346ab544bd1c15e1add7d1c6380e6b2def version.patch
82c8cdae3cf39a00205bb38a87561ba5b603c046c2438bfd897fc5ee4a2d1d5fde0431cb471f51b2e92cb76f795832ea9cb2f7494e4d67e7131aae2a6d6c29b2 lxc.initd
5b83b0323e58bf00bd1e124c265729499cee97559b6fe18482962e3bed50d121b4c7a09f25cbce7b1e18d4234627bc4b4581ba2060e33cd022f105b4429cef01 lxc.conf
b3b8c47a8594cefff58cef74efe9e6bf0dd8422a40289c4398ea34e61d04dd3d95c567e880a4b123df42ffac3fae179b63b130b357eb6659f73f922f2908d971 download-template-tmpfs.patch
-9f81565c5812419f4b42e7cd9fe9f7c6082647df0b1ad3ae862049ea42afdcc9bac210ea5a5f192095b0b6951499669387dc6bf4a22809d75e976a4bf28c38f9 alpine-template-mount-shm.patch"
+9f81565c5812419f4b42e7cd9fe9f7c6082647df0b1ad3ae862049ea42afdcc9bac210ea5a5f192095b0b6951499669387dc6bf4a22809d75e976a4bf28c38f9 alpine-template-mount-shm.patch
+965b21cb2e47e704ffe7ff9c3566a4710cdc5e6613bd3533a0a93d5b46ea42327f07eeb6420779cc14c632c7e2c8a487a1d0c000b2797c8c64553ef5a56fbb92 alpine-template-keep-setfcap.patch"
diff --git a/main/lxc/alpine-template-keep-setfcap.patch b/main/lxc/alpine-template-keep-setfcap.patch
new file mode 100644
index 000000000000..fa3c873b6a07
--- /dev/null
+++ b/main/lxc/alpine-template-keep-setfcap.patch
@@ -0,0 +1,24 @@
+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
--
GitLab