sync with aur/zfs-utils

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

3 files changed, 23 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5a6e3e8a2eb..183894f3e654 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zfs-utils-git
 	pkgdesc = Userspace utilities for the Zettabyte File System.
-	pkgver = 2.1.99.r1726.g7883ea2234
+	pkgver = 2.2.99.r63.g8e20e0ff39
 	pkgrel = 1
 	epoch = 2
 	url = https://zfsonlinux.org/
@@ -15,19 +15,22 @@ pkgbase = zfs-utils-git
 	makedepends = git
 	optdepends = python: pyzfs and extra utilities
 	optdepends = python-cffi: pyzfs
-	provides = zfs-utils=2.1.99.r1726.g7883ea2234
+	provides = zfs-utils=2.2.99.r63.g8e20e0ff39
 	conflicts = zfs-utils
 	backup = etc/default/zfs
 	backup = etc/zfs/zed.d/zed.rc
 	source = git+https://github.com/openzfs/zfs.git
+	source = zfs-node-permission.conf
 	source = zfs.initcpio.install
 	source = zfs.initcpio.hook
 	source = zfs.initcpio.zfsencryptssh.install
 	sha256sums = SKIP
+	sha256sums = 7ad45fd291aa582639725f14d88d7da5bd3d427012b25bddbe917ca6d1a07c1a
 	sha256sums = 2f09c742287f4738c7c09a9669f8055cd63d3b9474cd1f6d9447152d11a1b913
 	sha256sums = 15b5acea44225b4364ec6472a08d3d48666d241fe84c142e1171cd3b78a5584f
 	sha256sums = 93e6ac4e16f6b38b2fa397a63327bcf7001111e3a58eb5fb97c888098c932a51
 	b2sums = SKIP
+	b2sums = 7eb3408b1354a4dd504000739101afc7ec0aed1afcdfa029552bf6989e9a8cd4a95b3d3563b3fb7902afa30a80fb01a3f5a2d5af82f9c734c48b5cc23aac25ca
 	b2sums = cb774227f157573f960bdb345e5b014c043a573c987d37a1db027b852d77a5eda1ee699612e1d8f4a2770897624889f1a3808116a171cc4c796a95e3caa43012
 	b2sums = 779c864611249c3f21d1864508d60cfe5e0f5541d74fb3093c6bdfa56be2c76f386ac1690d363beaee491c5132f5f6dbc01553aa408cda579ebca74b0e0fd1d0
 	b2sums = 04e2af875e194df393d6cff983efc3fdf02a03a745d1b0b1e4a745f873d910b4dd0a45db956c1b5b2d97e9d5bf724ef12e23f7a2be3d5c12be027eaccf42349a
diff --git a/PKGBUILD b/PKGBUILD
index b9ebdd5956e0..83c06a80a594 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 #
 
 pkgname=zfs-utils-git
-pkgver=2.1.99.r1726.g7883ea2234
+pkgver=2.2.99.r63.g8e20e0ff39
 pkgrel=1
 epoch=2
 pkgdesc="Userspace utilities for the Zettabyte File System."
@@ -20,19 +20,22 @@ license=('CDDL')
 groups=('zfs-git')
 makedepends=('python' 'python-setuptools' 'python-cffi' 'git')
 optdepends=('python: pyzfs and extra utilities' 'python-cffi: pyzfs')
-provides=("${pkgname%-git}=${pkgver}")
-conflicts=("${pkgname%-git}")
+provides=("zfs-utils=${pkgver}")
+conflicts=('zfs-utils')
 backup=('etc/default/zfs'
         'etc/zfs/zed.d/zed.rc')
 source=('git+https://github.com/openzfs/zfs.git'
+        'zfs-node-permission.conf'
         'zfs.initcpio.install'
         'zfs.initcpio.hook'
         'zfs.initcpio.zfsencryptssh.install')
 sha256sums=('SKIP'
+            '7ad45fd291aa582639725f14d88d7da5bd3d427012b25bddbe917ca6d1a07c1a'
             '2f09c742287f4738c7c09a9669f8055cd63d3b9474cd1f6d9447152d11a1b913'
             '15b5acea44225b4364ec6472a08d3d48666d241fe84c142e1171cd3b78a5584f'
             '93e6ac4e16f6b38b2fa397a63327bcf7001111e3a58eb5fb97c888098c932a51')
 b2sums=('SKIP'
+        '7eb3408b1354a4dd504000739101afc7ec0aed1afcdfa029552bf6989e9a8cd4a95b3d3563b3fb7902afa30a80fb01a3f5a2d5af82f9c734c48b5cc23aac25ca'
         'cb774227f157573f960bdb345e5b014c043a573c987d37a1db027b852d77a5eda1ee699612e1d8f4a2770897624889f1a3808116a171cc4c796a95e3caa43012'
         '779c864611249c3f21d1864508d60cfe5e0f5541d74fb3093c6bdfa56be2c76f386ac1690d363beaee491c5132f5f6dbc01553aa408cda579ebca74b0e0fd1d0'
         '04e2af875e194df393d6cff983efc3fdf02a03a745d1b0b1e4a745f873d910b4dd0a45db956c1b5b2d97e9d5bf724ef12e23f7a2be3d5c12be027eaccf42349a')
@@ -78,11 +81,21 @@ build() {
 
 package() {
     cd zfs
+
     make DESTDIR="${pkgdir}" install
+    install -D -m644 contrib/bash_completion.d/zfs "${pkgdir}"/usr/share/bash-completion/completions/zfs
+
+	# Fix for permissions being overwritten on /dev/zfs. Related issues:
+	# https://github.com/openzfs/zfs/issues/15146
+	# https://github.com/systemd/systemd/issues/28653
+    install -D -m644 "${srcdir}"/zfs-node-permission.conf "${pkgdir}"/usr/lib/tmpfiles.d/zfs-node-permission.conf
+
     # Remove uneeded files
     rm -r "${pkgdir}"/etc/init.d
-    rm -r "${pkgdir}"/usr/share/initramfs-tools
     rm -r "${pkgdir}"/usr/lib/modules-load.d
+    rm -r "${pkgdir}"/usr/share/initramfs-tools
+    rm -r "${pkgdir}"/usr/share/zfs/*.sh
+    rm -r "${pkgdir}"/usr/share/zfs/{runfiles,test-runner,zfs-tests}
     # fix permissions
     chmod 750 ${pkgdir}/etc/sudoers.d
     chmod 440 ${pkgdir}/etc/sudoers.d/zfs
@@ -91,5 +104,4 @@ package() {
     install -D -m644 "${srcdir}"/zfs.initcpio.hook "${pkgdir}"/usr/lib/initcpio/hooks/zfs
     install -D -m644 "${srcdir}"/zfs.initcpio.install "${pkgdir}"/usr/lib/initcpio/install/zfs
     install -D -m644 "${srcdir}"/zfs.initcpio.zfsencryptssh.install "${pkgdir}"/usr/lib/initcpio/install/zfsencryptssh
-    install -D -m644 contrib/bash_completion.d/zfs "${pkgdir}"/usr/share/bash-completion/completions/zfs
 }
diff --git a/zfs-node-permission.conf b/zfs-node-permission.conf
new file mode 100644
index 000000000000..359fb7862218
--- /dev/null
+++ b/zfs-node-permission.conf
@@ -0,0 +1 @@
+z /dev/zfs 0666 - -