From 14d4cbbe7a1153eee2948b5b7afffd4febed7536 Mon Sep 17 00:00:00 2001 From: toomyem 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 | 6 ++--- 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 | 29 +++++++++++++++++++++++ srcpkgs/moosefs4/update | 1 + 9 files changed, 65 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 - #include - #include -+#include - - #ifdef HAVE_LINUX_NBD_H - #include diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template index 6903e7e07ec1d8..b4f8cc44c1a2fb 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,7 +12,7 @@ maintainer="Orphaned " 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" 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 + #include + #include ++#include + + #ifdef HAVE_LINUX_NBD_H + #include diff --git a/srcpkgs/moosefs4/template b/srcpkgs/moosefs4/template new file mode 100644 index 00000000000000..4c50446633ee6a --- /dev/null +++ b/srcpkgs/moosefs4/template @@ -0,0 +1,29 @@ +# 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 " +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" + +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)"