Semi-automated update for 4.12.4.a_1-2

3 files changed, 59 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99468727cb49..c72af930b419 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,34 @@
 # Generated by mksrcinfo v8
-# Tue Jul 11 14:11:35 UTC 2017
+# Wed Aug  2 02:45:49 UTC 2017
 pkgbase = zfs-linux-hardened
-	pkgdesc = Kernel modules for the Zettabyte File System.
-	pkgver = 0.6.5.11_4.12.e.0_1
-	pkgrel = 1
+	pkgver = 0.7.0_4.12.4.a_1
+	pkgrel = 2
 	url = http://zfsonlinux.org/
-	install = zfs.install
 	arch = x86_64
-	groups = archzfs-linux-hardened
 	license = CDDL
-	makedepends = linux-hardened-headers=4.12.e-1
+	makedepends = linux-hardened-headers=4.12.4.a-1
+	makedepends = spl-linux-hardened-headers
 	depends = kmod
 	depends = spl-linux-hardened
-	depends = zfs-utils-linux-hardened
-	depends = linux-hardened=4.12.e-1
+	depends = zfs-utils-common>=0.7.0
+	depends = linux-hardened=4.12.4.a-1
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.0/zfs-0.7.0.tar.gz
+	sha256sums = 6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2
+
+pkgname = zfs-linux-hardened
+	pkgdesc = Kernel modules for the Zettabyte File System.
+	install = zfs.install
+	groups = archzfs-linux-hardened
 	provides = zfs
-	conflicts = zfs-linux
-	conflicts = zfs-linux-git
-	conflicts = zfs-linux-lts
-	conflicts = zfs-linux-lts-git
 	conflicts = zfs-linux-hardened-git
-	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.11/zfs-0.6.5.11.tar.gz
-	sha256sums = 136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d
 
-pkgname = zfs-linux-hardened
+pkgname = zfs-linux-hardened-headers
+	pkgdesc = Kernel headers for the Zettabyte File System.
+	conflicts = zfs-archiso-linux-headers
+	conflicts = zfs-utils-common-git-headers
+	conflicts = zfs-linux-hardened-git-headers
+	conflicts = zfs-linux-lts-headers
+	conflicts = zfs-linux-lts-git-headers
+	conflicts = zfs-linux-headers
+	conflicts = zfs-linux-git-headers
 
diff --git a/PKGBUILD b/PKGBUILD
index 62a775b70eb1..5644efd277af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
-# Maintainer: Jan Houben <jan@nexttrex.de>
 # Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>
 #
 # This PKGBUILD was generated by the archzfs build scripts located at
 #
-# http://github.com/minextu/archzfs/tree/linux-hardened
+# http://github.com/archzfs/archzfs
 #
 # ! WARNING !
 #
@@ -16,38 +15,49 @@
 # archzfs github page.
 #
 #
-pkgname="zfs-linux-hardened"
-pkgver=0.6.5.11_4.12.e.0_1
-pkgrel=1
-pkgdesc="Kernel modules for the Zettabyte File System."
-depends=("kmod" "spl-linux-hardened" "zfs-utils-linux-hardened" "linux-hardened=4.12.e-1")
-makedepends=("linux-hardened-headers=4.12.e-1")
+pkgbase="zfs-linux-hardened"
+pkgname=("zfs-linux-hardened" "zfs-linux-hardened-headers")
+pkgver=0.7.0_4.12.4.a_1
+pkgrel=2
+makedepends=("linux-hardened-headers=4.12.4.a-1" "spl-linux-hardened-headers")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.11/zfs-0.6.5.11.tar.gz")
-sha256sums=("136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d")
-groups=("archzfs-linux-hardened")
+source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.0/zfs-0.7.0.tar.gz")
+sha256sums=("6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2")
 license=("CDDL")
-install=zfs.install
-provides=("zfs")
-conflicts=('zfs-linux' 'zfs-linux-git' 'zfs-linux-lts' 'zfs-linux-lts-git' 'zfs-linux-hardened-git')
+depends=("kmod" "spl-linux-hardened" "zfs-utils-common>=0.7.0" "linux-hardened=4.12.4.a-1")
 
 build() {
-    cd "${srcdir}/zfs-0.6.5.11"
+    cd "${srcdir}/zfs-0.7.0"
     ./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.6.5.11 --with-config=kernel \
-                --with-linux=/usr/lib/modules/4.12.0-1-hardened/build \
-                --with-linux-obj=/usr/lib/modules/4.12.0-1-hardened/build
+                --libexecdir=/usr/lib/zfs-0.7.0 --with-config=kernel \
+                --with-linux=/usr/lib/modules/4.12.4-1-hardened/build \
+                --with-linux-obj=/usr/lib/modules/4.12.4-1-hardened/build
     make
 }
 
-package() {
-    cd "${srcdir}/zfs-0.6.5.11"
+package_zfs-linux-hardened() {
+    pkgdesc="Kernel modules for the Zettabyte File System."
+    install=zfs.install
+    provides=("zfs")
+    groups=("archzfs-linux-hardened")
+    conflicts=('zfs-linux-hardened-git')
+    cd "${srcdir}/zfs-0.7.0"
     make DESTDIR="${pkgdir}" install
     cp -r "${pkgdir}"/{lib,usr}
     rm -r "${pkgdir}"/lib
+    # Remove src dir
+    rm -r "${pkgdir}"/usr/src
+}
+
+package_zfs-linux-hardened-headers() {
+    pkgdesc="Kernel headers for the Zettabyte File System."
+    conflicts=('zfs-archiso-linux-headers' 'zfs-utils-common-git-headers'  'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' )
+    cd "${srcdir}/zfs-0.7.0"
+    make DESTDIR="${pkgdir}" install
+    rm -r "${pkgdir}/lib"
     # Remove reference to ${srcdir}
-    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.12.0-1-hardened/Module.symvers
+    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.12.4-1-hardened/Module.symvers
 }
diff --git a/zfs.install b/zfs.install
index 3eb92b22e55c..bdc10c64bdcf 100644
--- a/zfs.install
+++ b/zfs.install
@@ -12,16 +12,11 @@ post_upgrade() {
 
 check_initramfs() {
     echo ">>> Updating ZFS module dependencies"
-    depmod -a 4.12.0-1-hardened
+    depmod -a 4.12.4-1-hardened
     MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?);
-    if [[ ${MK_CONF} == '0' ]]; then
-        if [[ $1 == 'remove' ]]; then
-            echo '>>> The ZFS packages have been removed, but "zfs" remains in the "hooks"'
-            echo '>>> list in mkinitcpio.conf! You will need to remove "zfs" from the '
-            echo '>>> "hooks" list and then regenerate the initial ramdisk.'
-        else
-            echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
-            mkinitcpio -p linux-hardened
-        fi
+    if [[ ${MK_CONF} == '0' && $1 == 'remove' ]]; then
+        echo '>>> The ZFS packages have been removed, but "zfs" remains in the "hooks"'
+        echo '>>> list in mkinitcpio.conf! You will need to remove "zfs" from the '
+        echo '>>> "hooks" list and then regenerate the initial ramdisk.'
     fi
 }