sys-fs/lxcfs: add a patch to fix an issue with fuse3 on 5.0.1

Closes: https://bugs.gentoo.org/862342
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

2 files changed, 150 insertions, 0 deletions

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
new file mode 100644
index 000000000000..45450504804a
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch
@@ -0,0 +1,71 @@
+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
new file mode 100644
index 000000000000..1a0187e1c338
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild
@@ -0,0 +1,79 @@
+# 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
+}