| 1 |
commit: b3e02158edf8174dcc898f0118d0fe75064e0758 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 12 00:40:13 2016 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 12 00:53:40 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e02158 |
| 7 |
|
| 8 |
app-emulation/ganeti: support USE=restricted-commands, tweak haskell flags and socat. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 10 +++++++--- |
| 13 |
app-emulation/ganeti/metadata.xml | 1 + |
| 14 |
2 files changed, 8 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild |
| 17 |
index e1c3ee4..a144974 100644 |
| 18 |
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild |
| 19 |
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild |
| 20 |
@@ -41,7 +41,7 @@ HOMEPAGE="http://www.ganeti.org/" |
| 21 |
|
| 22 |
LICENSE="GPL-2" |
| 23 |
SLOT="0" |
| 24 |
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen" |
| 25 |
+IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands" |
| 26 |
|
| 27 |
REQUIRED_USE="|| ( kvm xen lxc ) |
| 28 |
test? ( ipv6 ) |
| 29 |
@@ -159,7 +159,7 @@ DEPEND+=" |
| 30 |
>=dev-haskell/quickcheck-2.4.2:2= |
| 31 |
<dev-haskell/quickcheck-2.8.3:2= |
| 32 |
sys-apps/fakeroot |
| 33 |
- net-misc/socat |
| 34 |
+ >=net-misc/socat-1.7 |
| 35 |
dev-util/shelltestrunner |
| 36 |
)" |
| 37 |
|
| 38 |
@@ -251,6 +251,7 @@ src_configure () { |
| 39 |
--with-ssh-initscript=/etc/init.d/sshd \ |
| 40 |
--with-export-dir=/var/lib/ganeti-storage/export \ |
| 41 |
--with-os-search-path=/usr/share/${PN}/os \ |
| 42 |
+ $(use_enable restricted-commands) \ |
| 43 |
$(use_enable test haskell-tests) \ |
| 44 |
$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \ |
| 45 |
$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \ |
| 46 |
@@ -259,7 +260,10 @@ src_configure () { |
| 47 |
$(use_enable syslog) \ |
| 48 |
$(use_enable monitoring) \ |
| 49 |
$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \ |
| 50 |
- $(usex haskell-daemons "--enable-confd=haskell" '' '' '') |
| 51 |
+ $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \ |
| 52 |
+ --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \ |
| 53 |
+ --enable-socat-escape \ |
| 54 |
+ --enable-socat-compress |
| 55 |
} |
| 56 |
|
| 57 |
src_install () { |
| 58 |
|
| 59 |
diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml |
| 60 |
index 6fbe4e9..2693e91 100644 |
| 61 |
--- a/app-emulation/ganeti/metadata.xml |
| 62 |
+++ b/app-emulation/ganeti/metadata.xml |
| 63 |
@@ -31,6 +31,7 @@ |
| 64 |
<flag name="lxc">Enable Linux Countainers support</flag> |
| 65 |
<flag name="multiple-users">Enable support for running VMs as different users</flag> |
| 66 |
<flag name="monitoring">Enable the ganeti monitoring daemon</flag> |
| 67 |
+ <flag name="restricted-commands">Enable restricted commands in the node daemon</flag> |
| 68 |
<flag name="rbd">Enable rados block device support via sys-cluster/ceph</flag> |
| 69 |
<flag name="xen">Enable Xen support</flag> |
| 70 |
</use> |
Archives