Unverified Commit bf86bfb6 authored by Guillaume Girol's avatar Guillaume Girol Committed by GitHub
Browse files

Merge pull request #256312 from 6t8k/fuse3_3.11.0-3.16.1

fuse3: 3.11.0 -> 3.16.2
parents 3d9ca9d8 57909959
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -240,6 +240,18 @@

- `fileSystems.<name>.autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be.

- `fuse3` has been updated from 3.11.0 to 3.16.2; see [ChangeLog.rst](https://github.com/libfuse/libfuse/blob/fuse-3.16.2/ChangeLog.rst#libfuse-3162-2023-10-10) for an overview of the changes.

  Unsupported mount options are no longer silently accepted [(since 3.15.0)](https://github.com/libfuse/libfuse/blob/fuse-3.16.2/ChangeLog.rst#libfuse-3150-2023-06-09). The [affected mount options](https://github.com/libfuse/libfuse/commit/dba6b3983af34f30de01cf532dff0b66f0ed6045) are: `atime`, `diratime`, `lazytime`, `nolazytime`, `relatime`, `norelatime`, `strictatime`.

  For example,

  ```bash
  $ sshfs 127.0.0.1:/home/test/testdir /home/test/sshfs_mnt -o atime`
  ```

  would previously terminate successfully with the mount point established, now it outputs the error message ``fuse: unknown option(s): `-o atime'`` and terminates with exit status 1.

- `nixos-rebuild {switch,boot,test,dry-activate}` now runs the system activation inside `systemd-run`, creating an ephemeral systemd service and protecting the system switch against issues like network disconnections during remote (e.g. SSH) sessions. This has the side effect of running the switch in an isolated environment, that could possible break post-switch scripts that depends on things like environment variables being set. If you want to opt-out from this behavior for now, you may set the `NIXOS_SWITCH_USE_DIRTY_ENV` environment variable before running `nixos-rebuild`. However, keep in mind that this option will be removed in the future.

- The `services.vaultwarden.config` option default value was changed to make Vaultwarden only listen on localhost, following the [secure defaults for most NixOS services](https://github.com/NixOS/nixpkgs/issues/100192).
+3 −2
Original line number Diff line number Diff line
{ version, sha256Hash }:
{ version, hash }:

{ lib, stdenv, fetchFromGitHub, fetchpatch
, fusePackages, util-linux, gettext, shadow
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
    owner = "libfuse";
    repo = "libfuse";
    rev = "${pname}-${version}";
    sha256 = sha256Hash;
    inherit hash;
  };

  preAutoreconf = "touch config.rpath";
@@ -48,6 +48,7 @@ in stdenv.mkDerivation rec {
  mesonFlags = lib.optionals isFuse3 [
    "-Dudevrulesdir=/udev/rules.d"
    "-Duseroot=false"
    "-Dinitscriptdir="
  ];

  preConfigure = ''
+3 −3
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ let
in {
  fuse_2 = mkFuse {
    version = "2.9.9";
    sha256Hash = "1yxxvm58c30pc022nl1wlg8fljqpmwnchkywic3r74zirvlcq23n";
    hash = "sha256-dgjM6M7xk5MHi9xPyCyvF0vq0KM8UCsEYBcMhkrdvfs=";
  };

  fuse_3 = mkFuse {
    version = "3.11.0";
    sha256Hash = "1wx80xxlvjn0wxhmkr1g91vwrgxssyzds1hizzxc2xrd4kjh9dfb";
    version = "3.16.2";
    hash = "sha256-QO9s+IkR0rkqIYNqt2IYST6AVBkCr56jcuuz5nKJuA4=";
  };
}
+3 −2
Original line number Diff line number Diff line
diff --git a/lib/meson.build b/lib/meson.build
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -37,8 +37,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(),
                   soversion: '3', include_directories: include_dirs,
                   dependencies: deps, install: true,
                   link_depends: 'fuse_versionscript',
-                  c_args: [ '-DFUSE_USE_VERSION=35',
-                  c_args: [ '-DFUSE_USE_VERSION=312',
-                            '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ],
+                  c_args: [ '-DFUSE_USE_VERSION=35' ],
+                  c_args: [ '-DFUSE_USE_VERSION=312' ],
                   link_args: ['-Wl,--version-script,' + meson.current_source_dir()
                               + '/fuse_versionscript' ])
 
+12 −10
Original line number Diff line number Diff line
--- a/util/install_helper.sh	2019-07-10 12:00:15.984840142 +0200
+++ b/util/install_helper.sh	2019-07-10 12:28:56.343011401 +0200
@@ -37,10 +37,10 @@
 fi
--- a/util/install_helper.sh	2023-08-26 22:12:11.028651669 +0200
+++ b/util/install_helper.sh	2023-08-26 22:38:03.165058694 +0200
@@ -39,12 +39,12 @@
 
 if [ "${udevrulesdir}" != "" ]; then
     install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
-        "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
+        "${sysconfdir}${udevrulesdir}/99-fuse3.rules"
 fi
 
 if [ "$initscriptdir" != "" ]; then
     install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
-        "${DESTDIR}/etc/init.d/fuse3"
+        "${sysconfdir}/init.d/fuse3"
 
-            "${DESTDIR}${initscriptdir}/fuse3"
+            "${sysconfdir}${initscriptdir}/fuse3"
 
     if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
         /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
diff --git a/util/meson.build b/util/meson.build
index aa0e734..06d4378 100644
--- a/util/meson.build