[PR PATCH] mergerfs: update to 2.29.0

[pfpulux <pfpulux@users.noreply.github.com>]

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

There is a new pull request by pfpulux against master on the void-packages repository

https://github.com/pfpulux/void-packages mergerfs
https://github.com/void-linux/void-packages/pull/20958

mergerfs: update to 2.29.0


A patch file from https://github.com/void-linux/void-packages/pull/20958.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mergerfs-20958.patch --]
[-- Type: text/x-diff, Size: 5203 bytes --]

From ff3dfcf70a5961a6605e39e80ff3c622d496fce3 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Mon, 13 Apr 2020 18:52:00 +0200
Subject: [PATCH] mergerfs: update to 2.29.0

---
 srcpkgs/mergerfs/patches/001_install.patch    | 16 ++++
 .../mergerfs/patches/musl-fix-loff_t.patch    | 77 -------------------
 srcpkgs/mergerfs/template                     | 11 +--
 3 files changed, 20 insertions(+), 84 deletions(-)
 create mode 100644 srcpkgs/mergerfs/patches/001_install.patch
 delete mode 100644 srcpkgs/mergerfs/patches/musl-fix-loff_t.patch

diff --git a/srcpkgs/mergerfs/patches/001_install.patch b/srcpkgs/mergerfs/patches/001_install.patch
new file mode 100644
index 00000000000..9cbca6a8a0d
--- /dev/null
+++ b/srcpkgs/mergerfs/patches/001_install.patch
@@ -0,0 +1,16 @@
+--- libfuse/Makefile	2020-02-23 04:40:32.000000000 +0100
++++ libfuse/Makefile	2020-03-09 16:30:59.282571220 +0100
+@@ -93,11 +93,8 @@
+ 	strip --strip-all build/mount.mergerfs
+ 	strip --strip-all build/mergerfs-fusermount
+ 
+-install: mergerfs-fusermount mount.mergerfs strip
+-	install -D build/mergerfs-fusermount "$(INSTALLBINDIR)/mergerfs-fusermount"
+-	install -D build/mount.mergerfs "$(INSTALLSBINDIR)/mount.mergerfs"
+-	chown root:root "$(INSTALLBINDIR)/mergerfs-fusermount"
+-	chmod u+s "$(INSTALLBINDIR)/mergerfs-fusermount"
++install:
++	echo "---------"
+ 
+ .PHONY: objects strip
+ 
diff --git a/srcpkgs/mergerfs/patches/musl-fix-loff_t.patch b/srcpkgs/mergerfs/patches/musl-fix-loff_t.patch
deleted file mode 100644
index ac8857a76f1..00000000000
--- a/srcpkgs/mergerfs/patches/musl-fix-loff_t.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 7779db242ab470053c9da188a639573750587adb Mon Sep 17 00:00:00 2001
-From: Noel Cower <ncower@gmail.com>
-Date: Sun, 10 Feb 2019 20:41:54 -0800
-Subject: [PATCH] musl: use int64_t in place of loff_t
-
-This replaces the less portable loff_t with int64_t (loff_t is
-exclusive to the kernel). This stays compatible with the syscall when
-available without modifying
-
-src/fs_copy_file_range_unsupported.icpp is not updated because I'm not
-sure that would apply to musl or glibc targets.
----
- src/fs_copy_file_range.hpp        |  4 ++--
- src/fs_copy_file_range_linux.icpp | 14 +++++++-------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git src/fs_copy_file_range.hpp src/fs_copy_file_range.hpp
-index 0b8984e..036c0f8 100644
---- src/fs_copy_file_range.hpp
-+++ src/fs_copy_file_range.hpp
-@@ -26,9 +26,9 @@ namespace fs
- {
-   ssize_t
-   copy_file_range(const int           fd_in_,
--                  loff_t             *off_in_,
-+                  int64_t            *off_in_,
-                   const int           fd_out_,
--                  loff_t             *off_out_,
-+                  int64_t            *off_out_,
-                   const size_t        len_,
-                   const unsigned int  flags_);
- 
-diff --git src/fs_copy_file_range_linux.icpp src/fs_copy_file_range_linux.icpp
-index 4718649..408afb0 100644
---- src/fs_copy_file_range_linux.icpp
-+++ src/fs_copy_file_range_linux.icpp
-@@ -28,11 +28,11 @@
- #include <unistd.h>
- 
- static
--loff_t
-+ssize_t
- copy_file_range_(int           fd_in_,
--                 loff_t       *off_in_,
-+                 int64_t      *off_in_,
-                  int           fd_out_,
--                 loff_t       *off_out_,
-+                 int64_t      *off_out_,
-                  size_t        len_,
-                  unsigned int  flags_)
- {
-@@ -53,9 +53,9 @@ namespace fs
- {
-   ssize_t
-   copy_file_range(const int           fd_in_,
--                  loff_t             *off_in_,
-+                  int64_t            *off_in_,
-                   const int           fd_out_,
--                  loff_t             *off_out_,
-+                  int64_t            *off_out_,
-                   const size_t        len_,
-                   const unsigned int  flags_)
-   {
-@@ -73,8 +73,8 @@ namespace fs
-                   const size_t        len_,
-                   const unsigned int  flags_)
-   {
--    loff_t off_in;
--    loff_t off_out;
-+    int64_t off_in;
-+    int64_t off_out;
- 
-     off_in  = 0;
-     off_out = 0;
--- 
-2.20.1
-
diff --git a/srcpkgs/mergerfs/template b/srcpkgs/mergerfs/template
index 6c5c9a1f567..baf7e4afc44 100644
--- a/srcpkgs/mergerfs/template
+++ b/srcpkgs/mergerfs/template
@@ -1,18 +1,15 @@
 # Template file for 'mergerfs'
 pkgname=mergerfs
-version=2.25.1
-revision=2
+version=2.29.0
+revision=1
 build_style=gnu-makefile
-make_build_args="INTERNAL_FUSE=0"
-make_install_args="${make_build_args}"
-hostmakedepends="automake libtool pandoc pkg-config which"
-makedepends="fuse-devel"
+hostmakedepends="automake libtool pkg-config which"
 short_desc="FUSE union filesystem"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/trapexit/mergerfs"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=f604ad04aad99983c5f91e50e27275deefab4797c1343d8e0cf3664d1ca53fc5
+checksum=b33a2cfd933ee03a799c145cca70595290648eb8d7cde9459318afb709fff19d
 
 pre_build() {
 	sed -i 's|^CFLAGS[[:blank:]]*=|override CFLAGS +=|g' Makefile