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

3 files changed, 16 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4700e9be6318..e73e66050e39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 # Generated by mksrcinfo v8
-# Fri Dec 22 01:03:35 UTC 2017
+# Tue Dec 26 03:48:20 UTC 2017
 pkgbase = zfs-linux-hardened-git
-	pkgver = 2017.12.21.r3220.a8b2e3068.4.14.8.b.1
+	pkgver = 2017.12.22.r3222.823d48bfb.4.14.9.a.1
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = CDDL
-	makedepends = linux-hardened-headers=4.14.8.b-1
+	makedepends = linux-hardened-headers=4.14.9.a-1
 	makedepends = git
 	makedepends = spl-linux-hardened-git-headers
 	depends = kmod
 	depends = spl-linux-hardened-git
-	depends = zfs-utils-common-git=2017.12.21.r3220.a8b2e3068
-	depends = linux-hardened=4.14.8.b-1
-	source = git+https://github.com/zfsonlinux/zfs.git#commit=a8b2e30685c9214ccfd0181977540e080340df4e
+	depends = zfs-utils-common-git=2017.12.22.r3222.823d48bfb
+	depends = linux-hardened=4.14.9.a-1
+	source = git+https://github.com/zfsonlinux/zfs.git#commit=823d48bfb182137c53b9432498f1f0564eaa8bfc
 	sha256sums = SKIP
 
 pkgname = zfs-linux-hardened-git
@@ -26,6 +26,7 @@ pkgname = zfs-linux-hardened-git
 pkgname = zfs-linux-hardened-git-headers
 	pkgdesc = Kernel headers for the Zettabyte File System.
 	conflicts = zfs-archiso-linux-headers
+	conflicts = zfs-archiso-linux-git-headers
 	conflicts = zfs-linux-hardened-headers
 	conflicts = zfs-linux-lts-headers
 	conflicts = zfs-linux-lts-git-headers
diff --git a/PKGBUILD b/PKGBUILD
index 6fd5e25495a2..1cd061bcdab0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,15 +18,15 @@
 pkgbase="zfs-linux-hardened-git"
 pkgname=("zfs-linux-hardened-git" "zfs-linux-hardened-git-headers")
 
-pkgver=2017.12.21.r3220.a8b2e3068.4.14.8.b.1
+pkgver=2017.12.22.r3222.823d48bfb.4.14.9.a.1
 pkgrel=1
-makedepends=("linux-hardened-headers=4.14.8.b-1" "git" "spl-linux-hardened-git-headers")
+makedepends=("linux-hardened-headers=4.14.9.a-1" "git" "spl-linux-hardened-git-headers")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git#commit=a8b2e30685c9214ccfd0181977540e080340df4e")
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=823d48bfb182137c53b9432498f1f0564eaa8bfc")
 sha256sums=("SKIP")
 license=("CDDL")
-depends=("kmod" "spl-linux-hardened-git" "zfs-utils-common-git=2017.12.21.r3220.a8b2e3068" "linux-hardened=4.14.8.b-1")
+depends=("kmod" "spl-linux-hardened-git" "zfs-utils-common-git=2017.12.22.r3222.823d48bfb" "linux-hardened=4.14.9.a-1")
 
 build() {
     cd "${srcdir}/zfs"
@@ -34,8 +34,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.5 --with-config=kernel \
-                --with-linux=/usr/lib/modules/4.14.8-1-hardened/build \
-                --with-linux-obj=/usr/lib/modules/4.14.8-1-hardened/build
+                --with-linux=/usr/lib/modules/4.14.9-1-hardened/build \
+                --with-linux-obj=/usr/lib/modules/4.14.9-1-hardened/build
     make
 }
 
@@ -55,10 +55,10 @@ package_zfs-linux-hardened-git() {
 
 package_zfs-linux-hardened-git-headers() {
     pkgdesc="Kernel headers for the Zettabyte File System."
-    conflicts=('zfs-archiso-linux-headers' 'zfs-linux-hardened-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' )
+    conflicts=('zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-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"
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"
     # Remove reference to ${srcdir}
-    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.14.8-1-hardened/Module.symvers
+    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.14.9-1-hardened/Module.symvers
 }
diff --git a/zfs.install b/zfs.install
index 15f448942872..b7b8eb94b465 100644
--- a/zfs.install
+++ b/zfs.install
@@ -12,7 +12,7 @@ post_upgrade() {
 
 check_initramfs() {
     echo ">>> Updating ZFS module dependencies"
-    depmod -a 4.14.8-1-hardened
+    depmod -a 4.14.9-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"'