From b60bba31924b59583a52002357ae6748cd4cf501 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 24 Jan 2020 17:39:02 +0200
Subject: Update to 0.8.3

---
 PKGBUILD | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 2bfcc95..4601dac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds
 
 pkgname=zfs-utils
-pkgver=0.8.2
+pkgver=0.8.3
 pkgrel=2
 pkgdesc="Userspace utilities for the Zettabyte File System."
 arch=("i686" "x86_64")
@@ -13,15 +13,18 @@ license=('CDDL')
 optdepends=('python: for arcstat/arc_summary/dbufstat')
 source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
         "zfs.initcpio.install"
-        "zfs.initcpio.hook")
-sha256sums=('47608e257c8ecebb918014ef1da6172c3a45d990885891af18e80f5cc28beab8'
+        "zfs.initcpio.hook"
+        "zfs-functions.patch")
+sha256sums=('545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd'
             'SKIP'
             'da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d'
-            'f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e')
-b2sums=('5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0'
+            'f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e'
+            'd0fe6b0c8a03e7e7bd7681a3cc82366b9349d3426ecf2c6945e37bde26595d7d')
+b2sums=('8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958'
         'SKIP'
         '570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3'
-        '491a7f20b0c6b4ce4fcedab617b2d7a4f2a01f1bc8f1ae57efde2fb22c2ab09a1107a8f4877b95c27576fe4216d01f181936787f51ce532bb13c5806badf7519')
+        '491a7f20b0c6b4ce4fcedab617b2d7a4f2a01f1bc8f1ae57efde2fb22c2ab09a1107a8f4877b95c27576fe4216d01f181936787f51ce532bb13c5806badf7519'
+        'e649ef8d002c045551e2d064186a297d7d253ad01d95f6b714ba7c830a8572675d666dec2f61b57573acfdd5e34ece4126a047a7fca21baa50b4f25dc9aa9f31')
 validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027'  # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
               'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
 
@@ -57,14 +60,17 @@ package() {
     install -D -m644 contrib/bash_completion.d/zfs "${pkgdir}"/usr/share/bash-completion/completions/zfs
 
     # Remove uneeded files
-    rm -r "${pkgdir}"/etc/init.d
-    rm -r "${pkgdir}"/etc/sudoers.d #???
+    #rm -r "${pkgdir}"/etc/init.d
+    rm -rf "${pkgdir}"/etc/sudoers.d #???
     # We're experimenting with dracut in [extra], so start installing this.
     #rm -r "${pkgdir}"/usr/lib/dracut
-    rm -r "${pkgdir}"/usr/lib/modules-load.d
-    rm -r "${pkgdir}"/usr/share/initramfs-tools
-    rm -r "${pkgdir}"/usr/share/zfs
+    rm -rf "${pkgdir}"/usr/lib/modules-load.d
+    rm -rf "${pkgdir}"/usr/share/initramfs-tools
+    rm -rf "${pkgdir}"/usr/share/zfs
 
     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
+
+    # workaround for https://github.com/zfsonlinux/zfs/issues/9443
+    patch -u "${pkgdir}"/etc/zfs/zfs-functions -i "${srcdir}"/zfs-functions.patch
 }
-- 
cgit v1.2.1