gentoo auto-resync : 02:08:2022 - 09:17:58

4 files changed, 75 insertions, 1 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 2dbe5808fcff..721b7b467917 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 13ac245b8705..1846ef08e381 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,9 +1,10 @@
 AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58
 AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7
 AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf
+AUX lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch 2124 BLAKE2B b135dd04ba1afa2f1883eed5b3e5fec45237fa5a7d75f8e1734ab08100ef6475bce92d3cde4033e537d07d50bf8d6f770e9cd093aafc3e551f44ac12f466743f SHA512 eca56be841aa0546408ed501e515d22122b5345b70e6516d2f4952d8c6fec300e78d49c9ab894856c077a8bcf739276491013fb322f992898d4276f7b3f0ba9e
 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
 EBUILD lxcfs-5.0.0_p20220524.ebuild 1728 BLAKE2B 0b357a0906f9f7921d99948ce1721d4f6e3e076f3367ed2eae91078c4c71d20611cb49dad2c446675e200dd1e0060b06fbcadf304911145c1aae78f639b665b1 SHA512 67890b74409da3767b9169b727fc895fd4345abc62190414ee4ca3cb22fee4b24cdbe240b2c73162e99d0c0ce18a3eb340d91a6993c794ac6266f8fa898d4fe6
-EBUILD lxcfs-5.0.1.ebuild 1848 BLAKE2B 4bcf1691ede06337d5ee98ec1d5978d46532ff31fa3182d1aa93850e4c5740d0c71977188461a18b5dbf5819c60c9baff16812c34d5171c5e7f53005cd154f4f SHA512 6be20bb6e6fbc1f19e3e56a93717ebb3ab370835e7855145f3b06d7c8c2522768ed0844c4a833956a7d99291da9b1f33ca4b76146654d46ed55ae9626a1eb179
+EBUILD lxcfs-5.0.1-r1.ebuild 1925 BLAKE2B 6abcfb36b970d42daca81de4fc3505da269504e213868d1154746c48788e413c555e08cfe0f036c61c67da70897966f9b5b097e9311dc897d9d147cf683f4bfc SHA512 735b93a160f4ab25cfefacb9928737585fe7b0edd9a5ca198d2167230d1ad9480d7b2c7ee2105373fd92c309f4a87f5885d4d9469447eb49d32479b4d929fe29
 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab
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.ebuild b/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild
index 9af4475e9807..1a0187e1c338 100644
--- a/sys-fs/lxcfs/lxcfs-5.0.1.ebuild
+++ b/sys-fs/lxcfs/lxcfs-5.0.1-r1.ebuild
@@ -31,6 +31,8 @@ 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}]"
 }