Re: [PR PATCH] [Updated] moosefs: update to 3.0.118 and added 4.56.6

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

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

There is an updated pull request by toomyem against master on the void-packages repository

https://github.com/toomyem/void-packages moosefs
https://github.com/void-linux/void-packages/pull/53074

moosefs: update to 3.0.118 and added 4.56.6
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (using crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl

I added a separate package for 4.x line to keep both 3.x and 4.x lines available.

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

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

From c6c277885681e8fbcd3c9b172c7f5309dbdf29c5 Mon Sep 17 00:00:00 2001
From: toomyem <toomyem@gmail.com>
Date: Fri, 15 Nov 2024 10:48:24 +0100
Subject: [PATCH] moosefs: update to 3.0.118 and add 4.56.6

---
 srcpkgs/moosefs/patches/fix-musl.patch    | 10 --------
 srcpkgs/moosefs/template                  |  7 +++---
 srcpkgs/moosefs4/files/mfscgiserv/run     |  4 +++
 srcpkgs/moosefs4/files/mfschunkserver/run |  6 +++++
 srcpkgs/moosefs4/files/mfsmaster/run      |  6 +++++
 srcpkgs/moosefs4/files/mfsmetalogger/run  |  6 +++++
 srcpkgs/moosefs4/patches/fix-musl.patch   | 10 ++++++++
 srcpkgs/moosefs4/template                 | 30 +++++++++++++++++++++++
 srcpkgs/moosefs4/update                   |  1 +
 9 files changed, 67 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/moosefs/patches/fix-musl.patch
 create mode 100644 srcpkgs/moosefs4/files/mfscgiserv/run
 create mode 100644 srcpkgs/moosefs4/files/mfschunkserver/run
 create mode 100644 srcpkgs/moosefs4/files/mfsmaster/run
 create mode 100644 srcpkgs/moosefs4/files/mfsmetalogger/run
 create mode 100644 srcpkgs/moosefs4/patches/fix-musl.patch
 create mode 100644 srcpkgs/moosefs4/template
 create mode 100644 srcpkgs/moosefs4/update

diff --git a/srcpkgs/moosefs/patches/fix-musl.patch b/srcpkgs/moosefs/patches/fix-musl.patch
deleted file mode 100644
index 02e51bedb2e8ab..00000000000000
--- a/srcpkgs/moosefs/patches/fix-musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mfsclient/nbdmain.c	2020-06-08 08:19:08.422379805 +0200
-+++ b/mfsclient/nbdmain.c	2020-06-08 08:18:55.079380447 +0200
-@@ -39,6 +39,7 @@
- #include <errno.h>
- #include <inttypes.h>
- #include <pthread.h>
-+#include <sys/file.h>
- 
- #ifdef HAVE_LINUX_NBD_H
- #include <linux/nbd.h>
diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template
index 6903e7e07ec1d8..d8c2072409d1eb 100644
--- a/srcpkgs/moosefs/template
+++ b/srcpkgs/moosefs/template
@@ -1,7 +1,7 @@
 # Template file for 'moosefs'
 pkgname=moosefs
-version=3.0.117
-revision=2
+version=3.0.118
+revision=1
 build_style=gnu-configure
 configure_args="--localstatedir=/var/lib --with-default-user=_mfs
  --with-default-group=_mfs"
@@ -12,9 +12,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://moosefs.com/"
 distfiles="https://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
-checksum=d77947d0d8b699e2373926a1274ae81a9a8b24445c5ab986a1ec5e9203e3c3ba
+checksum=d730c82602b303004dbee2e30c0b013a6ee0ee88e427cee930f4a40bc9241df8
 python_version=3
 system_accounts="_mfs"
+conflicts="moosefs4>=0"
 
 pre_configure() {
 	sed -i 's,AC_RUN_IFELSE,AC_LINK_IFELSE,g' configure.ac
diff --git a/srcpkgs/moosefs4/files/mfscgiserv/run b/srcpkgs/moosefs4/files/mfscgiserv/run
new file mode 100644
index 00000000000000..4eee2a80277ecf
--- /dev/null
+++ b/srcpkgs/moosefs4/files/mfscgiserv/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+[ -e conf ] && . ./conf
+exec mfscgiserv -f $OPTS start
diff --git a/srcpkgs/moosefs4/files/mfschunkserver/run b/srcpkgs/moosefs4/files/mfschunkserver/run
new file mode 100644
index 00000000000000..316c8507de6206
--- /dev/null
+++ b/srcpkgs/moosefs4/files/mfschunkserver/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+exec 2>&1
+[ -e conf ] && . ./conf
+: ${CONF_FILE:=/etc/mfs/mfschunkserver.cfg}
+[ -e ${CONF_FILE} ] || exit 1
+exec mfschunkserver -c ${CONF_FILE} -f start
diff --git a/srcpkgs/moosefs4/files/mfsmaster/run b/srcpkgs/moosefs4/files/mfsmaster/run
new file mode 100644
index 00000000000000..72389baab5fde1
--- /dev/null
+++ b/srcpkgs/moosefs4/files/mfsmaster/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+exec 2>&1
+[ -e conf ] && . ./conf
+: ${CONF_FILE:=/etc/mfs/mfsmaster.cfg}
+[ -e ${CONF_FILE} ] || exit 1
+exec mfsmaster -c ${CONF_FILE} -f start
diff --git a/srcpkgs/moosefs4/files/mfsmetalogger/run b/srcpkgs/moosefs4/files/mfsmetalogger/run
new file mode 100644
index 00000000000000..2797217ea17238
--- /dev/null
+++ b/srcpkgs/moosefs4/files/mfsmetalogger/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+exec 2>&1
+[ -e conf ] && . ./conf
+: ${CONF_FILE:=/etc/mfs/mfsmetalogger.cfg}
+[ -e ${CONF_FILE} ] || exit 1
+exec mfsmetalogger -c ${CONF_FILE} -f start
diff --git a/srcpkgs/moosefs4/patches/fix-musl.patch b/srcpkgs/moosefs4/patches/fix-musl.patch
new file mode 100644
index 00000000000000..7c9b7bd9e41a88
--- /dev/null
+++ b/srcpkgs/moosefs4/patches/fix-musl.patch
@@ -0,0 +1,10 @@
+--- a/mfsclient/mfsbdev.c	2024-09-23 14:12:52.000000000 +0200
++++ b/mfsclient/mfsbdev.c	2024-11-15 10:29:23.666733778 +0100
+@@ -38,6 +38,7 @@
+ #include <errno.h>
+ #include <inttypes.h>
+ #include <pthread.h>
++#include <sys/file.h>
+ 
+ #ifdef HAVE_LINUX_NBD_H
+ #include <linux/nbd.h>
diff --git a/srcpkgs/moosefs4/template b/srcpkgs/moosefs4/template
new file mode 100644
index 00000000000000..65819866c2ce3a
--- /dev/null
+++ b/srcpkgs/moosefs4/template
@@ -0,0 +1,30 @@
+# Template file for 'moosefs4'
+pkgname=moosefs4
+version=4.56.6
+revision=1
+build_style=gnu-configure
+configure_args="--localstatedir=/var/lib --with-default-user=_mfs
+ --with-default-group=_mfs"
+hostmakedepends="automake libtool pkg-config"
+makedepends="zlib-devel libpcap-devel fuse-devel"
+short_desc="Fault tolerant, network distributed file system"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only"
+homepage="https://moosefs.com/"
+distfiles="https://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz"
+checksum=77cad891e38d33a9cfbaf25640e48a684f1650137cef8a86963673494444f7ed
+python_version=3
+system_accounts="_mfs"
+conflicts="moosefs>=0"
+
+pre_configure() {
+	sed -i 's,AC_RUN_IFELSE,AC_LINK_IFELSE,g' configure.ac
+	autoreconf -fi
+}
+
+post_install() {
+	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
+	for f in chunkserver master metalogger cgiserv; do
+		vsv mfs${f}
+	done
+}
diff --git a/srcpkgs/moosefs4/update b/srcpkgs/moosefs4/update
new file mode 100644
index 00000000000000..d494050f3cc110
--- /dev/null
+++ b/srcpkgs/moosefs4/update
@@ -0,0 +1 @@
+pattern="$pkgname-\K[\d\.]*(?=\-1\.tar\.gz)"