app-emulation/lxc: clean old 2.1.1
authorJoonas Niilola <juippis@gentoo.org>
Fri, 29 May 2020 13:10:23 +0000 (16:10 +0300)
committerJoonas Niilola <juippis@gentoo.org>
Fri, 29 May 2020 13:15:09 +0000 (16:15 +0300)
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
app-emulation/lxc/Manifest
app-emulation/lxc/lxc-2.1.1-r1.ebuild [deleted file]
app-emulation/lxc/metadata.xml

index 98668716a5d0ef31baf0f4c96cec16fabb6ee459..658b60ca5954cf5a545b144c3f5ee5d09a623225 100644 (file)
@@ -1,4 +1,3 @@
-DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69 SHA512 2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6 SHA512 cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30 SHA512 706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20
 DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c SHA512 0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3
diff --git a/app-emulation/lxc/lxc-2.1.1-r1.ebuild b/app-emulation/lxc/lxc-2.1.1-r1.ebuild
deleted file mode 100644 (file)
index 57389b9..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd readme.gentoo-r1
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="cgmanager examples lua python seccomp selinux"
-
-RDEPEND="
-       net-libs/gnutls
-       sys-libs/libcap
-       cgmanager? ( app-admin/cgmanager )
-       lua? ( >=dev-lang/lua-5.1:= )
-       python? ( ${PYTHON_DEPS} )
-       seccomp? ( sys-libs/libseccomp )
-       selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-       app-text/docbook-sgml-utils
-       >=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-       sys-apps/util-linux
-       app-misc/pax-utils
-       virtual/awk"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-       ~CPUSETS ~CGROUP_CPUACCT
-       ~CGROUP_SCHED
-
-       ~NAMESPACES
-       ~IPC_NS ~USER_NS ~PID_NS
-
-       ~NETLINK_DIAG ~PACKET_DIAG
-       ~INET_UDP_DIAG ~INET_TCP_DIAG
-       ~UNIX_DIAG ~CHECKPOINT_RESTORE
-
-       ~CGROUP_FREEZER
-       ~UTS_NS ~NET_NS
-       ~VETH ~MACVLAN
-
-       ~POSIX_MQUEUE
-       ~!NETPRIO_CGROUP
-
-       ~!GRKERNSEC_CHROOT_MOUNT
-       ~!GRKERNSEC_CHROOT_DOUBLE
-       ~!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"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
-
-ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
-ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
-ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
-ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for lxc-checkpoint"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
-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)
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-       kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       eapply "${FILESDIR}"/${PN}-2.0.6-bash-completion.patch
-       #558854
-       eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch
-       eapply "${FILESDIR}"/${PN}-2.1.1-fix-cgroup2-detection.patch
-       eapply "${FILESDIR}"/${PN}-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch
-       eapply "${FILESDIR}"/${PN}-2.1.1-cve-2018-6556.patch
-       eapply_user
-       eautoreconf
-}
-
-src_configure() {
-       append-flags -fno-strict-aliasing
-
-       if use python; then
-               #541932
-               python_setup "python3*"
-               export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}"
-       fi
-
-       # I am not sure about the --with-rootfs-path
-       # /var/lib/lxc is probably more appropriate than
-       # /usr/lib/lxc.
-       # Note by holgersson: Why is apparmor disabled?
-
-       # --enable-doc is for manpages which is why we don't link it to a "doc"
-       # USE flag. We always want man pages.
-       econf \
-               --localstatedir=/var \
-               --bindir=/usr/bin \
-               --sbindir=/usr/bin \
-               --with-config-path=/var/lib/lxc \
-               --with-rootfs-path=/var/lib/lxc/rootfs \
-               --with-distro=gentoo \
-               --with-runtime-path=/run \
-               --disable-apparmor \
-               --disable-werror \
-               --enable-doc \
-               $(use_enable cgmanager) \
-               $(use_enable examples) \
-               $(use_enable lua) \
-               $(use_enable python) \
-               $(use_enable seccomp) \
-               $(use_enable selinux)
-}
-
-python_compile() {
-       distutils-r1_python_compile build_ext -I.. -L../lxc/.libs --no-pkg-config
-}
-
-src_compile() {
-       default
-
-       if use python; then
-               pushd "${S}/src/python-${PN}" > /dev/null
-               distutils-r1_src_compile
-               popd > /dev/null
-       fi
-}
-
-src_install() {
-       default
-
-       mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
-       # start-ephemeral is no longer a command but removing it here
-       # generates QA warnings (still in upstream completion script)
-       bashcomp_alias ${PN}-start \
-               ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
-
-       if use python; then
-               pushd "${S}/src/python-lxc" > /dev/null
-               # Unset DOCS. This has been handled by the default target
-               unset DOCS
-               distutils-r1_src_install
-               popd > /dev/null
-       fi
-
-       keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
-
-       find "${D}" -name '*.la' -delete
-
-       # Gentoo-specific additions!
-       newinitd "${FILESDIR}/${PN}.initd.7" ${PN}
-
-       # Remember to compare our systemd unit file with the upstream one
-       # config/init/systemd/lxc.service.in
-       systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
-
-       DOC_CONTENTS="
-       Starting from version ${PN}-1.1.0-r3, the default lxc path has been
-       moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc
-       please add the following to your /etc/lxc/lxc.conf
-
-         lxc.lxcpath = /etc/lxc
-
-       For openrc, there is an init script provided with the package.
-       You _should_ only need to symlink /etc/init.d/lxc to
-       /etc/init.d/lxc.configname to start the container defined in
-       /etc/lxc/configname.conf.
-
-       Correspondingly, for systemd a service file lxc@.service is installed.
-       Enable and start lxc@configname in order to start the container defined
-       in /etc/lxc/configname.conf.
-
-       If you want checkpoint/restore functionality, please install criu
-       (sys-process/criu)."
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       readme.gentoo_print_elog
-}
index 00fc26795b2b783fd71261ab814b348faadc06e6..ca4eb37df6c9f4265213d60eb33f59283199a18a 100644 (file)
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="apparmor">Enable AppArmor support</flag>
-    <flag name="cgmanager">Enable support for cgroup management using <pkg>app-admin/cgmanager</pkg></flag>
     <flag name="templates">Install old style templates through <pkg>app-emulation/lxc-templates</pkg></flag>
     <flag name="tools">Build and install additional command line tools</flag>
   </use>