pyrox.dev
lol
fuse3: 3.11.0 -> 3.16.1
https://github.com/libfuse/libfuse/blob/fuse-3.16.1/ChangeLog.rst#libfuse-3161-2023-08-08
One change can be expected to break some setups:
- Unsupported mount options are no longer silently accepted [1]
For example, sshfs built against the present libfuse 3.11.0,
`$ sshfs 127.0.0.1:/home/test/testdir /home/test/sshfs_mnt -o atime`
terminates successfully (with the mount point established), while when
built against 3.16.1, it outputs the error message `fuse: unknown
option(s): `-o atime'` and terminates with exit status 1.
+21
-17
+3
-2
pkgs/os-specific/linux/fuse/common.nix
+3
-2
pkgs/os-specific/linux/fuse/common.nix
···
1
-
{ version, sha256Hash }:
1
+
{ version, hash }:
2
2
3
3
{ lib, stdenv, fetchFromGitHub, fetchpatch
4
4
, fusePackages, util-linux, gettext, shadow
···
17
17
owner = "libfuse";
18
18
repo = "libfuse";
19
19
rev = "${pname}-${version}";
20
-
sha256 = sha256Hash;
20
+
inherit hash;
21
21
};
22
22
23
23
preAutoreconf = "touch config.rpath";
···
48
48
mesonFlags = lib.optionals isFuse3 [
49
49
"-Dudevrulesdir=/udev/rules.d"
50
50
"-Duseroot=false"
51
+
"-Dinitscriptdir="
51
52
];
52
53
53
54
preConfigure = ''
+3
-3
pkgs/os-specific/linux/fuse/default.nix
+3
-3
pkgs/os-specific/linux/fuse/default.nix
···
7
7
in {
8
8
fuse_2 = mkFuse {
9
9
version = "2.9.9";
10
-
sha256Hash = "1yxxvm58c30pc022nl1wlg8fljqpmwnchkywic3r74zirvlcq23n";
10
+
hash = "sha256-dgjM6M7xk5MHi9xPyCyvF0vq0KM8UCsEYBcMhkrdvfs=";
11
11
};
12
12
13
13
fuse_3 = mkFuse {
14
-
version = "3.11.0";
15
-
sha256Hash = "1wx80xxlvjn0wxhmkr1g91vwrgxssyzds1hizzxc2xrd4kjh9dfb";
14
+
version = "3.16.1";
15
+
hash = "sha256-9UYrZ+aYwoa7OmsmUGvOW9uBzTw+p+ugjTMiQIHQ804=";
16
16
};
17
17
}
+3
-2
pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch
+3
-2
pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch
···
1
+
diff --git a/lib/meson.build b/lib/meson.build
1
2
--- a/lib/meson.build
2
3
+++ b/lib/meson.build
3
4
@@ -37,8 +37,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(),
4
5
soversion: '3', include_directories: include_dirs,
5
6
dependencies: deps, install: true,
6
7
link_depends: 'fuse_versionscript',
7
-
- c_args: [ '-DFUSE_USE_VERSION=35',
8
+
- c_args: [ '-DFUSE_USE_VERSION=312',
8
9
- '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ],
9
-
+ c_args: [ '-DFUSE_USE_VERSION=35' ],
10
+
+ c_args: [ '-DFUSE_USE_VERSION=312' ],
10
11
link_args: ['-Wl,--version-script,' + meson.current_source_dir()
11
12
+ '/fuse_versionscript' ])
12
13
+12
-10
pkgs/os-specific/linux/fuse/fuse3-install.patch
+12
-10
pkgs/os-specific/linux/fuse/fuse3-install.patch
···
1
-
--- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200
2
-
+++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200
3
-
@@ -37,10 +37,10 @@
4
-
fi
1
+
--- a/util/install_helper.sh 2023-08-26 22:12:11.028651669 +0200
2
+
+++ b/util/install_helper.sh 2023-08-26 22:38:03.165058694 +0200
3
+
@@ -39,12 +39,12 @@
5
4
6
-
install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
5
+
if [ "${udevrulesdir}" != "" ]; then
6
+
install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
7
7
- "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
8
8
+ "${sysconfdir}${udevrulesdir}/99-fuse3.rules"
9
-
10
-
install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
11
-
- "${DESTDIR}/etc/init.d/fuse3"
12
-
+ "${sysconfdir}/init.d/fuse3"
9
+
fi
13
10
11
+
if [ "$initscriptdir" != "" ]; then
12
+
install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
13
+
- "${DESTDIR}${initscriptdir}/fuse3"
14
+
+ "${sysconfdir}${initscriptdir}/fuse3"
14
15
15
-
if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
16
+
if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
17
+
/usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
16
18
diff --git a/util/meson.build b/util/meson.build
17
19
index aa0e734..06d4378 100644
18
20
--- a/util/meson.build