summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonas Niilola <juippis@gentoo.org>2022-08-16 10:52:57 +0300
committerJoonas Niilola <juippis@gentoo.org>2022-08-16 10:55:02 +0300
commitf6d48291b04a9517f65d4642f663d04552a2d6fc (patch)
tree70d0cb18c11e7b998fa767b51eef817a4bd16a16 /sys-fs/lxcfs
parentapp-containers/lxc: drop 5.0.0, 5.0.0-r1 (diff)
downloadgentoo-f6d48291b04a9517f65d4642f663d04552a2d6fc.tar.gz
gentoo-f6d48291b04a9517f65d4642f663d04552a2d6fc.tar.bz2
gentoo-f6d48291b04a9517f65d4642f663d04552a2d6fc.zip
sys-fs/lxcfs: drop 5.0.1-r1
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sys-fs/lxcfs')
-rw-r--r--sys-fs/lxcfs/Manifest2
-rw-r--r--sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch71
-rw-r--r--sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild79
3 files changed, 0 insertions, 152 deletions
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index be566a9bba41..93e0ab7ebffd 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,5 +1,3 @@
DIST lxcfs-5.0.0_p20220524.tar.gz 101563 BLAKE2B 2bf282aed5490d160a563ae97fdfbb887366a6ec60ea7f36f5400e4a11330c51ac3096d63c99dd4aa2ebe1a3497102af9df41ebd40e38b3bde6c6dcd4265b336 SHA512 c1183096dd2b74ef859183451b8c909f762e3c56dce0b9384ac163a6b6b3f7a17a63e840742f4cc5ac50b1f25d402583ca6cf31c1617754b35e21c5c991515f4
-DIST lxcfs-5.0.1.tar.gz 103221 BLAKE2B 49cd0be04d358db81046ac78e66e8acaa86ef66e51a869b884cb75e98c0501ee7db1b1e5604ca44f105f04378418e8077738a6d6abf85c48b35dfee2b93131e9 SHA512 edc685914e73b055161b8efe9109aca7bc2b1f1285e06a71b697f97d2e7f4cddf5256519325bf628318b64ae0203f594928d9e772e04988971151c4e46788818
-DIST lxcfs-5.0.1.tar.gz.asc 833 BLAKE2B a280e506f154497af3cc6a61bf458830939c67a6a065da1c0509f44ed07bd58bf80c10b5bfdbb18027ae2f200aaa2e9ca4b76cde070b860c34fb2cca7083e809 SHA512 90b982b61fcc56ac23fcef344014252faba280a8fb7539d28dbe2d36dc433c8de93d2c065d160cb98b42ab4b341d01ff2a379cad12827d8b70885c044e9e9ae8
DIST lxcfs-5.0.2.tar.gz 103236 BLAKE2B 5fc8dc437e97a79c78320f8d8111746b171b086beb176a6ada30b8c23164ae4e58ad42806bc0ea73bbbb15d94816bd9b3d5500f9e2a306e2458d23fb111bf68f SHA512 df51e7154060dd7efe992eb2bc40c5a52dce8c52063477110ed414ecc3f430f18d5023a29be6866560fc87b060c2158cc1e947f030c509188320d417eb23d407
DIST lxcfs-5.0.2.tar.gz.asc 833 BLAKE2B a411c6cb4f3382469ea80a974166c98b57ae4b92712bf55507720fc78ec73ef6acbd47f6b3410294b209f77f1f3a17dc4b9fb4dda00bb7323ef32c7185ba4c2e SHA512 f9d54e26d406ebca97c82298361318f13e74fd55285c2b6563ae6c71af63d9b8325ac06b9de8103a95a19c5d965c2d907c313ac151210a162998f8a37ea99676
diff --git a/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch b/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch
deleted file mode 100644
index 45450504804a..000000000000
--- a/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 5976d0349c1900e2649b7d2904d98ba6a7278e6b Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Fri, 29 Jul 2022 09:30:10 +0200
-Subject: [PATCH] fix reinitialization with fuse3
-
-With fuse3 `fuse_get_context` returns NULL before fuse was
-fully initialized, so we must not access it.
-
-Futher, we call 'do_reload' for normal initialization as
-well, so let's prevent that from re-initializing the
-bindings initially and only do this on actual reloads,
-otherwise we do it twice on startup.
-
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Fixes #549
----
- src/bindings.c | 2 +-
- src/lxcfs.c | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/bindings.c b/src/bindings.c
-index 422a6229..fee7ede0 100644
---- a/src/bindings.c
-+++ b/src/bindings.c
-@@ -943,5 +943,5 @@ void *lxcfs_fuse_init(struct fuse_conn_info *conn, void *data)
- can_use_sys_cpu = true;
- #endif
- has_versioned_opts = true;
-- return fc->private_data;
-+ return fc ? fc->private_data : NULL;
- }
-diff --git a/src/lxcfs.c b/src/lxcfs.c
-index d1a3d805..fed896c9 100644
---- a/src/lxcfs.c
-+++ b/src/lxcfs.c
-@@ -123,7 +123,7 @@ static int lxcfs_init_library(void)
-
- /* do_reload - reload the dynamic library. Done under
- * lock and when we know the user_count was 0 */
--static void do_reload(void)
-+static void do_reload(bool reinit)
- {
- int ret;
- char lxcfs_lib_path[PATH_MAX];
-@@ -164,7 +164,7 @@ static void do_reload(void)
-
- good:
- /* initialize the library */
-- if (lxcfs_init_library() < 0) {
-+ if (reinit && lxcfs_init_library() < 0) {
- log_exit("Failed to initialize liblxcfs.so");
- }
-
-@@ -180,7 +180,7 @@ static void up_users(void)
- {
- users_lock();
- if (users_count == 0 && need_reload)
-- do_reload();
-+ do_reload(true);
- users_count++;
- users_unlock();
- }
-@@ -1362,7 +1362,7 @@ int main(int argc, char *argv[])
- fuse_argv[fuse_argc++] = new_argv[0];
- fuse_argv[fuse_argc] = NULL;
-
-- do_reload();
-+ do_reload(false);
- if (install_signal_handler(SIGUSR1, sigusr1_reload)) {
- lxcfs_error("%s - Failed to install SIGUSR1 signal handler", strerror(errno));
- goto out;
diff --git a/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild b/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild
deleted file mode 100644
index 1a0187e1c338..000000000000
--- a/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake meson python-any-r1 systemd verify-sig
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
- verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0 LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc test"
-
-DEPEND="sys-fs/fuse:3"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/jinja[${PYTHON_USEDEP}]
- ')
- doc? ( sys-apps/help2man )
- verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-# Needs some black magic to work inside container/chroot.
-RESTRICT="test"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-PATCHES=( "${FILESDIR}"/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch )
-
-python_check_deps() {
- python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Fix python shebangs for python-exec[-native-symlinks], #851480
- local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
- python_fix_shebang -q ${shebangs[*]}
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use doc docs)
- $(meson_use test tests)
-
- -Dfuse-version=3
- -Dinit-script=""
- -Dwith-init-script=""
- )
-
- meson_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
- ./main.sh || die
-}
-
-src_install() {
- meson_src_install
-
- newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
- newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
-
- # Provide our own service file (copy of upstream) due to paths being different from upstream,
- # #728470
- systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
-}