commit: ff94e87fa07cb7c93bde70e2676aeec510a78e7d
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 11:48:25 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 11:51:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff94e87f
app-containers/lxc: drop 4.0.11_p1-r1
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-containers/lxc/Manifest | 2 -
.../lxc/files/lxc-4.0.11_p1-liburing-sync1.patch | 29 ----
.../lxc/files/lxc-4.0.11_p1-liburing-sync2.patch | 28 ---
app-containers/lxc/lxc-4.0.11_p1-r1.ebuild | 188 ---------------------
4 files changed, 247 deletions(-)
diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index e1145caad041..c736c09fa249 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -1,4 +1,2 @@
-DIST lxc-4.0.11.tar.gz 1543031 BLAKE2B
0309bbb96938e60e4cbe145fa0cc3c0a85d9154282a889d74167128b6166a280bb4d53df266990a529a98935ef2c12e8d2214e9a8f6cb293d47aa5808ebad82f
SHA512
23287e468da8939334f4261bfcbb52eadcbe5806bd97896db38c84eb42f32143dc17bb8b9bb7f7f88584b72056553c9edc33ddb693a345ecf88f3177573fa9c0
-DIST lxc-4.0.11.tar.gz.asc 833 BLAKE2B
68804d1d5ad09e388541b3a95a98ca14202c513ea3544a7389a49f4e13ecffc17715bb023675134fd99047c727cffe09cbd0a89883054b82650ebd23366823a7
SHA512
49a54aaf018772db40e1dadc0a10e7d727a2b14b34c0a3c704fd3f7a12e60082abf4628cc0a489ee620ef2210c7542abbdb6d1432e4297ceef52cdd6b158a5f8
DIST lxc-4.0.12.tar.gz 1565070 BLAKE2B
819b5140b641dbc1ed6cf5f2840bb0ee6d3ab8c687f4f8064e42d347113bdf50fcbb653a6fb26598db0daab0c83ad88fe0d27fd2842fac9d7f5fef73656d7976
SHA512
04437d9c891cd3a22f756c42f05e97398772587175d65aff9d394f0f3e810efc5c1fe7077c39573de3ec259e0605bc2a7ea51093613b2cef908372ae338df19d
DIST lxc-4.0.12.tar.gz.asc 833 BLAKE2B
2fca60b5ac267a893f70875ccdbe39db6b98b5fe51fe396692449e310b6e680e7b142380e193f5d8299f18e796ed2fd0e08cd186859069877fcca6bc26e44717
SHA512
4f2912879e6f3bf5fdbebb902cf16ca6b766b5720b817c4b4996e62098a1d282327d330ffd9768d45d69aeddb50184dc8485b0ef75b046449ce4c544cdc43c9b
diff --git a/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch
b/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch
deleted file mode 100644
index cd497a755523..000000000000
--- a/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From aac3f106ff012e1d6835b20c250dcf09c364530c Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian.brau...@ubuntu.com>
-Date: Thu, 28 Oct 2021 17:39:11 +0200
-Subject: [PATCH] mainloop: make sure that descr->ring is allocated
-
-This is future proofing more than anything else.
-
-Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
----
- src/lxc/mainloop.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c
-index 7c8f5d86af..17a4d55293 100644
---- a/src/lxc/mainloop.c
-+++ b/src/lxc/mainloop.c
-@@ -515,8 +515,10 @@ void lxc_mainloop_close(struct lxc_async_descr *descr)
-
- if (descr->type == LXC_MAINLOOP_IO_URING) {
- #if HAVE_LIBURING
-- io_uring_queue_exit(descr->ring);
-- munmap(descr->ring, sizeof(struct io_uring));
-+ if (descr->ring) {
-+ io_uring_queue_exit(descr->ring);
-+ munmap(descr->ring, sizeof(struct io_uring));
-+ }
- #else
- ERROR("Unsupported io_uring mainloop");
- #endif
diff --git a/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch
b/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch
deleted file mode 100644
index 33b8554193d3..000000000000
--- a/app-containers/lxc/files/lxc-4.0.11_p1-liburing-sync2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a585382b972c25ee8489147d94918d001ef439a7 Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian.brau...@ubuntu.com>
-Date: Thu, 28 Oct 2021 17:39:42 +0200
-Subject: [PATCH] start: check event loop type before closing fd
-
-Since this is a union we might otherwise stomp on io_uring mmap()ed
-memory.
-
-Fixes: #4016
-Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
----
- src/lxc/start.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lxc/start.c b/src/lxc/start.c
-index 8f7173ec8c..1a6046c7a4 100644
---- a/src/lxc/start.c
-+++ b/src/lxc/start.c
-@@ -629,7 +629,8 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
- TRACE("Mainloop is ready");
-
- ret = lxc_mainloop(&descr, -1);
-- close_prot_errno_disarm(descr.epfd);
-+ if (descr.type == LXC_MAINLOOP_EPOLL)
-+ close_prot_errno_disarm(descr.epfd);
- if (ret < 0 || !handler->init_died)
- goto out_mainloop_console;
-
diff --git a/app-containers/lxc/lxc-4.0.11_p1-r1.ebuild
b/app-containers/lxc/lxc-4.0.11_p1-r1.ebuild
deleted file mode 100644
index 4e14a39d94fa..000000000000
--- a/app-containers/lxc/lxc-4.0.11_p1-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam
readme.gentoo-r1 systemd verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc";
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz
- verify-sig? (
https://linuxcontainers.org/downloads/lxc/${P/_p1}.tar.gz.asc )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-LICENSE="GPL-2 LGPL-2.1 LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc io-uring man pam seccomp selinux +ssl +tools
verify-sig"
-
-RDEPEND="acct-group/lxc
- acct-user/lxc
- app-misc/pax-utils
- sys-apps/util-linux
- sys-libs/libcap
- virtual/awk
- caps? ( sys-libs/libcap )
- io-uring? ( >=sys-libs/liburing-2:= )
- pam? ( sys-libs/pam )
- seccomp? ( sys-libs/libseccomp )
- selinux? ( sys-libs/libselinux )
- ssl? (
- dev-libs/openssl:0=
- )"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-4
- apparmor? ( sys-apps/apparmor )"
-BDEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )
- man? ( app-text/docbook-sgml-utils )
- verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
- ~CGROUPS
- ~CGROUP_CPUACCT
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
-
- ~CGROUP_SCHED
- ~CPUSETS
- ~IPC_NS
- ~MACVLAN
-
- ~MEMCG
- ~NAMESPACES
- ~NET_NS
- ~PID_NS
-
- ~POSIX_MQUEUE
- ~USER_NS
- ~UTS_NS
- ~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container)
networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
- linux-info_pkg_setup
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
- "${FILESDIR}"/${P}-liburing-sync1.patch #820545
- "${FILESDIR}"/${P}-liburing-sync2.patch #820545
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-S="${WORKDIR}/${PN}-${PV/_p1}"
-
-src_prepare() {
- default
-
- export bashcompdir="/etc/bash_completion.d"
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- local myeconfargs=(
- --bindir=/usr/bin
- --localstatedir=/var
- --sbindir=/usr/bin
-
- --with-config-path=/var/lib/lxc
- --with-distro=gentoo
- --with-init-script=systemd
- --with-rootfs-path=/var/lib/lxc/rootfs
- --with-runtime-path=/run
- --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-
- --disable-coverity-build
- --disable-dlog
- --disable-fuzzers
- --disable-mutex-debugging
- --disable-no-undefined
- --disable-rpath
- --disable-sanitizers
- --disable-tests
- --disable-werror
-
- --enable-bash
- --enable-commands
- --enable-memfd-rexec
- --enable-thread-safety
-
- $(use_enable apparmor)
- $(use_enable caps capabilities)
- $(use_enable doc api-docs)
- $(use_enable doc examples)
- $(use_enable io-uring liburing)
- $(use_enable man doc)
- $(use_enable pam)
- $(use_enable seccomp)
- $(use_enable selinux)
- $(use_enable ssl openssl)
- $(use_enable tools)
-
- $(use_with pam pamdir $(getpam_mod_dir))
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- # The main bash-completion file will collide with lxd, need to relocate
and update symlinks.
- mkdir -p "${ED}"/$(get_bashcompdir) || die "Failed to create
bashcompdir."
- mv "${ED}"/etc/bash_completion.d/lxc
"${ED}"/$(get_bashcompdir)/lxc-start || die "Failed to relocate lxc
bash-completion file."
- rm -r "${ED}"/etc/bash_completion.d || die "Failed to remove wrong
bash_completion.d content."
-
- if use tools; then
- bashcomp_alias lxc-start
lxc-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,usernsexec,wait}
- else
- bashcomp_alias lxc-start lxc-usernsexec
- fi
-
- keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
- rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
-
- find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
-
- # Gentoo-specific additions!
- newinitd "${FILESDIR}/lxc.initd.8" lxc
-
- # Remember to compare our systemd unit file with the upstream one
- # config/init/systemd/lxc.service.in
- systemd_newunit "${FILESDIR}"/lxc_at.service.4.0.0 "lxc@.service"
-
- DOC_CONTENTS="
- 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."
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- elog "Please run 'lxc-checkconfig' to see optional kernel features."
- elog
- optfeature "automatic template scripts" app-containers/lxc-templates
- optfeature "Debian-based distribution container image support"
dev-util/debootstrap
- optfeature "snapshot & restore functionality" sys-process/criu
-}
