app-emulation/lxc: Bump to 2.0.3
authorErik Mackdanz <stasibear@gentoo.org>
Mon, 11 Jul 2016 00:28:14 +0000 (19:28 -0500)
committerErik Mackdanz <stasibear@gentoo.org>
Mon, 11 Jul 2016 00:28:14 +0000 (19:28 -0500)
removes devsetup script

Package-Manager: portage-2.3.0

app-emulation/lxc/Manifest
app-emulation/lxc/files/lxc-2.0.3-bash-completion.patch [new file with mode: 0644]
app-emulation/lxc/files/lxc-2.0.3-omit-sysconfig.patch [new file with mode: 0644]
app-emulation/lxc/lxc-2.0.3.ebuild [new file with mode: 0644]
app-emulation/lxc/metadata.xml

index ef865696b9a0359ec123f31b8ed8aaecf5e10a96..575cd3ee81b4489e1d911b5d2551148005dbe01c 100644 (file)
@@ -8,3 +8,4 @@ DIST lxc-1.1.3.tar.gz 599889 SHA256 b75fb8e376d3313e152f31fb7372b68f33a953a12191
 DIST lxc-1.1.4.tar.gz 604167 SHA256 b087baf5ac4b94618388e6e759d9cdafcf5c98ed67bf9012ee9660076f9fb0d1 SHA512 b239c285b68ddb25c165e998307d69b368bb802e89c1e26de9daab956ffc05cb8e80bf7c796233552b08a57d1cc37c22777bb7a7469db111582184ee13272c93 WHIRLPOOL 2d69d0540c15274627cdbd0f1944a119b601e1298b9328ba336beae0aa6bffd62dfdf85af82f54c3926489e19b4cee7eaa6c35bcfb72e4b3904f85102055ae85
 DIST lxc-1.1.5.tar.gz 607219 SHA256 eefce4cc679656cb8636bf0849f3ba6981c48167884e13dbcb377820a717c09c SHA512 e48ab549f1317afcb5f7768ab988ba27a3e9f1458504e1d70b2e27c502233e7b3538b8ce0b79940140a59a37681bcd8e459416e814f9e4814a4ed86b89e8df1c WHIRLPOOL 0d65ec400913b3298517ba0cb50e064b894d8b26cbd331662e11caee285a37aa1e0d1e4623b69e75585c4369544ca02ff97db90d5127c697cd53fde87d2bc968
 DIST lxc-2.0.1.tar.gz 772083 SHA256 543b927e0be6df256562afe05281552645c78c4a9c0881bf313e31ae13679a29 SHA512 f64cc7167bfed1cc74689bf7d9a5b1ad5b957d5791529c8319c55d2cc671dbd00df9c08fb8f10f73c0d77465a54eb4c98c980e66dd888f52c7670640c6bbf78f WHIRLPOOL a4d25a6733200fcc488b90c34715af8d5d9cd53632f8c82085e5dfe0216500c4714414b616bddda82f4ee014525fd222604d9d46d385658147e411060632f748
