Skip to content

Commit f0bb649

Browse files
committed
zfs-lts: update to 2.3.5.
1 parent 1aaf008 commit f0bb649

File tree

3 files changed

+32
-4
lines changed

3 files changed

+32
-4
lines changed

common/shlibs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3947,9 +3947,9 @@ libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
39473947
libzfsbootenv.so.1 libzfs-2.1.7_1
39483948
libzfs.so.7 libzfs-2.4.0_1
39493949
libzpool.so.7 libzfs-2.4.0_1
3950-
libzfs.so.4 libzfs-lts-2.1.7_1
3950+
libzfs.so.6 libzfs-lts-2.3.5_1
39513951
libuutil.so.3 libzfs-2.1.7_1
3952-
libzpool.so.5 libzfs-lts-2.1.7_1
3952+
libzpool.so.6 libzfs-lts-2.3.5_1
39533953
libzfs_core.so.3 libzfs-2.1.7_1
39543954
libnvpair.so.3 libzfs-2.1.7_1
39553955
libgmio.so gmio-0.4.1_1
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
commit 886d27d837f8e4c36ed53e54679278ce19b5e133
2+
Author: q66 <[email protected]>
3+
Date: Mon May 5 00:03:06 2025 +0200
4+
5+
work around musl strftime not supporting %k
6+
7+
diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
8+
index 8d96392..3d418e2 100644
9+
--- a/lib/libzfs/libzfs_dataset.c
10+
+++ b/lib/libzfs/libzfs_dataset.c
11+
@@ -2707,7 +2707,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen,
12+
13+
if (literal ||
14+
localtime_r(&time, &t) == NULL ||
15+
- strftime(propbuf, proplen, "%a %b %e %k:%M %Y",
16+
+ strftime(propbuf, proplen, "%a %b %e %H:%M %Y",
17+
&t) == 0)
18+
(void) snprintf(propbuf, proplen, "%llu",
19+
(u_longlong_t)val);
20+
@@ -3014,7 +3014,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen,
21+
22+
if (literal ||
23+
localtime_r(&time, &t) == NULL ||
24+
- strftime(propbuf, proplen, "%a %b %e %k:%M:%S %Y",
25+
+ strftime(propbuf, proplen, "%a %b %e %H:%M:%S %Y",
26+
&t) == 0)
27+
(void) snprintf(propbuf, proplen, "%llu",
28+
(u_longlong_t)val);

srcpkgs/zfs-lts/template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'zfs-lts'
22
pkgname=zfs-lts
3-
version=2.2.9
3+
version=2.3.5
44
revision=1
55
build_style=gnu-configure
66
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -16,7 +16,7 @@ maintainer="Toyam Cox <[email protected]>"
1616
license="CDDL-1.0"
1717
homepage="https://openzfs.github.io/openzfs-docs/"
1818
distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
19-
checksum=07ba7e14c383bce9fd06e611bc8bec45ad03c39f3c83ccea5aa1f77e80c45809
19+
checksum=326ae0cba8a615afa42c6891640e76acc4bd230f6d6ddec120c11e30b1392067
2020
# dkms must be before initramfs-regenerate to build modules before images
2121
triggers="dkms initramfs-regenerate"
2222
dkms_modules="zfs ${version}"

0 commit comments

Comments
 (0)