From 3ac2a348065febd4d3a2e7d7341f68bc36f17b2b Mon Sep 17 00:00:00 2001
From: Archzfs Buildbot <34833957+archzfs-bot@users.noreply.github.com>
Date: Tue, 5 Mar 2019 14:07:06 +0000
Subject: [PATCH] Semi-automated update for zfs 0.7.13

---
 .SRCINFO                                      | 12 +++++-------
 PKGBUILD                                      | 14 ++++----------
 ...ixes-for-current_kernel_time-in-4.20.patch | 19 -------------------
 3 files changed, 9 insertions(+), 36 deletions(-)
 delete mode 100644 upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch

diff --git a/.SRCINFO b/.SRCINFO
index 73b8ded..1c4622b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,21 @@
 pkgbase = zfs-dkms
 	pkgdesc = Kernel modules for the Zettabyte File System.
-	pkgver = 0.7.12
-	pkgrel = 2
+	pkgver = 0.7.13
+	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	groups = archzfs-dkms
 	license = CDDL
 	depends = spl-dkms
-	depends = zfs-utils=0.7.12
+	depends = zfs-utils=0.7.13
 	depends = lsb-release
 	depends = dkms
 	provides = zfs
 	provides = zfs-headers
 	conflicts = zfs
 	conflicts = zfs-headers
-	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.12/zfs-0.7.12.tar.gz
-	source = upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch
-	sha256sums = 720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848
-	sha256sums = 6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/zfs-0.7.13.tar.gz
+	sha256sums = d23f0d292049b1bc636d2300277292b60248c0bde6a0f4ba707c0cb5df3f8c8d
 
 pkgname = zfs-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 08580d1..f2d2d2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,24 +8,18 @@
 pkgname="zfs-dkms"
 pkgdesc="Kernel modules for the Zettabyte File System."
 
-pkgver=0.7.12
-pkgrel=2
+pkgver=0.7.13
+pkgrel=1
 makedepends=()
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"
-        "upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch")
-sha256sums=("720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848"
-            "6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d")
+source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz")
+sha256sums=("d23f0d292049b1bc636d2300277292b60248c0bde6a0f4ba707c0cb5df3f8c8d")
 license=("CDDL")
 depends=('spl-dkms' "zfs-utils=${pkgver}" "lsb-release" "dkms")
 provides=("zfs" "zfs-headers")
 groups=("archzfs-dkms")
 conflicts=("zfs" "zfs-headers")
-prepare() {
-    cd "${srcdir}/zfs-${pkgver}"
-    patch -Np1 -i ${srcdir}/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch
-}
 
 build() {
     cd "${srcdir}/zfs-${pkgver}"
diff --git a/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch b/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch
deleted file mode 100644
index e367522..0000000
--- a/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/include/zpios-ctl.h b/include/zpios-ctl.h
-index f17f1153260..068c9eaf173 100644
---- a/include/zpios-ctl.h
-+++ b/include/zpios-ctl.h
-@@ -181,9 +181,12 @@ zpios_timespec_t
- zpios_timespec_now(void)
- {
- 	zpios_timespec_t zts_now;
--	struct timespec ts_now;
-+	#if defined(HAVE_INODE_TIMESPEC64_TIMES)
-+		inode_timespec_t ts_now = current_kernel_time64();
-+	#else
-+		inode_timespec_t ts_now = current_kernel_time();
-+	#endif
- 
--	ts_now = current_kernel_time();
- 	zts_now.ts_sec  = ts_now.tv_sec;
- 	zts_now.ts_nsec = ts_now.tv_nsec;
-