Date: Friday, March 17, 2023 @ 01:35:43
Author: heftig
Revision: 471043
archrelease: copy trunk to extra-x86_64
Added:
flatpak/repos/extra-x86_64/0001-Set-size-of-file-info-for-symlinks-to-0.patch
(from rev 471042,
flatpak/trunk/0001-Set-size-of-file-info-for-symlinks-to-0.patch)
flatpak/repos/extra-x86_64/0002-tests-Don-t-use-g_test_message-before-g_test_init.patch
(from rev 471042,
flatpak/trunk/0002-tests-Don-t-use-g_test_message-before-g_test_init.patch)
flatpak/repos/extra-x86_64/PKGBUILD
(from rev 471042, flatpak/trunk/PKGBUILD)
flatpak/repos/extra-x86_64/flatpak-bindir.sh
(from rev 471042, flatpak/trunk/flatpak-bindir.sh)
flatpak/repos/extra-x86_64/fusermount3.diff
(from rev 471042, flatpak/trunk/fusermount3.diff)
Deleted:
flatpak/repos/extra-x86_64/PKGBUILD
flatpak/repos/extra-x86_64/flatpak-bindir.sh
flatpak/repos/extra-x86_64/fusermount3.diff
--------------------------------------------------------------+
0001-Set-size-of-file-info-for-symlinks-to-0.patch | 23
0002-tests-Don-t-use-g_test_message-before-g_test_init.patch | 61 ++
PKGBUILD | 278 +++++-----
flatpak-bindir.sh | 18
fusermount3.diff | 132 ++--
5 files changed, 302 insertions(+), 210 deletions(-)
Copied:
flatpak/repos/extra-x86_64/0001-Set-size-of-file-info-for-symlinks-to-0.patch
(from rev 471042,
flatpak/trunk/0001-Set-size-of-file-info-for-symlinks-to-0.patch)
===================================================================
--- 0001-Set-size-of-file-info-for-symlinks-to-0.patch
(rev 0)
+++ 0001-Set-size-of-file-info-for-symlinks-to-0.patch 2023-03-17 01:35:43 UTC
(rev 471043)
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Fri, 17 Mar 2023 01:58:24 +0100
+Subject: [PATCH] Set size of file info for symlinks to 0
+
+`ostree_raw_file_to_content_stream` will try to read it, causing a
+critical warning with GLib 2.76 causing tests to fail.
+---
+ common/flatpak-utils.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
+index f28fdc071b1c..b8ad97003877 100644
+--- a/common/flatpak-utils.c
++++ b/common/flatpak-utils.c
+@@ -5056,6 +5056,7 @@ flatpak_mtree_create_symlink (OstreeRepo *repo,
+
+ g_file_info_set_name (file_info, filename);
+ g_file_info_set_file_type (file_info, G_FILE_TYPE_SYMBOLIC_LINK);
++ g_file_info_set_size (file_info, 0);
+ g_file_info_set_attribute_uint32 (file_info, "unix::uid", 0);
+ g_file_info_set_attribute_uint32 (file_info, "unix::gid", 0);
+ g_file_info_set_attribute_uint32 (file_info, "unix::mode", S_IFLNK | 0777);
Copied:
flatpak/repos/extra-x86_64/0002-tests-Don-t-use-g_test_message-before-g_test_init.patch
(from rev 471042,
flatpak/trunk/0002-tests-Don-t-use-g_test_message-before-g_test_init.patch)
===================================================================
--- 0002-tests-Don-t-use-g_test_message-before-g_test_init.patch
(rev 0)
+++ 0002-tests-Don-t-use-g_test_message-before-g_test_init.patch
2023-03-17 01:35:43 UTC (rev 471043)
@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Fri, 17 Mar 2023 02:08:38 +0100
+Subject: [PATCH] tests: Don't use g_test_message before g_test_init
+
+Meson will fail a test using TAP if the first line on stdout isn't the
+TAP version declaration.
+---
+ tests/testlib.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/testlib.c b/tests/testlib.c
+index 41f27ac9f541..d51cec375bf6 100644
+--- a/tests/testlib.c
++++ b/tests/testlib.c
+@@ -50,38 +50,38 @@ isolated_test_dir_global_setup (void)
+
+ isolated_test_dir = g_strdup ("/tmp/flatpak-test-XXXXXX");
+ assert_mkdtemp (isolated_test_dir);
+- g_test_message ("isolated_test_dir: %s", isolated_test_dir);
++ g_printerr ("isolated_test_dir: %s\n", isolated_test_dir);
+
+ homedir = g_strconcat (isolated_test_dir, "/home", NULL);
+ g_assert_no_errno (g_mkdir_with_parents (homedir, S_IRWXU | S_IRWXG |
S_IRWXO));
+
+ g_setenv ("HOME", homedir, TRUE);
+- g_test_message ("setting HOME=%s", homedir);
++ g_printerr ("setting HOME=%s\n", homedir);
+
+ cachedir = g_strconcat (isolated_test_dir, "/home/cache", NULL);
+ g_assert_no_errno (g_mkdir_with_parents (cachedir, S_IRWXU | S_IRWXG |
S_IRWXO));
+ g_setenv ("XDG_CACHE_HOME", cachedir, TRUE);
+- g_test_message ("setting XDG_CACHE_HOME=%s", cachedir);
++ g_printerr ("setting XDG_CACHE_HOME=%s\n", cachedir);
+
+ configdir = g_strconcat (isolated_test_dir, "/home/config", NULL);
+ g_assert_no_errno (g_mkdir_with_parents (configdir, S_IRWXU | S_IRWXG |
S_IRWXO));
+ g_setenv ("XDG_CONFIG_HOME", configdir, TRUE);
+- g_test_message ("setting XDG_CONFIG_HOME=%s", configdir);
++ g_printerr ("setting XDG_CONFIG_HOME=%s\n", configdir);
+
+ datadir = g_strconcat (isolated_test_dir, "/home/share", NULL);
+ g_assert_no_errno (g_mkdir_with_parents (datadir, S_IRWXU | S_IRWXG |
S_IRWXO));
+ g_setenv ("XDG_DATA_HOME", datadir, TRUE);
+- g_test_message ("setting XDG_DATA_HOME=%s", datadir);
++ g_printerr ("setting XDG_DATA_HOME=%s\n", datadir);
+
+ statedir = g_strconcat (isolated_test_dir, "/home/state", NULL);
+ g_assert_no_errno (g_mkdir_with_parents (statedir, S_IRWXU | S_IRWXG |
S_IRWXO));
+ g_setenv ("XDG_STATE_HOME", statedir, TRUE);
+- g_test_message ("setting XDG_STATE_HOME=%s", statedir);
++ g_printerr ("setting XDG_STATE_HOME=%s\n", statedir);
+
+ runtimedir = g_strconcat (isolated_test_dir, "/runtime", NULL);
+ g_assert_no_errno (g_mkdir_with_parents (runtimedir, S_IRWXU));
+ g_setenv ("XDG_RUNTIME_DIR", runtimedir, TRUE);
+- g_test_message ("setting XDG_RUNTIME_DIR=%s", runtimedir);
++ g_printerr ("setting XDG_RUNTIME_DIR=%s\n", runtimedir);
+
+ g_reload_user_special_dirs_cache ();
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-17 01:35:26 UTC (rev 471042)
+++ PKGBUILD 2023-03-17 01:35:43 UTC (rev 471043)
@@ -1,135 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Contributor: Bartłomiej Piotrowski <[email protected]>
-# Contributor: Jan Alexander Steffens (heftig) <[email protected]>
-
-pkgbase=flatpak
-pkgname=(flatpak flatpak-docs)
-pkgver=1.15.3
-pkgrel=1
-epoch=1
-pkgdesc="Linux application sandboxing and distribution framework (formerly
xdg-app)"
-url="https://flatpak.org";
-arch=(x86_64)
-license=(LGPL)
-depends=(
- appstream
- bubblewrap
- curl
- dbus
- fuse3
- glib2
- json-glib
- libarchive
- libmalcontent
- libseccomp
- libxau
- ostree
- polkit
- python
- systemd
- xdg-dbus-proxy
-)
-makedepends=(
- docbook-xsl
- git
- gobject-introspection
- gtk-doc
- meson
- python-pyparsing
- xmlto
-)
-checkdepends=(
- socat
- valgrind
-)
-_commit=756994b5c433dad9786f9fad736667c4f524aeac # tags/1.15.3^0
-source=(
- "git+https://github.com/flatpak/flatpak#commit=$_commit";
- git+https://gitlab.gnome.org/GNOME/libglnx.git
- git+https://github.com/projectatomic/bubblewrap
- git+https://github.com/flatpak/xdg-dbus-proxy
- git+https://gitlab.gnome.org/alexl/variant-schema-compiler.git
- https://dl.flathub.org/repo/flathub.flatpakrepo
- fusermount3.diff
- flatpak-bindir.sh
-)
-b2sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
-
'c094461a28dab284c1d32cf470f38118a6cbce27acce633b81945fb859daef9bdec1261490f344221b5cacf4437f53934cb51173f7ad2f1d2e05001139e75c54'
-
'81010a49af57e6047ab57285e3f8430da3b2be8504bc5600502da9a3729e9f92bb086a314ca8a03bca446e8f203150e378f3443f7034d8d7ade9dad6f1b9db59'
-
'1c45caa65e2a1598f219977d5a81dcb8ea5d458880c43c40ba452b0c77cbbf41b36fa6911741f22c807d318e04e39e4fcc1455ed8d68faaba10162dae2570abc')
-
-pkgver() {
- cd flatpak
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd flatpak
-
- # Support fuse3
- # https://bugs.archlinux.org/task/75623
- git apply -3 ../fusermount3.diff
-
- git submodule init
- git submodule set-url libglnx "$srcdir/libglnx"
- git submodule set-url bubblewrap "$srcdir/bubblewrap"
- git submodule set-url dbus-proxy "$srcdir/xdg-dbus-proxy"
- git submodule set-url variant-schema-compiler
"$srcdir/variant-schema-compiler"
- git -c protocol.file.allow=always submodule update
-}
-
-build() {
- local meson_options=(
- -D dbus_config_dir=/usr/share/dbus-1/system.d
- -D selinux_module=disabled
- -D system_bubblewrap=bwrap
- -D system_dbus_proxy=xdg-dbus-proxy
- )
-
- arch-meson flatpak build "${meson_options[@]}"
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-_pick() {
- local p="$1" f d; shift
- for f; do
- d="$srcdir/$p/${f#$pkgdir/}"
- mkdir -p "$(dirname "$d")"
- mv "$f" "$d"
- rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
- done
-}
-
-package_flatpak() {
- depends+=(
- libostree-1.so
- xdg-desktop-portal
- )
- provides=(libflatpak.so)
-
- meson install -C build --destdir "$pkgdir"
-
- install -Dt "$pkgdir/etc/profile.d" -m644 flatpak-bindir.sh
- install -Dt "$pkgdir/etc/flatpak/remotes.d" flathub.flatpakrepo
-
- # Fixup mode to match polkit
- install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
-
- _pick docs "$pkgdir"/usr/share/{doc,gtk-doc}
-}
-
-package_flatpak-docs() {
- pkgdesc+=" (documentation)"
- depends=()
- mv docs/* "$pkgdir"
-}
-
-# vim:set sw=2 sts=-1 et:
Copied: flatpak/repos/extra-x86_64/PKGBUILD (from rev 471042,
flatpak/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-17 01:35:43 UTC (rev 471043)
@@ -0,0 +1,143 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Bartłomiej Piotrowski <[email protected]>
+# Contributor: Jan Alexander Steffens (heftig) <[email protected]>
+
+pkgbase=flatpak
+pkgname=(flatpak flatpak-docs)
+pkgver=1.15.4
+pkgrel=1
+epoch=1
+pkgdesc="Linux application sandboxing and distribution framework (formerly
xdg-app)"
+url="https://flatpak.org";
+arch=(x86_64)
+license=(LGPL)
+depends=(
+ appstream
+ bubblewrap
+ curl
+ dbus
+ fuse3
+ glib2
+ json-glib
+ libarchive
+ libmalcontent
+ libseccomp
+ libxau
+ ostree
+ polkit
+ python
+ systemd
+ xdg-dbus-proxy
+)
+makedepends=(
+ docbook-xsl
+ git
+ gobject-introspection
+ gtk-doc
+ meson
+ python-pyparsing
+ xmlto
+)
+checkdepends=(
+ socat
+ valgrind
+)
+_commit=e936e3100d406c50ba49f3ad6a0ecae455345ec0 # tags/1.15.4^0
+source=(
+ "git+https://github.com/flatpak/flatpak#commit=$_commit";
+ git+https://gitlab.gnome.org/GNOME/libglnx.git
+ git+https://github.com/projectatomic/bubblewrap
+ git+https://github.com/flatpak/xdg-dbus-proxy
+ git+https://gitlab.gnome.org/alexl/variant-schema-compiler.git
+ https://dl.flathub.org/repo/flathub.flatpakrepo
+ 0001-Set-size-of-file-info-for-symlinks-to-0.patch
+ 0002-tests-Don-t-use-g_test_message-before-g_test_init.patch
+ fusermount3.diff
+ flatpak-bindir.sh
+)
+b2sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+
'c094461a28dab284c1d32cf470f38118a6cbce27acce633b81945fb859daef9bdec1261490f344221b5cacf4437f53934cb51173f7ad2f1d2e05001139e75c54'
+
'e143c7bb1179b3fb337b05b14e3a2506b5603d315739e38df99264f98c362113fa4cc92bb3442c47354a3d0d91fd3dc6a9d4f92c7991db725867550c3ec07ca8'
+
'16e3006819ae991f676426163e69656b4340b8ca83c615668120858ec8e0a100c73e34b84ff94e6a62c6b5e7c9b95cf27ac95b9a8b33e81d53cc031364c53db3'
+
'81010a49af57e6047ab57285e3f8430da3b2be8504bc5600502da9a3729e9f92bb086a314ca8a03bca446e8f203150e378f3443f7034d8d7ade9dad6f1b9db59'
+
'1c45caa65e2a1598f219977d5a81dcb8ea5d458880c43c40ba452b0c77cbbf41b36fa6911741f22c807d318e04e39e4fcc1455ed8d68faaba10162dae2570abc')
+
+pkgver() {
+ cd flatpak
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd flatpak
+
+ # Fix tests
+ git apply -3 ../0001-Set-size-of-file-info-for-symlinks-to-0.patch
+ git apply -3 ../0002-tests-Don-t-use-g_test_message-before-g_test_init.patch
+
+ # Support fuse3
+ # https://bugs.archlinux.org/task/75623
+ git apply -3 ../fusermount3.diff
+
+ git submodule init
+ git submodule set-url libglnx "$srcdir/libglnx"
+ git submodule set-url bubblewrap "$srcdir/bubblewrap"
+ git submodule set-url dbus-proxy "$srcdir/xdg-dbus-proxy"
+ git submodule set-url variant-schema-compiler
"$srcdir/variant-schema-compiler"
+ git -c protocol.file.allow=always submodule update
+}
+
+build() {
+ local meson_options=(
+ -D dbus_config_dir=/usr/share/dbus-1/system.d
+ -D selinux_module=disabled
+ -D system_bubblewrap=bwrap
+ -D system_dbus_proxy=xdg-dbus-proxy
+ )
+
+ arch-meson flatpak build "${meson_options[@]}"
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+package_flatpak() {
+ depends+=(
+ libostree-1.so
+ xdg-desktop-portal
+ )
+ provides=(libflatpak.so)
+
+ meson install -C build --destdir "$pkgdir"
+
+ install -Dt "$pkgdir/etc/profile.d" -m644 flatpak-bindir.sh
+ install -Dt "$pkgdir/etc/flatpak/remotes.d" flathub.flatpakrepo
+
+ # Fixup mode to match polkit
+ install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
+
+ _pick docs "$pkgdir"/usr/share/{doc,gtk-doc}
+}
+
+package_flatpak-docs() {
+ pkgdesc+=" (documentation)"
+ depends=()
+ mv docs/* "$pkgdir"
+}
+
+# vim:set sw=2 sts=-1 et:
Deleted: flatpak-bindir.sh
===================================================================
--- flatpak-bindir.sh 2023-03-17 01:35:26 UTC (rev 471042)
+++ flatpak-bindir.sh 2023-03-17 01:35:43 UTC (rev 471043)
@@ -1,9 +0,0 @@
-if [ -n "$XDG_DATA_HOME" ] && [ -d "$XDG_DATA_HOME/flatpak/exports/bin" ]; then
- append_path "$XDG_DATA_HOME/flatpak/exports/bin"
-elif [ -n "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then
- append_path "$HOME/.local/share/flatpak/exports/bin"
-fi
-
-if [ -d /var/lib/flatpak/exports/bin ]; then
- append_path /var/lib/flatpak/exports/bin
-fi
Copied: flatpak/repos/extra-x86_64/flatpak-bindir.sh (from rev 471042,
flatpak/trunk/flatpak-bindir.sh)
===================================================================
--- flatpak-bindir.sh (rev 0)
+++ flatpak-bindir.sh 2023-03-17 01:35:43 UTC (rev 471043)
@@ -0,0 +1,9 @@
+if [ -n "$XDG_DATA_HOME" ] && [ -d "$XDG_DATA_HOME/flatpak/exports/bin" ]; then
+ append_path "$XDG_DATA_HOME/flatpak/exports/bin"
+elif [ -n "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then
+ append_path "$HOME/.local/share/flatpak/exports/bin"
+fi
+
+if [ -d /var/lib/flatpak/exports/bin ]; then
+ append_path /var/lib/flatpak/exports/bin
+fi
Deleted: fusermount3.diff
===================================================================
--- fusermount3.diff 2023-03-17 01:35:26 UTC (rev 471042)
+++ fusermount3.diff 2023-03-17 01:35:43 UTC (rev 471043)
@@ -1,66 +0,0 @@
-diff --git i/common/flatpak-dir.c w/common/flatpak-dir.c
-index 84816389..b99a7304 100644
---- i/common/flatpak-dir.c
-+++ w/common/flatpak-dir.c
-@@ -2109,7 +2109,7 @@ flatpak_dir_revokefs_fuse_unmount (OstreeRepo **repo,
-
- fusermount = g_subprocess_new (G_SUBPROCESS_FLAGS_NONE,
- error,
-- "fusermount", "-u", "-z", mnt_dir,
-+ "fusermount3", "-u", "-z", mnt_dir,
- NULL);
- if (g_subprocess_wait_check (fusermount, NULL, error))
- {
-diff --git i/tests/can-use-fuse.c w/tests/can-use-fuse.c
-index fb6e2000..759f0d84 100644
---- i/tests/can-use-fuse.c
-+++ w/tests/can-use-fuse.c
-@@ -53,23 +53,23 @@ check_fuse (void)
- return FALSE;
- }
-
-- fusermount = g_find_program_in_path ("fusermount");
-+ fusermount = g_find_program_in_path ("fusermount3");
-
- if (fusermount == NULL)
- {
-- cannot_use_fuse = g_strdup ("fusermount not found in PATH");
-+ cannot_use_fuse = g_strdup ("fusermount3 not found in PATH");
- return FALSE;
- }
-
- if (!g_file_test (fusermount, G_FILE_TEST_IS_EXECUTABLE))
- {
- cannot_use_fuse = g_strdup_printf ("%s not executable", fusermount);
- return FALSE;
- }
-
- if (!g_file_test ("/etc/mtab", G_FILE_TEST_EXISTS))
- {
-- cannot_use_fuse = g_strdup ("fusermount won't work without /etc/mtab");
-+ cannot_use_fuse = g_strdup ("fusermount3 won't work without /etc/mtab");
- return FALSE;
- }
-
-diff --git i/tests/libtest.sh w/tests/libtest.sh
-index 36d39ac4..e78d94ca 100644
---- i/tests/libtest.sh
-+++ w/tests/libtest.sh
-@@ -542,7 +542,7 @@ skip_one_without_bwrap () {
- }
-
- skip_without_fuse () {
-- fusermount --version >/dev/null 2>&1 || skip "no fusermount"
-+ fusermount3 --version >/dev/null 2>&1 || skip "no fusermount3"
-
- capsh --print | grep -q 'Bounding set.*[^a-z]cap_sys_admin' || \
- skip "No cap_sys_admin in bounding set, can't use FUSE"
-@@ -608,7 +608,7 @@ commit_to_path () {
- cleanup () {
- /bin/kill -9 $DBUS_SESSION_BUS_PID
- gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye >&2 || true
-- fusermount -u $XDG_RUNTIME_DIR/doc >&2 || :
-+ fusermount3 -u $XDG_RUNTIME_DIR/doc >&2 || :
- kill $(jobs -p) &> /dev/null || true
- if test -n "${TEST_SKIP_CLEANUP:-}"; then
- echo "# Skipping cleanup of ${TEST_DATA_DIR}"
Copied: flatpak/repos/extra-x86_64/fusermount3.diff (from rev 471042,
flatpak/trunk/fusermount3.diff)
===================================================================
--- fusermount3.diff (rev 0)
+++ fusermount3.diff 2023-03-17 01:35:43 UTC (rev 471043)
@@ -0,0 +1,66 @@
+diff --git i/common/flatpak-dir.c w/common/flatpak-dir.c
+index 84816389..b99a7304 100644
+--- i/common/flatpak-dir.c
++++ w/common/flatpak-dir.c
+@@ -2109,7 +2109,7 @@ flatpak_dir_revokefs_fuse_unmount (OstreeRepo **repo,
+
+ fusermount = g_subprocess_new (G_SUBPROCESS_FLAGS_NONE,
+ error,
+- "fusermount", "-u", "-z", mnt_dir,
++ "fusermount3", "-u", "-z", mnt_dir,
+ NULL);
+ if (g_subprocess_wait_check (fusermount, NULL, error))
+ {
+diff --git i/tests/can-use-fuse.c w/tests/can-use-fuse.c
+index fb6e2000..759f0d84 100644
+--- i/tests/can-use-fuse.c
++++ w/tests/can-use-fuse.c
+@@ -53,23 +53,23 @@ check_fuse (void)
+ return FALSE;
+ }
+
+- fusermount = g_find_program_in_path ("fusermount");
++ fusermount = g_find_program_in_path ("fusermount3");
+
+ if (fusermount == NULL)
+ {
+- cannot_use_fuse = g_strdup ("fusermount not found in PATH");
++ cannot_use_fuse = g_strdup ("fusermount3 not found in PATH");
+ return FALSE;
+ }
+
+ if (!g_file_test (fusermount, G_FILE_TEST_IS_EXECUTABLE))
+ {
+ cannot_use_fuse = g_strdup_printf ("%s not executable", fusermount);
+ return FALSE;
+ }
+
+ if (!g_file_test ("/etc/mtab", G_FILE_TEST_EXISTS))
+ {
+- cannot_use_fuse = g_strdup ("fusermount won't work without /etc/mtab");
++ cannot_use_fuse = g_strdup ("fusermount3 won't work without /etc/mtab");
+ return FALSE;
+ }
+
+diff --git i/tests/libtest.sh w/tests/libtest.sh
+index 36d39ac4..e78d94ca 100644
+--- i/tests/libtest.sh
++++ w/tests/libtest.sh
+@@ -542,7 +542,7 @@ skip_one_without_bwrap () {
+ }
+
+ skip_without_fuse () {
+- fusermount --version >/dev/null 2>&1 || skip "no fusermount"
++ fusermount3 --version >/dev/null 2>&1 || skip "no fusermount3"
+
+ capsh --print | grep -q 'Bounding set.*[^a-z]cap_sys_admin' || \
+ skip "No cap_sys_admin in bounding set, can't use FUSE"
+@@ -608,7 +608,7 @@ commit_to_path () {
+ cleanup () {
+ /bin/kill -9 $DBUS_SESSION_BUS_PID
+ gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye >&2 || true
+- fusermount -u $XDG_RUNTIME_DIR/doc >&2 || :
++ fusermount3 -u $XDG_RUNTIME_DIR/doc >&2 || :
+ kill $(jobs -p) &> /dev/null || true
+ if test -n "${TEST_SKIP_CLEANUP:-}"; then
+ echo "# Skipping cleanup of ${TEST_DATA_DIR}"
