Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 19 Mar 2026 16:46:55 +0000
From:      Alan Somers <asomers@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 026e198d1784 - main - filesystems/py-libzfs: patch collections.Sequence import error
Message-ID:  <69bc287f.26c72.4b0c6255@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by asomers:

URL: https://cgit.FreeBSD.org/ports/commit/?id=026e198d178474486d9cf683695c2b557752eb12

commit 026e198d178474486d9cf683695c2b557752eb12
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2026-03-19 16:44:08 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2026-03-19 16:46:44 +0000

    filesystems/py-libzfs: patch collections.Sequence import error
    
    In Python 3.10 collections.Sequence module was moved into the
    collections.abc.Sequence module, but nvpair.pxi is still using the old
    path.
    
    This patch fixes the import and also keeps backwards compatibility with
    <=py3.9.
    
    While I'm here, clean up the Makefile's style, and take maintainership.
    
    PR:             293920
    Approved by:    Goran Mekić (maintainer)
    Sponsored by:   ConnectWise
    Reported by:    js
---
 filesystems/py-libzfs/Makefile | 40 +++++++++++++++++++++-------------------
 filesystems/py-libzfs/distinfo |  4 +++-
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/filesystems/py-libzfs/Makefile b/filesystems/py-libzfs/Makefile
index 524c3f3d33a1..a4378ee8601d 100644
--- a/filesystems/py-libzfs/Makefile
+++ b/filesystems/py-libzfs/Makefile
@@ -1,51 +1,53 @@
 PORTNAME=	libzfs
 PORTVERSION=	1.1.2023020700
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	filesystems devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	meka@tilda.center
+MAINTAINER=	asomers@FreeBSD.org
 COMMENT=	Python libzfs bindings
 WWW=		https://github.com/truenas/py-libzfs
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+HAS_CONFIGURE=	yes
+USES=		compiler:c11 python
+USE_PYTHON=	autoplist cython0 distutils
+
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	666e8b6fdbbd4bb75f91e267be0e4c6378dd3558.diff:-p1 # backport of https://github.com/truenas/py-libzfs/pull/231
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	truenas
 GH_PROJECT=	py-libzfs
 GH_TAGNAME=	c1bd4a0
 
-HAS_CONFIGURE=	yes
-USES=		compiler:c11 python
-USE_PYTHON=	autoplist cython0 distutils
-
 CONFIGURE_ENV=	freebsd_src=${SRC_BASE}
 MAKE_ENV=	freebsd_src=${SRC_BASE}
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1600005
-EXTRA_PATCHES+=	${FILESDIR}/extra-libuutil.patch
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1401000
-EXTRA_PATCHES+=	${FILESDIR}/extra-zpool-add.patch
-.endif
-
 .if !exists(${SRC_BASE}/sys/Makefile)
 IGNORE=		requires kernel source files in ${SRC_BASE}
 .endif
 
 .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} >= 1401000
+EXTRA_PATCHES+=	${FILESDIR}/extra-zpool-add.patch
 .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
+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
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1600005
+# https://github.com/truenas/py-libzfs/pull/310
+EXTRA_PATCHES+=	${FILESDIR}/extra-libuutil.patch
 .endif
 
 .include <bsd.port.mk>
diff --git a/filesystems/py-libzfs/distinfo b/filesystems/py-libzfs/distinfo
index c6a97b79022b..025b08e1bcea 100644
--- a/filesystems/py-libzfs/distinfo
+++ b/filesystems/py-libzfs/distinfo
@@ -1,8 +1,10 @@
-TIMESTAMP = 1764867359
+TIMESTAMP = 1773915602
 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 (666e8b6fdbbd4bb75f91e267be0e4c6378dd3558.diff) = 4acc13d3257ba0457183527a36a0c65ad1c37b198008c99e2fb1d145fbb6709e
+SIZE (666e8b6fdbbd4bb75f91e267be0e4c6378dd3558.diff) = 905
 SHA256 (0ce0c8be75ae4c8873824b3c6e8f0a1736cd673b.diff) = 19b00cd7f7441ad705dba7b35c79cfc95eb2d1dd118636b74da6a1be581eb00c
 SIZE (0ce0c8be75ae4c8873824b3c6e8f0a1736cd673b.diff) = 7515
 SHA256 (9882ea5d43407b3be71621a2988e7cdaaf87aa09.diff) = 337ac1dda8890935e582f36eff551813ecb5d1a74f9ffe7c9fa23c0a2a7badca
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bc287f.26c72.4b0c6255>