From f18efa1dc42e700fcca9dd689d3093af14023cf8 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Mon, 4 Mar 2019 16:59:44 -0500
Subject: upgpkg: zfs-utils 0.7.13-1

upstream release

Restore hostid handling erroneously removed long ago by archzfs -- not
enforcing its use by default is reasonable, ignoring it when it is
present and explicitly desired by the user, is not reasonable.
---
 .SRCINFO             | 6 +++---
 PKGBUILD             | 4 ++--
 zfs.initcpio.install | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 544620f..2f6540d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = zfs-utils
 	pkgdesc = Userspace utilities for the Zettabyte File System.
-	pkgver = 0.7.12
+	pkgver = 0.7.13
 	pkgrel = 1
 	url = https://zfsonlinux.org/
 	arch = i686
 	arch = x86_64
 	license = CDDL
 	makedepends = git
-	source = git+https://github.com/zfsonlinux/zfs.git#tag=zfs-0.7.12?signed
+	source = git+https://github.com/zfsonlinux/zfs.git#tag=zfs-0.7.13?signed
 	source = zfs.initcpio.install
 	source = zfs.initcpio.hook
 	validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
 	validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
 	sha256sums = SKIP
-	sha256sums = 11e02412055fe3daf4753cf2ce7011e95647bb4c9ae74288a2a769f6a4c091b2
+	sha256sums = da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d
 	sha256sums = f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e
 
 pkgname = zfs-utils
diff --git a/PKGBUILD b/PKGBUILD
index b876fb4..1fef437 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
 
 pkgname=zfs-utils
-pkgver=0.7.12
+pkgver=0.7.13
 pkgrel=1
 pkgdesc="Userspace utilities for the Zettabyte File System."
 arch=("i686" "x86_64")
@@ -13,7 +13,7 @@ source=("git+https://github.com/zfsonlinux/zfs.git#tag=zfs-${pkgver}?signed"
         "zfs.initcpio.install"
         "zfs.initcpio.hook")
 sha256sums=('SKIP'
-            '11e02412055fe3daf4753cf2ce7011e95647bb4c9ae74288a2a769f6a4c091b2'
+            'da1cdc045d144d2109ec7b5d97c53a69823759d8ecff410e47c3a66b69e6518d'
             'f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e')
 validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027'  # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
               'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
diff --git a/zfs.initcpio.install b/zfs.initcpio.install
index d9e128a..589b46b 100644
--- a/zfs.initcpio.install
+++ b/zfs.initcpio.install
@@ -40,6 +40,7 @@ build() {
 
     [[ -f /etc/zfs/zpool.cache ]] && add_file "/etc/zfs/zpool.cache"
     [[ -f /etc/modprobe.d/zfs.conf ]] && add_file "/etc/modprobe.d/zfs.conf"
+    [[ -f /etc/hostid ]] && add_file "/etc/hostid"
 }
 
 help() {
-- 
cgit v1.2.1