diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile --- a/sysutils/openzfs-kmod/Makefile +++ b/sysutils/openzfs-kmod/Makefile @@ -1,5 +1,5 @@ PORTNAME= openzfs -PORTVERSION= 2021030100 +PORTVERSION= 2021041903 DISTVERSIONPREFIX= v CATEGORIES= sysutils PKGNAMESUFFIX?= -kmod @@ -15,7 +15,7 @@ USE_GITHUB= yes GH_ACCOUNT= openzfs GH_PROJECT= zfs -GH_TAGNAME= 2e160dee9 +GH_TAGNAME= zfs-2.1.0-rc3 KMODTARGET?= openzfs.ko PLIST_FILES= ${KMODDIR}/${KMODTARGET} diff --git a/sysutils/openzfs-kmod/distinfo b/sysutils/openzfs-kmod/distinfo --- a/sysutils/openzfs-kmod/distinfo +++ b/sysutils/openzfs-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614632193 -SHA256 (openzfs-zfs-v2021030100-2e160dee9_GH0.tar.gz) = af6a6467479d01f58cbbb38f0ab54afcb5708d298dd6a43b8678ad6a423ca428 -SIZE (openzfs-zfs-v2021030100-2e160dee9_GH0.tar.gz) = 31344155 +TIMESTAMP = 1618850638 +SHA256 (openzfs-zfs-v2021041903-zfs-2.1.0-rc3_GH0.tar.gz) = ac8e530e74704cca4f61a67a9d702de9450059ca9ce8cfd734ee4eca49884928 +SIZE (openzfs-zfs-v2021041903-zfs-2.1.0-rc3_GH0.tar.gz) = 31358387 diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile --- a/sysutils/openzfs/Makefile +++ b/sysutils/openzfs/Makefile @@ -1,5 +1,5 @@ PORTNAME= openzfs -PORTVERSION= 2021030100 +PORTVERSION= 2021041900 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -26,7 +26,7 @@ USE_GITHUB= yes GH_ACCOUNT= openzfs GH_PROJECT= zfs -GH_TAGNAME= 2e160dee9 +GH_TAGNAME= zfs-2.1.0-rc3 .include diff --git a/sysutils/openzfs/distinfo b/sysutils/openzfs/distinfo --- a/sysutils/openzfs/distinfo +++ b/sysutils/openzfs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614632503 -SHA256 (openzfs-zfs-v2021030100-2e160dee9_GH0.tar.gz) = af6a6467479d01f58cbbb38f0ab54afcb5708d298dd6a43b8678ad6a423ca428 -SIZE (openzfs-zfs-v2021030100-2e160dee9_GH0.tar.gz) = 31344155 +TIMESTAMP = 1618850810 +SHA256 (openzfs-zfs-v2021041900-zfs-2.1.0-rc3_GH0.tar.gz) = ac8e530e74704cca4f61a67a9d702de9450059ca9ce8cfd734ee4eca49884928 +SIZE (openzfs-zfs-v2021041900-zfs-2.1.0-rc3_GH0.tar.gz) = 31358387 diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist --- a/sysutils/openzfs/pkg-plist +++ b/sysutils/openzfs/pkg-plist @@ -299,7 +299,7 @@ lib/libzfs.a lib/libzfs.so lib/libzfs.so.4 -lib/libzfs.so.4.0.0 +lib/libzfs.so.4.1.0 lib/libzfs_core.a lib/libzfs_core.so lib/libzfs_core.so.3 @@ -310,40 +310,40 @@ lib/libzfsbootenv.so.1.0.0 lib/libzpool.a lib/libzpool.so -lib/libzpool.so.4 -lib/libzpool.so.4.0.0 +lib/libzpool.so.5 +lib/libzpool.so.5.0.0 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_error_translation.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_libzfs_core.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_nvlist.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/ctypes.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_constants%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_error_translation%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_libzfs_core%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_nvlist%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/ctypes%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/exceptions%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_constants.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_error_translation.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_libzfs_core.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_nvlist.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libnvpair.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libzfs_core.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libnvpair%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libzfs_core%%PYTHON_EXT_SUFFIX%%.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/libnvpair.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/libzfs_core.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/ctypes.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/exceptions.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_libzfs_core.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_nvlist.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_libzfs_core%%PYTHON_EXT_SUFFIX%%.pyc +%%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.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO -%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt -%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt -%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.0.0-py%%PYTHON_VER%%.egg-info/not-zip-safe -%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.0.0-py%%PYTHON_VER%%.egg-info/requires.txt -%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt +%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.0-py%%PYTHON_VER%%.egg-info/PKG-INFO +%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt +%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt +%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.0-py%%PYTHON_VER%%.egg-info/not-zip-safe +%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.0-py%%PYTHON_VER%%.egg-info/requires.txt +%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.1.0-py%%PYTHON_VER%%.egg-info/top_level.txt lib/security/pam_zfs_key.so libdata/pkgconfig/libzfs.pc libdata/pkgconfig/libzfs_core.pc @@ -522,6 +522,8 @@ %%TESTS%%share/zfs/compatibility.d/grub2 %%TESTS%%share/zfs/compatibility.d/openzfs-2.0-freebsd %%TESTS%%share/zfs/compatibility.d/openzfs-2.0-linux +%%TESTS%%share/zfs/compatibility.d/openzfs-2.1-freebsd +%%TESTS%%share/zfs/compatibility.d/openzfs-2.1-linux %%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.7.0 %%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.8.1 %%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.9.3 @@ -529,6 +531,8 @@ %%TESTS%%share/zfs/compatibility.d/truenas-12.0 %%TESTS%%share/zfs/compatibility.d/ubuntu-18.04 %%TESTS%%share/zfs/compatibility.d/ubuntu-20.04 +%%TESTS%%share/zfs/compatibility.d/zol-0.6.1 +%%TESTS%%share/zfs/compatibility.d/zol-0.6.4 %%TESTS%%share/zfs/compatibility.d/zol-0.6.5 %%TESTS%%share/zfs/compatibility.d/zol-0.7 %%TESTS%%share/zfs/compatibility.d/zol-0.8 @@ -584,6 +588,11 @@ %%TESTS%%share/zfs/zfs-tests/include/zpool_script.shlib %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/acl.cfg %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/acl_common.kshlib +%%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/cleanup.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/dosmode.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/dosmode_readonly_write +%%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/posixmode.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/acl/off/setup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/posix-sa/cleanup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/posix-sa/posix_001_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/acl/posix-sa/posix_002_pos.ksh @@ -1074,6 +1083,7 @@ %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted_unloaded.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_raw.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_sparse.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_set/cache_001_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_set/cache_002_neg.ksh @@ -1323,6 +1333,7 @@ %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_device_replaced.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_mirror_attached.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_mirror_detached.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_paths_changed.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_cachefile_shared_device.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_devices_missing.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_import/import_paths_changed.ksh @@ -1363,6 +1374,7 @@ %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/cleanup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize.kshlib %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_attach_detach_add_remove.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_fault_export_import_online.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_import_export.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_offline_export_import_online.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize_online_offline.ksh @@ -1458,6 +1470,7 @@ %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/setup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim.kshlib %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_attach_detach_add_remove.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_fault_export_import_online.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_import_export.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_multiple.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_neg.ksh @@ -1663,6 +1676,7 @@ %%TESTS%%share/zfs/zfs-tests/tests/functional/ctime/ctime_001_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/ctime/setup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/deadman/deadman.cfg +%%TESTS%%share/zfs/zfs-tests/tests/functional/deadman/deadman_ratelimit.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/deadman/deadman_sync.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/deadman/deadman_zio.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/delegate/cleanup.ksh @@ -2050,6 +2064,7 @@ %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_mounts.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_negative.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_origin.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_panic.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_props.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_resume.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/redacted_send/redacted_size.ksh