git: 7d944fce2dc6 - main - sysutils/py-saltext.zfs: ZFS extensions for Salt 3008

The branch main has been updated by asomers:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7d944fce2dc60f518a234dce421a5059a5fd7429

commit 7d944fce2dc60f518a234dce421a5059a5fd7429
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2026-08-17 20:23:58 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2026-09-09 19:07:06 +0000

    sysutils/py-saltext.zfs: ZFS extensions for Salt 3008
    
    This port contains modules and states that were previously builtin to
    Salt 3006, but must now be installed separately.
    
    It includes two patches used internally at Connectwise.
    
    PR:             296290
    Reviewed by:    krion
    Approved by:    krion (ports)
    Sponsored by:   ConnectWise
---
 sysutils/Makefile                                  |  1 +
 sysutils/py-saltext.zfs/Makefile                   | 26 ++++++++++++++++++++++
 sysutils/py-saltext.zfs/distinfo                   |  3 +++
 .../files/patch-src_saltext_zfs_states_zfs.py      | 19 ++++++++++++++++
 sysutils/py-saltext.zfs/pkg-descr                  |  4 ++++
 5 files changed, 53 insertions(+)

diff --git a/sysutils/Makefile b/sysutils/Makefile
index f368b1241f1d..12cfd02e5dd3 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1148,6 +1148,7 @@
     SUBDIR += py-rendercv
     SUBDIR += py-resolve-march-native
     SUBDIR += py-salt
+    SUBDIR += py-saltext.zfs
     SUBDIR += py-salt-tower
     SUBDIR += py-scandir
     SUBDIR += py-scarab
diff --git a/sysutils/py-saltext.zfs/Makefile b/sysutils/py-saltext.zfs/Makefile
new file mode 100644
index 000000000000..e526f338eba7
--- /dev/null
+++ b/sysutils/py-saltext.zfs/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	saltext.zfs
+DISTVERSION=	1.0.0
+CATEGORIES=	sysutils python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	saltext_zfs-${DISTVERSION}
+
+MAINTAINER=	asomers@FreeBSD.org
+COMMENT=	Salt Extension for interacting with ZFS
+WWW=		https://pypi.org/project/saltext.zfs/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=50.3.2:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}looseversion>0:devel/py-looseversion@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}salt>=3008.0:sysutils/py-salt@${PY_FLAVOR}
+
+USES=		python:3.10+
+USE_PYTHON=	autoplist pep517
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/sysutils/py-saltext.zfs/distinfo b/sysutils/py-saltext.zfs/distinfo
new file mode 100644
index 000000000000..7e74d5ce8990
--- /dev/null
+++ b/sysutils/py-saltext.zfs/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1786042000
+SHA256 (saltext_zfs-1.0.0.tar.gz) = fe6eb92d698a9d76cfce77daadefee6c5e3f89b0b0effefdf244d8258cc5d08d
+SIZE (saltext_zfs-1.0.0.tar.gz) = 93595
diff --git a/sysutils/py-saltext.zfs/files/patch-src_saltext_zfs_states_zfs.py b/sysutils/py-saltext.zfs/files/patch-src_saltext_zfs_states_zfs.py
new file mode 100644
index 000000000000..f440290b984f
--- /dev/null
+++ b/sysutils/py-saltext.zfs/files/patch-src_saltext_zfs_states_zfs.py
@@ -0,0 +1,19 @@
+--- src/saltext/zfs/states/zfs.py.orig	2026-08-06 18:58:31 UTC
++++ src/saltext/zfs/states/zfs.py
+@@ -440,6 +440,7 @@ def _dataset_present(
+             fields="value",
+             depth=0,
+             parsable=True,
++            source="default,inherited,local,none,received",
+         ).get(name, OrderedDict())
+ 
+         ## NOTE: build list of properties to update
+@@ -503,6 +504,8 @@ def _dataset_present(
+             )
+         else:
+             ## NOTE: create the dataset
++            if volume_size:
++                del properties["volsize"]
+             mod_res = __salt__["zfs.create"](
+                 name,
+                 **{
diff --git a/sysutils/py-saltext.zfs/pkg-descr b/sysutils/py-saltext.zfs/pkg-descr
new file mode 100644
index 000000000000..df2f0466b87c
--- /dev/null
+++ b/sysutils/py-saltext.zfs/pkg-descr
@@ -0,0 +1,4 @@
+saltext-zfs: Integrate Salt with ZFS
+
+Salt Extension for interacting with ZFS.  Contains modules and states that were
+formerly part of Salt 3006 but are now distributed separately.