Skip to content

zfs: update to 2.4.0, zfs-lts: update to 2.3.5 #58217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahesford wants to merge 2 commits into
base: master
Choose a base branch
from
+64 −84
Open

zfs: update to 2.4.0, zfs-lts: update to 2.3.5 #58217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aaf008
zfs: update to 2.4.0.
ahesford Dec 19, 2025
f0bb649
zfs-lts: update to 2.3.5.
ahesford Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions common/shlibs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3945,11 +3945,11 @@ libtss2-rc.so.0 tpm2-tss-2.3.1_1
libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1
libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
libzfsbootenv.so.1 libzfs-2.1.7_1
libzfs.so.6 libzfs-2.3.0_1
libzpool.so.6 libzfs-2.3.0_1
libzfs.so.4 libzfs-lts-2.1.7_1
libzfs.so.7 libzfs-2.4.0_1
libzpool.so.7 libzfs-2.4.0_1
libzfs.so.6 libzfs-lts-2.3.5_1
libuutil.so.3 libzfs-2.1.7_1
libzpool.so.5 libzfs-lts-2.1.7_1
libzpool.so.6 libzfs-lts-2.3.5_1
libzfs_core.so.3 libzfs-2.1.7_1
libnvpair.so.3 libzfs-2.1.7_1
libgmio.so gmio-0.4.1_1
Expand Down
28 changes: 28 additions & 0 deletions srcpkgs/zfs-lts/patches/0004-musl-strftime.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
commit 886d27d837f8e4c36ed53e54679278ce19b5e133
Author: q66 <q66@chimera-linux.org>
Date: Mon May 5 00:03:06 2025 +0200

work around musl strftime not supporting %k

diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
index 8d96392..3d418e2 100644
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@ -2707,7 +2707,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen,

if (literal ||
localtime_r(&time, &t) == NULL ||
- strftime(propbuf, proplen, "%a %b %e %k:%M %Y",
+ strftime(propbuf, proplen, "%a %b %e %H:%M %Y",
&t) == 0)
(void) snprintf(propbuf, proplen, "%llu",
(u_longlong_t)val);
@@ -3014,7 +3014,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen,

if (literal ||
localtime_r(&time, &t) == NULL ||
- strftime(propbuf, proplen, "%a %b %e %k:%M:%S %Y",
+ strftime(propbuf, proplen, "%a %b %e %H:%M:%S %Y",
&t) == 0)
(void) snprintf(propbuf, proplen, "%llu",
(u_longlong_t)val);
4 changes: 2 additions & 2 deletions srcpkgs/zfs-lts/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'zfs-lts'
pkgname=zfs-lts
version=2.2.9
version=2.3.5
revision=1
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
Expand All @@ -16,7 +16,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="CDDL-1.0"
homepage="https://openzfs.github.io/openzfs-docs/"
distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
checksum=07ba7e14c383bce9fd06e611bc8bec45ad03c39f3c83ccea5aa1f77e80c45809
checksum=326ae0cba8a615afa42c6891640e76acc4bd230f6d6ddec120c11e30b1392067
# dkms must be before initramfs-regenerate to build modules before images
triggers="dkms initramfs-regenerate"
dkms_modules="zfs ${version}"
Expand Down
76 changes: 0 additions & 76 deletions srcpkgs/zfs/patches/0003-musl-statx.patch
View file
Open in desktop

This file was deleted.

28 changes: 28 additions & 0 deletions srcpkgs/zfs/patches/0003-musl-strftime.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
commit 886d27d837f8e4c36ed53e54679278ce19b5e133
Author: q66 <q66@chimera-linux.org>
Date: Mon May 5 00:03:06 2025 +0200

work around musl strftime not supporting %k

diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
index 8d96392..3d418e2 100644
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@ -2707,7 +2707,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen,

if (literal ||
localtime_r(&time, &t) == NULL ||
- strftime(propbuf, proplen, "%a %b %e %k:%M %Y",
+ strftime(propbuf, proplen, "%a %b %e %H:%M %Y",
&t) == 0)
(void) snprintf(propbuf, proplen, "%llu",
(u_longlong_t)val);
@@ -3014,7 +3014,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen,

if (literal ||
localtime_r(&time, &t) == NULL ||
- strftime(propbuf, proplen, "%a %b %e %k:%M:%S %Y",
+ strftime(propbuf, proplen, "%a %b %e %H:%M:%S %Y",
&t) == 0)
(void) snprintf(propbuf, proplen, "%llu",
(u_longlong_t)val);
4 changes: 2 additions & 2 deletions srcpkgs/zfs/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'zfs'
pkgname=zfs
version=2.3.5
version=2.4.0
revision=1
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
Expand All @@ -16,7 +16,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="CDDL-1.0"
homepage="https://openzfs.github.io/openzfs-docs/"
distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
checksum=326ae0cba8a615afa42c6891640e76acc4bd230f6d6ddec120c11e30b1392067
checksum=7bdf13de0a71d95554c0e3e47d5e8f50786c30d4f4b63b7c593b1d11af75c9ee
# dkms must be before initramfs-regenerate to build modules before images
triggers="dkms initramfs-regenerate"
dkms_modules="zfs ${version}"
Expand Down
Loading