diff options
Diffstat (limited to 'app-emulation/lxc')
| -rw-r--r-- | app-emulation/lxc/Manifest | 3 | ||||
| -rw-r--r-- | app-emulation/lxc/files/lxc.initd.6 | 118 | ||||
| -rw-r--r-- | app-emulation/lxc/lxc-2.0.8.ebuild | 17 |
3 files changed, 11 insertions, 127 deletions
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest index be660440866f..0e6eef09d47b 100644 --- a/app-emulation/lxc/Manifest +++ b/app-emulation/lxc/Manifest @@ -9,7 +9,6 @@ AUX lxc-2.0.6-bash-completion.patch 919 SHA256 44c354c90d85371654d77337c8daeca34 AUX lxc-2.0.6-major.patch 1834 SHA256 c0095581ab6f92e6cdbfc8298af08f1fbcbff98cf6d107b925489fd7253e418d SHA512 274e2d138e32645aca2ab954e24db02c4d7c5750a781ebf3d81c69c7eeade06b33a3c8ac36a16548a58f6d7f518977fb2df09e22de96d966de542f470720b398 WHIRLPOOL 386ac9236f5b6ff7ed721f1d0aeace99598a62f42c06423b268f1b75bc96aa446a7dcedf41c3fe131ec21dbdf670b3308d957ae508ca125623656eb06fdd2638 AUX lxc.initd.3 3273 SHA256 f704614cfb1b07aeceda15f4edfa392f5866743b0e582753d6afcf8a942a0155 SHA512 38b4b4d4cc8473d5836ac5c4a0824099ea9037e11c6624db53d977f0dcd2dfec3731db5d71a47dc5ebd4fa723cca50dfa9bf39f317e8d146f2a278ef3c9c83a8 WHIRLPOOL 7c68c9c7a68c995294f67186c27d726838605693611a21bdc548b497d1fa23a2a30762da136ca2d474504f25680ca83b8ce41545ae4ae8d4172420fd5d6321ea AUX lxc.initd.5 3282 SHA256 bc57cbf32f3b226b938a5871e97323849050e3c2f68a3e1db78b927c16f7f930 SHA512 6f72701fa42d41b39647a95ec45ca4d669a08a300f54b39715bbb554001bf662b9173cdacc2cb49b8e1093f5fcef971a1fd8270164c73a8e49d1b66dcbe7408d WHIRLPOOL fc4f8c066fd8c8b4290d01b8b12161630437738bdc656e50ba8183f7d1e7775d40c211ab94f6dbd9a640c568168d98c94c26d24eb9969049fa1cc45145a40977 -AUX lxc.initd.6 3280 SHA256 1bc1ee13105e6e0e060952d9c00d8e21c2ca14f8a345196251399cf5d1114a5f SHA512 914075985f11c84f41c10a1b48906e7ac10c7e486389df2a18bfde87af105bf0d302f6db19ffd6f794cbaf06c691bb8ca914c15e651d4f7b442f7eaaa80b658e WHIRLPOOL e8c19d151e1072e067fd57c148f8d7bd1a6f6f43043a0cc060b450bf56233b28647afd8e22c21e29f3ae56c29c835f6b5f79c36ed66a51128ee5b1a5f835e026 AUX lxc_at.service 232 SHA256 0aaf2f362b3ac6aa2b427d47ac4436d46387624b0d8bc4850c5d5b6a7d228711 SHA512 4c3bab4f2cc9aea8b0753dcaf2fd7ed5f1cd7d97d286d6204b2fc17505b6edaac2f536bbda5c1466856311d0e93d75de91dec51e9b0f665d67afedbf40c19170 WHIRLPOOL f6928b4b85e63c38295cabc651b7bd61d2b0bc69ff1850de7cfa8a4f40e4894d94264c262fec7d345488cace49c4283f932739313b975f6862c1aa0ef51e0652 AUX lxc_at.service.4 265 SHA256 194ce2917e99a5050dd793bc31c7d4393f61a9244aaa2f59109eaf8bebfe44fd SHA512 d61e7103e90e6ffb3202533e7d7555d8c02b943f06ec6c0d673713c1c0ede58641312c65d6dd6a15907c1171522e6148c2313d7b11acbd85d59fe65758cd52b3 WHIRLPOOL 55892d9cc5ff8cd8ca95ccae65abbb9735904cf1aba6ea33008349bbe4ea2ac01f83307998e90265b7dd2127761c05199be4f7133f21af1490bda40bf18a2873 DIST lxc-1.0.8.tar.gz 575127 SHA256 399ac3eb4e0a89d657fb2e2a57f686ed061d3f1ea4733e7521b1539e9906c7ee SHA512 f552a4f48bb47d26c6b9ddaf8221a439c0848e3f54ec41b77d54717c21bddd56193941046cc96c699790e8265e762a926469c25ee687adcf7795f2906b1c260a WHIRLPOOL 72cd0b8b0345692dd9a3ed8785ee27f5e575794a96c515db1f1d073c29be4c06ae8c1ee24fa375a5ede2bba2494704916710b2e8814ed991d43330a40dff3d56 @@ -25,7 +24,7 @@ EBUILD lxc-2.0.4.ebuild 6309 SHA256 9d9bd96381602b2ec6a6fc13d94e0fb76976fa57b22b EBUILD lxc-2.0.5.ebuild 6309 SHA256 9d9bd96381602b2ec6a6fc13d94e0fb76976fa57b22b7979aeb1f3b69c01339f SHA512 c4ebc644ac33bd976308b191f6fbad170872056879071562bae1e80e8082f0882e942d2757207aafce1ebdb1c7d8d8cee3f45339b5be6d205421541fef9594de WHIRLPOOL 2e6ace147e77c1f582b7ca7d6d5fa1985f004a4b0d2708b931b616e2ab9f0b40e8700a8170695e9f4e4a9804b1f79d7d69a3a23d2e1f1f93584a7665c31b5c0d EBUILD lxc-2.0.6-r1.ebuild 6362 SHA256 c6214bb9886d05bed8cdc6b51f297250953041037c51b95bd35bab27e0ee4d23 SHA512 57ed76595bfe00f8a924793832ea5b8ab4c08b68d978b91343cb43f0299b06a10baa0e65766b37a4a9dcb432cfc6cd1da93d8abd526967ccc5cf40693f748cf8 WHIRLPOOL b17dc35ab7af1e82bfc0cd44bd6bce79fe2a3ea1a550f966ad33c1f727bda20f3d410c7ccd9ab810e67440c64a67296c6f9d9ea8e3592d23a9b5e5e12345eb83 EBUILD lxc-2.0.7.ebuild 6343 SHA256 a86fe2f27af090ff94537efc0dde8d73b867f9fb377d0d446d3fb46dda3b77f5 SHA512 91312a9209a731026aa53f3d7bb73a0dc8f90f9fc37680cf56439067bd63aa3f35c60d2d320d5fae3d8469ea1a3fcd8e83ee5093ea4252643fd82e776ea5d58f WHIRLPOOL 0085faa8d54e65338c149530f5060320f17c53e7b778f051df43210992d8df2f9a3618cca72045591c22211569886a59775084c656aa52e726a2f1ab85e92148 -EBUILD lxc-2.0.8.ebuild 6351 SHA256 74a9ccedef00b13e078063edcb73538d4219b95494c3c22e059e3a3b1f970635 SHA512 a210cbfc88c8010977a03dfe64d29d7e9193eccd2bffb463698df9d18b8fe994d705704074be0fe9204fabeb134c6fe6407de9e89c7e8ff4ef702aadf9273fb9 WHIRLPOOL 43d19ca00c789ccb8cdb73ac3c54d1f9509a2dcce529587a6cff9fc2645972747a0c3bff5f2074d8baf934eaa913a7a640f95003635075973f0337b4e5d6e32e +EBUILD lxc-2.0.8.ebuild 6429 SHA256 7cbae50463ee5e8ae53cd225f04727e8568269a2f5d16810958f450694fded72 SHA512 173af6b3482067cd483865eb0080a78bea4b9662c540a4c6f6614c20d886ca2eae961ad63024c86d7156703b04c976a30d9095844361c549cd0ebff3edfacebd WHIRLPOOL 42aef7f1b2e22fcaabbe8e3c61d0daa988c33b58d1d7a5cc3838fa2f8af153382da0bd317556e000e253e60389ec85a629119e474f36bca0bcd22bad9ff100cd MISC ChangeLog 8797 SHA256 5711cccd5a871d9fa0df3728422d0bf02db636520f586ad9a332227a429e7b21 SHA512 08ea3917b8b910af4ccbd4986a4147302138bb23a3eee8a0d130ddfbe9ecd3c4044daba508ab4b53542e46ce33dca88328fc7a4652517a258286a2d286dee8ad WHIRLPOOL 5b85b0e1447cea8d93d8c38196624798b7f760803634c546a6e343bcc4804ff6da4cb2152cd584a37487806b2ddb0d9d790229ae2ff1b8754acd48d3ce645290 MISC ChangeLog-2015 16297 SHA256 14a9b5072facfe49b0c62131adff2be1185bacb7a44a0511fe447e22ac7aeb32 SHA512 d71746fdc367f4e5833ccde0cf1bcc047db4cb0582a00fac51f5b97c3fc1a160e3add6409185f9197faaa58b94f82f8532e7291344e8cc66a6ff49d48aa719c5 WHIRLPOOL fb28525b3c00a96e7f34beb01b28a486e5071041275f332ab0971ec6ae78159ad3361e3280c9d76b66d0ab6ea2aada06eb1d3530f5fb5ade8f80b073a4ce2416 MISC metadata.xml 811 SHA256 5bd0e8948d73e86844f03feaf3cf8276c0fc101355b29b86db03c2674ce06340 SHA512 fea5f647ca7eb616307378375af86051034e03170f6ce62e2219f78343797072902102515f93cc0f809558fbfbca88eb81e9f8d0fa621ae18381d39a12c31aa2 WHIRLPOOL 732d83aba86a12ed0ba0d3691cef7d56dd83382b7cdfed73935d65c47667323befb5ebb8e9e3f8bbec0f7dc8730125aad28fb7e000deeacd701b5f8a0ccef25d diff --git a/app-emulation/lxc/files/lxc.initd.6 b/app-emulation/lxc/files/lxc.initd.6 deleted file mode 100644 index a66dfdd22b41..000000000000 --- a/app-emulation/lxc/files/lxc.initd.6 +++ /dev/null @@ -1,118 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -CONTAINER=${SVCNAME#*.} - -LXC_PATH=`lxc-config lxc.lxcpath` - -lxc_get_configfile() { - if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then - echo "${LXC_PATH}/${CONTAINER}.conf" - elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then - echo "${LXC_PATH}/${CONTAINER}/config" - else - eerror "Unable to find a suitable configuration file." - eerror "If you set up the container in a non-standard" - eerror "location, please set the CONFIGFILE variable." - return 1 - fi -} - -[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)} - -lxc_get_var() { - awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' ${CONFIGFILE} -} - -lxc_get_net_link_type() { - awk 'BEGIN { FS="[ \t]*=[ \t]*"; _link=""; _type="" } - $1 == "lxc.network.type" {_type=$2;} - $1 == "lxc.network.link" {_link=$2;} - {if(_link != "" && _type != ""){ - printf("%s:%s\n", _link, _type ); - _link=""; _type=""; - }; }' <${CONFIGFILE} -} - -checkconfig() { - if [ ${CONTAINER} = ${SVCNAME} ]; then - eerror "You have to create an init script for each container:" - eerror " ln -s lxc /etc/init.d/lxc.container" - return 1 - fi - - # no need to output anything, the function takes care of that. - [ -z "${CONFIGFILE}" ] && return 1 - - utsname=$(lxc_get_var lxc.utsname) - if [ ${CONTAINER} != ${utsname} ]; then - eerror "You should use the same name for the service and the" - eerror "container. Right now the container is called ${utsname}" - return 1 - fi -} - -depend() { - # be quiet, since we have to run depend() also for the - # non-muxed init script, unfortunately. - checkconfig 2>/dev/null || return 0 - - config ${CONFIGFILE} - need localmount - use lxcfs - - local _x _if - for _x in $(lxc_get_net_link_type); do - _if=${_x%:*} - case "${_x##*:}" in - # when the network type is set to phys, we can make use of a - # network service (for instance to set it up before we disable - # the net_admin capability), but we might also not set it up - # at all on the host and leave the net_admin capable service - # to take care of it. - phys) use net.${_if} ;; - *) need net.${_if} ;; - esac - done -} - -start() { - checkconfig || return 1 - rm -f /var/log/lxc/${CONTAINER}.log - - rootpath=$(lxc_get_var lxc.rootfs) - - # Check the format of our init and the chroot's init, to see - # if we have to use linux32 or linux64; always use setarch - # when required, as that makes it easier to deal with - # x32-based containers. - case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in - EM_X86_64) setarch=linux64;; - EM_386) setarch=linux32;; - esac - - ebegin "Starting ${CONTAINER}" - env -i ${setarch} $(which lxc-start) -l WARN -n ${CONTAINER} -f ${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log - sleep 1 - - # lxc-start -d will _always_ report a correct startup, even if it - # failed, so rather than trust that, check that the cgroup exists. - [ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ] - eend $? -} - -stop() { - checkconfig || return 1 - - - if ! [ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]; then - ewarn "${CONTAINER} doesn't seem to be started." - return 0 - fi - - # 10s should be enough to shut everything down - ebegin "Stopping ${CONTAINER}" - lxc-stop -t 10 -n ${CONTAINER} - eend $? -} diff --git a/app-emulation/lxc/lxc-2.0.8.ebuild b/app-emulation/lxc/lxc-2.0.8.ebuild index ae0977801e10..d22f583a5a46 100644 --- a/app-emulation/lxc/lxc-2.0.8.ebuild +++ b/app-emulation/lxc/lxc-2.0.8.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 -PYTHON_COMPAT=( python{3_4,3_5} ) +PYTHON_COMPAT=( python3_{4,5,6} ) DISTUTILS_OPTIONAL=1 inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd @@ -16,21 +16,23 @@ KEYWORDS="~amd64 ~arm ~arm64" LICENSE="LGPL-3" SLOT="0" -IUSE="cgmanager doc examples lua python seccomp" +IUSE="cgmanager doc examples lua python seccomp selinux" -RDEPEND="net-libs/gnutls +RDEPEND=" + net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1:= ) python? ( ${PYTHON_DEPS} ) - seccomp? ( sys-libs/libseccomp )" + seccomp? ( sys-libs/libseccomp ) + selinux? ( sys-libs/libselinux )" DEPEND="${RDEPEND} doc? ( app-text/docbook-sgml-utils ) >=sys-kernel/linux-headers-3.2" RDEPEND="${RDEPEND} - sys-process/criu + sys-process/criu[selinux=] sys-apps/util-linux app-misc/pax-utils virtual/awk" @@ -136,7 +138,8 @@ src_configure() { $(use_enable examples) \ $(use_enable lua) \ $(use_enable python) \ - $(use_enable seccomp) + $(use_enable seccomp) \ + $(use_enable selinux) } python_compile() { |