git: 105f4df19183 - 2025Q4 - filesystems/py-libzfs: fix the build on FreeBSD 15

From: Alan Somers <asomers_at_FreeBSD.org>
Date: Tue, 09 Dec 2025 13:42:50 UTC
The branch 2025Q4 has been updated by asomers:

URL: https://cgit.FreeBSD.org/ports/commit/?id=105f4df19183c020f3206a709c48d97392bfe0d3

commit 105f4df19183c020f3206a709c48d97392bfe0d3
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2025-12-04 16:57:26 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2025-12-09 13:42:16 +0000

    filesystems/py-libzfs: fix the build on FreeBSD 15
    
    There were two problems:
    
    * Needed to backport a newer py-libzfs PR due to a libzfs API change
    * Since 15.0 is now released, its OSVERSION reset to 1500000
    
    PR:             291393
    Sponsored by:   ConnectWise
    Approved by:    Goran Mekić <meka@tilda.center> (maintainer)
    
    (cherry picked from commit f3f63d8635c962ae38191a4774df55790e18946e)
---
 filesystems/py-libzfs/Makefile | 10 ++++++++--
 filesystems/py-libzfs/distinfo |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/filesystems/py-libzfs/Makefile b/filesystems/py-libzfs/Makefile
index 5b39bd449964..35bed6c55700 100644
--- a/filesystems/py-libzfs/Makefile
+++ b/filesystems/py-libzfs/Makefile
@@ -25,7 +25,7 @@ MAKE_ENV=	freebsd_src=${SRC_BASE}
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1500018 || (${OSVERSION} >= 1401000 && ${OSVERSION} < 1500000))
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1401000
 EXTRA_PATCHES+=	${FILESDIR}/extra-zpool-add.patch
 .endif
 
@@ -35,7 +35,13 @@ IGNORE=		requires kernel source files in ${SRC_BASE}
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000
 PATCH_SITES=    https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=     0b2ab0594997c44e80e3fdfe9d2add106d81149a.diff:-p1 # backport of https://github.com/truenas/py-libzfs/pull/251
+PATCHFILES+=     0b2ab0594997c44e80e3fdfe9d2add106d81149a.diff:-p1 # backport of https://github.com/truenas/py-libzfs/pull/251
+.endif
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500000
+PATCH_SITES=    https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=     0ce0c8be75ae4c8873824b3c6e8f0a1736cd673b.diff:-p1 # backport of https://github.com/truenas/py-libzfs/pull/297
+PATCHFILES+=     9882ea5d43407b3be71621a2988e7cdaaf87aa09.diff:-p1 # backport of https://github.com/truenas/py-libzfs/pull/297
 .endif
 
 .include <bsd.port.mk>
diff --git a/filesystems/py-libzfs/distinfo b/filesystems/py-libzfs/distinfo
index 96872e080854..c6a97b79022b 100644
--- a/filesystems/py-libzfs/distinfo
+++ b/filesystems/py-libzfs/distinfo
@@ -1,5 +1,9 @@
-TIMESTAMP = 1734977733
+TIMESTAMP = 1764867359
 SHA256 (truenas-py-libzfs-1.1.2023020700-c1bd4a0_GH0.tar.gz) = 23b2d6e1b6ed78be2d12068f9b1b0b01270afaaf0f017817a5fb109d358aa818
 SIZE (truenas-py-libzfs-1.1.2023020700-c1bd4a0_GH0.tar.gz) = 99656
 SHA256 (0b2ab0594997c44e80e3fdfe9d2add106d81149a.diff) = 1fb37c3a678dbaadd47999f7d29631824a404561ca5f2237613d2b22b42fa138
 SIZE (0b2ab0594997c44e80e3fdfe9d2add106d81149a.diff) = 1453
+SHA256 (0ce0c8be75ae4c8873824b3c6e8f0a1736cd673b.diff) = 19b00cd7f7441ad705dba7b35c79cfc95eb2d1dd118636b74da6a1be581eb00c
+SIZE (0ce0c8be75ae4c8873824b3c6e8f0a1736cd673b.diff) = 7515
+SHA256 (9882ea5d43407b3be71621a2988e7cdaaf87aa09.diff) = 337ac1dda8890935e582f36eff551813ecb5d1a74f9ffe7c9fa23c0a2a7badca
+SIZE (9882ea5d43407b3be71621a2988e7cdaaf87aa09.diff) = 10116