ZFS 2.2.2 upstream release

2 files changed, 10 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae06e20c556c..847098ab5b5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zfs-utils
 	pkgdesc = Userspace utilities for the Zettabyte File System.
-	pkgver = 2.2.1
-	pkgrel = 2
+	pkgver = 2.2.2
+	pkgrel = 1
 	url = https://zfsonlinux.org/
 	arch = i686
 	arch = x86_64
@@ -10,23 +10,20 @@ pkgbase = zfs-utils
 	optdepends = python: for arcstat/arc_summary/dbufstat
 	backup = etc/default/zfs
 	backup = etc/zfs/zed.d/zed.rc
-	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.1/zfs-2.2.1.tar.gz
-	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.1/zfs-2.2.1.tar.gz.asc
-	source = https://github.com/openzfs/zfs/commit/30d581121bb122c90959658e7b28b1672d342897.patch
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.2/zfs-2.2.2.tar.gz
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.2/zfs-2.2.2.tar.gz.asc
 	source = zfs-node-permission.conf
 	source = zfs.initcpio.install
 	source = zfs.initcpio.hook
 	validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
 	validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
-	sha256sums = 4ff2de43d39710283ae8ff1744aa96e6cdc83c8efe86a715294d4f6bc34a8e8e
+	sha256sums = 76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9
 	sha256sums = SKIP
-	sha256sums = 0a066b4c5f2bbe87dd02c19b4fb3bd51c7a237ed5ea23c5090e5915a1af3b10c
 	sha256sums = 7ad45fd291aa582639725f14d88d7da5bd3d427012b25bddbe917ca6d1a07c1a
 	sha256sums = 2f09c742287f4738c7c09a9669f8055cd63d3b9474cd1f6d9447152d11a1b913
 	sha256sums = 15b5acea44225b4364ec6472a08d3d48666d241fe84c142e1171cd3b78a5584f
-	b2sums = c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6
+	b2sums = f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866
 	b2sums = SKIP
-	b2sums = 26d1aebb0293cf2ab555c119bea7d991e0ff80c4d72f7707d2c4dad945d67d6f489324b914fa884f1f2d16cba6db63a85d85257da3400d7469cb4a12c88759d0
 	b2sums = 7eb3408b1354a4dd504000739101afc7ec0aed1afcdfa029552bf6989e9a8cd4a95b3d3563b3fb7902afa30a80fb01a3f5a2d5af82f9c734c48b5cc23aac25ca
 	b2sums = cb774227f157573f960bdb345e5b014c043a573c987d37a1db027b852d77a5eda1ee699612e1d8f4a2770897624889f1a3808116a171cc4c796a95e3caa43012
 	b2sums = 779c864611249c3f21d1864508d60cfe5e0f5541d74fb3093c6bdfa56be2c76f386ac1690d363beaee491c5132f5f6dbc01553aa408cda579ebca74b0e0fd1d0
diff --git a/PKGBUILD b/PKGBUILD
index 56a9d6f9532f..346fdbdf2d5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,24 @@
 # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
 
 pkgname=zfs-utils
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.2.2
+pkgrel=1
 pkgdesc="Userspace utilities for the Zettabyte File System."
 arch=("i686" "x86_64" "aarch64")
 url="https://zfsonlinux.org/"
 license=('CDDL')
 optdepends=('python: for arcstat/arc_summary/dbufstat')
 source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
-        "https://github.com/openzfs/zfs/commit/30d581121bb122c90959658e7b28b1672d342897.patch"
         "zfs-node-permission.conf"
         "zfs.initcpio.install"
         "zfs.initcpio.hook")
-sha256sums=('4ff2de43d39710283ae8ff1744aa96e6cdc83c8efe86a715294d4f6bc34a8e8e'
+sha256sums=('76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9'
             'SKIP'
-            '0a066b4c5f2bbe87dd02c19b4fb3bd51c7a237ed5ea23c5090e5915a1af3b10c'
             '7ad45fd291aa582639725f14d88d7da5bd3d427012b25bddbe917ca6d1a07c1a'
             '2f09c742287f4738c7c09a9669f8055cd63d3b9474cd1f6d9447152d11a1b913'
             '15b5acea44225b4364ec6472a08d3d48666d241fe84c142e1171cd3b78a5584f')
-b2sums=('c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6'
+b2sums=('f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866'
         'SKIP'
-        '26d1aebb0293cf2ab555c119bea7d991e0ff80c4d72f7707d2c4dad945d67d6f489324b914fa884f1f2d16cba6db63a85d85257da3400d7469cb4a12c88759d0'
         '7eb3408b1354a4dd504000739101afc7ec0aed1afcdfa029552bf6989e9a8cd4a95b3d3563b3fb7902afa30a80fb01a3f5a2d5af82f9c734c48b5cc23aac25ca'
         'cb774227f157573f960bdb345e5b014c043a573c987d37a1db027b852d77a5eda1ee699612e1d8f4a2770897624889f1a3808116a171cc4c796a95e3caa43012'
         '779c864611249c3f21d1864508d60cfe5e0f5541d74fb3093c6bdfa56be2c76f386ac1690d363beaee491c5132f5f6dbc01553aa408cda579ebca74b0e0fd1d0')
@@ -35,9 +32,6 @@ backup=('etc/default/zfs'
 prepare() {
     cd "${srcdir}"/zfs-${pkgver}
 
-    # Backport fix for issue related to file corruption. (https://github.com/openzfs/zfs/issues/15526)
-    patch -p1 -i ../30d581121bb122c90959658e7b28b1672d342897.patch
-
     # pyzfs is not built, but build system tries to check for python anyway
     ln -sf /bin/true python3-fake