aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Pirogov <vbnet.ru@gmail.com>2020-05-13 15:35:52 +0300
committerRasmus Thomsen <oss@cogitri.dev>2020-05-13 13:13:08 +0000
commitd9b2a35dfc0a50971d14a839252b6125cd906707 (patch)
treef3aaeba2dedfc9b66bf2f5379ac455ae1ccc98e4
parent8e3b76248c08860d6a7daa6528c471e60e707caa (diff)
downloadaports-d9b2a35dfc0a50971d14a839252b6125cd906707.tar.gz
aports-d9b2a35dfc0a50971d14a839252b6125cd906707.tar.bz2
aports-d9b2a35dfc0a50971d14a839252b6125cd906707.tar.xz
testing/moosefs: upgrade to 3.0.113
-rw-r--r--testing/moosefs/APKBUILD10
-rw-r--r--testing/moosefs/moosefs-nbd.patch42
2 files changed, 48 insertions, 4 deletions
diff --git a/testing/moosefs/APKBUILD b/testing/moosefs/APKBUILD
index 6e5420171b..9a50e3fdd3 100644
--- a/testing/moosefs/APKBUILD
+++ b/testing/moosefs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Pirogov <vbnet.ru@gmail.com>
# Maintainer: Michael Pirogov <vbnet.ru@gmail.com>
pkgname=moosefs
-pkgver=3.0.112
+pkgver=3.0.113
pkgrel=0
pkgdesc="Open Source, Petabyte, Fault-Tolerant, Highly Performing, Scalable Network Distributed File System"
url="https://moosefs.com"
@@ -22,7 +22,8 @@ source="$pkgname-$pkgver.tar.gz::http://ppa.moosefs.com/src/moosefs-$pkgver-1.ta
$pkgname-cgiserv.confd
$pkgname-master.initd
$pkgname-metalogger.initd
- $pkgname-chunkserver.initd"
+ $pkgname-chunkserver.initd
+ $pkgname-nbd.patch"
prepare() {
default_prepare
@@ -151,9 +152,10 @@ cgiserv_openrc() {
install -Dm644 "$srcdir"/moosefs-cgiserv.confd "$subpkgdir"/etc/conf.d/moosefs-cgiserv
}
-sha512sums="fe09d5fa747a2f24c027b19892e1f7e2e1e69850d7bd48f17565650225fa1554fc601135aadc6a4da10f667fe0bb58469bed23e7d694971d28c7f8e407e119af moosefs-3.0.112.tar.gz
+sha512sums="c96a8c23e0039a9f7f3e3a8d002513cffcd2c2f49a19a11666c404967cc54c3feac033ce1a3ed8445fb7914dc64a2af6d634b6c88c595c89bf944c73ea574300 moosefs-3.0.113.tar.gz
c698aff4de9aeb76202a809e44ac8d0ec9c6348a806b1c813c2a40858339b1c139a480a9c5aff40bf2c9821883c6c0dfeabb010f3faa5746673235f0fb3c5a76 moosefs-cgiserv.initd
b5c625f0004df33889de60ddad37e41f3acf081b37247606a1544e5f63354e121fe4cce511a6e60f4f2c0305155faf0614b8a4bce7267929fe68a1a4b546b582 moosefs-cgiserv.confd
a041fa324d37bda098ad65e9d6507f281ed388471956ca79aa33b8b0d1c4a9d528662a2410c47f3856183d6378ac7fb417c3d7ec314f624e7e5dac7c5e4247f0 moosefs-master.initd
8e73a7715e7a010d435efb9058ed67aad1caa95c840d3f1fae6bafd2a700cedbb0244d29363929d8e8d9a2036a2e0b173c0c2f7b52529ba4088e1296479fc0f5 moosefs-metalogger.initd
-56a714f3d29030ca12dc1859a1121b2a89606a2ccccec65481e2eb0b846757dea71dfe5f5a6d648b32e731d14b7d7725f79703851365b0862d7eb415a5f49dfb moosefs-chunkserver.initd"
+56a714f3d29030ca12dc1859a1121b2a89606a2ccccec65481e2eb0b846757dea71dfe5f5a6d648b32e731d14b7d7725f79703851365b0862d7eb415a5f49dfb moosefs-chunkserver.initd
+3e957fd22d3667eeb5690b9b03067eee55799a0e47bcbf62783efaca9595ccf49fa292ab3cf798151ca6f08b282ef89c3004af6f2567998567898a738a2633d2 moosefs-nbd.patch"
diff --git a/testing/moosefs/moosefs-nbd.patch b/testing/moosefs/moosefs-nbd.patch
new file mode 100644
index 0000000000..dc1b2326cd
--- /dev/null
+++ b/testing/moosefs/moosefs-nbd.patch
@@ -0,0 +1,42 @@
+From a4f89aae9fae993abebe25e5c9653c14464fa8c5 Mon Sep 17 00:00:00 2001
+From: Jakub Kruszona-Zawadzki <acid@moosefs.com>
+Date: Wed, 13 May 2020 10:24:00 +0200
+Subject: [PATCH] (mfsio/nbd) fixed compile issue on systems without LOCK_*
+ constants (issue #366)
+
+---
+ buildno.txt | 2 +-
+ mfsclient/mfsio.h | 13 +++++++++++++
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/buildno.txt b/buildno.txt
+index 44acfeb..87577dc 100644
+--- a/buildno.txt
++++ b/buildno.txt
+@@ -1 +1 @@
+-1201
++1202
+diff --git a/mfsclient/mfsio.h b/mfsclient/mfsio.h
+index 5385cc0..fb1c8ee 100644
+--- a/mfsclient/mfsio.h
++++ b/mfsclient/mfsio.h
+@@ -29,6 +29,19 @@ typedef struct _mfscfg {
+ # define UTIME_OMIT ((1l << 30) - 2l)
+ #endif
+
++#ifndef LOCK_SH
++#define LOCK_SH 1
++#endif
++#ifndef LOCK_EX
++#define LOCK_EX 2
++#endif
++#ifndef LOCK_NB
++#define LOCK_NB 4
++#endif
++#ifndef LOCK_UN
++#define LOCK_UN 8
++#endif
++
+ int mfs_mknod(const char *path, mode_t mode, dev_t dev);
+ int mfs_unlink(const char *path);
+ int mfs_mkdir(const char *path, mode_t mode);