Semi-automated update for kernel 4.17.9-1 + zfs 0.7.9

1 files changed, 13 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c7cf5cfc6085..c23caba40dc6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,15 +19,19 @@
 pkgbase="zfs-linux"
 pkgname=("zfs-linux" "zfs-linux-headers")
 
-pkgver=0.7.9.4.17.8.1
-pkgrel=1
-makedepends=("linux-headers=4.17.8-1" "spl-linux-headers")
+pkgver=0.7.9.4.17.9.1
+pkgrel=2
+makedepends=("linux-headers=4.17.9-1" "spl-linux-headers")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz")
-sha256sums=("f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a")
+source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz" "upstream-ac09630-Fix-zpl_mount-deadlock.patch")
+sha256sums=("f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a" "1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8")
 license=("CDDL")
-depends=("kmod" 'spl-linux' "zfs-utils-common=0.7.9" "linux=4.17.8-1")
+depends=("kmod" 'spl-linux' "zfs-utils-common=0.7.9" "linux=4.17.9-1")
+prepare() {
+    cd "${srcdir}/zfs-0.7.9"
+    patch -Np1 -i ${srcdir}/upstream-ac09630-Fix-zpl_mount-deadlock.patch
+}
 
 build() {
     cd "${srcdir}/zfs-0.7.9"
@@ -35,8 +39,8 @@ build() {
     ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \
                 --datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \
                 --libexecdir=/usr/lib/zfs-0.7.9 --with-config=kernel \
-                --with-linux=/usr/lib/modules/4.17.8-1-ARCH/build \
-                --with-linux-obj=/usr/lib/modules/4.17.8-1-ARCH/build
+                --with-linux=/usr/lib/modules/4.17.9-1-ARCH/build \
+                --with-linux-obj=/usr/lib/modules/4.17.9-1-ARCH/build
     make
 }
 
@@ -62,5 +66,5 @@ package_zfs-linux-headers() {
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"
     # Remove reference to ${srcdir}
-    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.17.8-1-ARCH/Module.symvers
+    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.17.9-1-ARCH/Module.symvers
 }