summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2015-10-15 14:21:15 +0200
committerJakub Jirutka <jakub@jirutka.cz>2015-10-31 02:06:25 +0100
commitc2c88ec4ea7cba331b6486cab9041cb909b49b6a (patch)
tree8b048daa8577ea4c69732b7abe90cc96107196af
parentsys-kernel/gentoo-sources: Linux patch 3.18.23 (diff)
downloadgentoo-c2c88ec4ea7cba331b6486cab9041cb909b49b6a.tar.gz
gentoo-c2c88ec4ea7cba331b6486cab9041cb909b49b6a.tar.bz2
gentoo-c2c88ec4ea7cba331b6486cab9041cb909b49b6a.zip
app-emulation/lxc: Forward-port !GRKERNSEC* checks to 1.1.3+
See 78ef1b565ae26608f11a81f2b60e4a8e404ef9c3 and a226893bb48e8979b054b1b8cb463402a8d58e27.
-rw-r--r--app-emulation/lxc/lxc-1.1.3.ebuild4
-rw-r--r--app-emulation/lxc/lxc-1.1.4.ebuild4
2 files changed, 8 insertions, 0 deletions
diff --git a/app-emulation/lxc/lxc-1.1.3.ebuild b/app-emulation/lxc/lxc-1.1.3.ebuild
index 4a336ef0ddc8..b41c68543906 100644
--- a/app-emulation/lxc/lxc-1.1.3.ebuild
+++ b/app-emulation/lxc/lxc-1.1.3.ebuild
@@ -61,6 +61,8 @@ CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS
+ ~!GRKERNSEC_PROC
+ ~!GRKERNSEC_SYSFS_RESTRICT
"
ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
@@ -89,6 +91,8 @@ ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC featu
ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers"
DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
diff --git a/app-emulation/lxc/lxc-1.1.4.ebuild b/app-emulation/lxc/lxc-1.1.4.ebuild
index 734490497674..12c175199343 100644
--- a/app-emulation/lxc/lxc-1.1.4.ebuild
+++ b/app-emulation/lxc/lxc-1.1.4.ebuild
@@ -61,6 +61,8 @@ CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS
+ ~!GRKERNSEC_PROC
+ ~!GRKERNSEC_SYSFS_RESTRICT
"
ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
@@ -89,6 +91,8 @@ ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC featu
ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes"
ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers"
DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)