Semi-automated update for kernel 4.20.13.arch1-1 + zfs 0.7.13

3 files changed, 7 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4fffa132b3a4..bdd66fa6b2f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = zfs-linux
-	pkgver = 0.7.12_4.20.13.arch1.1
+	pkgver = 0.7.13_4.20.13.arch1.1
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = x86_64
@@ -8,12 +8,10 @@ pkgbase = zfs-linux
 	makedepends = spl-linux-headers
 	depends = kmod
 	depends = spl-linux
-	depends = zfs-utils=0.7.12
+	depends = zfs-utils=0.7.13
 	depends = linux=4.20.13.arch1-1
-	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-linux
 	pkgdesc = Kernel modules for the Zettabyte File System.
diff --git a/PKGBUILD b/PKGBUILD
index 8e7216085015..deda79e69b84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@
 #
 pkgbase="zfs-linux"
 pkgname=("zfs-linux" "zfs-linux-headers")
-_zfsver="0.7.12"
+_zfsver="0.7.13"
 _kernelver="4.20.13.arch1-1"
 _extramodules="4.20.13-arch1-1-ARCH"
 
@@ -26,16 +26,10 @@ pkgrel=1
 makedepends=("linux-headers=${_kernelver}" "spl-linux-headers")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver}/zfs-${_zfsver}.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-${_zfsver}/zfs-${_zfsver}.tar.gz")
+sha256sums=("d23f0d292049b1bc636d2300277292b60248c0bde6a0f4ba707c0cb5df3f8c8d")
 license=("CDDL")
 depends=("kmod" 'spl-linux' "zfs-utils=${_zfsver}" "linux=${_kernelver}")
-prepare() {
-    cd "${srcdir}/zfs-${_zfsver}"
-    patch -Np1 -i ${srcdir}/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch
-}
 
 build() {
     cd "${srcdir}/zfs-${_zfsver}"
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 e36752293987..000000000000
--- 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;
-