mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-12 18:59:50 +03:00
main/zfs: upgrade to 2.3.3
https://github.com/openzfs/zfs/releases/tag/zfs-2.3.3
This commit is contained in:
parent
29fa1bc61c
commit
abdd850d6c
2 changed files with 3 additions and 44 deletions
|
@ -1,7 +1,7 @@
|
|||
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=zfs
|
||||
pkgver=2.3.2
|
||||
pkgver=2.3.3
|
||||
pkgrel=0
|
||||
pkgdesc="Advanced filesystem and volume manager"
|
||||
url="https://openzfs.org"
|
||||
|
@ -38,9 +38,7 @@ subpackages="
|
|||
py3-pyzfs-pyc
|
||||
py3-pyzfs:pyzfs:noarch
|
||||
"
|
||||
source="https://github.com/openzfs/zfs/releases/download/zfs-$pkgver/zfs-$pkgver.tar.gz
|
||||
tests-fix-S_IFMT-undeclared-at-statx.c.patch
|
||||
"
|
||||
source="https://github.com/openzfs/zfs/releases/download/zfs-$pkgver/zfs-$pkgver.tar.gz"
|
||||
|
||||
# secfixes:
|
||||
# 2.2.1-r1:
|
||||
|
@ -118,6 +116,5 @@ pyzfs() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
94311f2eca1488be83aa0cb802b4a4541bbbd061a3e8e5cbda62cabbb0c8f9a705372ad192cb77703b3d7642c43be7f604f3c363b243cf03a6aceae2d7e5db81 zfs-2.3.2.tar.gz
|
||||
3a6742c19b860577862558af722f362d321e83aa1f5445165b629f0482119f42ded9b9f823c801f504dccfd0191a78d7fb82b41c8bd0d6b0f1618f2239319efc tests-fix-S_IFMT-undeclared-at-statx.c.patch
|
||||
0a18615da052989c19e889758972f14173e790710a2615fc186212d02f9909f0bf62debc19d85ff5c58411d8ef82aa85aff20804c3fbe2446913cd293a18b80d zfs-2.3.3.tar.gz
|
||||
"
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
From 634c172ee89f5303493a75dc7ff55e0a355b503a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?=
|
||||
<salvador.joseluis@gmail.com>
|
||||
Date: Fri, 2 May 2025 23:49:25 +0200
|
||||
Subject: [PATCH] tests: fix `S_IFMT` undeclared at `statx.c`
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
`S_IFMT` is declared in `sys/stat.h`, but we cannot include this header
|
||||
because it redeclares the `statx` function with different argument
|
||||
types. Therefore, we define `S_IFMT` ourselves, in the same way as the
|
||||
other definitions.
|
||||
|
||||
Reviewed-by: Rob Norris <robn@despairlabs.com>
|
||||
Reviewed-by: George Melikov <mail@gmelikov.ru>
|
||||
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
|
||||
Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
|
||||
Closes #17293
|
||||
Closes #17294
|
||||
---
|
||||
tests/zfs-tests/cmd/statx.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/tests/zfs-tests/cmd/statx.c b/tests/zfs-tests/cmd/statx.c
|
||||
index 89939f6efb40..1acc7e58c5ce 100644
|
||||
--- a/tests/zfs-tests/cmd/statx.c
|
||||
+++ b/tests/zfs-tests/cmd/statx.c
|
||||
@@ -109,6 +109,9 @@ _statx(int fd, const char *path, int flags, unsigned int mask, void *stx)
|
||||
#ifndef STATX_DIOALIGN
|
||||
#define STATX_DIOALIGN (1<<13)
|
||||
#endif
|
||||
+#ifndef S_IFMT
|
||||
+#define S_IFMT 0170000
|
||||
+#endif
|
||||
|
||||
typedef struct {
|
||||
int64_t tv_sec;
|
Loading…
Add table
Add a link
Reference in a new issue