summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2016-07-11 17:40:13 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2016-07-11 17:53:40 -0700
commitb3e02158edf8174dcc898f0118d0fe75064e0758 (patch)
treeabf705db371eba5f9f3805e17fd97375a7ad5758
parentsys-kernel/gentoo-sources: Linux patch 4.6.4. Select SYSVIPC when GENTOO_LINU... (diff)
downloadgentoo-b3e02158edf8174dcc898f0118d0fe75064e0758.tar.gz
gentoo-b3e02158edf8174dcc898f0118d0fe75064e0758.tar.bz2
gentoo-b3e02158edf8174dcc898f0118d0fe75064e0758.zip
app-emulation/ganeti: support USE=restricted-commands, tweak haskell flags and socat.
Package-Manager: portage-2.2.28
-rw-r--r--app-emulation/ganeti/ganeti-2.15.2-r5.ebuild10
-rw-r--r--app-emulation/ganeti/metadata.xml1
2 files changed, 8 insertions, 3 deletions
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index e1c3ee4388c4..a1449740a333 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="http://www.ganeti.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
REQUIRED_USE="|| ( kvm xen lxc )
test? ( ipv6 )
@@ -159,7 +159,7 @@ DEPEND+="
>=dev-haskell/quickcheck-2.4.2:2=
<dev-haskell/quickcheck-2.8.3:2=
sys-apps/fakeroot
- net-misc/socat
+ >=net-misc/socat-1.7
dev-util/shelltestrunner
)"
@@ -251,6 +251,7 @@ src_configure () {
--with-ssh-initscript=/etc/init.d/sshd \
--with-export-dir=/var/lib/ganeti-storage/export \
--with-os-search-path=/usr/share/${PN}/os \
+ $(use_enable restricted-commands) \
$(use_enable test haskell-tests) \
$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
@@ -259,7 +260,10 @@ src_configure () {
$(use_enable syslog) \
$(use_enable monitoring) \
$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
- $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
+ $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
+ --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
+ --enable-socat-escape \
+ --enable-socat-compress
}
src_install () {
diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index 6fbe4e936c52..2693e91dd293 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -31,6 +31,7 @@
<flag name="lxc">Enable Linux Countainers support</flag>
<flag name="multiple-users">Enable support for running VMs as different users</flag>
<flag name="monitoring">Enable the ganeti monitoring daemon</flag>
+ <flag name="restricted-commands">Enable restricted commands in the node daemon</flag>
<flag name="rbd">Enable rados block device support via sys-cluster/ceph</flag>
<flag name="xen">Enable Xen support</flag>
</use>