+DIST lxc-2.0.3.tar.gz 772448 SHA256 635afa330088fea57883018da326fc72f85460b5a6c7802ad68044381aff14f3 SHA512 df714f189ec7aa681710fbd58405b8958740102032c0130d8a0eaaae0341a9bc91a215136203c404ad79773800f620bf6f71f811b3effe559aed66efa4f34fef WHIRLPOOL 89ce2f6762c7279e24658c1154b5c2960d3db32e0ec3724b338f5d30da77cc0b33a2376e5eebe6d9c356bdd34c2aa9da1e2434aecd7e428fa4b729389e35b862
diff --git a/app-emulation/lxc/files/lxc-2.0.3-bash-completion.patch b/app-emulation/lxc/files/lxc-2.0.3-bash-completion.patch
new file mode 100644 (file)
index 0000000..9ef6013
--- /dev/null
@@ -0,0 +1,31 @@
+--- lxc-lxc-2.0.1/config/bash/Makefile.am.orig 2016-05-18 20:40:42.238487678 +0000
++++ lxc-lxc-2.0.1/config/bash/Makefile.am      2016-05-18 20:43:02.163497779 +0000
+@@ -2,12 +2,12 @@
+ if ENABLE_BASH
+ install-bash:
+-      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/
+-      $(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/
++      $(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions/
++      $(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/
+ uninstall-bash:
+-      rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc
+-      rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || :
++      rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc
++      rmdir $(DESTDIR)$(datarootdir)/bash-completion/completions/ || :
+ install-data-local: install-bash
+ uninstall-local: uninstall-bash
+--- lxc-lxc-2.0.1/config/bash/lxc.in.orig      2016-05-18 20:40:51.079488316 +0000
++++ lxc-lxc-2.0.1/config/bash/lxc.in   2016-05-18 20:45:03.506506538 +0000
+@@ -1,4 +1,3 @@
+-_have lxc-start && {
+     _lxc_names() {
+         COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
+     }
+@@ -100,4 +99,3 @@
+     complete -o default -F _lxc_generic_o lxc-copy
+     complete -o default -F _lxc_generic_o lxc-start-ephemeral
+-}
diff --git a/app-emulation/lxc/files/lxc-2.0.3-omit-sysconfig.patch b/app-emulation/lxc/files/lxc-2.0.3-omit-sysconfig.patch
new file mode 100644 (file)
index 0000000..9b83a3b
--- /dev/null
@@ -0,0 +1,5 @@
+--- lxc-lxc-2.0.1/config/Makefile.am.orig      2016-05-19 02:56:11.891113982 +0000
++++ lxc-lxc-2.0.1/config/Makefile.am   2016-05-19 02:56:32.596115476 +0000
+@@ -1 +1 @@
+-SUBDIRS = apparmor bash etc init selinux templates yum sysconfig
++SUBDIRS = apparmor bash etc init selinux templates yum
diff --git a/app-emulation/lxc/lxc-2.0.3.ebuild b/app-emulation/lxc/lxc-2.0.3.ebuild
new file mode 100644 (file)
index 0000000..291b2d4
--- /dev/null
@@ -0,0 +1,197 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/-}"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/"
+SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="cgmanager doc examples lua python seccomp"
+
+RDEPEND="net-libs/gnutls
+       sys-libs/libcap
+       cgmanager? ( app-admin/cgmanager )
+       lua? ( >=dev-lang/lua-5.1:= )
+       python? ( ${PYTHON_DEPS} )
+       seccomp? ( sys-libs/libseccomp )"
+
+DEPEND="${RDEPEND}
+       doc? ( app-text/docbook-sgml-utils )
+       >=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+       sys-process/criu
+       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
+
+       ~DEVPTS_MULTIPLE_INSTANCES
+       ~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)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-bash-completion.patch
+       #558854
+       epatch "${FILESDIR}"/${P}-omit-sysconfig.patch
+       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.
+       econf \
+               --localstatedir=/var \
+               --bindir=/usr/bin \
+               --sbindir=/usr/bin \
+               --docdir=/usr/share/doc/${PF} \
+               --with-config-path=/var/lib/lxc \
+               --with-rootfs-path=/var/lib/lxc/rootfs \
+               --with-distro=gentoo \
+               --with-runtime-path=/run \
+               --disable-apparmor \
+               $(use_enable cgmanager) \
+               $(use_enable doc) \
+               $(use_enable examples) \
+               $(use_enable lua) \
+               $(use_enable python) \
+               $(use_enable seccomp)
+}
+
+python_compile() {
+       distutils-r1_python_compile build_ext -I ../ -L ../${PN}
+}
+
+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.4" ${PN}
+
+       # Remember to compare our systemd unit file with the upstream one
+       # config/init/systemd/lxc.service.in
+       systemd_newunit "${FILESDIR}"/${PN}_at.service.3 "lxc@.service"
+}
+
+pkg_postinst() {
+       elog ""
+       elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been"
+       elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc"
+       elog "please add the following to your /etc/lxc/default.conf"
+       elog "lxc.lxcpath = /etc/lxc"
+       elog ""
+       elog "There is an init script provided with the package now; no documentation"
+       elog "is currently available though, so please check out /etc/init.d/lxc ."
+       elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
+       elog "to start the container defined into /etc/lxc/configname.conf ."
+       elog "For further information about LXC development see"
+       elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
+       elog ""
+}
index a1fcb3db2644bf3c133f0c85935c0704288e877d..69aeae856f3bad9e55ef27213c2e12932fe6bc0c 100644 (file)
@@ -10,6 +10,9 @@
   <maintainer type="person">
     <email>hwoarang@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>stasibear@gentoo.org</email>
+  </maintainer>
   <maintainer type="project">
     <email>virtualization@gentoo.org</email>
     <name>Gentoo Virtualization Project</name>