From 50464716e3eec4deee6ef8f9a58752eb1a29b16e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 10 Jul 2019 13:20:40 +0200
Subject: [PATCH] fuse3: 3.6.1 -> 3.6.2

---
 pkgs/os-specific/linux/fuse/common.nix        |  5 ++-
 pkgs/os-specific/linux/fuse/default.nix       |  4 +-
 .../linux/fuse/fuse3-install.patch            | 37 +++++--------------
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index f72b3cac737..f829f1da424 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -38,7 +38,10 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";
 
-  mesonFlags = stdenv.lib.optional isFuse3 "-Dudevrulesdir=etc/udev/rules.d";
+  mesonFlags = stdenv.lib.optionals isFuse3 [
+    "-Dudevrulesdir=/udev/rules.d"
+    "-Duseroot=false"
+  ];
 
   preConfigure = ''
     export MOUNT_FUSE_PATH=$out/sbin
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index a4dfda41a0c..f48e528b486 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -11,7 +11,7 @@ in {
   };
 
   fuse_3 = mkFuse {
-    version = "3.6.1";
-    sha256Hash = "1118r2nx64cpv9s5a6dgh49y0pnjcc5ybpkh5pigxf14bpqa26pb";
+    version = "3.6.2";
+    sha256Hash = "1cxx94q6zqns1iw5d4g3ll8f78swqxl6h25bpxmqkqsj6c91pzkl";
   };
 }
diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/pkgs/os-specific/linux/fuse/fuse3-install.patch
index 6f938536974..147bcb439fb 100644
--- a/pkgs/os-specific/linux/fuse/fuse3-install.patch
+++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch
@@ -1,37 +1,18 @@
---- a/util/install_helper.sh	2018-08-31 21:22:34.580563286 +0200
-+++ b/util/install_helper.sh	2018-08-31 21:30:54.837939149 +0200
-@@ -22,30 +22,11 @@
-     DESTDIR="${DESTDIR%/}"
+--- 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
  
--chown root:root "${DESTDIR}${bindir}/fusermount3"
--chmod u+s "${DESTDIR}${bindir}/fusermount3"
--
- install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
- 	"${DESTDIR}${sysconfdir}/fuse.conf"
- 
--
--if test ! -e "${DESTDIR}/dev/fuse"; then
--    mkdir -p "${DESTDIR}/dev"
--    mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229
--fi
--
  install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
 -        "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
-+        "${sysconfdir}/udev/rules.d/99-fuse3.rules"
++        "${sysconfdir}${udevrulesdir}/99-fuse3.rules"
  
  install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
-         "${DESTDIR}${sysconfdir}/init.d/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
--else
--    echo "== FURTHER ACTION REQUIRED =="
--    echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script"
--fi
--
--
+-        "${DESTDIR}/etc/init.d/fuse3"
++        "${sysconfdir}/init.d/fuse3"
+ 
+ 
+ if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
 diff --git a/util/meson.build b/util/meson.build
 index aa0e734..06d4378 100644
 --- a/util/meson.build