Merge pull request #1325 from truenas/NAS-127386

NAS-127386 / 13.1 / sysutils/openzfs*: Sync with upstream zfs-2.2.3
truenas · Feb 16, 2024 · 177b6a8 · 177b6a8
2 parents 25d849c + 20fde46
commit 177b6a8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2023121400
+PORTVERSION=	2024021600
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
@@ -13,7 +13,7 @@ USES=		cpe kmod
 USE_GITHUB=	yes
 GH_ACCOUNT=	truenas
 GH_PROJECT=	zfs
-GH_TAGNAME=	b88422e3f
+GH_TAGNAME=	829c60ca6
 KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}

diff --git a/sysutils/openzfs-kmod/distinfo b/sysutils/openzfs-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702574327
-SHA256 (truenas-zfs-v2023121400-b88422e3f_GH0.tar.gz) = e040a3cc6692887b82f18cdc98740444262c1e54e2aff5db26d3c49ce149e3fc
-SIZE (truenas-zfs-v2023121400-b88422e3f_GH0.tar.gz) = 33078657
+TIMESTAMP = 1708064429
+SHA256 (truenas-zfs-v2024021600-829c60ca6_GH0.tar.gz) = d5d89ba12e1e9bf43d69aebbfc55c290b961aec8131ecf6deae3f699984623e7
+SIZE (truenas-zfs-v2024021600-829c60ca6_GH0.tar.gz) = 33109765
diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openzfs
-PORTVERSION=	2023121400
+PORTVERSION=	2024021600
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -26,7 +26,7 @@ OPTIONS_SUB=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	truenas
 GH_PROJECT=	zfs
-GH_TAGNAME=	b88422e3f
+GH_TAGNAME=	829c60ca6
 
 .include <bsd.port.pre.mk>
 

diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702574290
-SHA256 (truenas-zfs-v2023121400-b88422e3f_GH0.tar.gz) = e040a3cc6692887b82f18cdc98740444262c1e54e2aff5db26d3c49ce149e3fc
-SIZE (truenas-zfs-v2023121400-b88422e3f_GH0.tar.gz) = 33078657
+TIMESTAMP = 1708064696
+SHA256 (truenas-zfs-v2024021600-829c60ca6_GH0.tar.gz) = d5d89ba12e1e9bf43d69aebbfc55c290b961aec8131ecf6deae3f699984623e7
+SIZE (truenas-zfs-v2024021600-829c60ca6_GH0.tar.gz) = 33109765
diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist
@@ -330,12 +330,12 @@ lib/libzpool.so.5.0.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_nvlist%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/test_libzfs_core.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/test_nvlist.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/not-zip-safe
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/requires.txt
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.3-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.3-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.3-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.3-py%%PYTHON_VER%%.egg-info/not-zip-safe
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.3-py%%PYTHON_VER%%.egg-info/requires.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.3-py%%PYTHON_VER%%.egg-info/top_level.txt
 lib/security/pam_zfs_key.so
 libdata/pkgconfig/libzfs.pc
 libdata/pkgconfig/libzfs_core.pc