Update to 2.1.2

Merge branch 'master' of https://aur.archlinux.org/zfs-utils

2 files changed, 5 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
deleted file mode 100644
index d4a699c..0000000
--- a/.SRCINFO
+++ /dev/null
@@ -1,29 +0,0 @@
-pkgbase = zfs-utils
-	pkgdesc = Userspace utilities for the Zettabyte File System.
-	pkgver = 0.8.3
-	pkgrel = 1
-	url = https://zfsonlinux.org/
-	arch = i686
-	arch = x86_64
-	license = CDDL
-	optdepends = python: for arcstat/arc_summary/dbufstat
-	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz
-	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz.asc
-	source = zfs.initcpio.install
-	source = zfs.initcpio.hook
-	source = zfs-functions.patch
-	validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
-	validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
-	sha256sums = 545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd
-	sha256sums = SKIP
-	sha256sums = da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d
-	sha256sums = f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e
-	sha256sums = d0fe6b0c8a03e7e7bd7681a3cc82366b9349d3426ecf2c6945e37bde26595d7d
-	b2sums = 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958
-	b2sums = SKIP
-	b2sums = 570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3
-	b2sums = 491a7f20b0c6b4ce4fcedab617b2d7a4f2a01f1bc8f1ae57efde2fb22c2ab09a1107a8f4877b95c27576fe4216d01f181936787f51ce532bb13c5806badf7519
-	b2sums = e649ef8d002c045551e2d064186a297d7d253ad01d95f6b714ba7c830a8572675d666dec2f61b57573acfdd5e34ece4126a047a7fca21baa50b4f25dc9aa9f31
-
-pkgname = zfs-utils
-
diff --git a/PKGBUILD b/PKGBUILD
index e07dab2..e4dd0ad 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=2.0.3
+pkgver=2.1.2
 pkgrel=1
 pkgdesc="Userspace utilities for the Zettabyte File System."
 arch=("i686" "x86_64")
@@ -15,11 +15,7 @@ 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=('0694f64aa76a3a0a506e20e99b49102c3cb68bef63cb0f0154e50befc387e539'
-            'SKIP'
-            'da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d'
-            '9c20256093997f7cfa9e7eb5d85d4a712d528a6ff19ef35b83ad03fb1ceae3bc')
-b2sums=('71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5'
+b2sums=('ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584'
         'SKIP'
         '570e995bba07ea0fb424dff191180b8017b6469501964dc0b70fd51e338a4dad260f87cc313489866cbfd1583e4aac2522cf7309c067cc5314eb83c37fe14ff3'
         'e14366cbf680e3337d3d478fe759a09be224c963cc5207bee991805312afc49a49e6691f11e5b8bbe8dde60e8d855bd96e7f4f48f24a4c6d4a8c1bab7fc2bba0')
@@ -33,9 +29,6 @@ build() {
                 --sysconfdir=/etc \
                 --sbindir=/usr/bin \
                 --with-mounthelperdir=/usr/bin \
-                --libdir=/usr/lib \
-                --datadir=/usr/share \
-                --includedir=/usr/include \
                 --with-udevdir=/usr/lib/udev \
                 --libexecdir=/usr/lib \
                 --enable-pyzfs=no \
@@ -55,6 +48,9 @@ package() {
     rm -rf "${pkgdir}"/usr/share/initramfs-tools
     rm -rf "${pkgdir}"/usr/share/zfs
 
+    # openrc won't run services with #!/bin/sh
+    sed -i "s+\#\!/bin/sh+\#\!/sbin/openrc-run+" "${pkgdir}"/etc/init.d/*
+
     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