diff --git a/.SRCINFO b/.SRCINFO index c72af93..6318901 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,19 +1,19 @@ # Generated by mksrcinfo v8 -# Wed Aug 2 02:45:49 UTC 2017 +# Thu Aug 10 04:51:53 UTC 2017 pkgbase = zfs-linux-hardened - pkgver = 0.7.0_4.12.4.a_1 - pkgrel = 2 + pkgver = 0.7.1_4.12.5.a_1 + pkgrel = 1 url = http://zfsonlinux.org/ arch = x86_64 license = CDDL - makedepends = linux-hardened-headers=4.12.4.a-1 + makedepends = linux-hardened-headers=4.12.5.a-1 makedepends = spl-linux-hardened-headers depends = kmod depends = spl-linux-hardened - 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 + depends = zfs-utils-common>=0.7.1 + depends = linux-hardened=4.12.5.a-1 + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.1/zfs-0.7.1.tar.gz + sha256sums = 231b104979ddacfeb1889e1dec175337276e7b3b109d40656089744b5caf3ef6 pkgname = zfs-linux-hardened pkgdesc = Kernel modules for the Zettabyte File System. @@ -25,7 +25,6 @@ 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 diff --git a/PKGBUILD b/PKGBUILD index 5644efd..9afb732 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,24 +17,24 @@ # 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") +pkgver=0.7.1_4.12.5.a_1 +pkgrel=1 +makedepends=("linux-hardened-headers=4.12.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.0/zfs-0.7.0.tar.gz") -sha256sums=("6907524f5ca4149b799fe65cd31b552b0ae90dba5dc20524e1a24fc708d807d2") +source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.1/zfs-0.7.1.tar.gz") +sha256sums=("231b104979ddacfeb1889e1dec175337276e7b3b109d40656089744b5caf3ef6") license=("CDDL") -depends=("kmod" "spl-linux-hardened" "zfs-utils-common>=0.7.0" "linux-hardened=4.12.4.a-1") +depends=("kmod" "spl-linux-hardened" "zfs-utils-common>=0.7.1" "linux-hardened=4.12.5.a-1") build() { - cd "${srcdir}/zfs-0.7.0" + cd "${srcdir}/zfs-0.7.1" ./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.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 + --libexecdir=/usr/lib/zfs-0.7.1 --with-config=kernel \ + --with-linux=/usr/lib/modules/4.12.5-1-hardened/build \ + --with-linux-obj=/usr/lib/modules/4.12.5-1-hardened/build make } @@ -44,7 +44,7 @@ package_zfs-linux-hardened() { provides=("zfs") groups=("archzfs-linux-hardened") conflicts=('zfs-linux-hardened-git') - cd "${srcdir}/zfs-0.7.0" + cd "${srcdir}/zfs-0.7.1" make DESTDIR="${pkgdir}" install cp -r "${pkgdir}"/{lib,usr} rm -r "${pkgdir}"/lib @@ -54,10 +54,10 @@ package_zfs-linux-hardened() { 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" + 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' ) + cd "${srcdir}/zfs-0.7.1" make DESTDIR="${pkgdir}" install rm -r "${pkgdir}/lib" # Remove reference to ${srcdir} - sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.12.4-1-hardened/Module.symvers + sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.12.5-1-hardened/Module.symvers } diff --git a/zfs.install b/zfs.install index bdc10c6..4c3f092 100644 --- a/zfs.install +++ b/zfs.install @@ -12,7 +12,7 @@ post_upgrade() { check_initramfs() { echo ">>> Updating ZFS module dependencies" - depmod -a 4.12.4-1-hardened + depmod -a 4.12.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"'