Semi-automated update for 0.6.5.8_4.4.20_1-2

3 files changed, 31 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b950f9cdf4c..8f66a27e7376 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 # Generated by mksrcinfo v8
-# Sat Sep 10 21:21:09 UTC 2016
+# Tue Sep 13 04:46:44 UTC 2016
 pkgbase = zfs-utils-linux-lts
 	pkgdesc = Kernel module support files for the Zettabyte File System.
-	pkgver = 0.6.5.7_4.4.20_1
-	pkgrel = 1
+	pkgver = 0.6.5.8_4.4.20_1
+	pkgrel = 2
 	url = http://zfsonlinux.org/
+	install = zfs-utils.install
 	arch = x86_64
 	groups = archzfs-linux-lts
 	license = CDDL
@@ -12,11 +13,11 @@ pkgbase = zfs-utils-linux-lts
 	depends = spl-linux-lts
 	depends = linux-lts=4.4.20
 	provides = zfs-utils
-	source = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.5.7.tar.gz
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.8/zfs-0.6.5.8.tar.gz
 	source = zfs-utils.bash-completion-r1
 	source = zfs-utils.initcpio.install
 	source = zfs-utils.initcpio.hook
-	sha256sums = 4a9e271bb9a6af8d564e4d5800e4fff36224f1697b923a7253659bdda80dc590
+	sha256sums = d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84
 	sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540
 	sha256sums = dfafce18240722bee26b5864982b4db1cd6d682c4b93a8b1f4832c98686f50d2
 	sha256sums = 5f749dbe3b853c5b569d5050b50226b53961cf1fa2cfc5cea0ecc3df75885d2f
diff --git a/PKGBUILD b/PKGBUILD
index 2a923743d9d3..95d570281b11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,37 +16,38 @@
 #
 #
 pkgname="zfs-utils-linux-lts"
-pkgver=0.6.5.7_4.4.20_1
-pkgrel=1
+pkgver=0.6.5.8_4.4.20_1
+pkgrel=2
 pkgdesc="Kernel module support files for the Zettabyte File System."
 depends=("spl-linux-lts" "linux-lts=4.4.20")
 makedepends=("linux-lts-headers=4.4.20")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.5.7.tar.gz"
+source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.8/zfs-0.6.5.8.tar.gz"
         "zfs-utils.bash-completion-r1"
         "zfs-utils.initcpio.install"
         "zfs-utils.initcpio.hook")
-sha256sums=("4a9e271bb9a6af8d564e4d5800e4fff36224f1697b923a7253659bdda80dc590"
+sha256sums=("d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84"
             "b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
             "dfafce18240722bee26b5864982b4db1cd6d682c4b93a8b1f4832c98686f50d2"
             "5f749dbe3b853c5b569d5050b50226b53961cf1fa2cfc5cea0ecc3df75885d2f")
 license=("CDDL")
 groups=("archzfs-linux-lts")
 provides=("zfs-utils")
+install=zfs-utils.install
 
 build() {
-    cd "${srcdir}/zfs-0.6.5.7"
+    cd "${srcdir}/zfs-0.6.5.8"
     ./autogen.sh
     ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \
                 --libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \
-                --with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs-0.6.5.7 \
+                --with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs-0.6.5.8 \
                 --with-config=user
     make
 }
 
 package() {
-    cd "${srcdir}/zfs-0.6.5.7"
+    cd "${srcdir}/zfs-0.6.5.8"
     make DESTDIR="${pkgdir}" install
     # Remove uneeded files
     rm -r "${pkgdir}"/etc/init.d
@@ -54,6 +55,9 @@ package() {
     # move module tree /lib -> /usr/lib
     cp -r "${pkgdir}"/{lib,usr}
     rm -r "${pkgdir}"/lib
+    # Autoload the zfs module at boot
+    mkdir -p "${pkgdir}/etc/modules-load.d"
+    printf "%s\n" "zfs" > "${pkgdir}/etc/modules-load.d/zfs.conf"
     # Install the support files
     install -D -m644 "${srcdir}"/zfs-utils.initcpio.hook "${pkgdir}"/usr/lib/initcpio/hooks/zfs
     install -D -m644 "${srcdir}"/zfs-utils.initcpio.install "${pkgdir}"/usr/lib/initcpio/install/zfs
diff --git a/zfs-utils.install b/zfs-utils.install
new file mode 100644
index 000000000000..ba23cb0f98ac
--- /dev/null
+++ b/zfs-utils.install
@@ -0,0 +1,14 @@
+show_warning() {
+    echo ">>> WARNING: The systemd unit files for archzfs have changed!"
+    echo ">>>          You may need re-enable the zfs systemd service."
+    echo ">>>          See https://github.com/archzfs/archzfs/issues/72"
+}
+
+post_install() {
+    show_warning
+}
+
+post_upgrade() {
+    show_warning
+}
+