Re: [PR PATCH] [Updated] New package: garage-0.9.0

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

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

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

https://github.com/Vaelatern/void-packages garage
https://github.com/void-linux/void-packages/pull/48033

New package: garage-0.9.0
None

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

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

From 543e9bc71a5411b3b3c783ffc3edd4501fe92273 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Tue, 2 Jan 2024 16:49:18 -0500
Subject: [PATCH] New package: garage-0.9.0

---
 srcpkgs/garage/patches/build-on-macos.patch | 31 +++++++++++++++++++++
 srcpkgs/garage/template                     | 18 ++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/garage/patches/build-on-macos.patch
 create mode 100644 srcpkgs/garage/template

diff --git a/srcpkgs/garage/patches/build-on-macos.patch b/srcpkgs/garage/patches/build-on-macos.patch
new file mode 100644
index 0000000000000..e974bd3a5e723
--- /dev/null
+++ b/srcpkgs/garage/patches/build-on-macos.patch
@@ -0,0 +1,31 @@
+This does not just fix on macos, but also fixes on i686 and arm-32bit
+but somehow only on glibc, not musl. Why?
+
+From c7f5dcd953ff1fdfa002a8bccfb43eafcc6fddd4 Mon Sep 17 00:00:00 2001
+From: trinity-1686a <trinity@deuxfleurs.fr>
+Date: Sun, 15 Oct 2023 17:57:27 +0200
+Subject: [PATCH] fix compilation on macos
+
+fsblkcnt_t is ony 32b there, so we have to do an additional cast
+---
+ src/rpc/system.rs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rpc/system.rs b/src/rpc/system.rs
+index 78fcc74b..4b40bec4 100644
+--- a/src/rpc/system.rs
++++ b/src/rpc/system.rs
+@@ -899,8 +899,8 @@ impl NodeStatus {
+ 		use nix::sys::statvfs::statvfs;
+ 		let mount_avail = |path: &Path| match statvfs(path) {
+ 			Ok(x) => {
+-				let avail = x.blocks_available() * x.fragment_size() as u64;
+-				let total = x.blocks() * x.fragment_size() as u64;
++				let avail = x.blocks_available() as u64 * x.fragment_size() as u64;
++				let total = x.blocks() as u64 * x.fragment_size() as u64;
+ 				Some((x.filesystem_id(), avail, total))
+ 			}
+ 			Err(_) => None,
+-- 
+2.40.1
+
diff --git a/srcpkgs/garage/template b/srcpkgs/garage/template
new file mode 100644
index 0000000000000..6b95e6c880bc7
--- /dev/null
+++ b/srcpkgs/garage/template
@@ -0,0 +1,18 @@
+# Template file for 'garage'
+pkgname=garage
+version=0.9.0
+revision=1
+build_style=cargo
+make_install_args="--path src/garage"
+hostmakedepends="pkg-config"
+makedepends="libzstd-devel libsodium-devel"
+short_desc="Distributed S3 object storage service tailored for self-hosting"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="AGPL-3.0-only"
+homepage="https://garagehq.deuxfleurs.fr/"
+distfiles="https://git.deuxfleurs.fr/Deuxfleurs/garage/archive/v${version}.tar.gz"
+checksum=1d0d09053dd0b5bba89c73e11c568ea28aaedd92db7af618a4dd514d3a7e6222
+
+post_install() {
+	vlicense LICENSE
+}