[bug#43776] [PATCH] Update mergerfs

[Lars-Dominik Braun <lars@6xq.net>]

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

Hi,

the following patches upgrade mergerfs and mergerfs-tools to the most
recent versions. I’m running both on my GuixSD storage machine.

Cheers,
Lars


[-- Attachment #2: 0002-gnu-mergerfs-tools-Update-to-480296e.patch --]
[-- Type: text/x-diff, Size: 1318 bytes --]

From 6c5e5db45f7691f33c721b2c192248fad239b9c5 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 3 Oct 2020 12:17:26 +0200
Subject: [PATCH 2/2] gnu: mergerfs-tools: Update to 480296e.

* gnu/packages/file-systems.scm (mergerfs-tools): Update to 480296e.
---
 gnu/packages/file-systems.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index f021e81612..c6486c67ef 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -814,8 +814,8 @@ is similar to mhddfs, unionfs, and aufs.")
               ))))
 
 (define-public mergerfs-tools
-  (let ((commit "c926779d87458d103f3b674603bf97801ae2486d")
-        (revision "1"))
+  (let ((commit "480296ed03d1c3c7909697d7ef96d35840ee26b8")
+        (revision "2"))
     (package
       (name "mergerfs-tools")
       ;; No released version exists.
@@ -829,7 +829,7 @@ is similar to mhddfs, unionfs, and aufs.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "04hhwcib0xv4cf1mkj8zrp2aqpxkncml9iqg4m1mz6a5zhzsk0vm"))))
+           "0xr06gi4xcr832rzy0hkp5c1n231s7w5iq1nkjvx9kvm0dl7chpq"))))
       (build-system copy-build-system)
       (inputs
        `(("python" ,python)
-- 
2.26.2


[-- Attachment #3: 0001-gnu-mergerfs-Update-to-2.31.0.patch --]
[-- Type: text/x-diff, Size: 1771 bytes --]

From 5a45d6423f7cf801cd6ad07f30e39513e3c31e07 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 3 Oct 2020 12:15:19 +0200
Subject: [PATCH 1/2] gnu: mergerfs: Update to 2.31.0.

* gnu/packages/file-systems.scm (mergerfs) [version]: Update to 2.31.0.
[arguments]: Adjust Makefile substitutions.
---
 gnu/packages/file-systems.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 0d897a6307..f021e81612 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -768,7 +768,7 @@ community.")
 (define-public mergerfs
   (package
     (name "mergerfs")
-    (version "2.29.0")
+    (version "2.31.0")
     (source
      (origin
        (method url-fetch)
@@ -776,7 +776,7 @@ community.")
                            version "/mergerfs-" version ".tar.gz"))
        (sha256
         (base32
-         "17gizw4vgbqqjd2ykkfpp276942jb5qclp0lkiwkmq1yjgyjqfmk"))))
+         "0k4asbg5n9dhy5jpjkw6simqqnr1zira2y4i71cq05091dfwm90p"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; No tests exist.
@@ -797,8 +797,9 @@ community.")
              ;; The Makefile does not allow overriding PREFIX via make variables.
              (substitute* '("Makefile" "libfuse/Makefile")
                (("= /usr/local") (string-append "= " (assoc-ref outputs "out")))
+               (("= /sbin") "= $(EXEC_PREFIX)/sbin")
                ;; cannot chown as build user
-               (("chown root:root") "true"))
+               (("chown root(:root)?") "true"))
              #t)))))
     ;; mergerfs bundles a heavily modified copy of libfuse.
     (inputs `(("util-linux" ,util-linux)))
-- 
2.26.2