Semi-automated update for 4.14.5.a.1-1

3 files changed, 23 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 077deee35d12..f3a4155feeb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 # Generated by mksrcinfo v8
-# Sun Dec  3 23:46:21 UTC 2017
+# Wed Dec 13 19:58:50 UTC 2017
 pkgbase = zfs-linux-hardened
-	pkgver = 0.7.3_4.14.3.a.1
+	pkgver = 0.7.4_4.14.5.a.1
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = CDDL
-	makedepends = linux-hardened-headers=4.14.3.a-1
+	makedepends = linux-hardened-headers=4.14.5.a-1
 	makedepends = spl-linux-hardened-headers
 	depends = kmod
 	depends = spl-linux-hardened
-	depends = zfs-utils-common=0.7.3
-	depends = linux-hardened=4.14.3.a-1
-	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.3/zfs-0.7.3.tar.gz
-	sha256sums = cb8fc606835d3f91471e49aca31a6a0a71733b1cbe74fa510e0fe0efa670fe51
+	depends = zfs-utils-common=0.7.4
+	depends = linux-hardened=4.14.5.a-1
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.4/zfs-0.7.4.tar.gz
+	sha256sums = SKIP
 
 pkgname = zfs-linux-hardened
 	pkgdesc = Kernel modules for the Zettabyte File System.
@@ -30,6 +30,8 @@ pkgname = zfs-linux-hardened-headers
 	conflicts = zfs-linux-lts-git-headers
 	conflicts = zfs-linux-headers
 	conflicts = zfs-linux-git-headers
+	conflicts = zfs-linux-vfio-headers
+	conflicts = zfs-linux-vfio-git-headers
 	conflicts = zfs-linux-zen-headers
 	conflicts = zfs-linux-zen-git-headers
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c50780c4ffe..bad5d7b2efbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,24 +18,24 @@
 pkgbase="zfs-linux-hardened"
 pkgname=("zfs-linux-hardened" "zfs-linux-hardened-headers")
 
-pkgver=0.7.3_4.14.3.a.1
+pkgver=0.7.4_4.14.5.a.1
 pkgrel=1
-makedepends=("linux-hardened-headers=4.14.3.a-1" "spl-linux-hardened-headers")
+makedepends=("linux-hardened-headers=4.14.5.a-1" "spl-linux-hardened-headers")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.3/zfs-0.7.3.tar.gz")
-sha256sums=("cb8fc606835d3f91471e49aca31a6a0a71733b1cbe74fa510e0fe0efa670fe51")
+source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.4/zfs-0.7.4.tar.gz")
+sha256sums=("SKIP")
 license=("CDDL")
-depends=("kmod" "spl-linux-hardened" "zfs-utils-common=0.7.3" "linux-hardened=4.14.3.a-1")
+depends=("kmod" "spl-linux-hardened" "zfs-utils-common=0.7.4" "linux-hardened=4.14.5.a-1")
 
 build() {
-    cd "${srcdir}/zfs-0.7.3"
+    cd "${srcdir}/zfs-0.7.4"
     ./autogen.sh
     ./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.3 --with-config=kernel \
-                --with-linux=/usr/lib/modules/4.14.3-1-hardened/build \
-                --with-linux-obj=/usr/lib/modules/4.14.3-1-hardened/build
+                --libexecdir=/usr/lib/zfs-0.7.4 --with-config=kernel \
+                --with-linux=/usr/lib/modules/4.14.5-1-hardened/build \
+                --with-linux-obj=/usr/lib/modules/4.14.5-1-hardened/build
     make
 }
 
@@ -45,7 +45,7 @@ package_zfs-linux-hardened() {
     provides=("zfs")
     groups=("archzfs-linux-hardened")
     conflicts=('zfs-linux-hardened-git')
-    cd "${srcdir}/zfs-0.7.3"
+    cd "${srcdir}/zfs-0.7.4"
     make DESTDIR="${pkgdir}" install
     cp -r "${pkgdir}"/{lib,usr}
     rm -r "${pkgdir}"/lib
@@ -55,10 +55,10 @@ package_zfs-linux-hardened() {
 
 package_zfs-linux-hardened-headers() {
     pkgdesc="Kernel headers for the Zettabyte File System."
-    conflicts=('zfs-archiso-linux-headers'  'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
-    cd "${srcdir}/zfs-0.7.3"
+    conflicts=('zfs-archiso-linux-headers'  'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
+    cd "${srcdir}/zfs-0.7.4"
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"
     # Remove reference to ${srcdir}
-    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.14.3-1-hardened/Module.symvers
+    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.14.5-1-hardened/Module.symvers
 }
diff --git a/zfs.install b/zfs.install
index 314f987da735..1d4c6e2b2864 100644
--- a/zfs.install
+++ b/zfs.install
@@ -12,7 +12,7 @@ post_upgrade() {
 
 check_initramfs() {
     echo ">>> Updating ZFS module dependencies"
-    depmod -a 4.14.3-1-hardened
+    depmod -a 4.14.5-1-hardened
     MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?);
     if [[ ${MK_CONF} == '0' && $1 == 'remove' ]]; then
         echo '>>> The ZFS packages have been removed, but "zfs" remains in the "hooks"'